From 29779c34db2472c68cce12480fdb8e65867a2b7b Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Thu, 25 Feb 2010 13:27:27 +0100 Subject: [PATCH 1/2] fix indentation --- osc/fetch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osc/fetch.py b/osc/fetch.py index b9ce7e54..a47d2f89 100644 --- a/osc/fetch.py +++ b/osc/fetch.py @@ -206,7 +206,7 @@ class Fetcher: dest = "%s/%s" % (self.cachedir, i) if not os.path.exists(dest): os.makedirs(dest, mode=0755) - dest += '/_pubkey' + dest += '/_pubkey' if os.path.exists(dest): buildinfo.keys.append(dest) From 47138ecf2b149eb3d1b1c2b66b5a6735a2e0d409 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Thu, 25 Feb 2010 13:36:48 +0100 Subject: [PATCH 2/2] don't catch IOError to produce backtrace that points at cause --- osc/babysitter.py | 4 ---- osc/fetch.py | 5 ++--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/osc/babysitter.py b/osc/babysitter.py index 20687802..030bf196 100644 --- a/osc/babysitter.py +++ b/osc/babysitter.py @@ -134,10 +134,6 @@ def run(prg): print >>sys.stderr, e.msg return 1 - except IOError, e: - print >>sys.stderr, e - return 1 - except AttributeError, e: print >>sys.stderr, e return 1 diff --git a/osc/fetch.py b/osc/fetch.py index a47d2f89..82d96691 100644 --- a/osc/fetch.py +++ b/osc/fetch.py @@ -335,10 +335,9 @@ def verify_pacs(pac_list, key_list): except Exception, e: failed = True print pkg, ':', e - except Exception, e: - print str(e) + except: checker.cleanup() - sys.exit(1) + raise if failed: checker.cleanup()