[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [emerge/kde-4.8] bin: fixed overiting of existing files with EMERGE_USE_SYMLINKS, this is needed aft
From:       Patrick von Reth <patrick.vonreth () gmail ! com>
Date:       2012-03-15 9:11:48
Message-ID: 20120315091148.9F39EA60A9 () git ! kde ! org
[Download RAW message or body]

Git commit d5ee42f1711a56ec96345c950f0ef9fa4ae4bc1d by Patrick von Reth.
Committed on 15/03/2012 at 10:11.
Pushed by vonreth into branch 'kde-4.8'.

fixed overiting of existing files with EMERGE_USE_SYMLINKS, this is needed after \
switching branches

M  +3    -3    bin/utils.py

http://commits.kde.org/emerge/d5ee42f1711a56ec96345c950f0ef9fa4ae4bc1d

diff --git a/bin/utils.py b/bin/utils.py
index 8d2000d..d1d39ee 100644
--- a/bin/utils.py
+++ b/bin/utils.py
@@ -1165,12 +1165,12 @@ def copyFile(src, dest,linkOnly = \
envAsBool("EMERGE_USE_SYMLINKS")):  if os.path.islink(src):
         src = resolveLink(src)
     if linkOnly:
+        if (os.path.exists(dest) or os.path.islink(dest)):#if link is invailid \
os.path.exists will return false +            warning("overiding existing link or \
file %s with %s" % (dest,src)) +            os.remove(dest)
         if src.endswith(".exe") or src.endswith("qt.conf"):
             os.link( src , dest )
         else:
-            if (os.path.exists(dest) or os.path.islink(dest)):#if link is invailid \
                os.path.exists will return false
-                warning("overiding existing link or file %s with %s" % (dest,src))
-                os.remove(dest)
             os.symlink(deSubstPath(src), dest )
     else:
         shutil.copy(src,dest)


[prev in list] [next in list] [prev in thread] [next in thread]