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/
Date: Sat, 20 Feb 2016 12:12:12
Message-Id: 1455970370.426c02c2521b862ed7876c3fdb3018b34f843224.zorry@gentoo
1 commit: 426c02c2521b862ed7876c3fdb3018b34f843224
2 Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 20 12:12:50 2016 +0000
4 Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 20 12:12:50 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=426c02c2
7
8 Remove the profile/config and some prints
9
10 pym/tbc/flags.py | 3 ---
11 pym/tbc/sync.py | 14 --------------
12 2 files changed, 17 deletions(-)
13
14 diff --git a/pym/tbc/flags.py b/pym/tbc/flags.py
15 index eea48f3..82b7d42 100644
16 --- a/pym/tbc/flags.py
17 +++ b/pym/tbc/flags.py
18 @@ -117,7 +117,6 @@ class tbc_use_flags(object):
19 # reset cpv filter
20 self._mysettings.reset()
21 self._mysettings.lock()
22 - print(usemask)
23 return use, use_expand_hidden, usemask, useforce
24
25 def get_all_cpv_use_looked(self):
26 @@ -218,7 +217,6 @@ class tbc_use_flags(object):
27 use_flagsDict[x] = True
28 for x in use_disable:
29 use_flagsDict[x] = False
30 - print("use_flagsDict", use_flagsDict)
31 for k, v in use_flagsDict.items():
32 if build_use_flags_dict[k] != v:
33 if build_use_flags_dict[k]:
34 @@ -227,5 +225,4 @@ class tbc_use_flags(object):
35 build_use_flags_list.append("-" + k)
36 if build_use_flags_list == []:
37 build_use_flags_list = None
38 - print(build_use_flags_list)
39 return build_use_flags_list
40
41 diff --git a/pym/tbc/sync.py b/pym/tbc/sync.py
42 index 59560f0..7063bfb 100644
43 --- a/pym/tbc/sync.py
44 +++ b/pym/tbc/sync.py
45 @@ -63,12 +63,6 @@ def git_sync_main(session):
46 GuestBusy = False
47 else:
48 time.sleep(60)
49 - #remove the needed base profile clone
50 - try:
51 - os.remove(mysettings['PORTDIR'] + "/profiles/config/parent")
52 - os.rmdir(mysettings['PORTDIR'] + "/profiles/config")
53 - except:
54 - pass
55
56 # check git diffs witch get updated and pass that to a dict
57 # fetch and merge the repo
58 @@ -105,14 +99,6 @@ def git_sync_main(session):
59 write_log(session, log_msg, "info", config_id, 'sync.git_sync_main')
60 log_msg = "Checking repo %s Done" % (reponame)
61 write_log(session, log_msg, "info", config_id, 'sync.git_sync_main')
62 - # Need to add a clone of profiles/base for reading the tree
63 - try:
64 - os.mkdir(mysettings['PORTDIR'] + "/profiles/config", 0o777)
65 - with open(mysettings['PORTDIR'] + "/profiles/config/parent", "w") as f:
66 - f.write("../base\n")
67 - f.close()
68 - except:
69 - pass
70
71 log_msg = "Repo sync ... Done."
72 write_log(session, log_msg, "info", config_id, 'sync.git_sync_main')