[Piuparts-commits] [piuparts] 08/08: Revert "disable apt installing .deb files while investigating problems"

[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 1839d44573987589e8634031cb1f996049556841
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Jan 24 11:39:34 2017 +0100

    Revert "disable apt installing .deb files while investigating problems"
    
    This reverts commit 6ac6ab90dde2799003340162581e5efabc447b36.
---
 master-bin/detect_piuparts_issues.in | 1 -
 piuparts.py                          | 1 -
 2 files changed, 2 deletions(-)

diff --git a/master-bin/detect_piuparts_issues.in b/master-bin/detect_piuparts_issues.in
index 0d2d1c4..8a9128c 100755
--- a/master-bin/detect_piuparts_issues.in
+++ b/master-bin/detect_piuparts_issues.in
@@ -66,7 +66,6 @@ for SECTION in $SECTIONS ; do
 		rgrep -l -e 'createuser: could not connect to database postgres: could not connect to server: No such file or directory' $MASTER/$SECTION/$subdir >> $FILE
 		rgrep -l -e 'Non-default port in /etc/postgresql/.*/main/postgresql.conf' $MASTER/$SECTION/$subdir >> $FILE
 		rgrep -l -e 'Firebird .* server already running.' $MASTER/$SECTION/$subdir >> $FILE
-		rgrep -l -e 'E: Command line option --allow-downgrades is not understood' $MASTER/$SECTION/$subdir >> $FILE
 		find $MASTER/$SECTION/$subdir -name '*.log' -size 0 >> $FILE
 	done
 done
diff --git a/piuparts.py b/piuparts.py
index 3bde322..d9bf94f 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -1204,7 +1204,6 @@ class Chroot:
             #   dummy package
             (status, output) = self.run(["dpkg-query", "-f", "${Version}\n", "-W", "apt"], ignore_errors=True)
             apt_can_install_debs = LooseVersion(output.strip()) >= LooseVersion("1.1")
-            apt_can_install_debs = False
 
             if with_scripts:
                 self.run_scripts("pre_install")

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