Make sure that PORT_LOGDIR is properly unset when it is unusable. Thanks to solar...

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

diff --git a/pym/portage.py b/pym/portage.py
index f5d4cf1e74ed8b5a9019093713b8ecf04b8034ef..0f6d3bb1c96899e0ab6e46b4d4a0c00d8ac22335 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1251,7 +1251,8 @@ class config:
                        writemsg(yellow("!!!")+" PORT_LOGDIR was defined, but set to nothing.\n",
                                noiselevel=-1)
                        writemsg(yellow("!!!")+" Disabling it.  Please set it to a non null value.\n")
-                       del self["PORT_LOGDIR"]
+                       while "PORT_LOGDIR" in self:
+                               del self["PORT_LOGDIR"]
 
                if self["PORTAGE_CACHEDIR"]:
                        # XXX: Deprecated -- April 15 -- NJ
@@ -2748,7 +2749,8 @@ def prepare_build_dirs(myroot, mysettings, cleanup):
                        writemsg("!!! Permission issues with PORT_LOGDIR='%s'\n" % \
                                mysettings["PORT_LOGDIR"], noiselevel=-1)
                        writemsg("!!! Disabling logging.\n", noiselevel=-1)
-                       mysettings["PORT_LOGDIR"]=""
+                       while "PORT_LOGDIR" in mysettings:
+                               del mysettings["PORT_LOGDIR"]
 
 def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
        fetchonly=0, cleanup=0, dbkey=None, use_cache=1, fetchall=0, tree=None,