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 1RDogP-0004Tu-Fz for garchives@archives.gentoo.org; Wed, 12 Oct 2011 02:36:37 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29A5C21C047; Wed, 12 Oct 2011 02:36:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id F210121C047 for ; Wed, 12 Oct 2011 02:36:29 +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 4EE891B4044 for ; Wed, 12 Oct 2011 02:36:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1FB1B80042 for ; Tue, 11 Oct 2011 23:32:14 +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: <2dc37de0d1eb21ecef4c04381c7d7bde0e2c4ed3.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 X-VCS-Directories: gobs/pym/ X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: 2dc37de0d1eb21ecef4c04381c7d7bde0e2c4ed3 Date: Tue, 11 Oct 2011 23:32:14 +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: 6efe51dc6afdc36e22bd9ae51f49a2a2 commit: 2dc37de0d1eb21ecef4c04381c7d7bde0e2c4ed3 Author: Magnus Granberg gentoo org> AuthorDate: Tue Oct 11 23:32:01 2011 +0000 Commit: Magnus Granberg gentoo org> CommitDate: Tue Oct 11 23:32:01 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/zorry.git;a=3D= commit;h=3D2dc37de0 fix the remove of packages/gobs.use --- gobs/pym/build_log.py | 5 ++--- gobs/pym/build_queru.py | 5 ++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gobs/pym/build_log.py b/gobs/pym/build_log.py index 4ba3f37..1555972 100644 --- a/gobs/pym/build_log.py +++ b/gobs/pym/build_log.py @@ -497,7 +497,6 @@ class gobs_buildlog(object): mydbapi=3Dtrees[settings["ROOT"]]["bintree"].dbapi, tree=3D"bintree") shutil.rmtree(tmpdir) - print('emerge info list', msg) return msg =20 def write_msg_file(self, msg, log_path): @@ -560,7 +559,7 @@ class gobs_buildlog(object): if build_id is not None: for msg_line in msg: self.write_msg_file(msg_line, emerge_info_logfilename) - print("Package: ", pkg.cpv, " logged to db.") + print("Package: ", pkg.cpv, "logged to db.") else: - print("Package: ", pkg.cpv, " NOT logged to db.") + print("Package: ", pkg.cpv, "NOT logged to db.") CM.putConnection(conn) diff --git a/gobs/pym/build_queru.py b/gobs/pym/build_queru.py index c27c5b8..c987ff1 100644 --- a/gobs/pym/build_queru.py +++ b/gobs/pym/build_queru.py @@ -684,7 +684,10 @@ 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") + try: + os.remove("/etc/portage/package.use/gobs.use") + except: + pass if build_fail is False or depclean_fail is False: return False return True