diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2006-05-15 03:06:27 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-05-15 03:06:27 +0000 |
| commit | f37b80c742f24fbfe601b3c04d97549f8d8191fb (patch) | |
| tree | bc4c56d03f88f0c738f9a317870b9c79827d3390 /pym | |
| parent | Ensure that ${ROOT} is normalized for bug #90444. (diff) | |
| download | portage-multirepo-f37b80c742f24fbfe601b3c04d97549f8d8191fb.tar.gz portage-multirepo-f37b80c742f24fbfe601b3c04d97549f8d8191fb.tar.bz2 portage-multirepo-f37b80c742f24fbfe601b3c04d97549f8d8191fb.zip | |
Revert the performance optimization from r3355 in favor of maximum robustness.
svn path=/main/trunk/; revision=3357
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/portage.py b/pym/portage.py index 46b403f0..d3814f29 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -5670,7 +5670,8 @@ class dblink: # we do this so we can remove from non-root filesystems # (use the ROOT var to allow maintenance on other partitions) try: - mydat[1] = self.myroot + mydat[1][1:] + mydat[1] = os.normpath(os.path.join( + self.myroot, mydat[1].lstrip(os.path.sep))) if mydat[0]=="obj": #format: type, mtime, md5sum pkgfiles[string.join(mydat[1:-2]," ")]=[mydat[0], mydat[-1], mydat[-2]] |