getbinpkg.py fix except: open can be IOERror or OSError and cPickle can throw an...

svn path=/main/trunk/; revision=5585

diff --git a/pym/getbinpkg.py b/pym/getbinpkg.py
index 6939e4840e2085c83bbc3a471d428432bff20d84..c4e7e679375ca61e2f6039d1a56a38abac41c5b5 100644 (file)
--- a/pym/getbinpkg.py
+++ b/pym/getbinpkg.py
@@ -433,9 +433,7 @@ def dir_get_metadata(baseurl, conn=None, chunk_size=3000, verbose=1, usingcache=
                metadata = cPickle.load(metadatafile)
                sys.stderr.write("Loaded metadata pickle.\n")
                metadatafile.close()
-       except SystemExit, e:
-               raise
-       except:
+       except (cPickle.UnpicklingError, OSError, IOError):
                metadata = {}
        if not metadata.has_key(baseurl):
                metadata[baseurl]={}