summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-03-05 00:10:40 +0000
committerZac Medico <zmedico@gentoo.org>2006-03-05 00:10:40 +0000
commit0b93a666b7d09d709a563d9ef76637ef7bbcd444 (patch)
tree51d7956bc0649511067796ec42b8ecafe32b088e /pym
parent67424c79c1a824554cecd5172f9bcaaa436921ad (diff)
downloadportage-0b93a666b7d09d709a563d9ef76637ef7bbcd444.tar.gz
portage-0b93a666b7d09d709a563d9ef76637ef7bbcd444.tar.bz2
portage-0b93a666b7d09d709a563d9ef76637ef7bbcd444.zip
Strip the leading slash from WORLD_FILE so that os.path.join works correctly for bug #124471. Thanks to Thomas de Grenier de Latour for finding the cause of the problem and Jonathan Adamczewski for the initial report.
svn path=/main/trunk/; revision=2812
Diffstat (limited to 'pym')
-rw-r--r--pym/portage.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 8dd2866b0..c36e19193 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -5826,7 +5826,8 @@ class dblink:
os.chown(pdir, 0, portage_gid)
os.chmod(pdir, 02770)
- write_atomic(os.path.join(self.myroot,WORLD_FILE),"\n".join(newworldlist))
+ write_atomic(os.path.join(self.myroot, WORLD_FILE.lstrip(os.sep)),
+ "\n".join(newworldlist))
#do original postrm
if myebuildpath and os.path.exists(myebuildpath):