[Piuparts-commits] [piuparts] 02/08: piuparts-depends-dummy_error.conf: recognize the failure from apt-get install p-d-d.deb

[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 5f5e16fe3bdfe2742189c056d770b982bacd7167
Author: Andreas Beckmann <anbe at debian.org>
Date:   Tue Jan 24 05:07:07 2017 +0100

    piuparts-depends-dummy_error.conf: recognize the failure from apt-get install p-d-d.deb
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/changelog                                 | 2 ++
 known_problems/piuparts-depends-dummy_error.conf | 2 +-
 piuparts.py                                      | 6 ++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ec747b0..0b36495 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ piuparts (0.75) UNRELEASED; urgency=medium
   * scripts/pre_distupgrade_zz_database-server: Run pg_upgradecluster during
     dist-upgrades.
   * Detect more database setup issues.
+  * known_problems/piuparts-depends-dummy_error.conf: Recognize the failure
+    from 'apt-get install piuparts-depends-dummy.deb'.
 
  -- Andreas Beckmann <anbe at debian.org>  Sun, 15 Jan 2017 20:34:58 +0100
 
diff --git a/known_problems/piuparts-depends-dummy_error.conf b/known_problems/piuparts-depends-dummy_error.conf
index 4b62ebe..2c4452a 100644
--- a/known_problems/piuparts-depends-dummy_error.conf
+++ b/known_problems/piuparts-depends-dummy_error.conf
@@ -1,7 +1,7 @@
 #
 # detect problems where piuparts-depends-dummy.deb was not installed
 #
-PATTERN='ERROR: Installation of piuparts-depends-dummy FAILED'
+PATTERN='ERROR: Installation of piuparts-depends-dummy FAILED|ERROR: Command failed.*apt-get.*install.*piuparts-depends-dummy.deb'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Problems installing piuparts-depends-dummy.deb'
diff --git a/piuparts.py b/piuparts.py
index b013340..3bde322 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -2476,10 +2476,12 @@ def install_purge_test(chroot, chroot_state, package_files, packages, extra_pack
 
         # Install the metapackage
         chroot.install_package_files([metapackage], with_scripts=False)
+
+        # Check whether it got installed, the 'dpkg -i p-d-d.deb && apt-get -yf install' approach
+        # may not have installed it, cannot happen with 'apt-get install p-d-d.deb' (since stretch)
         if not chroot.is_installed(["piuparts-depends-dummy"]):
             logging.error("Installation of piuparts-depends-dummy FAILED")
-            # FIXME: too many failures
-            # panic()
+            # don't panic(), too many problems on old distros
 
         # Now remove it
         metapackagename = os.path.basename(metapackage)[:-4]

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