Ubuntu
autopkgtest package

Merge lp:~racb/ubuntu/saucy/autopkgtest/fix-exception-handling into lp:ubuntu/saucy/autopkgtest

  1. Saucy (13.10)
  2. fix-exception-handling
  3. Merge into saucy
Proposed by Robie Basak
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~racb/ubuntu/saucy/autopkgtest/fix-exception-handling
Merge into: lp:ubuntu/saucy/autopkgtest
Diff against target: 17 lines (+2/-2)
1 file modified
runner/adt-run (+2/-2)
To merge this branch: bzr merge lp:~racb/ubuntu/saucy/autopkgtest/fix-exception-handling
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Ubuntu branches Pending
Review via email: mp+172757@code.launchpad.net

Commit message

Correctly re-raise exception on some register failure errors

e is not defined. The exception object is oe, not e.

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thank you! Committed to Debian: http://anonscm.debian.org/gitweb/?p=autopkgtest/autopkgtest.git;a=commitdiff;h=b466a5d27

I won't directly merge this into the Ubuntu branch, we sync from Debian now.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'runner/adt-run'
2--- runner/adt-run 2013-06-27 13:49:25 +0000
3+++ runner/adt-run 2013-07-03 08:20:32 +0000
4@@ -1465,11 +1465,11 @@
5
6 try: os.remove(dest.write())
7 except (IOError,OSError), oe:
8- if oe.errno != errno.ENOENT: raise e
9+ if oe.errno != errno.ENOENT: raise oe
10
11 try: os.link(af.read(), dest.write())
12 except (IOError,OSError), oe:
13- if oe.errno != errno.EXDEV: raise e
14+ if oe.errno != errno.EXDEV: raise oe
15 shutil.copy(af.read(), dest.write())
16
17 if act.ah['deb_'+forwhat] == 'install':

Subscribers

People subscribed via source and target branches

to all changes: