[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.45-60-g7a90c2e

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 7a90c2e3d6eefbfd4f3da8cd2a25c1cb5922e717
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Thu Jul 19 13:12:36 2012 +0200

    p: fix leftover directories not being accounted for dependencies
    
    Ignore the stat object when splitting leftover/modified/removed files
    between warning (caused by dependencies) and error (caused by packages
    being tested).
    mtime and other attributes may be different between snapshots.
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/debian/changelog b/debian/changelog
index 82f61a7..80b33b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ piuparts (0.46) UNRELEASED; urgency=low
     - Add to ignored_files:
       + /var/lib/cdebconf/{questions,templates}.dat-old
       + /var/lib/onioncat/
+    - Fix some leftover directories getting incorrectly accounted to the
+      package being tested instead of the dependencies in --warn-on-others mode.
   * piupartslib/dependencyparser.py:
     - Package names may now have a ":any" qualification in some cases.  Extend
       the parser to recognize and discard this suffix.
diff --git a/piuparts.py b/piuparts.py
index 12e632a..76131ad 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -1851,8 +1851,9 @@ def prune_files_list(files, depsfiles):
     list of removed elements.
     """
     warn = []
-    for vfile in depsfiles:
-        if vfile in files:
+    depfiles_names = [x[0] for x in depsfiles]
+    for vfile in files[:]:
+        if vfile[0] in depfiles_names:
             files.remove(vfile)
             warn.append(vfile)
     return warn
@@ -1982,7 +1983,7 @@ def check_results(chroot, chroot_state, file_owners, deps_info=None):
                       file_list(modified, file_owners))
         ok = False
 
-    if ok and settings.warn_on_others and deps_info is not None:
+    if settings.warn_on_others and deps_info is not None:
         if warnnew:
             msg = ("Warning: Package purging left files on system:\n" +
                    file_list(warnnew, file_owners) + \

-- 
piuparts git repository