mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-12-28 10:46:15 +01:00
Code

Merge branch 'master' of git://gitorious.org/opensuse/osc

Browse Source
This commit is contained in:
Marcus Huewe 2010-02-25 14:13:23 +01:00
commit 12d8824e93
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osc/babysitter.py
View File

@ -134,10 +134,6 @@ def run(prg):
print >>sys.stderr, e.msg print >>sys.stderr, e.msg
return 1 return 1
except IOError, e:
print >>sys.stderr, e
return 1
except AttributeError, e: except AttributeError, e:
print >>sys.stderr, e print >>sys.stderr, e
return 1 return 1

7
osc/fetch.py
View File

@ -206,7 +206,7 @@ class Fetcher:
dest = "%s/%s" % (self.cachedir, i) dest = "%s/%s" % (self.cachedir, i)
if not os.path.exists(dest): if not os.path.exists(dest):
os.makedirs(dest, mode=0755) os.makedirs(dest, mode=0755)
dest += '/_pubkey' dest += '/_pubkey'
if os.path.exists(dest): if os.path.exists(dest):
buildinfo.keys.append(dest) buildinfo.keys.append(dest)
@ -335,10 +335,9 @@ def verify_pacs(pac_list, key_list):
except Exception, e: except Exception, e:
failed = True failed = True
print pkg, ':', e print pkg, ':', e
except Exception, e: except:
print str(e)
checker.cleanup() checker.cleanup()
sys.exit(1) raise
if failed: if failed:
checker.cleanup() checker.cleanup()