summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2012-05-22 17:06:32 (GMT)
committerJoey Hess <joey@kitenet.net>2012-05-22 17:06:57 (GMT)
commit1b29e06047c22fd044eb22d17d67899aefaa15b0 (patch)
tree9c21afacaf0a6c1feb0329bed7eb2a5229091939
parent4c6ae88d6e0c38024a516d140a7abc43d4cd3510 (diff)
downloaddebootstrap-1b29e06047c22fd044eb22d17d67899aefaa15b0.zip
debootstrap-1b29e06047c22fd044eb22d17d67899aefaa15b0.tar.gz
debootstrap-1b29e06047c22fd044eb22d17d67899aefaa15b0.tar.bz2
minor cleanup
-rw-r--r--debian/changelog3
-rw-r--r--functions4
2 files changed, 3 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index d437191..a384bdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
-debootstrap (1.0.40+nmu1) UNRELEASED; urgency=low
+debootstrap (1.0.41) UNRELEASED; urgency=low
- * Non-maintainer upload.
* Add support for InRelease files (Closes: #638682)
-- Mehdi Dogguy <mehdi@debian.org> Tue, 22 May 2012 12:16:57 +0200
diff --git a/functions b/functions
index 44f1cae..a7081f5 100644
--- a/functions
+++ b/functions
@@ -516,12 +516,12 @@ download_release_sig () {
fi
info RELEASESIG "Checking Release signature"
+ # Don't worry about the exit status from gpgv; parsing the output will
+ # take care of that.
if [ "$release_file_variant" = "IN" ]; then
(gpgv --status-fd 1 --keyring "$KEYRING" --ignore-time-conflict \
"$relsigdest" || true) | read_gpg_status
else
- # Don't worry about the exit status from gpgv; parsing the output will
- # take care of that.
(gpgv --status-fd 1 --keyring "$KEYRING" --ignore-time-conflict \
"$relsigdest" "$reldest" || true) | read_gpg_status
fi