[Fai-commit] r5597 - trunk/lib

[Thomas Lange]

Author: lange
Date: 2009-10-26 11:06:02 +0000 (Mon, 26 Oct 2009)
New Revision: 5597

Modified:
   trunk/lib/subroutines
Log:
load apt keys in task_updatebase, not in task_prepareapt


Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines	2009-10-25 20:31:12 UTC (rev 5596)
+++ trunk/lib/subroutines	2009-10-26 11:06:02 UTC (rev 5597)
@@ -843,19 +843,19 @@
 Aptitude::CmdLine::Ignore-Trust-Violations yes;
 EOF
     fi
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+task_updatebase() {
 
+    # maybe the base system is not up to date
+
     local keyfile
     # add apt keys for signed repositories
     for keyfile in `cd $FAI/package_config; ls *.asc`; do
 	echo -n "Loading APT key from $keyfile "
 	cat $FAI/package_config/$keyfile | $ROOTCMD apt-key add -
     done
-}
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-task_updatebase() {
 
-    # maybe the base system is not up to date
-
     if [ "$verbose" ]; then
 	echo "Updating base"
 	updatebase </dev/null 2>&1 | tee -a $LOGDIR/software.log