Handle the case in dblink.unmerge() when the log file is a temp file and so

it doesn't exist after postrm cleaning.

svn path=/main/trunk/; revision=11100

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index deea8539b4ca7c93319fd579dea4e6cacfb415a9..32d83e25aa18ad89c9a1eddb451325bf987a772c 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1739,10 +1739,15 @@ class dblink(object):
                                                del e
                                        unlockdir(catdir_lock)
 
-               if log_path is not None:
+               if log_path is not None and os.path.exists(log_path):
                        # Restore this since it gets lost somewhere above and it
                        # needs to be set for _display_merge() to be able to log.
+                       # Note that the log isn't necessarily supposed to exist
+                       # since if PORT_LOGDIR is unset then it's a temp file
+                       # so it gets cleaned above.
                        self.settings["PORTAGE_LOG_FILE"] = log_path
+               else:
+                       self.settings.pop("PORTAGE_LOG_FILE", None)
 
                env_update(target_root=self.myroot, prev_mtimes=ldpath_mtimes,
                        contents=contents, env=self.settings.environ(),