summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Stubbs <jstubbs@gentoo.org>2005-12-25 09:11:52 +0000
committerJason Stubbs <jstubbs@gentoo.org>2005-12-25 09:11:52 +0000
commit4ca0a35889cacd686e69ce5083b14b19ff689aa4 (patch)
tree61652d8be72e2baf3d0cd73bbd0c2bafec4e750a
parentSkip to next directory after one has been removed in unmerge(). (diff)
downloadportage-multirepo-4ca0a35889cacd686e69ce5083b14b19ff689aa4.tar.gz
portage-multirepo-4ca0a35889cacd686e69ce5083b14b19ff689aa4.tar.bz2
portage-multirepo-4ca0a35889cacd686e69ce5083b14b19ff689aa4.zip
Include symlinks themselves when checking collision-protect.
svn path=/main/trunk/; revision=2460
-rw-r--r--pym/portage.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/pym/portage.py b/pym/portage.py
index f451c466..57e266f2 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -5846,6 +5846,7 @@ class dblink:
mycwd = os.getcwd()
os.chdir(srcroot)
mysymlinks = filter(os.path.islink, listdir(srcroot, recursive=1, filesonly=0, followSymlinks=False))
+ myfilelist.extend(mysymlinks)
stopmerge=False
starttime=time.time()