[Uludag-commits] r12289 - trunk/pisi/pisi

[svn-uludag at uludag.org.tr]

Author: faik
Date: Wed Feb  7 15:22:28 2007
New Revision: 12289

Modified:
   trunk/pisi/pisi/atomicoperations.py
   trunk/pisi/pisi/delta.py
Log:
this filtering is overkill.. only symlink problem, so we can check this.



Modified: trunk/pisi/pisi/atomicoperations.py
=================================================================
--- trunk/pisi/pisi/atomicoperations.py	(original)
+++ trunk/pisi/pisi/atomicoperations.py	Wed Feb  7 15:22:28 2007
@@ -300,8 +300,9 @@
                 if not os.path.exists(destdir):
                     os.makedirs(destdir)
 
-                if os.path.islink(old_path):
-                    os.symlink(os.readlink(old_path), new_path)
+                if os.path.islink(old_path): 
+                    if not os.path.exists(new_path):
+                        os.symlink(os.readlink(old_path), new_path)
                 else:
                     shutil.copy(old_path, new_path)
 

Modified: trunk/pisi/pisi/delta.py
=================================================================
--- trunk/pisi/pisi/delta.py	(original)
+++ trunk/pisi/pisi/delta.py	Wed Feb  7 15:22:28 2007
@@ -118,7 +118,6 @@
     relocations = []
     for hash in files_new.keys():
         if hash in files_old:
-            files_new[hash] = filter(lambda x:x not in files_old[hash], files_new[hash])
             for i in range(len(files_new[hash])):
                 if files_old[hash][0].path != files_new[hash][i].path:
                     relocations.append((files_old[hash][0], files_new[hash][i]))