Gentoo Archives: gentoo-commits

From: Magnus Granberg <zorry@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/zorry:master commit in: gobs/pym/
Date: Fri, 30 Sep 2011 13:17:51
Message-Id: 28772c5dcefe37aab4a7707b2366e538713e7d78.zorry@gentoo
1 commit: 28772c5dcefe37aab4a7707b2366e538713e7d78
2 Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 30 13:15:08 2011 +0000
4 Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 30 13:15:08 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=28772c5d
7
8 add code for testing action_info()
9
10 ---
11 gobs/pym/build_log.py | 16 ++++++++++++++++
12 gobs/pym/build_queru.py | 8 ++++++--
13 gobs/pym/package.py | 3 ++-
14 3 files changed, 24 insertions(+), 3 deletions(-)
15
16 diff --git a/gobs/pym/build_log.py b/gobs/pym/build_log.py
17 index 2656732..079a3c7 100644
18 --- a/gobs/pym/build_log.py
19 +++ b/gobs/pym/build_log.py
20 @@ -1,6 +1,14 @@
21 from __future__ import print_function
22 import re
23 +import os
24 +try:
25 + from subprocess import getstatusoutput as subprocess_getstatusoutput
26 +except ImportError:
27 + from commands import getstatusoutput as subprocess_getstatusoutput
28 from gobs.text import get_log_text_list
29 +from _emerge.main import parse_opts
30 +from portage.util import writemsg, \
31 + writemsg_level, writemsg_stdout
32 from gobs.repoman_gobs import gobs_repoman
33 import portage
34 from gobs.readconf import get_conf_settings
35 @@ -428,6 +436,7 @@ class gobs_buildlog(object):
36 mydbapi=trees[self._mysettings["ROOT"]]["bintree"].dbapi,
37 tree="bintree")
38 shutil.rmtree(tmpdir)
39 + print('emerge info list', msg)
40
41 def add_buildlog_main(self):
42 conn=CM.getConnection()
43 @@ -444,9 +453,16 @@ class gobs_buildlog(object):
44 for sum_log_line in sum_build_log_list:
45 summary_error = summary_error + " " + sum_log_line
46 build_log_dict['logfilename'] = re.sub("\/var\/log\/portage\/", "", self._mysettings.get("PORTAGE_LOG_FILE"))
47 + os.fchmod(self._mysettings.get("PORTAGE_LOG_FILE"), 224)
48 if self._build_dict['queue_id'] is None:
49 build_id = self.add_new_ebuild_buildlog(build_error, summary_error, build_log_dict)
50 else:
51 build_id = move_queru_buildlog(conn, self._build_dict['queue_id'], build_error, summary_error, build_log_dict)
52 # update_qa_repoman(conn, build_id, build_log_dict)
53 + argscmd = []
54 + myaction, myopts, myfiles = parse_opts(argscmd, silent=True)
55 + trees = {
56 + root : {'porttree' : portage.portagetree(root, settings=self._mysettings)}
57 + }
58 + action_info(self, trees, myopts, myfiles):
59 print("build_id", build_id[0], "logged to db.")
60
61 diff --git a/gobs/pym/build_queru.py b/gobs/pym/build_queru.py
62 index 88eed9f..92d3286 100644
63 --- a/gobs/pym/build_queru.py
64 +++ b/gobs/pym/build_queru.py
65 @@ -102,6 +102,7 @@ class queruaction(object):
66 summary_error = summary_error + " " + sum_log_line
67 if settings.get("PORTAGE_LOG_FILE") is not None:
68 build_log_dict['logfilename'] = re.sub("\/var\/log\/portage\/", "", settings.get("PORTAGE_LOG_FILE"))
69 + # os.chmode(settings.get("PORTAGE_LOG_FILE"), 224)
70 else:
71 build_log_dict['logfilename'] = ""
72 move_queru_buildlog(conn, build_dict['queue_id'], build_error, summary_error, build_log_dict)
73 @@ -647,8 +648,10 @@ class queruaction(object):
74
75 def build_procces(self, buildqueru_cpv_dict, build_dict, settings, portdb):
76 build_cpv_list = []
77 - abs_user_config = os.path.join(settings["PORTAGE_CONFIGROOT"], USER_CONFIG_PATH)
78 - print('abs_user_config', abs_user_config)
79 + try:
80 + open("/etc/portage/package.use/gobs.use", "a"
81 + except:
82 + pass
83 for k, v in buildqueru_cpv_dict.iteritems():
84 build_use_flags_list = []
85 for x, y in v.iteritems():
86 @@ -682,6 +685,7 @@ class queruaction(object):
87 print('build_fail', build_fail)
88 if not "nodepclean" in build_dict['post_message']:
89 depclean_fail = main_depclean()
90 + os.remove("/etc/portage/package.use/gobs.use")
91 if build_fail is False or depclean_fail is False:
92 return False
93 return True
94
95 diff --git a/gobs/pym/package.py b/gobs/pym/package.py
96 index d2cc8ac..cac1046 100644
97 --- a/gobs/pym/package.py
98 +++ b/gobs/pym/package.py
99 @@ -299,4 +299,5 @@ class gobs_package(object):
100 add_old_ebuild(conn,package_id, old_ebuild_list)
101 update_active_ebuild(conn,package_id, ebuild_version_tree)
102 return_id = add_new_package_sql(conn,packageDict)
103 - print('return_id', return_id)
104 \ No newline at end of file
105 + print('return_id', return_id)
106 + CM.putConnection(conn)
107 \ No newline at end of file