[Piuparts-commits] rev 650 - piatti/org/piuparts.debian.org/etc trunk trunk/debian

Holger Levsen holger at alioth.debian.org
Tue Feb 23 10:43:08 UTC 2010 

Author: holger
Date: 2010-02-23 10:43:08 +0000 (Tue, 23 Feb 2010)
New Revision: 650

Modified:
   piatti/org/piuparts.debian.org/etc/piuparts.conf.goldwasser
   piatti/org/piuparts.debian.org/etc/piuparts.conf.piatti
   trunk/debian/changelog
   trunk/piuparts.1.txt
   trunk/piuparts.py
Log:
* piuparts.py: 
  - new option: --warn-on-leftovers-after-purge to not fail if a package
    leaves files behind after purge. (Closes: #566599)



Modified: piatti/org/piuparts.debian.org/etc/piuparts.conf.goldwasser
===================================================================
--- piatti/org/piuparts.debian.org/etc/piuparts.conf.goldwasser	2010-02-23 09:34:03 UTC (rev 649)
+++ piatti/org/piuparts.debian.org/etc/piuparts.conf.goldwasser	2010-02-23 10:43:08 UTC (rev 650)
@@ -7,7 +7,7 @@
 
 [global]
 #sections = squeeze sid lenny2squeeze
-sections = lenny2squeeze sid
+sections = lenny2squeeze
 master-host = localhost
 master-user = piupartsm
 master-directory = /org/piuparts.debian.org/master/
@@ -34,7 +34,7 @@
 packages-url = http://ftp.de.debian.org/debian/dists/squeeze/main/binary-amd64/Packages.bz2
 sources-url = http://ftp.de.debian.org/debian/dists/squeeze/main/source/Sources.bz2
 mirror = http://ftp.de.debian.org/debian/
-piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-symlinks --warn-on-others --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
+piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-symlinks --warn-on-others --warn-on-leftovers-after-purge --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
 distro = squeeze
 chroot-tgz = squeeze.tar.gz
 max-reserved = 5
@@ -46,7 +46,7 @@
 packages-url = http://ftp.de.debian.org/debian/dists/squeeze/main/binary-amd64/Packages.bz2
 sources-url = http://ftp.de.debian.org/debian/dists/squeeze/main/source/Sources.bz2
 mirror = http://ftp.de.debian.org/debian/
-piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-symlinks --warn-on-others --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
+piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-symlinks --warn-on-others --warn-on-leftovers-after-purge --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
 upgrade-test-distros = lenny squeeze
 upgrade-test-chroot-tgz = lenny.tar.gz
 max-reserved = 5

Modified: piatti/org/piuparts.debian.org/etc/piuparts.conf.piatti
===================================================================
--- piatti/org/piuparts.debian.org/etc/piuparts.conf.piatti	2010-02-23 09:34:03 UTC (rev 649)
+++ piatti/org/piuparts.debian.org/etc/piuparts.conf.piatti	2010-02-23 10:43:08 UTC (rev 650)
@@ -33,7 +33,7 @@
 packages-url = http://piatti.debian.org/debian/dists/squeeze/main/binary-amd64/Packages.bz2
 sources-url = http://piatti.debian.org/debian/dists/squeeze/main/source/Sources.bz2
 mirror = http://piatti.debian.org/debian/
-piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-symlinks --warn-on-others --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
+piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-symlinks --warn-on-others --warn-on-leftovers-after-purge --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
 distro = squeeze
 chroot-tgz = squeeze.tar.gz
 max-reserved = 100
@@ -45,7 +45,7 @@
 packages-url = http://piatti.debian.org/debian/dists/squeeze/main/binary-amd64/Packages.bz2
 sources-url = http://piatti.debian.org/debian/dists/squeeze/main/source/Sources.bz2
 mirror = http://piatti.debian.org/debian/
-piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-symlinks --warn-on-others --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
+piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-symlinks --warn-on-others --warn-on-leftovers-after-purge --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
 upgrade-test-distros = lenny squeeze
 upgrade-test-chroot-tgz = lenny.tar.gz
 max-reserved = 100

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-02-23 09:34:03 UTC (rev 649)
+++ trunk/debian/changelog	2010-02-23 10:43:08 UTC (rev 650)
@@ -23,8 +23,11 @@
     - fix crash when going into sleep when idle. 
     - add support for only doing upgrade tests (without the basic test in the
       upgrade target distro). 
-  * piuparts.py: new option --log-level to specify the verbosity of piuparts
-    output. Thanks to Fabrice Coutadeur for the patch! (Closes: #567190)
+  * piuparts.py: 
+    - new option: --log-level to specify the verbosity of piuparts
+      output. Thanks to Fabrice Coutadeur for the patch! (Closes: #567190)
+    - new option: --warn-on-leftovers-after-purge to not fail if a package
+      leaves files behind after purge. (Closes: #566599)
   * Add ${misc:Depends} to Depends in debian/control. 
   * Makefile: support python 2.5 and 2.6 instead of 2.4 and 2.5, adjust
     debian/control accordingly.

Modified: trunk/piuparts.1.txt
===================================================================
--- trunk/piuparts.1.txt	2010-02-23 09:34:03 UTC (rev 649)
+++ trunk/piuparts.1.txt	2010-02-23 10:43:08 UTC (rev 650)
@@ -150,14 +150,18 @@
 *-W, --warn-symlinks*::
   Check for broken symlinks, but warn only if found.
 
+*--warn-on-leftovers-after-purge*::
+  Print a warning rather than failing if files are left behind after purge.
+
 *--warn-on-others*::
   Print a warning rather than failing if files are left behind, modified, or removed by a package that was not given on the command-line.
 +
 This way, you can basically isolate the purge test to your own packages. If a package that is brought in as a dependency doesn't purge cleanly, the test will not fail because of it (but a warning message will be printed).
 +
-Behavior with multple packages given on the command-line could be problematic, particularly if the dependency tree of one package in the list includes another in the list. Therefore, it is recommended to use this option with one package at a time.
+Behavior with multiple packages given on the command-line could be problematic, particularly if the dependency tree of one package in the list includes another in the list. Therefore, it is recommended to use this option with one package at a time.
 
 
+
 EXAMPLES
 --------
 Assume that you have just built a new version of your Debian package, to be uploaded to Debian unstable. It is in _../foo_1.0-2_i386.deb_ and you would like to know whether it installs and uninstalls properly. Here's what you would do:

Modified: trunk/piuparts.py
===================================================================
--- trunk/piuparts.py	2010-02-23 09:34:03 UTC (rev 649)
+++ trunk/piuparts.py	2010-02-23 10:43:08 UTC (rev 650)
@@ -143,6 +143,7 @@
         self.endmeta = None
         self.saveendmeta = None
         self.warn_on_others = False
+        self.warn_on_leftovers_after_purge = False
         self.keep_sources_list = False
         self.skip_minimize = True
         self.list_installed_files = False
@@ -1552,9 +1553,13 @@
 
     ok = True
     if new:
-        logging.error("FAIL: Package purging left files on system:\n" +
+        if settings.warn_on_leftovers_after_purge:
+          logging.info("Warning: Package purging left files on system:\n" +
                        file_list(new, file_owners))
-        ok = False
+        else:
+          logging.error("FAIL: Package purging left files on system:\n" +
+                       file_list(new, file_owners))
+          ok = False
     if removed:
         logging.error("FAIL: After purging files have disappeared:\n" +
                       file_list(removed, file_owners))
@@ -1566,7 +1571,7 @@
 
     if ok and settings.warn_on_others and deps_info is not None:
         if warnnew:
-            msg = ("Warning: Package puring left files on system:\n" +
+            msg = ("Warning: Package purging left files on system:\n" +
                    file_list(warnnew, file_owners) + \
                    "These files seem to have been left by dependencies rather "
                    "than by packages\nbeing explicitly tested.\n")
@@ -1963,13 +1968,18 @@
                       help="Print a warning rather than failing if "
                            "files are left behind, modified, or removed "
                            "by a package that was not given on the "
-                           "command-line.  Behavior with multple packages "
+                           "command-line.  Behavior with multiple packages "
                            "given could be problematic, particularly if the "
                            "dependency tree of one package in the list "
                            "includes another in the list.  Therefore, it is "
                            "recommended to use this option with one package "
                            "at a time.")
 
+    parser.add_option("warn-on-leftovers-after-purge",
+                      action="store_true", default=False,
+                      help="Print a warning rather than failing if "
+                           "files are left behind after purge.")
+
     parser.add_option("-W", "--warn-symlinks", action="store_true",
                       default=False,
                       help="Warn only for broken symlinks.")
@@ -2020,6 +2030,7 @@
     settings.warn_broken_symlinks = opts.warn_symlinks
     settings.savetgz = opts.save
     settings.warn_on_others = opts.warn_on_others
+    settings.warn_on_leftovers_after_purge = opts.warn_on_leftovers_after_purge
     settings.debfoster_options = opts.debfoster_options.split()
     settings.dpkg_force_confdef = opts.dpkg_force_confdef

More information about the Piuparts-commits mailing list