Catch BadZipfile and raise with the corrupted file's name

This commit is contained in:
Faik Uygur
2009-06-18 07:24:41 +00:00
parent d28cb80381
commit 7bb4329c5c
2 changed files with 8 additions and 3 deletions
+6 -2
View File
@@ -17,6 +17,7 @@ _ = __trans.ugettext
import os
import shutil
import zipfile
import pisi
import pisi.context as ctx
@@ -123,8 +124,11 @@ class Install(AtomicOperation):
ignore_file_conflicts = ctx.get_option('ignore_file_conflicts')
self.ignore_file_conflicts = ignore_file_conflicts
self.package_fname = package_fname
self.package = pisi.package.Package(package_fname)
self.package.read()
try:
self.package = pisi.package.Package(package_fname)
self.package.read()
except zipfile.BadZipfile:
raise zipfile.BadZipfile(self.package_fname)
self.metadata = self.package.metadata
self.files = self.package.files
self.pkginfo = self.metadata.package
+2 -1
View File
@@ -12,6 +12,7 @@
import os
import sys
import zipfile
import gettext
__trans = gettext.translation('pisi', fallback=True)
@@ -145,8 +146,8 @@ def install_pkg_files(package_URIs, reinstall = False):
d_t = {}
dfn = {}
for x in package_URIs:
package = pisi.package.Package(x)
try:
package = pisi.package.Package(x)
package.read()
except zipfile.BadZipfile:
# YALI needed to get which file is broken