summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2005-11-27 14:38:37 +0000
committerLennart Poettering <lennart@poettering.net>2005-11-27 14:38:37 +0000
commitb7c8a88445936ab74ff675e2f2e17a039434d448 (patch)
tree39f2a03c6db73f391d759c2dfdb9e4e4d085520f
parentfa214d488ac8605592b4003452606ec08b092ba3 (diff)
deal with struct.error exceptions
git-svn-id: file:///home/lennart/svn/public/sse/trunk@77 5fbabb74-0606-0410-a5e4-b5cc6a42724e
-rwxr-xr-xfeed/sse_tar.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/feed/sse_tar.py b/feed/sse_tar.py
index 62a48d1..be82ea2 100755
--- a/feed/sse_tar.py
+++ b/feed/sse_tar.py
@@ -5,7 +5,7 @@ import sse_feed, sse_db
from sse_config import *
from sse_defs import *
-import tarfile, zipfile, sys, os, time, zlib, tempfile
+import tarfile, zipfile, sys, os, time, zlib, tempfile, struct
from md5 import new as message_digest
tar_suffixes = [ ".tar.gz", ".tar.bz2", ".tgz", ".tbz2", ".tar" ]
@@ -148,7 +148,7 @@ def uncompress_archive(archive, root, package_id, meta = {}):
n = uncompress_tar(archive, root, package_id, meta)
except tarfile.TarError:
n = uncompress_zip(archive, root, package_id, meta)
- except (zipfile.error, zlib.error, EOFError, IOError), e:
+ except (zipfile.error, zlib.error, EOFError, IOError, struct.error), e:
print "WARNING: Broken archive: %s" % e
return n