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

[Holger Levsen]

Author: holger
Date: 2011-07-10 10:41:45 +0000 (Sun, 10 Jul 2011)
New Revision: 917

Modified:
   trunk/debian/changelog
   trunk/piuparts.1.txt
   trunk/piuparts.py
Log:
* piuparts.py: 
  - new option "--no-install-purge-test" to only do upgrade tests
    - Thanks to Andreas Bergmann for the patch (Closes: #588482)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2011-07-10 10:23:33 UTC (rev 916)
+++ trunk/debian/changelog	2011-07-10 10:41:45 UTC (rev 917)
@@ -22,15 +22,18 @@
   * piuparts-report.py: 
     - correct a typo from the patch for #523950.
     - make_stats_graph: draw the two new states as well.
-  * Make piuparts use proxy settings either from apt configuration or
-    http_proxy environment variable, the latter overwriting the former (if
-    present) - Thanks to Scott Schaefer for the patch. (Closes: #632046)  
+  * piuparts.py: 
+    - use proxy settings either from apt configuration or http_proxy 
+      environment variable, the latter overwriting the former (if present) 
+      - Thanks to Scott Schaefer for the patch. (Closes: #632046)
+    - new option "--no-install-purge-test" to only do upgrade tests
+      - Thanks to Andreas Bergmann for the patch (Closes: #588482)
   * debian/control:
     - require python >= 2.6.6-3~, get rid of python-support build-depends.
     - add X-Python-Version: pseudo-header
   * debian/rules: use dh_python2 instead of python-support to build the 
     package
-  * Makefile: build for python 2.6 and 2.7 instead of 2.5 and 2.6
+  * Makefile: build for python 2.6 and 2.7 instead of 2.5 and 2.6 
 
  -- Holger Levsen <holger at debian.org>  Sat, 25 Jun 2011 23:33:49 +0200
 

Modified: trunk/piuparts.1.txt
===================================================================
--- trunk/piuparts.1.txt	2011-07-10 10:23:33 UTC (rev 916)
+++ trunk/piuparts.1.txt	2011-07-10 10:41:45 UTC (rev 917)
@@ -111,6 +111,9 @@
 *--no-upgrade-test*::
   Skip testing upgrade from an existing version in the archive.
 
+*--no-install-purge-test*::
+  Skip the install and purge test.
+
 *-p, --pbuilder*::
   Use _/var/cache/pbuilder/base.tgz_ as the base tarball. This is a shorthand so that you don't need to use '-b' for it.
 

Modified: trunk/piuparts.py
===================================================================
--- trunk/piuparts.py	2011-07-10 10:23:33 UTC (rev 916)
+++ trunk/piuparts.py	2011-07-10 10:41:45 UTC (rev 917)
@@ -149,6 +149,7 @@
         self.keep_sources_list = False
         self.skip_minimize = True
         self.list_installed_files = False
+        self.no_install_purge_test = False
         self.no_upgrade_test = False
         self.skip_cronfiles_test = False
         self.skip_logrotatefiles_test = False
@@ -2024,6 +2025,10 @@
                       help="Skip testing the upgrade from an existing version " +
 		      "in the archive.")
     
+    parser.add_option("--no-install-purge-test", 
+                      action="store_true", default=False,
+                      help="Skip install and purge test.")
+
     parser.add_option("-p", "--pbuilder", action="callback",
                       callback=set_basetgz_to_pbuilder,
                       help="Use /var/cache/pbuilder/base.tgz as the base " +
@@ -2115,6 +2120,7 @@
     settings.skip_minimize = opts.skip_minimize
     settings.minimize = opts.minimize
     settings.list_installed_files = opts.list_installed_files
+    settings.no_install_purge_test = opts.no_install_purge_test
     settings.no_upgrade_test = opts.no_upgrade_test
     settings.skip_cronfiles_test = opts.skip_cronfiles_test
     settings.skip_logrotatefiles_test = opts.skip_logrotatefiles_test
@@ -2227,11 +2233,12 @@
         root_info = chroot.save_meta_data()
         selections = chroot.get_selections()
 
-        if not install_purge_test(chroot, root_info, selections,
-                  package_list, packages):
-            logging.error("FAIL: Installation and purging test.")
-            panic()
-        logging.info("PASS: Installation and purging test.")
+        if not settings.no_install_purge_test:
+            if not install_purge_test(chroot, root_info, selections,
+                      package_list, packages):
+                logging.error("FAIL: Installation and purging test.")
+                panic()
+            logging.info("PASS: Installation and purging test.")
 
         if not settings.no_upgrade_test:
             if not settings.args_are_package_files: