diff options
| author | Matthijs Kooijman <matthijs@stdin.nl> | 2010-08-19 12:33:02 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2010-09-17 20:07:16 +0200 |
| commit | ee0e9ffe0a69d1ae1080f8087725015ae0ff8bc4 (patch) | |
| tree | caf48559cc9cc07b7d201a381e39ae9adc3ff48f /git-buildpackage | |
| parent | 083834b407e2e76e1386f9004e495a88f2906cf4 (diff) | |
Let git-import-orig find the changelog when not on the debian-branch.
When no changelog file is available in the checkout, look for the
changelog in the repository. This allows for using git-import-orig when
the upstream branch is checked out, for example.
Diffstat (limited to 'git-buildpackage')
| -rwxr-xr-x | git-buildpackage | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-buildpackage b/git-buildpackage index cbc310a3..3fe6f913 100755 --- a/git-buildpackage +++ b/git-buildpackage @@ -326,7 +326,7 @@ def main(argv): raise GbpError, "Use --git-ignore-branch to ignore or --git-debian-branch to set the branch name." try: - cp = du.parse_changelog(changelog) + cp = du.parse_changelog(filename=changelog) version = cp['Version'] version_no_epoch = cp['NoEpoch-Version'] if du.is_native(cp): @@ -385,7 +385,7 @@ def main(argv): print "Exporting '%s' to '%s'" % (options.export, tmp_dir) dump_tree(tmp_dir, tree) - cp = du.parse_changelog(os.path.join(tmp_dir, 'debian', 'changelog')) + cp = du.parse_changelog(filename=os.path.join(tmp_dir, 'debian', 'changelog')) export_dir = os.path.join(output_dir, "%s-%s" % (cp['Source'], major)) print "Moving '%s' to '%s'" % (tmp_dir, export_dir) move_old_export(export_dir) |