From acaef1d250fef204a2e80d2e383878948ca7f29a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20H=C3=BCwe?= Date: Tue, 8 Jul 2008 15:51:37 +0000 Subject: [PATCH] - disable signature check when getting data from a rpm file - catch rpm.error exceptions --- osc/babysitter.py | 6 ++++++ osc/core.py | 1 + 2 files changed, 7 insertions(+) diff --git a/osc/babysitter.py b/osc/babysitter.py index d257f08b..26989c53 100644 --- a/osc/babysitter.py +++ b/osc/babysitter.py @@ -9,6 +9,8 @@ import sys import signal from osc import oscerr from urllib2 import URLError, HTTPError +# import as RPMError because the class "error" is too generic +from rpm import error as RPMError # the good things are stolen from Matt Mackall's mercurial @@ -127,3 +129,7 @@ def run(prg): except AttributeError, e: print >>sys.stderr, e return 1 + + except RPMError, e: + print >>sys.stderr, e + return 1 diff --git a/osc/core.py b/osc/core.py index c7ef02b4..3052e120 100755 --- a/osc/core.py +++ b/osc/core.py @@ -3096,6 +3096,7 @@ def data_from_rpm(rpm_file, *rpmdata): try: import rpm ts = rpm.TransactionSet() + ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES) file = open(rpm_file, 'r') header = ts.hdrFromFdno(file.fileno()) file.close()