[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#30732: should tested patch first



OK, so I didn't test the patch first.  here's a patch that does work:

--- /usr/bin/dpkg-buildpackage	Sun Nov  1 12:50:45 1998
+++ bin/dpkg-buildpackage	Tue Dec 15 17:41:57 1998
@@ -30,24 +30,11 @@
          -nc           do not clean source tree (implies -b)
          -tc           clean source tree when finished
          -h            print this message
+         -ap           add pause before starting signature process
 END
 }
 
 rootcommand=''
-signcommand=pgp # Default command for signing
-warnpgp='no'	# Display a warning to encourage switching to gpg?
-if [ ! -e $HOME/.gnupg/secring.gpg ] ; then
-	warnpgp=yes
-fi
-if [ -e $HOME/.gnupg/secring.gpg -a ! -e $HOME/.pgp/secring.pgp ] ; then
-	signcommand=gpg
-fi
-if [ -e $HOME/.pgp/secring.pgp -a ! -e $HOME/.gnupg/secring.gpg ] ; then
-	signcommand=pgp
-fi
-signinterface=$signcommand
-signsource='withecho signfile'
-signchanges='withecho signfile'
 cleansource=false
 binarytarget=binary
 sourcestyle=''
@@ -56,6 +43,7 @@
 maint=''
 desc=''
 noclean=false
+usepause="false"
 
 while [ $# != 0 ]
 do
@@ -68,6 +56,7 @@
 	-spgp)  signinterface=pgp ;;
 	-us)	signsource=: ; warnpgp='' ;;
 	-uc)	signchanges=: ; warnpgp='' ;;
+    -ap)    usepause="true" ;;
 	-a*)    opt_a=1; arch="$value" ;;
 	-si)	sourcestyle=-si ;;
 	-sa)	sourcestyle=-sa ;;
@@ -150,6 +139,28 @@
 fi
 withecho debian/rules build
 withecho $rootcommand debian/rules $binarytarget
+
+if [ "$usepause" = "true" ] ; then
+    echo Press the return key to start signing process
+    read dummy_stuff
+fi
+
+# must do tests for type of sign command down here.
+signcommand=pgp # Default command for signing
+warnpgp='no'	# Display a warning to encourage switching to gpg?
+if [ ! -e $HOME/.gnupg/secring.gpg ] ; then
+	warnpgp=yes
+fi
+if [ -e $HOME/.gnupg/secring.gpg -a ! -e $HOME/.pgp/secring.pgp ] ; then
+	signcommand=gpg
+fi
+if [ -e $HOME/.pgp/secring.pgp -a ! -e $HOME/.gnupg/secring.gpg ] ; then
+	signcommand=pgp
+fi
+signinterface=$signcommand
+signsource='withecho signfile'
+signchanges='withecho signfile'
+
 if [ x$binaryonly = x ]; then
         $signsource "$pv.dsc"
 fi
----------------------------------------------------------------------

Thanks
Dres
-- 
@James LewisMoss <dres@ioa.com>         |  Blessed Be!
@    http://www.ioa.com/~dres           |  Linux is kewl!
@"Argue for your limitations and sure enough, they're yours." Bach


Reply to: