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

[Lucas Nussbaum]

Author: lucas
Date: 2008-05-05 09:37:39 +0000 (Mon, 05 May 2008)
New Revision: 147

Modified:
   trunk/debian/changelog
   trunk/piuparts.py
Log:
added --debfoster-options option (closes #458922)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-03-16 21:22:53 UTC (rev 146)
+++ trunk/debian/changelog	2008-05-05 09:37:39 UTC (rev 147)
@@ -1,10 +1,16 @@
-piuparts (0.30) UNRELEASED; urgency=low
+piuparts (0.31) UNRELEASED; urgency=low
 
+  [ Lars Wirzenius ]
   * piuparts.docbook: Added a few words of description of the tarball
     that -b expects. (Closes: 466048)
 
- -- Lars Wirzenius <liw at iki.fi>  Sat, 16 Feb 2008 10:14:13 +0200
+  [ Lucas Nussbaum ]
+  * Added a --debfoster-options option, to allow the user to override
+    debfoster's default options and test with more packages installed
+    in the chroot. (Closes: #458922)
 
+ -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Mon, 05 May 2008 11:36:18 +0200
+
 piuparts (0.30) unstable; urgency=low
 
   * piuparts.py:

Modified: trunk/piuparts.py
===================================================================
--- trunk/piuparts.py	2008-03-16 21:22:53 UTC (rev 146)
+++ trunk/piuparts.py	2008-05-05 09:37:39 UTC (rev 147)
@@ -144,6 +144,7 @@
         self.no_upgrade_test = False
         self.skip_cronfiles_test = False
         self.check_broken_symlinks = True
+	self.debfoster_options = None
         self.ignored_files = [
             "/dev/MAKEDEV",
             "/etc/aliases",
@@ -622,8 +623,7 @@
              return
 
         self.run(["apt-get", "install", "debfoster"])
-        self.run(["debfoster", "-o", "MaxPriority=required", "-o",
-                  "UseRecommends=no", "-f", "-n", "apt", "debfoster"])
+        self.run(["debfoster"] + settings.debfoster_options)
         remove_files([self.relative("var/lib/debfoster/keepers")])
         self.run(["dpkg", "--purge", "debfoster"])
 
@@ -1731,6 +1731,10 @@
     parser.add_option("-v", "--verbose", 
                       action="store_true", default=False,
                       help="No meaning anymore.")
+
+    parser.add_option("--debfoster-options",
+                      default="-o MaxPriority=required -o UseRecommends=no -f -n apt debfoster",
+		      help="Run debfoster with different parameters (default: -o MaxPriority=required -o UseRecommends=no -f -n apt debfoster).")
     
     (opts, args) = parser.parse_args()
 
@@ -1755,6 +1759,7 @@
     settings.check_broken_symlinks = not opts.no_symlinks
     settings.savetgz = opts.save
     settings.warn_on_others = opts.warn_on_others
+    settings.debfoster_options = opts.debfoster_options.split()
 
     if opts.adt_virt is None:
         settings.adt_virt = None