Launchpad itself

Merge lp:~lamont/launchpad/sigill into lp:launchpad

  1. sigill
  2. Merge into devel
Proposed by LaMont Jones on 2010-11-10
Status: Merged
Approved by: Julian Edwards on 2010-11-11
Approved revision: no longer in the source branch.
Merged at revision: 11939
Proposed branch: lp:~lamont/launchpad/sigill
Merge into: lp:launchpad
Diff against target: 13 lines (+0/-2)
1 file modified
lib/canonical/buildd/binarypackage.py (+0/-2)
To merge this branch: bzr merge lp:~lamont/launchpad/sigill
Reviewer Review Type Date Requested Status
Julian Edwards (community) 2010-11-10 Approve on 2010-11-11
Review via email: mp+40569@code.launchpad.net

Commit Message

launchpad-buildd updates for SIGILL to not automatically retry the build

Description of the Change

launchpad-buildd updates for SIGILL to not automatically retry the build

To post a comment you must log in.
Julian Edwards (julian-edwards) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/buildd/binarypackage.py'
2--- lib/canonical/buildd/binarypackage.py 2010-07-13 09:13:41 +0000
3+++ lib/canonical/buildd/binarypackage.py 2010-11-10 19:12:50 +0000
4@@ -19,9 +19,7 @@
5 class BuildLogRegexes:
6 """Build log regexes for performing actions based on regexes, and extracting dependencies for auto dep-waits"""
7 GIVENBACK = [
8- (" terminated by signal 4"),
9 ("^E: There are problems and -y was used without --force-yes"),
10- ("^make.* Illegal instruction"),
11 ]
12 DEPFAIL = [
13 ("(?P<pk>[\-+.\w]+)\(inst [^ ]+ ! >> wanted (?P<v>[\-.+\w:~]+)\)","\g<pk> (>> \g<v>)"),