← Back to branch summary

~jelmer/bzr-builddeb/merge-package-revision

« back to all changes in this revision

Viewing changes to merge_changelog.py

  • Committer: Vincent Ladeuil
  • Date: 2011-10-25 10:55:57 UTC
  • Revision ID: v.ladeuil+lp@free.fr-20111025105557-wv5zbo77m4xenpd0
Fix the returned values when dpkg-mergechangelogs is not available.

Also, small tweaks to the DistributionBranch.__init__ doc string found eons ago.

Show diffs side-by-side

added added

removed removed

Lines of Context:
merge_changelog.py
68
68
        except OSError, e:
69
69
            if e.errno == errno.ENOENT:
70
70
                # No dpkg-mergechangelogs command available
71
 
                return 'not_applicable'
 
71
                return 'not_applicable', ''
72
72
            raise
73
73
        stdout, stderr = proc.communicate()
74
74
        retcode = proc.returncode