diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-06-22 01:24:16 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-06-22 01:24:16 +0000 |
| commit | 4d210bd46083032cf10a2084d4c6ee259a590214 (patch) | |
| tree | d3b59ec7686492ceb1aea6df6b26868e8c5fb5cb /pym | |
| parent | 564f0e2925956c2566e2911ee9d2ab2d7af7944c (diff) | |
| download | portage-4d210bd46083032cf10a2084d4c6ee259a590214.tar.gz portage-4d210bd46083032cf10a2084d4c6ee259a590214.tar.bz2 portage-4d210bd46083032cf10a2084d4c6ee259a590214.zip | |
Make sure that PORT_LOGDIR is properly unset when it is unusable. Thanks to solar for reporting issues with logs landing in $PWD.
svn path=/main/trunk/; revision=3586
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py index f5d4cf1e7..0f6d3bb1c 100644 --- 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, |