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

fetcher icin "pasakli olma" seysi.. (fix #1359)

Browse Source
This commit is contained in:
A. Murat Eren
2005-12-22 21:07:15 +00:00
parent 73e1b88282
commit 332a1ae8f0
1 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/fetcher.py
+26 -14
View File
@@ -85,7 +85,12 @@ class Fetcher:
else: else:
self.fetchRemoteFile(archivefile + ".part") self.fetchRemoteFile(archivefile + ".part")
move(archivefile + ".part", archivefile) if os.stat(archivefile + ".part").st_size == 0:
os.remove(archivefile + '.part')
self.err(_('A problem occured. Please check the archive address and/or permissions again.'))
else:
move(archivefile + ".part", archivefile)
return archivefile return archivefile
def _do_grab(self, fileURI, dest, totalsize): def _do_grab(self, fileURI, dest, totalsize):
@@ -160,20 +165,27 @@ class Fetcher:
uri = self.url.uri uri = self.url.uri
flag = 1
try: try:
fileObj = urllib2.urlopen(self.formatRequest(urllib2.Request(uri))) try:
headers = fileObj.info() fileObj = urllib2.urlopen(self.formatRequest(urllib2.Request(uri)))
except ValueError, e: headers = fileObj.info()
self.err(_('Cannot fetch %s; value error: %s') % (uri, e)) flag = 0
except urllib2.HTTPError, e: except ValueError, e:
self.err(_('Cannot fetch %s; %s') % (uri, e)) self.err(_('Cannot fetch %s; value error: %s') % (uri, e))
except urllib2.URLError, e: except urllib2.HTTPError, e:
self.err(_('Cannot fetch %s; %s') % (uri, e[-1][-1])) self.err(_('Cannot fetch %s; %s') % (uri, e))
except OSError, e: except urllib2.URLError, e:
self.err(_('Cannot fetch %s; %s') % (uri, e)) self.err(_('Cannot fetch %s; %s') % (uri, e[-1][-1]))
except HTTPException, e: except OSError, e:
self.err(_('Cannot fetch %s; (%s): %s') % (uri, e.__class__.__name__, e)) self.err(_('Cannot fetch %s; %s') % (uri, e))
except HTTPException, e:
self.err(_('Cannot fetch %s; (%s): %s') % (uri, e.__class__.__name__, e))
finally:
if flag:
if os.stat(archivefile).st_size == 0:
os.remove(archivefile)
try: try:
totalsize = int(headers['Content-Length']) + self.existsize totalsize = int(headers['Content-Length']) + self.existsize
except: except: