Remove bashisms in dpkg-buildpackage. Closes: #422239

diff --git a/ChangeLog b/ChangeLog
index c03954d79b98e131b9030a446ceef89482bee625..017a6cd3c81e79299a780408264c01d957198a0e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-09  Guillem Jover  <guillem@debian.org>
+
+       * scripts/dpkg-buildpackage.sh: Remove check for variable being empty,
+       as the path check quoted, thus removing the bashisms.
+
 2007-05-08  Guillem Jover  <guillem@debian.org>
 
        * configure.ac: Bump version to 1.14.2~.

diff --git a/debian/changelog b/debian/changelog
index 579bc8eee3d861d467c0475184b152fdd0aa9000..2a5815e99218f1907b9421bc36f69076450e206a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 dpkg (1.14.2) UNRELEASED; urgency=low
 
-  * 
+  * Remove bashisms in dpkg-buildpackage. Closes: #422239
 
  -- Guillem Jover <guillem@debian.org>  Tue, 08 May 2007 18:48:22 +0300
 

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