[Piuparts-commits] [piuparts] 03/06: p: simplify list-installed-files handling

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit 7ccf3eb20c67ddf4b681b40ec41e05da99f538cb
Author: Andreas Beckmann <anbe at debian.org>
Date:   Mon Aug 10 00:00:35 2015 +0200

    p: simplify list-installed-files handling
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 piuparts.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/piuparts.py b/piuparts.py
index 48866b2..3c067df 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -1150,18 +1150,19 @@ class Chroot:
             apt_get_install.extend(settings.distro_config.get_target_flags(
                 os.environ["PIUPARTS_DISTRIBUTION"]))
             apt_get_install.append("install")
+
             if settings.list_installed_files:
                 pre_info = self.save_meta_data()
 
-                self.run(["dpkg", "-i"] + tmp_files, ignore_errors=True)
-                self.list_installed_files(pre_info, self.save_meta_data())
+            self.run(["dpkg", "-i"] + tmp_files, ignore_errors=True)
 
-                self.run(apt_get_install)
+            if settings.list_installed_files:
                 self.list_installed_files(pre_info, self.save_meta_data())
 
-            else:
-                self.run(["dpkg", "-i"] + tmp_files, ignore_errors=True)
-                self.run(apt_get_install)
+            self.run(apt_get_install)
+
+            if settings.list_installed_files:
+                self.list_installed_files(pre_info, self.save_meta_data())
 
             if not self.is_installed(unqualify(packages)):
                 logging.error("Could not install %s.", " ".join(unqualify(packages)))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git