Просмотр исходного кода

Give a correct warning when the user requested an unknown
sign command that we will default to a pgp style interface.
Closes: #133470

Frank Lichtenheld лет назад: 20
Родитель
Сommit
bf97ddac7d
3 измененных файлов с 14 добавлено и 5 удалено
  1. 8 0
      ChangeLog
  2. 3 0
      debian/changelog
  3. 3 5
      scripts/dpkg-buildpackage.sh

+ 8 - 0
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>
 2006-06-17  Frank Lichtenheld  <djpig@debian.org>
 
 
 	* scripts/dpkg-source.pl: Fix typo in regex that caused
 	* scripts/dpkg-source.pl: Fix typo in regex that caused

+ 3 - 0
debian/changelog

@@ -22,6 +22,9 @@ dpkg (1.13.22~) UNRELEASED; urgency=low
   [ Frank Lichtenheld ]
   [ Frank Lichtenheld ]
   * dpkg-source issued spurious warnings about fields defined with
   * dpkg-source issued spurious warnings about fields defined with
     XB-. They now get correctly suppressed. Closes: #374154
     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 ]
   [ Updated dpkg Translations ]
   * Romanian (Eddy Petrişor).
   * Romanian (Eddy Petrişor).

+ 3 - 5
scripts/dpkg-buildpackage.sh

@@ -134,14 +134,12 @@ fi
 
 
 if test -n "$forcesigninterface" ; then
 if test -n "$forcesigninterface" ; then
   signinterface=$forcesigninterface
   signinterface=$forcesigninterface
-if [ "$signinterface" != "gpg" ] && [ "$signinterface" != "pgp" ] ; then
-	echo >&2 "$progname: invalid sign interface specified"
-	exit 1
-fi
 else
 else
   signinterface=$signcommand
   signinterface=$signcommand
 fi
 fi
-
+if [ -n "$signcommand" ] && [ "$signinterface" != "gpg" ] && [ "$signinterface" != "pgp" ] ; then
+    echo >&2 "$progname: unknown sign command, assuming pgp style interface"
+fi
 
 
 mustsetvar () {
 mustsetvar () {
 	if [ "x$2" = x ]; then
 	if [ "x$2" = x ]; then