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

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

[Magnus Granberg]

commit:     08f90494ed3951858cfb92ae00ff95bd1951964b
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 19 11:14:44 2015 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 11:14:44 2015 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=08f90494

move /repoman/repoman_main.py to repoman.py

 patches/portage.patch | 8 ++++----
 pym/tbc/qachecks.py   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/patches/portage.patch b/patches/portage.patch
index 1faf3c0..3728501 100644
--- a/patches/portage.patch
+++ b/patches/portage.patch
@@ -12,7 +12,7 @@
 	We copy Scheduler.py from portage and patch it.
 	Fix so we can use add_buildlog_main()
 	We use add_buildlog_main() for loging.
-	* tbc/pym/repoman/main.py
+	* tbc/pym/repoman.py
 	We add config_root pkdir and remove action
 
 --- a/pym/tbc/actions.py	2013-03-22 17:57:23.000000000 +0100
@@ -209,7 +209,7 @@
  		args = sys.argv[1:]
  
  	args = portage._decode_argv(args)
-+	
++
 +	if build_dict is None:
 +		build_dict = {}
  
@@ -287,8 +287,8 @@
  		self._jobs -= 1
  		self._status_display.running = self._jobs
  		self._schedule()
---- a/pym/tbc/repoman/main.py	2015-09-22 02:20:41.000000000 +0200
-+++ b/pym/tbc/repoman/main.py	2015-10-04 20:21:57.586494104 +0200
+--- a/pym/tbc/repoman.py	2015-09-22 02:20:41.000000000 +0200
++++ b/pym/tbc/repoman.py	2015-10-04 20:21:57.586494104 +0200
 @@ -45,8 +45,9 @@ bad = create_color_func("BAD")
  os.umask(0o22)
  

diff --git a/pym/tbc/qachecks.py b/pym/tbc/qachecks.py
index 451f315..acb080e 100644
--- a/pym/tbc/qachecks.py
+++ b/pym/tbc/qachecks.py
@@ -15,7 +15,7 @@ from portage.exception import DigestException, FileNotFound, ParseError, Permiss
 from _emerge.Package import Package
 from _emerge.RootConfig import RootConfig
 from repoman.checks.ebuilds.checks import run_checks
-from tbc.repoman.main import repoman_main
+from tbc.repoman import repoman_main
 from tbc.sqlquerys import get_configmetadata_info, get_config_info, get_setup_info
 import portage