[Fai-commit] r5684 - people/michael/experimental/patches

[Michael Tautschnig]

Author: mt
Date: 2009-11-30 13:20:02 +0000 (Mon, 30 Nov 2009)
New Revision: 5684

Added:
   people/michael/experimental/patches/bugfix-558139
Modified:
   people/michael/experimental/patches/series
   people/michael/experimental/patches/setup-storage_lvm-preserve2
Log:
added patch for #558139


Added: people/michael/experimental/patches/bugfix-558139
===================================================================
--- people/michael/experimental/patches/bugfix-558139	                        (rev 0)
+++ people/michael/experimental/patches/bugfix-558139	2009-11-30 13:20:02 UTC (rev 5684)
@@ -0,0 +1,17 @@
+2009-11-30  Michael Tautschnig  <mt at debian.org>
+
+	* install_packages: Make aptitude-r method handle MAX_PACKAGES (thanks Stefan
+		Goetz). (closes: #558139)
+Index: trunk/bin/install_packages
+===================================================================
+--- trunk.orig/bin/install_packages
++++ trunk/bin/install_packages	
+@@ -187,7 +187,7 @@
+     next;
+   }
+ 
+-  if ($atype eq "install" || $atype eq "smarti" || $atype eq "aptitude" || $atype eq "unpack" || $opt_l || $opt_L) {
++  if ($atype eq "install" || $atype eq "smarti" || $atype eq "aptitude" || $atype eq "aptitude-r" || $atype eq "unpack" || $opt_l || $opt_L) {
+ 
+     mkpackagelist(@{$list{$atype}}); # create lists of known and unknown packages
+     if ($opt_l) {

Modified: people/michael/experimental/patches/series
===================================================================
--- people/michael/experimental/patches/series	2009-11-30 13:15:24 UTC (rev 5683)
+++ people/michael/experimental/patches/series	2009-11-30 13:20:02 UTC (rev 5684)
@@ -11,3 +11,4 @@
 setup-storage_sameas-option
 setup-storage_cryptsetup
 setup-storage_lvm-preserve2
+bugfix-558139

Modified: people/michael/experimental/patches/setup-storage_lvm-preserve2
===================================================================
--- people/michael/experimental/patches/setup-storage_lvm-preserve2	2009-11-30 13:15:24 UTC (rev 5683)
+++ people/michael/experimental/patches/setup-storage_lvm-preserve2	2009-11-30 13:20:02 UTC (rev 5684)
@@ -2,7 +2,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Commands.pm
 +++ trunk/lib/setup-storage/Commands.pm	
-@@ -352,6 +352,7 @@
+@@ -353,6 +353,7 @@
            ($FAI::configs{"PHY_$disk"}{partitions}{$part_no}{size}{preserve}) and
            next;
        }
@@ -10,7 +10,7 @@
        $vg_exists = 0;
        last;
      }
-@@ -393,7 +394,7 @@
+@@ -394,7 +395,7 @@
    my @new_devices = ();
    push @new_devices, &FAI::enc_name($_) foreach (keys %new_devs);