From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R9cyM-0000EH-Ta for garchives@archives.gentoo.org; Fri, 30 Sep 2011 13:17:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B0F521C038; Fri, 30 Sep 2011 13:17:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4E00521C038 for ; Fri, 30 Sep 2011 13:17:42 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BDBEF1B4011 for ; Fri, 30 Sep 2011 13:17:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D586E80042 for ; Fri, 30 Sep 2011 13:17:40 +0000 (UTC) From: "Magnus Granberg" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Magnus Granberg" Message-ID: <28772c5dcefe37aab4a7707b2366e538713e7d78.zorry@gentoo> Subject: [gentoo-commits] dev/zorry:master commit in: gobs/pym/ X-VCS-Repository: dev/zorry X-VCS-Files: gobs/pym/build_log.py gobs/pym/build_queru.py gobs/pym/package.py X-VCS-Directories: gobs/pym/ X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: 28772c5dcefe37aab4a7707b2366e538713e7d78 Date: Fri, 30 Sep 2011 13:17:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 53bbf240ae9f0cb50721a8ee5ec986be commit: 28772c5dcefe37aab4a7707b2366e538713e7d78 Author: Magnus Granberg gentoo org> AuthorDate: Fri Sep 30 13:15:08 2011 +0000 Commit: Magnus Granberg gentoo org> CommitDate: Fri Sep 30 13:15:08 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/zorry.git;a=3D= commit;h=3D28772c5d add code for testing action_info() --- gobs/pym/build_log.py | 16 ++++++++++++++++ gobs/pym/build_queru.py | 8 ++++++-- gobs/pym/package.py | 3 ++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/gobs/pym/build_log.py b/gobs/pym/build_log.py index 2656732..079a3c7 100644 --- a/gobs/pym/build_log.py +++ b/gobs/pym/build_log.py @@ -1,6 +1,14 @@ from __future__ import print_function import re +import os +try: + from subprocess import getstatusoutput as subprocess_getstatusoutput +except ImportError: + from commands import getstatusoutput as subprocess_getstatusoutput from gobs.text import get_log_text_list +from _emerge.main import parse_opts +from portage.util import writemsg, \ + writemsg_level, writemsg_stdout from gobs.repoman_gobs import gobs_repoman import portage from gobs.readconf import get_conf_settings @@ -428,6 +436,7 @@ class gobs_buildlog(object): mydbapi=3Dtrees[self._mysettings["ROOT"]]["bintree"].dbapi, tree=3D"bintree") shutil.rmtree(tmpdir) + print('emerge info list', msg) =20 def add_buildlog_main(self): conn=3DCM.getConnection() @@ -444,9 +453,16 @@ class gobs_buildlog(object): for sum_log_line in sum_build_log_list: summary_error =3D summary_error + " " + sum_log_line build_log_dict['logfilename'] =3D re.sub("\/var\/log\/portage\/", "", = self._mysettings.get("PORTAGE_LOG_FILE")) + os.fchmod(self._mysettings.get("PORTAGE_LOG_FILE"), 224) if self._build_dict['queue_id'] is None: build_id =3D self.add_new_ebuild_buildlog(build_error, summary_error,= build_log_dict) else: build_id =3D move_queru_buildlog(conn, self._build_dict['queue_id'], = build_error, summary_error, build_log_dict) # update_qa_repoman(conn, build_id, build_log_dict) + argscmd =3D [] + myaction, myopts, myfiles =3D parse_opts(argscmd, silent=3DTrue) + trees =3D { + root : {'porttree' : portage.portagetree(root, settings=3Dself._mysett= ings)} + } + action_info(self, trees, myopts, myfiles): print("build_id", build_id[0], "logged to db.") diff --git a/gobs/pym/build_queru.py b/gobs/pym/build_queru.py index 88eed9f..92d3286 100644 --- a/gobs/pym/build_queru.py +++ b/gobs/pym/build_queru.py @@ -102,6 +102,7 @@ class queruaction(object): summary_error =3D summary_error + " " + sum_log_line if settings.get("PORTAGE_LOG_FILE") is not None: build_log_dict['logfilename'] =3D re.sub("\/var\/log\/portage\/", "= ", settings.get("PORTAGE_LOG_FILE")) + # os.chmode(settings.get("PORTAGE_LOG_FILE"), 224) else: build_log_dict['logfilename'] =3D "" move_queru_buildlog(conn, build_dict['queue_id'], build_error, summa= ry_error, build_log_dict) @@ -647,8 +648,10 @@ class queruaction(object): =20 def build_procces(self, buildqueru_cpv_dict, build_dict, settings, port= db): build_cpv_list =3D [] - abs_user_config =3D os.path.join(settings["PORTAGE_CONFIGROOT"], USER_= CONFIG_PATH) - print('abs_user_config', abs_user_config) + try: + open("/etc/portage/package.use/gobs.use", "a" + except: + pass for k, v in buildqueru_cpv_dict.iteritems(): build_use_flags_list =3D [] for x, y in v.iteritems(): @@ -682,6 +685,7 @@ class queruaction(object): print('build_fail', build_fail) if not "nodepclean" in build_dict['post_message']: depclean_fail =3D main_depclean() + os.remove("/etc/portage/package.use/gobs.use") if build_fail is False or depclean_fail is False: return False return True diff --git a/gobs/pym/package.py b/gobs/pym/package.py index d2cc8ac..cac1046 100644 --- a/gobs/pym/package.py +++ b/gobs/pym/package.py @@ -299,4 +299,5 @@ class gobs_package(object): add_old_ebuild(conn,package_id, old_ebuild_list) update_active_ebuild(conn,package_id, ebuild_version_tree) return_id =3D add_new_package_sql(conn,packageDict) - print('return_id', return_id) \ No newline at end of file + print('return_id', return_id) + CM.putConnection(conn) \ No newline at end of file