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 1Q3O5X-0001Jg-Fq for garchives@archives.gentoo.org; Sat, 26 Mar 2011 07:39:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9F1EE1C009; Sat, 26 Mar 2011 07:39:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 57F311C009 for ; Sat, 26 Mar 2011 07:39:03 +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 D1C4A1B410F for ; Sat, 26 Mar 2011 07:39:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 3DD2B8006A for ; Sat, 26 Mar 2011 07:39:02 +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/, pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/actions.py pym/portage/dbapi/vartree.py X-VCS-Directories: pym/portage/dbapi/ pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: a1a23d2bc25a324b24c180dc982d9442229dc9eb Date: Sat, 26 Mar 2011 07:39:02 +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: 6673df3b5650af4206447656e22f23b1 commit: a1a23d2bc25a324b24c180dc982d9442229dc9eb Author: Zac Medico gentoo org> AuthorDate: Sat Mar 26 07:38:23 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Mar 26 07:38:23 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Da1a23d2b unmerge: fix PORTAGE_BACKGROUND logic --- pym/_emerge/actions.py | 7 +++++++ pym/portage/dbapi/vartree.py | 13 ++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index f79f927..53d1880 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2623,6 +2623,13 @@ def action_uninstall(settings, trees, ldpath_mtime= s, sched._background =3D sched._background_mode() sched._status_display.quiet =3D True =20 + if sched._background: + sched.settings.unlock() + sched.settings["PORTAGE_BACKGROUND"] =3D "1" + sched.settings.backup_changes("PORTAGE_BACKGROUND") + sched.settings.lock() + sched.pkgsettings[root] =3D portage.config(clone=3Dsched.settings) + if action in ('clean', 'unmerge') or \ (action =3D=3D 'prune' and "--nodeps" in opts): # When given a list of atoms, unmerge them in the order given. diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index c90d86b..98f578f 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1477,12 +1477,15 @@ class dblink(object): # We create a scheduler instance and use it to # log unmerge output separately from merge output. self._scheduler =3D PollScheduler().sched_iface - if self.settings.get("PORTAGE_BACKGROUND_UNMERGE") =3D=3D "1": - self.settings["PORTAGE_BACKGROUND"] =3D "1" - self.settings.backup_changes("PORTAGE_BACKGROUND") + if self.settings.get("PORTAGE_BACKGROUND") =3D=3D "subprocess": + if self.settings.get("PORTAGE_BACKGROUND_UNMERGE") =3D=3D "1": + self.settings["PORTAGE_BACKGROUND"] =3D "1" + self.settings.backup_changes("PORTAGE_BACKGROUND") + background =3D True + else: + self.settings.pop("PORTAGE_BACKGROUND", None) + elif self.settings.get("PORTAGE_BACKGROUND") =3D=3D "1": background =3D True - else: - self.settings.pop("PORTAGE_BACKGROUND", None) =20 self.vartree.dbapi._bump_mtime(self.mycpv) showMessage =3D self._display_merge