# HG changeset patch
# User Sune Foldager <cryo@cyanite.org>
# Date 1316001476 -7200
# Node ID 2ca855126091fb099f3534e32258e9f04e9e7169
# Parent  cbba7fca7c4d7941b8427123bd7f98e86c97ecea# Parent  106f89299da61291b31dc054de721c98a04a1380
merge with stable

diff -r cbba7fca7c4d -r 2ca855126091 mercurial/bundlerepo.py
--- 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