[devel] git-merge-recursive fails on symlinks

[Alexey Tourbin <at@altlinux.ru>]

[-- Attachment #1: Type: text/plain, Size: 1458 bytes --]

/usr/bin/git-merge-recursive:
   266          if stat.S_ISREG(mode):
   267              try:
   268                  os.unlink(path)
   269              except OSError:
   270                  pass
   271              if mode & 0100:
   272                  mode = 0777
   273              else:
   274                  mode = 0666
   275              fd = os.open(path, os.O_WRONLY | os.O_TRUNC | os.O_CREAT, mode)
   276              proc = subprocess.Popen(prog, stdout=fd)
   277              proc.wait()
   278              os.close(fd)
   279          elif stat.S_ISLNK(mode):
   280              linkTarget = runProgram(prog)
   281              os.symlink(linkTarget, path)
   282          else:
   283              assert(False)

os.symlink на строке 281 у меня выпало с ошибкой типа path exists.

--- /usr/bin/git-merge-recursive-	2006-10-06 12:18:27 +0400
+++ /usr/bin/git-merge-recursive	2006-10-10 23:00:45 +0400
@@ -263,11 +263,11 @@ def updateFileExt(sha, mode, path, updat
                     die("Couldn't create directory", p, e.strerror)
 
         prog = ['git-cat-file', 'blob', sha]
+        try:
+            os.unlink(path)
+        except OSError:
+            pass
         if stat.S_ISREG(mode):
-            try:
-                os.unlink(path)
-            except OSError:
-                pass
             if mode & 0100:
                 mode = 0777
             else:
End of patch

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]