[Fai-commit] r3121 - in trunk: bin debian

[fai-repository at svn.debian.org]

Author: lange
Date: 2005-11-29 21:19:37 +0000 (Tue, 29 Nov 2005)
New Revision: 3121

Modified:
   trunk/bin/install_packages
   trunk/debian/changelog
Log:
do not install recommended package by default,
add aptitude-r in download only mode


Modified: trunk/bin/install_packages
===================================================================
--- trunk/bin/install_packages	2005-11-28 23:23:07 UTC (rev 3120)
+++ trunk/bin/install_packages	2005-11-29 21:19:37 UTC (rev 3121)
@@ -25,7 +25,7 @@
 # MA 02111-1307, USA.
 #*********************************************************************
 
-my $version = "Version 2.16, 26-nov-2005";
+my $version = "Version 2.17, 29-nov-2005";
 $0=~ s#.+/##; # remove path from program name
 
 # import variables: $verbose, $MAXPACKAGES, $classes, $FAI, $FAI_ROOT
@@ -74,7 +74,7 @@
            "taskrm" => "tasksel -n remove",
              "hold" => "dpkg --set-selections",
             "clean" => "apt-get clean",
-         "aptitude" => "aptitude $aptopt install",
+         "aptitude" => "aptitude -R $aptopt install",
        "aptitude-r" => "aptitude -r $aptopt install",
           "pending" => "dpkg --configure --pending",
             "dpkgc" => "dpkg -C",
@@ -401,7 +401,8 @@
 %command = (
 	    install => "apt-get $qopt -d $ENV{aptoptions} -y --force-yes --fix-missing install",
          "taskinst" => "aptitude -d $ENV{aptoptions} -y install $devnull",
-         "aptitude" => "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",
             "clean" => 'true',
           "pending" => 'true',
             "dpkgc" => 'true',

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-11-28 23:23:07 UTC (rev 3120)
+++ trunk/debian/changelog	2005-11-29 21:19:37 UTC (rev 3121)
@@ -13,7 +13,8 @@
     if mkisofs is available (closes: #334871), exist unless arch is i386
     or amd64 (closes: #339098)
   * install_packages: ignore packages ending with - when using -d
-    (closes: #334333), remove backtick evaluation (closes: #322157)
+    (closes: #334333), remove backtick evaluation (closes: #322157), add
+    -R to default aptitude call, add aptitude-r for download only mode
   * lib/create_ramdisk: make /etc/network/run/ifstate writable
     (closes: #312128) 
   * fai-mirror: add -i to egrep (closes: #312508), add option
@@ -42,7 +43,7 @@
     overwritten during softupdate (closes: #313069, #314995)
   * subroutines-linux: fix idempotent code (closes: #340422)
   
- -- Thomas Lange <lange at debian.org>  Mon, 28 Nov 2005 16:35:01 +0100
+ -- Thomas Lange <lange at debian.org>  Tue, 29 Nov 2005 22:17:15 +0100
 
 fai (2.8.4) unstable; urgency=high