autolanding silently fails if changelog is badly formatted

Bug #1187627 reported by Martin Mrazik
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
PBuilderJenkins
New
High
Unassigned
jenkins-launchpad-plugin
New
Undecided
Unassigned

Bug Description

autoland.py fails with no trace in the merge proposal. In the followin case the changelog is missing one space after the e-mail address. CI and the previous autolanding tests are passing just fine.

DEBUG: Merging lp:~music-app-dev/music-app/frankenstein-merge to lp:music-app
Traceback (most recent call last):
  File "/var/lib/jenkins/jenkins-launchpad-plugin/autoland.py", line 272, in <module>
    sys.exit(main())
  File "/var/lib/jenkins/jenkins-launchpad-plugin/autoland.py", line 263, in main
    return merge_and_commit(launchpad, mp, args)
  File "/var/lib/jenkins/jenkins-launchpad-plugin/autoland.py", line 105, in merge_and_commit
    target.merge(source, str(mp.reviewed_revid))
  File "/usr/local/lib/python2.7/dist-packages/tarmac/branch.py", line 108, in merge
    branch.bzr_branch, to_revision=revid)
  File "<string>", line 4, in merge_from_branch_write_locked
  File "/usr/lib/python2.7/dist-packages/bzrlib/workingtree.py", line 806, in merge_from_branch
    conflicts = merger.do_merge()
  File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 686, in do_merge
    merge = operation.run_simple()
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 136, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/merge.py", line 653, in _do_merge_to
    hook(merge)
  File "/usr/lib/python2.7/dist-packages/bzrlib/plugins/builddeb/__init__.py", line 205, in pre_merge
    pre_merge_fix_ancestry(merger)
  File "/usr/lib/python2.7/dist-packages/bzrlib/plugins/builddeb/__init__.py", line 315, in pre_merge_fix_ancestry
    source_revid=merger.other_tree.get_revision_id())
  File "/usr/lib/python2.7/dist-packages/bzrlib/plugins/builddeb/merge_package.py", line 119, in fix_ancestry_as_needed
    (us_ver, us_revid) = _upstream_version_data(source, source_revid)
  File "/usr/lib/python2.7/dist-packages/bzrlib/plugins/builddeb/merge_package.py", line 55, in _upstream_version_data
    changelog, _ignore = find_changelog(tree, False)
  File "/usr/lib/python2.7/dist-packages/bzrlib/plugins/builddeb/util.py", line 211, in find_changelog
    raise UnparseableChangelog(str(e))
bzrlib.plugins.builddeb.errors.UnparseableChangelog: There was an error parsing the changelog: Could not parse changelog: Badly formatted trailer line: -- Victor Thompson <email address hidden> Tue, 04 June 2013 11:45:00 -0400

Revision history for this message
Sergio Schvezov (sergiusens) wrote :

CI needs to fail and we need to move the pbuilderjenkins stuff to bzr bd

Changed in pbuilderjenkins:
importance: Undecided → High
assignee: nobody → Sergio Schvezov (sergiusens)
Changed in pbuilderjenkins:
assignee: Sergio Schvezov (sergiusens) → nobody
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.