merge with stable
authorSune Foldager <cryo@cyanite.org>
Wed, 14 Sep 2011 13:57:56 +0200
changeset 15093 2ca855126091
parent 15092 cbba7fca7c4d (current diff)
parent 15091 106f89299da6 (diff)
child 15096 868282fa29d8
merge with stable
--- a/mercurial/bundlerepo.py	Wed Sep 14 13:57:31 2011 +0200
+++ b/mercurial/bundlerepo.py	Wed Sep 14 13:57:56 2011 +0200
@@ -315,7 +315,8 @@
     common, incoming, rheads = tmp
     if not incoming:
         try:
-            os.unlink(bundlename)
+            if bundlename:
+                os.unlink(bundlename)
         except OSError:
             pass
         return other, [], other.close