[X2Go-Commits] [x2go-keyring] 41/47: Makefile: accept empty indices.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2go-keyring.

commit be150edfe3b9c095ba59d3d453f7739ce2dc11b7
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Aug 4 16:09:57 2019 +0200

    Makefile: accept empty indices.
---
 Makefile         | 40 ++++++++++++++++++++++++++++------------
 debian/changelog |  1 +
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 38029b4..5c10df5 100644
--- a/Makefile
+++ b/Makefile
@@ -26,24 +26,40 @@ verify-results: keyrings/x2go-maintainers-keyring.gpg keyrings/x2go-maintainers-
 	#	Maybe "just" checking that no key is added if we merge, but how…
 
 keyrings/x2go-archive-keyring.gpg: active-keys/index
-	jetring-build -I $@ active-keys
-	gpg ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp
-	mv -f $@.tmp $@
+	if [ -e 'active-keys/index' ] && [ ! -s 'active-keys/index' ]; then \
+		gpg ${GPG_OPTIONS} --keyring $@ --fingerprint; \
+	else \
+		jetring-build -I $@ active-keys; \
+		gpg ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp; \
+		mv -f $@.tmp $@; \
+	fi
 
 keyrings/x2go-archive-removed-keys.gpg: removed-keys/index
-	jetring-build -I $@ removed-keys
-	gpg ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp
-	mv -f $@.tmp $@
+	if [ -e 'removed-keys/index' ] && [ ! -s 'removed-keys/index' ]; then \
+		gpg ${GPG_OPTIONS} --keyring $@ --fingerprint; \
+	else \
+		jetring-build -I $@ removed-keys; \
+		gpg ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp; \
+		mv -f $@.tmp $@; \
+	fi
 
 keyrings/x2go-maintainers-keyring.gpg: x2go-maintainers/index
-	jetring-build -I $@ x2go-maintainers
-	gpg ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp
-	mv -f $@.tmp $@
+	if [ -e 'x2go-maintainers/index' ] && [ ! -s 'x2go-maintainers/index' ]; then \
+		gpg ${GPG_OPTIONS} --keyring $@ --fingerprint; \
+	else \
+		jetring-build -I $@ x2go-maintainers; \
+		gpg ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp; \
+		mv -f $@.tmp $@; \
+	fi
 
 keyrings/x2go-maintainers-removed-keys.gpg: x2go-maintainers-removed-keys/index
-	jetring-build -I $@ x2go-maintainers-removed-keys
-	gpg ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp
-	mv -f $@.tmp $@
+	if [ -e 'x2go-maintainers-removed-keys/index' ] && [ ! -s 'x2go-maintainers-removed-keys/index' ]; then \
+		gpg ${GPG_OPTIONS} --keyring $@ --fingerprint; \
+	else \
+		jetring-build -I $@ x2go-maintainers-removed-keys; \
+		gpg ${GPG_OPTIONS} --no-keyring --import-options import-export --import < $@ > $@.tmp; \
+		mv -f $@.tmp $@; \
+	fi
 
 $(TRUSTED-LIST) :: trusted.gpg/x2go-archive-%.gpg : active-keys/add-% active-keys/index
 	mkdir -p $(TMPRING) trusted.gpg
diff --git a/debian/changelog b/debian/changelog
index 61d53ff..fc54aa3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,6 +50,7 @@ x2go-keyring (2019.08.04) UNRELEASED; urgency=medium
     Oleksandr Shneyder (invalid format).
   - x2go-maintainers/: re-add key for Oleksandr Shneyder.
   * active-keys/: convert to new mechanism.
+  * Makefile: accept empty indices.
   * 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