The following commit has been merged in the master branch:
commit ee9d475df820ea81c188cd2ca4e0b628aa1a6cc6
Author: James McCoy <[email protected]>
Date: Fri Nov 4 21:26:34 2011 -0400
who-uploads: Don't check for default keyrings with --no-default-keyrings
Closes: #515058
Signed-off-by: James McCoy <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index 7652768..fb3be15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,8 @@ devscripts (2.11.2) UNRELEASED; urgency=low
#376595)
+ Allow specifying which sources files to read. (Closes: #509983)
* Remove references to obsolete PGP keyrings in who-uploads/dscverify.
+ * who-uploads: Don't check for default keyrings with --no-default-keyrings.
+ (Closes: #515058)
[ Stefano Rivera ]
* debchange: Add precise as a recognised Ubuntu distro.
diff --git a/scripts/who-uploads.sh b/scripts/who-uploads.sh
index 3d75a94..3ab229d 100755
--- a/scripts/who-uploads.sh
+++ b/scripts/who-uploads.sh
@@ -126,19 +126,7 @@ fi
MAXUPLOADS=$WHOUPLOADS_MAXUPLOADS
WANT_DATE=$WHOUPLOADS_DATE
-OIFS="$IFS"
-IFS=:
declare -a GPG_DEFAULT_KEYRINGS
-
-for keyring in $WHOUPLOADS_KEYRINGS; do
- if [ -f "$keyring" ]; then
- GPG_DEFAULT_KEYRINGS=("${GPG_DEFAULT_KEYRINGS[@]}" "--keyring"
"$keyring")
- elif [ -n "$keyring" ]; then
- echo "Could not find keyring $keyring, skipping it" >&2
- fi
-done
-IFS="${OIFS:- }"
-
declare -a GPG_KEYRINGS
# Command-line options
@@ -170,7 +158,8 @@ while [ "$1" ]; do
fi
;;
--no-default-keyrings)
- GPG_DEFAULT_KEYRINGS=( ) ;;
+ WHOUPLOADS_KEYRINGS=
+ ;;
--no-conf|--noconf)
echo "$PROGNAME: $1 is only acceptable as the first command-line
option!" >&2
exit 1 ;;
@@ -184,6 +173,19 @@ while [ "$1" ]; do
shift
done
+OIFS="$IFS"
+IFS=:
+
+for keyring in $WHOUPLOADS_KEYRINGS; do
+ if [ -f "$keyring" ]; then
+ GPG_DEFAULT_KEYRINGS=("${GPG_DEFAULT_KEYRINGS[@]}" "--keyring"
"$keyring")
+ elif [ -n "$keyring" ]; then
+ echo "Could not find keyring $keyring, skipping it" >&2
+ fi
+done
+
+IFS="${OIFS:- }"
+
# Some useful abbreviations for gpg options
GPG_NO_KEYRING="--no-options --no-auto-check-trustdb --no-default-keyring
--keyring /dev/null"
GPG_OPTIONS="--no-options --no-auto-check-trustdb --no-default-keyring"
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
