diff options
| author |   Daniel Robbins <drobbins@gentoo.org> | 2000-12-02 06:38:37 +0000 |
|---|---|---|
| committer | Daniel Robbins <drobbins@gentoo.org> | 2000-12-02 06:38:37 +0000 |
| commit | 532980ae8728ff2e7cc9b2e7bfe5311ef849bb9b (patch) | |
| tree | 336ee413d300d5859f05d664ddc9836eec634a43 /sys-apps | |
| parent | *** empty log message *** (diff) | |
| download | gentoo-2-532980ae8728ff2e7cc9b2e7bfe5311ef849bb9b.tar.gz gentoo-2-532980ae8728ff2e7cc9b2e7bfe5311ef849bb9b.tar.bz2 gentoo-2-532980ae8728ff2e7cc9b2e7bfe5311ef849bb9b.zip | |
portage merge fix, kernel fix
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/portage/files/portage.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys-apps/portage/files/portage.py b/sys-apps/portage/files/portage.py index 227641a14886..b97138adde1a 100644 --- a/sys-apps/portage/files/portage.py +++ b/sys-apps/portage/files/portage.py @@ -151,7 +151,7 @@ def mergefiles(outfile,mystart): if os.path.islink(x): myto=os.readlink(x) if os.path.exists(floc[0]): - if os.path.isdir(floc[0]): + if (not os.path.islink(floc[0])) and (os.path.isdir(floc[0])): print "!!!",floc[0],"->",myto else: os.unlink(floc[0]) |