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

This commit is contained in:
A. Murat Eren
2005-12-22 21:07:15 +00:00
parent 73e1b88282
commit 332a1ae8f0
+12
View File
@@ -85,7 +85,12 @@ class Fetcher:
else: else:
self.fetchRemoteFile(archivefile + ".part") self.fetchRemoteFile(archivefile + ".part")
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) move(archivefile + ".part", archivefile)
return archivefile return archivefile
def _do_grab(self, fileURI, dest, totalsize): def _do_grab(self, fileURI, dest, totalsize):
@@ -160,9 +165,12 @@ class Fetcher:
uri = self.url.uri uri = self.url.uri
flag = 1
try:
try: try:
fileObj = urllib2.urlopen(self.formatRequest(urllib2.Request(uri))) fileObj = urllib2.urlopen(self.formatRequest(urllib2.Request(uri)))
headers = fileObj.info() headers = fileObj.info()
flag = 0
except ValueError, e: except ValueError, e:
self.err(_('Cannot fetch %s; value error: %s') % (uri, e)) self.err(_('Cannot fetch %s; value error: %s') % (uri, e))
except urllib2.HTTPError, e: except urllib2.HTTPError, e:
@@ -173,6 +181,10 @@ class Fetcher:
self.err(_('Cannot fetch %s; %s') % (uri, e)) self.err(_('Cannot fetch %s; %s') % (uri, e))
except HTTPException, e: except HTTPException, e:
self.err(_('Cannot fetch %s; (%s): %s') % (uri, e.__class__.__name__, 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