[Fai-commit] r3347 - trunk/bin

[fai-repository at svn.debian.org]

Author: lange
Date: 2006-03-29 15:31:58 +0000 (Wed, 29 Mar 2006)
New Revision: 3347

Modified:
   trunk/bin/install_packages
Log:
add yum support


Modified: trunk/bin/install_packages
===================================================================
--- trunk/bin/install_packages	2006-03-29 15:09:03 UTC (rev 3346)
+++ trunk/bin/install_packages	2006-03-29 15:31:58 UTC (rev 3347)
@@ -25,7 +25,7 @@
 # MA 02111-1307, USA.
 #*********************************************************************
 
-my $version = "Version 3.1, 28-march-2006";
+my $version = "Version 3.2, 29-march-2006";
 $0=~ s#.+/##; # remove path from program name
 
 # import variables: $verbose, $MAXPACKAGES, $classes, $FAI, $FAI_ROOT
@@ -65,7 +65,7 @@
 
 my $aptopt='-y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold"';
 
- at commands = qw/urpmi hold taskrm taskinst clean aptitude aptitude-r install unpack remove dselect-upgrade/;
+ at commands = qw/urpmi urpme yumgroup yumi yumr hold taskrm taskinst clean aptitude aptitude-r install unpack remove dselect-upgrade/;
 %command = (
 	    install => "apt-get $aptopt --fix-missing install",
 	   ninstall => "apt-get $aptopt --fix-missing -s install",
@@ -82,6 +82,10 @@
           "pending" => "dpkg --configure --pending",
             "dpkgc" => "dpkg -C",
 	      urpmi => "urpmi --auto --foce --allow-force --keep",
+	      urpme => "urpme --auto --foce --allow-force --keep",
+	      yumi  => "yum -y install",
+	      yumr  => "yum -y remove",
+         yumgroup   => "yum -y groupinstall",
 );
 
 $test = 0;
@@ -146,8 +150,9 @@
 
   my $packlist = join(' ',@{$list{$atype}});
 
-  if ($atype eq "urpmi") { # use this so clean is not called
-    execute("$rootcmd $command{urpmi}") if $packlist;
+  if ($atype =~ /rpm|yum/) {
+    $command{clean} = "true"; # do not cal apt-get lcean for rpm and yum packages
+    execute("$rootcmd $command{$atype}") if $packlist;
     next;
   }