[Fai-commit] r5955 - in trunk: bin conf debian

[Thomas Lange]

Author: lange
Date: 2010-08-07 03:04:13 +0000 (Sat, 07 Aug 2010)
New Revision: 5955

Modified:
   trunk/bin/install_packages
   trunk/conf/NFSROOT
   trunk/debian/changelog
Log:
install_packages: add cupt support

Modified: trunk/bin/install_packages
===================================================================
--- trunk/bin/install_packages	2010-08-06 16:24:27 UTC (rev 5954)
+++ trunk/bin/install_packages	2010-08-07 03:04:13 UTC (rev 5955)
@@ -68,7 +68,7 @@
 
 
 # @commands is the order of the commands that are executed
-our @commands = qw/y2i y2r zypper zypper-rm yast rpmr urpmi urpme yumgroup yumi yumr smarti smartr hold taskrm taskinst clean-internal aptitude aptitude-r install unpack remove dselect-upgrade/;
+our @commands = qw/y2i y2r zypper zypper-rm yast rpmr urpmi urpme yumgroup yumi yumr smarti smartr hold taskrm taskinst clean-internal cupt cupt-r aptitude aptitude-r install unpack remove dselect-upgrade/;
 %command = (
           "install" => "apt-get $aptopt --fix-missing install",
     "inst-internal" => "apt-get $aptopt --fix-missing -s install",
@@ -80,6 +80,8 @@
    "clean-internal" => "apt-get clean",
          "aptitude" => "aptitude -R $aptopt install",
        "aptitude-r" => "aptitude -r $aptopt install",
+             "cupt" => "cupt -R $aptopt install",
+           "cupt-r" => "cupt $aptopt install",
            "unpack" => "cd $downloaddir; aptitude download",
   "unpack-internal" => "dpkg --unpack --recursive $downloaddir; rm $downloaddir/*.deb",
  "pending-internal" => "dpkg --configure --pending",
@@ -138,7 +140,7 @@
 }
 
 # check if any Debian related commands/types are used in package_config
-my @debiantypes= qw/taskinst aptitude aptitude-r install remove dselect-upgrade smarti/;
+my @debiantypes= qw/taskinst cupt cupt-r aptitude aptitude-r install remove dselect-upgrade smarti/;
 foreach my $dt (@debiantypes) {
   $types{$dt} and $hasdebian=1;
 }
@@ -187,7 +189,7 @@
     next;
   }
 
-  if ($atype eq "install" || $atype eq "smarti" || $atype eq "aptitude" || $atype eq "aptitude-r" || $atype eq "unpack" || $opt_l || $opt_L) {
+  if ($atype eq "install" || $atype eq "smarti" || $atype eq "cupt"|| $atype eq "cupt-r"|| $atype eq "aptitude" || $atype eq "aptitude-r" || $atype eq "unpack" || $opt_l || $opt_L) {
 
     mkpackagelist(@{$list{$atype}}); # create lists of known and unknown packages
     getsources(); # retrieve sources
@@ -510,12 +512,14 @@
 undef %command;
 
 $maxpl=9999;
- at commands = qw/taskinst aptitude aptitude-r install unpack/;
+ at commands = qw/taskinst cupt cupt-r aptitude aptitude-r install unpack/;
 %command = (
 	  "install" => "apt-get $qopt -d $ENV{aptoptions} -y --fix-missing install",
          "taskinst" => "aptitude -d $ENV{aptoptions} -y install $devnull",
          "aptitude" => "aptitude -R -d $ENV{aptoptions} -y install $devnull",
        "aptitude-r" => "aptitude -r -d $ENV{aptoptions} -y install $devnull",
+             "cupt" => "cupt -R --download-only $ENV{aptoptions} -y install $devnull",
+           "cupt-r" => "cupt --download-only $ENV{aptoptions} -y install $devnull",
            "unpack" => "cd $downloaddir; aptitude download",
    "clean-internal" => 'true',
  "pending-internal" => 'true',

Modified: trunk/conf/NFSROOT
===================================================================
--- trunk/conf/NFSROOT	2010-08-06 16:24:27 UTC (rev 5954)
+++ trunk/conf/NFSROOT	2010-08-07 03:04:13 UTC (rev 5955)
@@ -8,6 +8,7 @@
 procinfo dialog discover
 console-tools console-common
 iproute udev subversion liblinux-lvm-perl
+cupt
 
 # needed for the simple examples
 cfengine2 libapt-pkg-perl

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-08-06 16:24:27 UTC (rev 5954)
+++ trunk/debian/changelog	2010-08-07 03:04:13 UTC (rev 5955)
@@ -116,6 +116,7 @@
   * add approx support in class FAISERVER
   * mkdebmirror: use cdn.debian.net
   * 10-conffiles, 50-host-classes: add support for hosts named client01,...
+  * install_packages: add cupt support
   
   [ Michael Tautschnig ]
   * setup-storage: Bumped version number to 1.3