Give a correct warning when the user requested an unknown

sign command that we will default to a pgp style interface.
Closes: #133470

diff --git a/ChangeLog b/ChangeLog
index 254fc31fc708e99e3c7e3223147bb68bbfa9243d..e6d1e47e9871544fef40d88c7e7117d1644772f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-06-18  Frank Lichtenheld  <djpig@debian.org>
+
+       * scripts/dpkg-buildpackage.sh: Fix testing
+       the content of $signinterface by moving the
+       test to a place where it can actually fail.
+       Give the user a correct warning message about
+       what we do (i.e. defaulting to pgp style).
+
 2006-06-17  Frank Lichtenheld  <djpig@debian.org>
 
        * scripts/dpkg-source.pl: Fix typo in regex that caused

diff --git a/debian/changelog b/debian/changelog
index e5bf4c1cb2b218dbb44d911aa9a760f29cd13760..346e6b5f903eca5b0839919fa07d91189d0dac37 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,9 @@ dpkg (1.13.22~) UNRELEASED; urgency=low
   [ Frank Lichtenheld ]
   * dpkg-source issued spurious warnings about fields defined with
     XB-. They now get correctly suppressed. Closes: #374154
+  * Give a correct warning when the user requested an unknown
+    sign command that we will default to a pgp style interface.
+    Closes: #133470
 
   [ Updated dpkg Translations ]
   * Romanian (Eddy Petrişor).

diff --git a/scripts/dpkg-buildpackage.sh b/scripts/dpkg-buildpackage.sh
index be865cdf6a4938aecaeb1cd8aba47ea6bead8ef5..571863c11ce4abb58e05bfa8c9304c289cd73a92 100755 (executable)
--- a/scripts/dpkg-buildpackage.sh
+++ b/scripts/dpkg-buildpackage.sh
@@ -134,14 +134,12 @@ fi
 
 if test -n "$forcesigninterface" ; then
   signinterface=$forcesigninterface
-if [ "$signinterface" != "gpg" ] && [ "$signinterface" != "pgp" ] ; then
-       echo >&2 "$progname: invalid sign interface specified"
-       exit 1
-fi
 else
   signinterface=$signcommand
 fi
-
+if [ -n "$signcommand" ] && [ "$signinterface" != "gpg" ] && [ "$signinterface" != "pgp" ] ; then
+    echo >&2 "$progname: unknown sign command, assuming pgp style interface"
+fi
 
 mustsetvar () {
        if [ "x$2" = x ]; then