dblink.unmerge: fix some background logic cases

diff --git a/pym/portage/dbapi/_MergeProcess.py b/pym/portage/dbapi/_MergeProcess.py
index b52c158689a0778319b9dc7ca455006c86bb9e53..78e1ecd6703e4a230d613c22d1b69154ab41bf19 100644 (file)
--- 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") == "1":
+               if not self.unmerge:
                        # unmerge phases have separate logs
-                       self.settings["PORTAGE_BACKGROUND_UNMERGE"] = "1"
+                       if self.settings.get("PORTAGE_BACKGROUND") == "1":
+                               self.settings["PORTAGE_BACKGROUND_UNMERGE"] = "1"
+                       else:
+                               self.settings["PORTAGE_BACKGROUND_UNMERGE"] = "0"
                        self.settings.backup_changes("PORTAGE_BACKGROUND_UNMERGE")
                self.settings["PORTAGE_BACKGROUND"] = "subprocess"
                self.settings.backup_changes("PORTAGE_BACKGROUND")

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 11eaca3026beda810b890534d272fd83b338a715..889cb588a8316f2b8b64707bd822151d5ecd8a88 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1629,6 +1629,9 @@ class dblink(object):
                                self.settings["PORTAGE_BACKGROUND"] = "1"
                                self.settings.backup_changes("PORTAGE_BACKGROUND")
                                background = True
+                       elif self.settings.get("PORTAGE_BACKGROUND_UNMERGE") == "0":
+                               self.settings["PORTAGE_BACKGROUND"] = "0"
+                               self.settings.backup_changes("PORTAGE_BACKGROUND")
                elif self.settings.get("PORTAGE_BACKGROUND") == "1":
                        background = True