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

[Holger Levsen]

Author: holger
Date: 2010-11-10 22:50:14 +0000 (Wed, 10 Nov 2010)
New Revision: 726

Modified:
   trunk/debian/changelog
   trunk/piuparts.py
Log:
remove logrotate and depended packages after the test. (Closes: #602409)
This is a fix for the incomplete patch for #566597. Again, this is a
hardcoded list. :-(

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-11-10 21:43:55 UTC (rev 725)
+++ trunk/debian/changelog	2010-11-10 22:50:14 UTC (rev 726)
@@ -49,6 +49,9 @@
       /etc/rc.\.d/[SK])[0-9]{2}(.*)$ so that piuparts doesn't complain about
       initscripts renamed by insserv. Thanks to by Andreas Beckmann for the
       patch! (Closes: #586793)
+    - remove logrotate and depended packages after the test. (Closes: #602409)
+      This is a fix for the incomplete patch for #566597. Again, this is a
+      hardcoded list. :-(
   * Add ${misc:Depends} to Depends in debian/control. 
   * Remove versioned dependencies on debhelper, dpkg-dev and debootstrap as
     the versions available in Etch are sufficient.

Modified: trunk/piuparts.py
===================================================================
--- trunk/piuparts.py	2010-11-10 21:43:55 UTC (rev 725)
+++ trunk/piuparts.py	2010-11-10 22:50:14 UTC (rev 726)
@@ -875,6 +875,14 @@
         # Finally, purge actual packages.
         self.remove_or_purge("purge", nondeps_to_purge)
 
+        # remove logrotate and it's depends 
+        #    (this is a fix for #602409 introduced by #566597 
+        #    - search for the latter bug number in this file)
+        # XXX: another crude hack: ^^^
+        if not settings.skip_logrotatefiles_test:
+          self.remove_or_purge("remove", "adduser cron libpopt0 logrotate")
+          self.remove_or_purge("purge", "adduser cron libpopt0 logrotate")
+
         # Run custom scripts after purge all packages.
         if settings.scriptsdir is not None: 
             self.run_scripts("post_purge")
@@ -1082,7 +1090,8 @@
         """Check if a given list of logrotatefiles has any output. Executes 
         logrotate file as logrotate would do from cron (except for SHELL)"""
         failed = False
-        # XXX That's a crude hack. Can't we define a set of needed packages differently?
+        # XXX That's a crude hack (to fix #602409). Can't we define a set of needed packages differently?
+        #     It also introduces the need for hack to fix #602409 in piuparts.py
         (a,b) = self.run(['apt-get','install', '-y', 'logrotate'])
         for file in list: