[Piuparts-commits] rev 548 - in trunk: . debian

[Holger Levsen]

Author: holger
Date: 2009-12-07 18:28:03 +0000 (Mon, 07 Dec 2009)
New Revision: 548

Modified:
   trunk/debian/NEWS
   trunk/debian/changelog
   trunk/piuparts.py
Log:
  - --skip-minimize is now the default. This is because debootstrap is called
    with --variant=minbase instead of --resolv-deps now and because if a 
    base.tgz or an lvm snapshot is specified, piuparts should not touch it.
    (Closes: #539142)
  * TODO: decide whether to add a --minimize option or to remove the
    debfoster code. 
* debian/NEWS

Modified: trunk/debian/NEWS
===================================================================
--- trunk/debian/NEWS	2009-12-07 15:02:14 UTC (rev 547)
+++ trunk/debian/NEWS	2009-12-07 18:28:03 UTC (rev 548)
@@ -1,3 +1,11 @@
+piuparts (0.38) UNRELEASED; urgency=low
+
+  * --skip-minimize is now the default. This is because debootstrap is called
+    with --variant=minbase instead of --resolv-deps now and because if a 
+    base.tgz or an lvm snapshot is specified, piuparts should not touch it.
+
+ -- Holger Levsen <holger at debian.org>  Mon, 07 Dec 2009 19:18:07 +0100
+
 piuparts (0.36) unstable; urgency=low
 
   * piuparts 0.36 introduces many changes to master-slave mode, please read

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-12-07 15:02:14 UTC (rev 547)
+++ trunk/debian/changelog	2009-12-07 18:28:03 UTC (rev 548)
@@ -6,8 +6,15 @@
     - Add support for warning on broken symlinks. Thanks to Carl Chenet for
       the patch. (Closes: #440151)  
     - Make --help usuable without needing to be run as root. (Closes: #547379)
+    - --skip-minimize is now the default. This is because debootstrap is called
+      with --variant=minbase instead of --resolv-deps now and because if a 
+      base.tgz or an lvm snapshot is specified, piuparts should not touch it.
+      (Closes: #539142)
+    * TODO: decide whether to add a --minimize option or to remove the
+      debfoster code. 
   * piuparts-report: report broken symlinks.
   * Makefile: workaround 559305 by calling a2x twice.   
+  * debian/NEWS
 
  -- Holger Levsen <holger at debian.org>  Fri, 04 Dec 2009 15:55:42 +0100
 

Modified: trunk/piuparts.py
===================================================================
--- trunk/piuparts.py	2009-12-07 15:02:14 UTC (rev 547)
+++ trunk/piuparts.py	2009-12-07 18:28:03 UTC (rev 548)
@@ -144,7 +144,7 @@
         self.saveendmeta = None
         self.warn_on_others = False
         self.keep_sources_list = False
-        self.skip_minimize = False
+        self.skip_minimize = True
         self.list_installed_files = False
         self.no_upgrade_test = False
         self.skip_cronfiles_test = False
@@ -661,7 +661,7 @@
         """Set up a minimal Debian system in a chroot."""
         logging.debug("Setting up minimal chroot for %s at %s." % 
               (settings.debian_distros[0], self.name))
-        run(["debootstrap", "--resolve-deps", settings.debian_distros[0], 
+        run(["debootstrap", "--variant=minbase", settings.debian_distros[0], 
              self.name, settings.debian_mirrors[0][0]])
 
     def minimize(self):
@@ -1812,7 +1812,7 @@
                            "at a time.")
 			   
     parser.add_option("--skip-minimize", 
-                      action="store_true", default=False,
+                      action="store_true", default=True,
                       help="Skip minimize chroot step.")
     
     parser.add_option("--list-installed-files",