[Fai-commit] r6579 - trunk/bin

[Thomas Lange]

Author: lange
Date: 2011-06-22 13:55:47 +0000 (Wed, 22 Jun 2011)
New Revision: 6579

Modified:
   trunk/bin/install_packages
Log:
create aptpkg cache only if $hasdebian is also set


Modified: trunk/bin/install_packages
===================================================================
--- trunk/bin/install_packages	2011-06-22 13:07:22 UTC (rev 6578)
+++ trunk/bin/install_packages	2011-06-22 13:55:47 UTC (rev 6579)
@@ -125,15 +125,6 @@
 @classes = grep { !/^#|^\s*$/ } split(/[\s\n]+/,$ENV{classes});
 foreach (@classes) { $classisdef{$_}=1;}
 
-# do not use AptPkg if target is not a Debian system
-if ($use_aptpkg) {
-  $_config->init;                 # initialize AptPkg
-  $_config->set("Dir",$FAI_ROOT); # simulate "chroot"
-  $_config->{quiet}=2;            # don't show cache initialization messages
-  $_system = $_config->system;
-  $cache = new AptPkg::Cache;
-}
-
 warn "$0: reading config files from directory $classpath\n" if $verbose;
 foreach (@classes) {
   &readconfig($classpath,$_) if -f "$classpath/$_"; # read all package config files
@@ -145,6 +136,15 @@
   $types{$dt} and $hasdebian=1;
 }
 
+# use AptPkg only if target uses apt and Apt::Pkg is available
+if ($use_aptpkg && $hasdebian) {
+  $_config->init;                 # initialize AptPkg
+  $_config->set("Dir",$FAI_ROOT); # simulate "chroot"
+  $_config->{quiet}=2;            # don't show cache initialization messages
+  $_system = $_config->system;
+  $cache = new AptPkg::Cache;
+}
+
 if ($types{'smarti'}) {  # smarti is used in a packages_config file
   $command{'clean-internal'} = $command{'smartc-internal'};
   $command{'pending-internal'} = "true";