dgit: Give better advice if .dsc/.changes signing fails

If no changes are needed to the package, user may indeed just debsign
and dput.  Closes:#844131.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index cfd2e2b2d826a3c4c98e5c600a7a37df2a90de7f..d2127cdbf999ef8af5c5b24feca47ed244615d06 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ dgit (2.12~) unstable; urgency=medium
   * Slightly better message when .dsc not found.  Apropos of #844128.
   * dgit-maint-native(7): Clarify that we mean native source format.
     [Phil Hands]  Closes:#847987.
+  * Give better advice if .dsc/.changes signing fails: if no changes
+    are needed to the package, user may indeed just debsign and dput.
+    Closes:#844131.
 
   Test suite:
   * Provide and use stunt lintian and debuild, to avoid lintian

diff --git a/dgit b/dgit
index ee82cd06485146a85a3a69d9d890de439cbaeacf..224d85b5015d55cc64f3e8e44fe95e05d6adb50d 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -3995,8 +3995,12 @@ END
     runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
 
     supplementary_message(<<'END');
-Push failed, after updating the remote git repository.
-If you want to try again, you must use a new version number.
+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.
+If you need to change the package, you must use a new version number.
 END
     if ($we_are_responder) {
        my $dryrunsuffix = act_local() ? "" : ".tmp";