diff options
author | Guido Günther <agx@sigxcpu.org> | 2016-06-29 22:32:20 +0200 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2016-06-29 22:35:41 +0200 |
commit | 496423477a6e43934189d8354cd8c6eb27aa6249 (patch) | |
tree | 54b5fbbed39c279f7c0d40e0f766572909bb55d2 | |
parent | 10e942378002f4238bb52f2be34445daf686a8f4 (diff) |
dch: Log version number when preparing a snapshot
Closes: #829025
-rw-r--r-- | gbp/scripts/dch.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gbp/scripts/dch.py b/gbp/scripts/dch.py index 230d908..134fc3a 100644 --- a/gbp/scripts/dch.py +++ b/gbp/scripts/dch.py @@ -191,7 +191,7 @@ def do_snapshot(changelog, repo, next_snapshot): cp['MangledVersion'] = "%s~%s" % (release, suffix) mangle_changelog(changelog, cp, commit) - return snapshot, commit + return snapshot, commit, cp['MangledVersion'] def parse_commit(repo, commitid, opts, last_commit=False): """Parse a commit and return message, author, and author email""" @@ -527,8 +527,8 @@ def main(argv): do_release(changelog, repo, cp, use_git_author=options.use_git_author, dch_options=dch_options) elif options.snapshot: - (snap, version) = do_snapshot(changelog, repo, options.snapshot_number) - gbp.log.info("Changelog has been prepared for snapshot #%d at %s" % (snap, version)) + (snap, commit, version) = do_snapshot(changelog, repo, options.snapshot_number) + gbp.log.info("Changelog %s (snapshot #%d) prepared up to %s" % (version, snap, commit[:7])) if editor_cmd: gbpc.Command(editor_cmd, ["debian/changelog"])() @@ -541,7 +541,7 @@ def main(argv): # Commit the changes to the changelog file msg = changelog_commit_msg(options, version) repo.commit_files([changelog], msg) - gbp.log.info("Changelog has been committed for version %s" % version) + gbp.log.info("Changelog committed for version %s" % version) except (gbpc.CommandExecFailed, GbpError, |