[Fai-commit] r4434 - trunk/bin

[lange at alioth.debian.org]

Author: lange
Date: 2007-07-11 20:56:51 +0000 (Wed, 11 Jul 2007)
New Revision: 4434

Modified:
   trunk/bin/install_packages
Log:
call clean command only when Debian types/commands are used,
minor cleanup of code


Modified: trunk/bin/install_packages
===================================================================
--- trunk/bin/install_packages	2007-07-11 20:44:36 UTC (rev 4433)
+++ trunk/bin/install_packages	2007-07-11 20:56:51 UTC (rev 4434)
@@ -155,7 +155,7 @@
 # call apt-get or tasksel for each type of command whith the list of packages
 foreach $atype (@commands) {
 
-  if ($atype eq "clean") {
+  if ($atype eq "clean" && $hasdebian) {
     execute("$rootcmd $command{clean}") unless $listonly;
     next;
   }
@@ -170,15 +170,8 @@
 
   my $packlist = join(' ',@{$list{$atype}});
 
-  if ($atype =~ /rpm|yum|y2/) {
-    $command{clean} = "true"; # do not cal apt-get lcean for rpm and yum packages
-    execute("$rootcmd $command{$atype} $packlist") if $packlist;
-    next;
-  }
-
   if ($atype eq "hold") {
-    my $hold = join " hold\n", @{$list{hold}};
-    $hold .= " hold\n";
+    my $hold = join " hold\n", @{$list{hold}}, " hold\n";
     execute("echo \"$hold\" | $rootcmd $command{hold}");
     next;
   }