[gentoo-commits] proj/tinderbox-cluster:master commit in: patches/, /

[gentoo-commits] proj/tinderbox-cluster:master commit in: patches/, /

[Magnus Granberg]

commit:     0f476f3d0f1027c83cb7dc1796069f16d98ba71a
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  4 21:25:45 2015 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Tue Aug  4 21:25:45 2015 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=0f476f3d

fix the patch and setup to support the move

 patches/portage.patch | 12 ++++++------
 setup.py              | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/patches/portage.patch b/patches/portage.patch
index 14ec949..fadbd32 100644
--- a/patches/portage.patch
+++ b/patches/portage.patch
@@ -13,8 +13,8 @@
 	Fix so we can use add_buildlog_main()
 	We use add_buildlog_main() for loging.
 
---- a/tbc/pym/actions.py	2013-03-22 17:57:23.000000000 +0100
-+++ b/tbc/pym/actions.py	2013-03-22 19:00:43.265582143 +0100
+--- a/pym/tbc/actions.py	2013-03-22 17:57:23.000000000 +0100
++++ b/pym/tbc/actions.py	2013-03-22 19:00:43.265582143 +0100
 @@ -72,7 +72,7 @@ from _emerge.MetadataRegen import Metada
  from _emerge.Package import Package
  from _emerge.ProgressHandler import ProgressHandler
@@ -180,8 +180,8 @@
  		post_emerge(emerge_config.action, emerge_config.opts,
  			emerge_config.args, emerge_config.target_config.root,
  			emerge_config.trees, emerge_config.target_config.mtimedb, retval)
---- a/tbc/pym/main.py	2013-03-22 17:57:23.000000000 +0100
-+++ b/tbc/pym/main.py	2012-12-06 03:32:56.104889716 +0100
+--- a/pym/tbc/main.py	2013-03-22 17:57:23.000000000 +0100
++++ b/pym/tbc/main.py	2012-12-06 03:32:56.104889716 +0100
 @@ -11,7 +11,7 @@ portage.proxy.lazyimport.lazyimport(glob
  	'logging',
  	'portage.util:writemsg_level',
@@ -222,8 +222,8 @@
  	finally:
  		# Call destructors for our portdbapi instances.
  		for x in emerge_config.trees.values():
---- a/tbc/pym/Scheduler.py	2013-03-22 17:57:23.000000000 +0100
-+++ b/tbc/pym/Scheduler.py	2012-12-21 02:09:28.082301168 +0100
+--- a/pym/tbc/Scheduler.py	2013-03-22 17:57:23.000000000 +0100
++++ b/pym/tbc/Scheduler.py	2012-12-21 02:09:28.082301168 +0100
 @@ -62,6 +62,8 @@ from _emerge.PackageMerge import Package
  from _emerge.PollScheduler import PollScheduler
  from _emerge.SequentialTaskQueue import SequentialTaskQueue

diff --git a/setup.py b/setup.py
index 45331e0..6a96128 100644
--- a/setup.py
+++ b/setup.py
@@ -14,14 +14,14 @@ def find_packages():
 			yield os.path.relpath(dirpath, 'pym')
 
 setup(
-        version = os.path.split(os.path.abspath(__file__))[-2].split('-')[-1],
-        packages = list(find_packages()),
-        package_dir = {'tbc': 'pym'},
-        name="tbc",
-        author='Zorry',
-        author_email='tinderbox-cluster@gentoo.org',
-        url='https://anongit.gentoo.org/git/proj/tinderbox-cluster.git',
-        description='Tinderbox cluster',
-        platforms=["any"],
-        license="GPL2",
+	version = os.path.split(os.path.abspath(__file__))[-2].split('-')[-1],
+	packages = list(find_packages()),
+	package_dir = {'': 'pym'},
+	name="tbc",
+	author='Zorry',
+	author_email='tinderbox-cluster@gentoo.org',
+	url='https://anongit.gentoo.org/git/proj/tinderbox-cluster.git',
+	description='Tinderbox cluster',
+	platforms=["any"],
+	license="GPL2",
 )