Mercurial > hg-stable
changeset 15093:2ca855126091
merge with stable
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Wed, 14 Sep 2011 13:57:56 +0200 |
parents | cbba7fca7c4d (current diff) 106f89299da6 (diff) |
children | 868282fa29d8 |
files | |
diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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