From 61d4c687e30afb277d2b2c45c8e93861e896693a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Serdar=20Dalg=C4=B1=C3=A7?= Date: Tue, 26 Jan 2010 13:38:06 +0000 Subject: [PATCH] Handle urllib2 errors of dummy .part files created as a result of unreachable translations.xml's. Fixes #12136. Ilgili hatadaki 8. yorumda Isbaran'in yazdiklari sorunu acikliyor. BUG:FIXED:12136 --- ChangeLog | 4 ++++ pisi/fetcher.py | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0d4ac50e..1f9a2647 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-01-26 Serdar Dalgıç + * Handle urllib2 errors of dummy .part files created as a result of unreachable + translations.xml's. Fixes #12136. + 2010-01-23 Ozan Çağlayan * Add support for optional reverse="[tT]rue" in for reverse applying a patch. diff --git a/pisi/fetcher.py b/pisi/fetcher.py index 1882c4d1..0402cc8f 100644 --- a/pisi/fetcher.py +++ b/pisi/fetcher.py @@ -206,7 +206,13 @@ class Fetcher: return None import urllib2 - file_obj = urllib2.urlopen(urllib2.Request(self.url.get_uri())) + try: + file_obj = urllib2.urlopen(urllib2.Request(self.url.get_uri())) + except urllib2.HTTPError: + ctx.ui.debug(_("Remote file can not be reached. Previously downloaded part of the file will be removed.")) + os.remove(self.partial_file) + return None + headers = file_obj.info() file_obj.close() if headers.has_key('Content-Length'):