[Fai-commit] r6742 - trunk/lib

[Thomas Lange]

Author: lange
Date: 2011-10-22 22:51:46 +0000 (Sat, 22 Oct 2011)
New Revision: 6742

Modified:
   trunk/lib/subroutines
Log:
add missing suffix .asc in file name, minor change in message


Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines	2011-10-22 22:47:53 UTC (rev 6741)
+++ trunk/lib/subroutines	2011-10-22 22:51:46 UTC (rev 6742)
@@ -932,15 +932,15 @@
 
     # add apt keys for all classes
     for keyfile in $classes; do
-	[ ! -f $FAI/package_config/$keyfile ] && continue
-	echo -n "Loading APT key from $keyfile "
-	cat $FAI/package_config/$keyfile | $ROOTCMD apt-key add -
-	unset keys["$keyfile"]
+	[ ! -f $FAI/package_config/$keyfile.asc ] && continue
+	echo -n "Loading APT key from $keyfile.asc "
+	cat $FAI/package_config/$keyfile.asc | $ROOTCMD apt-key add -
+	unset keys["$keyfile.asc"]
     done
 
     # print which *.asc files were not loaded
     if [ ${#keys[@]} -ne 0 ]; then
-	echo "Following signatures are not loaded:"
+	echo "Following apt keys are not loaded:"
 	for i in "${!keys[@]}"; do
 	    echo "$i"
 	done