| 1 |
commit: efc19df1a18d39257fb76e7259798e041d7b8619 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 3 10:13:23 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 3 10:13:23 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=efc19df1 |
| 7 |
|
| 8 |
dblink.unmerge: fix some background logic cases |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/dbapi/_MergeProcess.py | 7 +++++-- |
| 12 |
pym/portage/dbapi/vartree.py | 3 +++ |
| 13 |
2 files changed, 8 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/pym/portage/dbapi/_MergeProcess.py b/pym/portage/dbapi/_MergeProcess.py |
| 16 |
index b52c158..78e1ecd 100644 |
| 17 |
--- a/pym/portage/dbapi/_MergeProcess.py |
| 18 |
+++ b/pym/portage/dbapi/_MergeProcess.py |
| 19 |
@@ -217,9 +217,12 @@ class MergeProcess(SpawnProcess): |
| 20 |
# already be opened by the parent process, so we set the |
| 21 |
# "subprocess" value for use in conditional logging code |
| 22 |
# involving PORTAGE_LOG_FILE. |
| 23 |
- if not self.unmerge and self.settings.get("PORTAGE_BACKGROUND") == "1": |
| 24 |
+ if not self.unmerge: |
| 25 |
# unmerge phases have separate logs |
| 26 |
- self.settings["PORTAGE_BACKGROUND_UNMERGE"] = "1" |
| 27 |
+ if self.settings.get("PORTAGE_BACKGROUND") == "1": |
| 28 |
+ self.settings["PORTAGE_BACKGROUND_UNMERGE"] = "1" |
| 29 |
+ else: |
| 30 |
+ self.settings["PORTAGE_BACKGROUND_UNMERGE"] = "0" |
| 31 |
self.settings.backup_changes("PORTAGE_BACKGROUND_UNMERGE") |
| 32 |
self.settings["PORTAGE_BACKGROUND"] = "subprocess" |
| 33 |
self.settings.backup_changes("PORTAGE_BACKGROUND") |
| 34 |
|
| 35 |
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py |
| 36 |
index 11eaca3..889cb58 100644 |
| 37 |
--- a/pym/portage/dbapi/vartree.py |
| 38 |
+++ b/pym/portage/dbapi/vartree.py |
| 39 |
@@ -1629,6 +1629,9 @@ class dblink(object): |
| 40 |
self.settings["PORTAGE_BACKGROUND"] = "1" |
| 41 |
self.settings.backup_changes("PORTAGE_BACKGROUND") |
| 42 |
background = True |
| 43 |
+ elif self.settings.get("PORTAGE_BACKGROUND_UNMERGE") == "0": |
| 44 |
+ self.settings["PORTAGE_BACKGROUND"] = "0" |
| 45 |
+ self.settings.backup_changes("PORTAGE_BACKGROUND") |
| 46 |
elif self.settings.get("PORTAGE_BACKGROUND") == "1": |
| 47 |
background = True |
Archives