From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 6 Jan 2010 13:07:45 +0000 (+0000)
Subject: iron out non-relevant error messages
X-Git-Tag: MyPLC-4.3-37~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c838ac0e5a1c5a30afba5ccc43db7c0dbfd9710f;hp=53d18fd32ca64189e2df95d8305652ef17f23a1c;p=myplc.git

iron out non-relevant error messages
---

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