From 99b86875f618f79c39572f8e7c722a2936f07cb3 Mon Sep 17 00:00:00 2001 From: Lingchaox Xin Date: Mon, 1 Jul 2013 16:33:51 +0800 Subject: [PATCH] Revert Exception handle in 2c7ea4c Change-Id: I0f9f21abf483f47339bcf2d153b7f65e211e9db0 --- job_submitobs.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/job_submitobs.py b/job_submitobs.py index ab36576..328dd28 100755 --- a/job_submitobs.py +++ b/job_submitobs.py @@ -49,10 +49,6 @@ EMAIL_FOOTER = '\n\n--------------------------------------------------------\n'\ 'Automatically generated by backend service.\n'\ 'Please DO NOT Reply!' -class SubmitobsError(Exception): - """Local error handler""" - pass - def send_mail(title, msg, receiver): """ post message back to gerrit and send mail to tag owner """ @@ -97,7 +93,7 @@ def find_submit_tag(event, mygit): try: tag = mygit.describe(event['patchset_revision'], pattern='submit/%s/*' % branch, exact_match=True) - except GitRepositoryError, err: + except GitRepositoryError: # don'n find submit tag on this commit, return None tag = None @@ -271,8 +267,8 @@ def parse_specfile(specfile, tmp_dir, prj_dir, packaging_dir, tag, event, \ with utils.Workdir(prj_dir): runner.show('gbs export --spec %s --packaging-dir %s -o %s' \ % (os.path.basename(specfile), packaging_dir, outdir)) - except SubmitobsError, soe: - print('gbp parse spec failed. %s' % soe) + except Exception, err: + print('gbp parse spec failed. %s' % err) msg = "The tag %s pushed, but backend service failed to parse %s. "\ "Please make sure (gbs export) can work in this project." \ % (tag, os.path.basename(specfile)) @@ -420,9 +416,9 @@ def main(): newreq = localpkg.submit_req(obs_dst_prj, msg=commit_msg) print 'New request %s is created' % newreq break - except SubmitobsError, soe: + except Exception, err: print('obs operation failed, retrying...') - print soe + print err sleep(1) retry_count -= 1 -- 2.7.4