Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fetcher: Handle all fetch errors

Browse Source 
Also show the URI in the error message (not the local path).

BUG:FIXED:10948
This commit is contained in:
Fatih Aşıcı
2010-05-18 07:55:03 +00:00
parent 05a1f77b4b
commit 8774eaf162
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/fetcher.py
+2 -2
View File
@@ -151,7 +151,7 @@ class Fetcher:
copy_local = 1, copy_local = 1,
user_agent = 'PiSi Fetcher/' + pisi.__version__) user_agent = 'PiSi Fetcher/' + pisi.__version__)
except urlgrabber.grabber.URLGrabError, e: except urlgrabber.grabber.URLGrabError, e:
raise FetchError(_('Could not fetch destination file "%s": %s') % (self.archive_file, e)) raise FetchError(_('Could not fetch destination file "%s": %s') % (self.url.get_uri(), e))
if os.stat(self.partial_file).st_size == 0: if os.stat(self.partial_file).st_size == 0:
os.remove(self.partial_file) os.remove(self.partial_file)
@@ -207,7 +207,7 @@ class Fetcher:
import urllib2 import urllib2
try: try:
file_obj = urllib2.urlopen(urllib2.Request(self.url.get_uri())) file_obj = urllib2.urlopen(urllib2.Request(self.url.get_uri()))
except urllib2.HTTPError: except urllib2.URLError:
ctx.ui.debug(_("Remote file can not be reached. Previously downloaded part of the file will be removed.")) ctx.ui.debug(_("Remote file can not be reached. Previously downloaded part of the file will be removed."))
os.remove(self.partial_file) os.remove(self.partial_file)
return None return None