Change heuristics of dpkg-buildpackage's gpg check to allow for

more complex setups (Julian Gilbey). Closes: #163061

diff --git a/ChangeLog b/ChangeLog
index bc6314bbe430ac84ceb6f4da06facb33f2b4d9d6..b58d739a599d65a382230dee201dd6ef1dac1ceb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
        file even if signing .dsc file fails to make it
        easier to just sign the package later.
 
+       * scripts/dpkg-buildpackage.sh: Change heuristics
+       of gpg check so that it allows for more complex
+       setups.
+
 2006-01-29  Anand Kumria  <wildfire@progsoc.org>
 
        * scripts/dpkg-source.pl (checkdiff): Ignore comments

diff --git a/debian/changelog b/debian/changelog
index 9ab3785bc4d23f7b2a8c752736910f78be70016d..cddf9f1517ebfe38131e30f512e82be9a20498b4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ dpkg (1.13.14~) UNRELEASED; urgency=low
   * Let dpkg-buildpackage create a .changes file even if signing the
     .dsc file failed. This makes it easier to just sign the package
     later (Julian Gilbey). Closes: #217963
+  * Change heuristics of dpkg-buildpackage's gpg check to allow for
+    more complex setups (Julian Gilbey). Closes: #163061
 
  -- Guillem Jover <guillem@debian.org>  Sun, 29 Jan 2006 06:02:58 +0200
 

diff --git a/scripts/dpkg-buildpackage.sh b/scripts/dpkg-buildpackage.sh
index f8ffea96c7d249ea5325857991bcd2222e175ef2..b2602af1e58d41f38e2ac91b9353bba14d549e88 100755 (executable)
--- a/scripts/dpkg-buildpackage.sh
+++ b/scripts/dpkg-buildpackage.sh
@@ -48,7 +48,7 @@ END
 
 rootcommand=''
 signcommand=""
-if ( [ -e $GNUPGHOME/secring.gpg ] || [ -e $HOME/.gnupg/secring.gpg ] ) && \
+if (( [ -n "$GNUPGHOME" ] && [ -e "$GNUPGHOME" ] ) || [ -e "$HOME/.gnupg" ] ) && \
                command -v gpg > /dev/null 2>&1; then
        signcommand=gpg
 elif command -v pgp > /dev/null 2>&1 ; then