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 1QSRRC-0001SV-ST for garchives@archives.gentoo.org; Fri, 03 Jun 2011 10:17:07 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A3641C001; Fri, 3 Jun 2011 10:16:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C2B041C00A for ; Fri, 3 Jun 2011 10:16:58 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 25EDB1BC014 for ; Fri, 3 Jun 2011 10:16:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2894880506 for ; Fri, 3 Jun 2011 10:16:57 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/_MergeProcess.py pym/portage/dbapi/vartree.py X-VCS-Directories: pym/portage/dbapi/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: efc19df1a18d39257fb76e7259798e041d7b8619 Date: Fri, 3 Jun 2011 10:16:57 +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: 12c60f0ae7cd63e20c22e5f2ca2c305a commit: efc19df1a18d39257fb76e7259798e041d7b8619 Author: Zac Medico gentoo org> AuthorDate: Fri Jun 3 10:13:23 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Jun 3 10:13:23 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Defc19df1 dblink.unmerge: fix some background logic cases --- pym/portage/dbapi/_MergeProcess.py | 7 +++++-- pym/portage/dbapi/vartree.py | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pym/portage/dbapi/_MergeProcess.py b/pym/portage/dbapi/_Merg= eProcess.py index b52c158..78e1ecd 100644 --- a/pym/portage/dbapi/_MergeProcess.py +++ b/pym/portage/dbapi/_MergeProcess.py @@ -217,9 +217,12 @@ class MergeProcess(SpawnProcess): # already be opened by the parent process, so we set the # "subprocess" value for use in conditional logging code # involving PORTAGE_LOG_FILE. - if not self.unmerge and self.settings.get("PORTAGE_BACKGROUND") =3D=3D= "1": + if not self.unmerge: # unmerge phases have separate logs - self.settings["PORTAGE_BACKGROUND_UNMERGE"] =3D "1" + if self.settings.get("PORTAGE_BACKGROUND") =3D=3D "1": + self.settings["PORTAGE_BACKGROUND_UNMERGE"] =3D "1" + else: + self.settings["PORTAGE_BACKGROUND_UNMERGE"] =3D "0" self.settings.backup_changes("PORTAGE_BACKGROUND_UNMERGE") self.settings["PORTAGE_BACKGROUND"] =3D "subprocess" self.settings.backup_changes("PORTAGE_BACKGROUND") diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 11eaca3..889cb58 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1629,6 +1629,9 @@ class dblink(object): self.settings["PORTAGE_BACKGROUND"] =3D "1" self.settings.backup_changes("PORTAGE_BACKGROUND") background =3D True + elif self.settings.get("PORTAGE_BACKGROUND_UNMERGE") =3D=3D "0": + self.settings["PORTAGE_BACKGROUND"] =3D "0" + self.settings.backup_changes("PORTAGE_BACKGROUND") elif self.settings.get("PORTAGE_BACKGROUND") =3D=3D "1": background =3D True =20