Gentoo Archives: gentoo-commits

From: Magnus Granberg <zorry@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/tinderbox-cluster:master commit in: pym/tbc/, patches/
Date: Sat, 19 Dec 2015 11:15:17
Message-Id: 1450523684.08f90494ed3951858cfb92ae00ff95bd1951964b.zorry@gentoo
1 commit: 08f90494ed3951858cfb92ae00ff95bd1951964b
2 Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 19 11:14:44 2015 +0000
4 Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 19 11:14:44 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=08f90494
7
8 move /repoman/repoman_main.py to repoman.py
9
10 patches/portage.patch | 8 ++++----
11 pym/tbc/qachecks.py | 2 +-
12 2 files changed, 5 insertions(+), 5 deletions(-)
13
14 diff --git a/patches/portage.patch b/patches/portage.patch
15 index 1faf3c0..3728501 100644
16 --- a/patches/portage.patch
17 +++ b/patches/portage.patch
18 @@ -12,7 +12,7 @@
19 We copy Scheduler.py from portage and patch it.
20 Fix so we can use add_buildlog_main()
21 We use add_buildlog_main() for loging.
22 - * tbc/pym/repoman/main.py
23 + * tbc/pym/repoman.py
24 We add config_root pkdir and remove action
25
26 --- a/pym/tbc/actions.py 2013-03-22 17:57:23.000000000 +0100
27 @@ -209,7 +209,7 @@
28 args = sys.argv[1:]
29
30 args = portage._decode_argv(args)
31 -+
32 ++
33 + if build_dict is None:
34 + build_dict = {}
35
36 @@ -287,8 +287,8 @@
37 self._jobs -= 1
38 self._status_display.running = self._jobs
39 self._schedule()
40 ---- a/pym/tbc/repoman/main.py 2015-09-22 02:20:41.000000000 +0200
41 -+++ b/pym/tbc/repoman/main.py 2015-10-04 20:21:57.586494104 +0200
42 +--- a/pym/tbc/repoman.py 2015-09-22 02:20:41.000000000 +0200
43 ++++ b/pym/tbc/repoman.py 2015-10-04 20:21:57.586494104 +0200
44 @@ -45,8 +45,9 @@ bad = create_color_func("BAD")
45 os.umask(0o22)
46
47
48 diff --git a/pym/tbc/qachecks.py b/pym/tbc/qachecks.py
49 index 451f315..acb080e 100644
50 --- a/pym/tbc/qachecks.py
51 +++ b/pym/tbc/qachecks.py
52 @@ -15,7 +15,7 @@ from portage.exception import DigestException, FileNotFound, ParseError, Permiss
53 from _emerge.Package import Package
54 from _emerge.RootConfig import RootConfig
55 from repoman.checks.ebuilds.checks import run_checks
56 -from tbc.repoman.main import repoman_main
57 +from tbc.repoman import repoman_main
58 from tbc.sqlquerys import get_configmetadata_info, get_config_info, get_setup_info
59 import portage