commit: 9020aa9bd3b6dc20703eec64817b8978197120b4
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 7 05:41:40 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jun 7 05:41:40 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9020aa9b
scripts/rsync-generation/update-rsync-master: hashgen -> qmanifest
Now hashgen is integrated in portage-utils as qmanifest, switch to using
it.
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
scripts/rsync-generation/update-rsync-master.sh | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/scripts/rsync-generation/update-rsync-master.sh
b/scripts/rsync-generation/update-rsync-master.sh
index d5afe16c2e..a8da6c894b 100755
--- a/scripts/rsync-generation/update-rsync-master.sh
+++ b/scripts/rsync-generation/update-rsync-master.sh
@@ -274,23 +274,12 @@ echo "($(date +"%F %R")) signing Manifest"
sed -i -e '/^thin-manifests/s/true/false/' "${RSYNCDIR}"/metadata/layout.conf
# generate Thick Manifests
-${BASE_PATH}/hashgen "${RSYNCDIR}"
-
# Signing is done with our snapshot signing key, and only on the top
# level Manifest, for it covers indirectly the entire tree
-
# remember, HOME is set to misc/ so .gnupg keychain lives there
-gpg --batch --no-tty --passphrase-fd 0 --default-key C6317B3C \
- --pinentry-mode loopback \
- --sign --clearsign --digest-algo SHA512 \
- --yes "${RSYNCDIR}"/Manifest \
- < "${BASE_PATH}"/autosigner.pwd 2>&1
-if [[ -f ${RSYNCDIR}/Manifest.asc ]] ; then
- touch -r "${RSYNCDIR}"/Manifest "${RSYNCDIR}"/Manifest.asc
- mv "${RSYNCDIR}"/Manifest{.asc,}
-else
- echo "signing failed!" >> /dev/stderr
-fi
+cat "${BASE_PATH}"/autosigner.pwd | \
+ qmanifest -g -p -s "0xC6317B3C" "${RSYNCDIR}" || \
+ echo "Manifest generation and/or signing failed!" >> /dev/stderr
echo "($(date +"%F %R")) Manifest signed"
