[Fai-commit] r3338 - trunk/bin

[fai-repository at svn.debian.org]

Author: lange
Date: 2006-03-28 15:17:40 +0000 (Tue, 28 Mar 2006)
New Revision: 3338

Modified:
   trunk/bin/install_packages
Log:
move urpmi call


Modified: trunk/bin/install_packages
===================================================================
--- trunk/bin/install_packages	2006-03-28 14:49:23 UTC (rev 3337)
+++ trunk/bin/install_packages	2006-03-28 15:17:40 UTC (rev 3338)
@@ -25,7 +25,7 @@
 # MA 02111-1307, USA.
 #*********************************************************************
 
-my $version = "Version 3.0, 27-march-2006";
+my $version = "Version 3.1, 28-march-2006";
 $0=~ s#.+/##; # remove path from program name
 
 # import variables: $verbose, $MAXPACKAGES, $classes, $FAI, $FAI_ROOT
@@ -131,11 +131,6 @@
 # call apt-get or tasksel for each type of command whith the list of packages
 foreach $atype (@commands) {
 
-  if ($atype eq "urpmi") { # use this so clean is not called
-    execute("$rootcmd $command{urpmi}") unless $listonly;
-    next;
-  }
-
   if ($atype eq "clean") {
     execute("$rootcmd $command{clean}") unless $listonly;
     next;
@@ -151,6 +146,11 @@
 
   my $packlist = join(' ',@{$list{$atype}});
 
+  if ($atype eq "urpmi") { # use this so clean is not called
+    execute("$rootcmd $command{urpmi}") if $packlist;
+    next;
+  }
+
   if ($atype eq "hold") {
     my $hold = join " hold\n", @{$list{hold}};
     $hold .= " hold\n";