summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-21 13:40:31 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-21 13:41:00 +0100
commitc0b9db3fad908bcf3b02a5179fbd2288f3d44a4d (patch)
treef297a991d3d62cc083f015604ebc7d4a8e9b86a2
parentadb0dd0b2ac3a1602c2fe1e39ba241c53eff5324 (diff)
dgit: Remove unsubstituted $changesfile from message
Closes:#906787. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--debian/changelog1
-rwxr-xr-xdgit5
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index cfd8e76..50ee0b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
dgit (6.9~) unstable; urgency=medium
* dgit: do not crash on push of a new gdr package. Closes:#906784.
+ * dgit: Remove unsubstituted $changesfile from message Closes:906787.
* dgit-maint-debrebase(7): improve "Converting an existing package",
and refer to "ILLEGAL OPERATIONS" in git-debrebase(5).
Closes:#905573. [ Sean Whitton ]
diff --git a/dgit b/dgit
index f06087d..1f1b0f5 100755
--- a/dgit
+++ b/dgit
@@ -4476,9 +4476,8 @@ END
supplementary_message(<<'END');
Push failed, while obtaining signatures on the .changes and .dsc.
If it was just that the signature failed, you may try again by using
-debsign by hand to sign the changes
- $changesfile
-and then dput to complete the upload.
+debsign by hand to sign the changes file (see the command dgit tried,
+above), and then dput that changes file to complete the upload.
If you need to change the package, you must use a new version number.
END
if ($we_are_responder) {