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

[Michael Tautschnig]

Author: mt
Date: 2010-01-31 18:09:44 +0000 (Sun, 31 Jan 2010)
New Revision: 5714

Removed:
   people/michael/experimental/patches/bugfix-514160
Modified:
   people/michael/experimental/patches/bugfix-479537
   people/michael/experimental/patches/series
Log:
updated patches to reflect current trunk


Modified: people/michael/experimental/patches/bugfix-479537
===================================================================
--- people/michael/experimental/patches/bugfix-479537	2010-01-31 12:53:32 UTC (rev 5713)
+++ people/michael/experimental/patches/bugfix-479537	2010-01-31 18:09:44 UTC (rev 5714)
@@ -22,7 +22,7 @@
 ===================================================================
 --- trunk.orig/bin/install_packages
 +++ trunk/bin/install_packages	
-@@ -272,13 +272,21 @@
+@@ -274,13 +274,21 @@
        # by default no classes are listed after this command so doit
        $doit = 1;
        if ($cllist) {

Deleted: people/michael/experimental/patches/bugfix-514160
===================================================================
--- people/michael/experimental/patches/bugfix-514160	2010-01-31 12:53:32 UTC (rev 5713)
+++ people/michael/experimental/patches/bugfix-514160	2010-01-31 18:09:44 UTC (rev 5714)
@@ -1,25 +0,0 @@
-2009-11-22  Michael Tautschnig  <mt at debian.org>
-
-	* install_packages: Added zypper support (thanks Thomas Neumann for the
-		patch). (closes: #514160)
-Index: trunk/bin/install_packages
-===================================================================
---- trunk.orig/bin/install_packages
-+++ trunk/bin/install_packages	
-@@ -69,7 +69,7 @@
- 
- 
- # @commands is the order of the commands that are executed
--our @commands = qw/y2i y2r 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 yast rpmr urpmi urpme yumgroup yumi yumr smarti smartr hold taskrm taskinst clean-internal 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",
-@@ -90,6 +90,7 @@
- 	     "yumi" => "yum -y install",
- 	     "yumr" => "yum -y remove",
-         "yumgroup"  => "yum -y groupinstall",
-+	  "zypper"  => "zypper -n install",
- 	     "y2i"  => "y2pmsh isc",
- 	     "y2r"  => "y2pmsh remove",
- 	     "yast" => "yast -i",

Modified: people/michael/experimental/patches/series
===================================================================
--- people/michael/experimental/patches/series	2010-01-31 12:53:32 UTC (rev 5713)
+++ people/michael/experimental/patches/series	2010-01-31 18:09:44 UTC (rev 5714)
@@ -4,6 +4,5 @@
 bugfix-313397
 bugfix-479537
 setup-storage_no-cylinder-boundaries
-bugfix-514160
 setup-storage_lvm-preserve2
 setup-storage_GIB-support