From: Frank Lichtenheld Date: Sun, 29 Jan 2006 16:10:59 +0000 (+0000) Subject: Change heuristics of dpkg-buildpackage's gpg check to allow for X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b5dce50051fc024788cf5a5f19248def7b41262;p=dpkg 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 bc6314bb..b58d739a 100644 --- 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 * scripts/dpkg-source.pl (checkdiff): Ignore comments diff --git a/debian/changelog b/debian/changelog index 9ab3785b..cddf9f15 100644 --- 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 Sun, 29 Jan 2006 06:02:58 +0200 diff --git a/scripts/dpkg-buildpackage.sh b/scripts/dpkg-buildpackage.sh index f8ffea96..b2602af1 100755 --- 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