This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2go-keyring. commit b1519ad2f042a32e2d3185b8c6d03e5eda9f22ff Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 18 14:33:01 2019 +0200 Makefile: do not try to run gpg1 to export and import keys if the keyrings are actually empty. --- Makefile | 16 ++++++++++++---- debian/changelog | 2 ++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e8ee0aa..348418f 100644 --- a/Makefile +++ b/Makefile @@ -75,7 +75,9 @@ keyrings/x2go-archive-keyring.gpg: active-keys/index keyrings/x2go-archive-keyring.gpg1: keyrings/x2go-archive-keyring.gpg touch $@ - ${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import + if [ -s $@ ]; then \ + ${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import; \ + fi rm -f $@~ keyrings/x2go-archive-removed-keys.gpg: removed-keys/index @@ -95,7 +97,9 @@ keyrings/x2go-archive-removed-keys.gpg: removed-keys/index keyrings/x2go-archive-removed-keys.gpg1: keyrings/x2go-archive-removed-keys.gpg touch $@ - ${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import + if [ -s $@ ]; then \ + ${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import; \ + fi rm -f $@~ keyrings/x2go-maintainers-keyring.gpg: x2go-maintainers/index @@ -115,7 +119,9 @@ keyrings/x2go-maintainers-keyring.gpg: x2go-maintainers/index keyrings/x2go-maintainers-keyring.gpg1: keyrings/x2go-maintainers-keyring.gpg touch $@ - ${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import + if [ -s $@ ]; then \ + ${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import; \ + fi rm -f $@~ keyrings/x2go-maintainers-removed-keys.gpg: x2go-maintainers-removed-keys/index @@ -135,7 +141,9 @@ keyrings/x2go-maintainers-removed-keys.gpg: x2go-maintainers-removed-keys/index keyrings/x2go-maintainers-removed-keys.gpg1: keyrings/x2go-maintainers-removed-keys.gpg touch $@ - ${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import + if [ -s $@ ]; then \ + ${GPG1} ${GPG_OPTIONS} --keyring $< --export | ${GPG1} ${GPG_OPTIONS} --keyring $@ --import; \ + fi rm -f $@~ $(TRUSTED-LIST) :: trusted.gpg/x2go-archive-%.gpg : active-keys/add-% active-keys/index diff --git a/debian/changelog b/debian/changelog index d761b87..4a034f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -94,6 +94,8 @@ x2go-keyring (2019.08.04) UNRELEASED; urgency=medium their signatures. * Makefile: do not require a full build and verification run for the maintonly target. + * Makefile: do not try to run gpg1 to export and import keys if the keyrings + are actually empty. * debian/control: - Change maintainer to the mailing list. - Add the old package maintainer to the Uploaders field and myself. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2go-keyring.git