diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2012-05-17 13:20:48 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-05-17 13:20:48 -0700 |
| commit | 75d5e44211e997dbba91307f27c12f9c83579299 (patch) | |
| tree | b2711f7cee059cece3097fff51b9c17c0ec41122 /pym/portage/util/movefile.py | |
| parent | merge: fix abs symlink adjustment, bug #416431 (diff) | |
| download | portage-75d5e44211e997dbba91307f27c12f9c83579299.tar.gz portage-75d5e44211e997dbba91307f27c12f9c83579299.tar.bz2 portage-75d5e44211e997dbba91307f27c12f9c83579299.zip | |
movefile: fix abs symlink adjustment, bug #416431
Diffstat (limited to 'pym/portage/util/movefile.py')
| -rw-r--r-- | pym/portage/util/movefile.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pym/portage/util/movefile.py b/pym/portage/util/movefile.py index 5ffd16bf0..10577b565 100644 --- a/pym/portage/util/movefile.py +++ b/pym/portage/util/movefile.py @@ -141,9 +141,9 @@ def movefile(src, dest, newmtime=None, sstat=None, mysettings=None, if stat.S_ISLNK(sstat[stat.ST_MODE]): try: target=os.readlink(src) - if mysettings and mysettings["D"]: - if target.find(mysettings["D"])==0: - target=target[len(mysettings["D"]):] + if mysettings and "D" in mysettings and \ + target.startswith(mysettings["D"]): + target = target[len(mysettings["D"])-1:] if destexists and not stat.S_ISDIR(dstat[stat.ST_MODE]): os.unlink(dest) try: |