X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plc.d%2Fgpg;h=304b1ead5309b4a466760e9004f259c49dfe8e8a;hb=c838ac0e5a1c5a30afba5ccc43db7c0dbfd9710f;hp=5fd39232ea5cb68f0429702d75b24d62409e6978;hpb=53d18fd32ca64189e2df95d8305652ef17f23a1c;p=myplc.git

diff --git a/plc.d/gpg b/plc.d/gpg
index 5fd3923..304b1ea 100755
--- a/plc.d/gpg
+++ b/plc.d/gpg
@@ -113,7 +113,12 @@ EOF
 	    rpm --allmatches -e gpg-pubkey
 	    check
 	fi
-	rpm --import /etc/pki/rpm-gpg/*
+	# starting with rpm-4.6, this fails when run a second time
+	# it would be complex to do this properly based on the filename, 
+	# as /etc/pki/rpm-gpg/ typically has many symlinks to the same file
+	# see also http://fedoranews.org/tchung/gpg/
+	# so just ignore the result
+	rpm --import /etc/pki/rpm-gpg/* || :
 	check
 
 	# Make GPG key readable by apache so that the API can sign peer requests