custom-scripts/scripts-debug-triggers/pre_distupgrade_debug_triggers

@@ -4,5 +4,5 @@ set -e
 if [ ! -f /etc/dpkg/dpkg.cfg.d/piuparts-debug-triggers ]
 then
 	echo "Enabling dpkg trigger debugging"
-	echo 'debug=70000' > /etc/dpkg/dpkg.cfg.d/piuparts-debug-triggers
+	echo 'debug=70441' > /etc/dpkg/dpkg.cfg.d/piuparts-debug-triggers
 fi

custom-scripts/scripts-debug-triggers/pre_install_debug_triggers

@@ -6,5 +6,5 @@ test "$PIUPARTS_TEST" = "install" || exit 0
 if [ ! -f /etc/dpkg/dpkg.cfg.d/piuparts-debug-triggers ]
 then
 	echo "Enabling dpkg trigger debugging"
-	echo 'debug=70000' > /etc/dpkg/dpkg.cfg.d/piuparts-debug-triggers
+	echo 'debug=70441' > /etc/dpkg/dpkg.cfg.d/piuparts-debug-triggers
 fi

custom-scripts/scripts/pre_distupgrade_allow_unauthenticated

@@ -44,6 +44,8 @@ if [ "$PIUPARTS_DISTRIBUTION_NEXT" = "wheezy" ]; then
 # The Release file is not getting updated.
 Acquire::Check-Valid-Until "false";
 EOF
+elif [ "$PIUPARTS_DISTRIBUTION_NEXT" = "wheezy-backports" ]; then
+	:
 elif [ -e /etc/apt/apt.conf.d/unauthenticated-wheezy ]; then
 	echo "FAIL: /etc/apt/apt.conf.d/unauthenticated-wheezy exists"
 	exit 1

custom-scripts/scripts/pre_distupgrade_exceptions

@@ -175,16 +175,3 @@ if [ "$PIUPARTS_DISTRIBUTION_NEXT" = "jessie" ]; then
 	fi
 
 fi
-
-if [ "$PIUPARTS_DISTRIBUTION_NEXT" = "experimental" ]; then
-
-	case ${PIUPARTS_OBJECTS} in
-		dnscache-run=1:1.05-9~exp2)
-			#664848: breaks dns resolution in chroot if installed in a chroot
-			log_debug
-			echo "*** ABORT - Installation broke DNS in chroot ***"
-			exit 1
-			;;
-	esac
-
-fi

debian/changelog

 piuparts (1.0.1) UNRELEASED; urgency=medium
 
-  * ...
+  [ Andreas Beckmann ]
+  * piuparts.py:
+    - Add '--max-command-output-size' option to allow overriding the default
+      of 8 MB for debugging runs.
+    - Run pre_remove scripts before computing packages to be removed.
+  * piuparts-slave.py:
+    - Generate separate tarball names for --merged-usr chroots.
 
  -- Holger Levsen <holger@debian.org>  Sat, 04 May 2019 21:53:16 +0200
 

instances/piuparts.conf-template.pejacevic

@@ -287,7 +287,6 @@ piuparts-flags =
 	%(flags-merged-usr)s
 distro = None
 upgrade-test-distros = sid
-chroot-tgz = %(upgrade-test-distros)s-merged-usr_@ARCH@.tgz
 # 3 days (60*60*24*3)
 max-tgz-age = 259200
 
@@ -408,7 +407,6 @@ json-sections = none
 piuparts-flags =
 	%(flags-merged-usr)s
 distro = sid
-chroot-tgz = %(distro)s-merged-usr_@ARCH@.tgz
 
 
 [sid-broken-symlinks]

instances/piuparts.conf.anbe

@@ -331,7 +331,7 @@ sections =
 	lenny222testing_i386/non-free
 #
 	wheezy/main
-	wheezy-rcmd/main
+	wheezy_i386/main
 	wheezy-lts/main
 	wheezy-security/main
 	wheezy-backports/main
@@ -359,9 +359,10 @@ sections =
 	lenny/main
 	lenny_i386/main
 	lenny2squeeze/main
+	lenny2squeeze_i386/main
 #
 	wheezy/contrib
-	wheezy-rcmd/contrib
+	wheezy_i386/contrib
 	wheezy-lts/contrib
 #	wheezy-security/contrib
 	wheezy-backports/contrib
@@ -389,9 +390,10 @@ sections =
 	lenny/contrib
 	lenny_i386/contrib
 	lenny2squeeze/contrib
+	lenny2squeeze_i386/contrib
 #
 	wheezy/non-free
-	wheezy-rcmd/non-free
+	wheezy_i386/non-free
 	wheezy-lts/non-free
 #	wheezy-security/non-free
 	wheezy-backports/non-free
@@ -419,6 +421,7 @@ sections =
 	lenny/non-free
 	lenny_i386/non-free
 	lenny2squeeze/non-free
+	lenny2squeeze_i386/non-free
 #
 testing-suite = buster
 #
@@ -500,7 +503,6 @@ upgrade-test-distros = sid
 arch = amd64
 area = main
 components = main
-chroot-tgz = %(upgrade-test-distros)s-merged-usr_%(arch)s.tgz
 # 60*60*24*2
 max-tgz-age = 172800
 
@@ -514,7 +516,6 @@ arch = i386
 setarch = linux32
 area = main
 components = main
-chroot-tgz = %(upgrade-test-distros)s-merged-usr_%(arch)s.tgz
 # 60*60*24*2
 max-tgz-age = 172800
 
@@ -938,7 +939,6 @@ distro = sid
 arch = amd64
 area = main
 components = main
-chroot-tgz = %(distro)s-merged-usr_%(arch)s.tgz
 
 [sid-merged-usr/contrib]
 precedence = 45
@@ -949,7 +949,6 @@ depends-sections = sid-merged-usr/main sid-merged-usr/non-free
 distro = sid
 arch = amd64
 area = contrib
-chroot-tgz = %(distro)s-merged-usr_%(arch)s.tgz
 
 [sid-merged-usr/non-free]
 precedence = 45
@@ -960,7 +959,6 @@ depends-sections = sid-merged-usr/main sid-merged-usr/contrib
 distro = sid
 arch = amd64
 area = non-free
-chroot-tgz = %(distro)s-merged-usr_%(arch)s.tgz
 
 
 [sid-bl/main]
@@ -1777,11 +1775,9 @@ area = non-free
 reschedule-old-count = 0
 
 
-[wheezy-rcmd/main]
+[wheezy_i386/main]
 precedence = 1000
-description = + With recommended packages.
 piuparts-flags =
-	--install-recommends
 	%(flags-default)s
 	%(flags-start-wheezy)s
 	%(flags-end-wheezy)s
@@ -1792,30 +1788,26 @@ area = main
 components = main
 reschedule-old-count = 0
 
-[wheezy-rcmd/contrib]
+[wheezy_i386/contrib]
 precedence = 1000
-description = + With recommended packages.
 piuparts-flags =
-	--install-recommends
 	%(flags-default)s
 	%(flags-start-wheezy)s
 	%(flags-end-wheezy)s
-depends-sections = wheezy-rcmd/main wheezy-rcmd/non-free
+depends-sections = wheezy_i386/main wheezy_i386/non-free
 distro = wheezy
 arch = i386
 setarch = linux32
 area = contrib
 reschedule-old-count = 0
 
-[wheezy-rcmd/non-free]
+[wheezy_i386/non-free]
 precedence = 1000
-description = + With recommended packages.
 piuparts-flags =
-	--install-recommends
 	%(flags-default)s
 	%(flags-start-wheezy)s
 	%(flags-end-wheezy)s
-depends-sections = wheezy-rcmd/main wheezy-rcmd/contrib
+depends-sections = wheezy_i386/main wheezy_i386/contrib
 distro = wheezy
 arch = i386
 setarch = linux32
@@ -2298,6 +2290,53 @@ upgrade-test-distros = lenny squeeze
 reschedule-old-count = 0
 
 
+[lenny2squeeze_i386/main]
+precedence = 1000
+piuparts-flags =
+	%(flags-default)s
+	%(flags-start-lenny)s
+	%(flags-end-squeeze)s
+	-i /usr/local/share/octave/
+	-i /usr/local/share/octave/site-m/
+	-i /usr/share/octave/ls-R
+	-i /usr/share/octave/packages/
+arch = i386
+setarch = linux32
+area = main
+components = main
+distro = lenny
+upgrade-test-distros = lenny squeeze
+reschedule-old-count = 0
+
+[lenny2squeeze_i386/contrib]
+precedence = 1000
+piuparts-flags =
+	%(flags-default)s
+	%(flags-start-lenny)s
+	%(flags-end-squeeze)s
+depends-sections = lenny2squeeze_i386/main lenny2squeeze_i386/non-free
+arch = i386
+setarch = linux32
+area = contrib
+distro = lenny
+upgrade-test-distros = lenny squeeze
+reschedule-old-count = 0
+
+[lenny2squeeze_i386/non-free]
+precedence = 1000
+piuparts-flags =
+	%(flags-default)s
+	%(flags-start-lenny)s
+	%(flags-end-squeeze)s
+depends-sections = lenny2squeeze_i386/main lenny2squeeze_i386/contrib
+arch = i386
+setarch = linux32
+area = non-free
+distro = lenny
+upgrade-test-distros = lenny squeeze
+reschedule-old-count = 0
+
+
 [lenny222testing/main]
 precedence = 150
 piuparts-flags =

master-bin/detect_well_known_errors.py

@@ -35,7 +35,7 @@ from piupartslib.dwke import *
 
 
 CONFIG_FILE = "/etc/piuparts/piuparts.conf"
-KPR_DIRS = ('pass', 'bugged', 'affected', 'fail')
+KPR_DIRS = ('pass', 'bugged', 'affected', 'fail', 'untestable')
 
 
 class Busy(Exception):

piuparts-slave.py

@@ -411,7 +411,8 @@ class Section:
     def _get_tarball(self):
         basetgz = self._config["chroot-tgz"] or \
             self._distro_config.get_basetgz(self._config.get_start_distro(),
-                                            self._config.get_arch())
+                                            self._config.get_arch(),
+                                            merged_usr="--merged-usr" in self._config["piuparts-flags"])
         return os.path.join(self._config["basetgz-directory"], basetgz)
 
     def _check_tarball(self):

piuparts.1.txt

@@ -173,6 +173,10 @@ The tarball can be created with the '-s' option, or you can use one that *pbuild
 *--log-level*='level'::
   Display messages from loglevel LEVEL, possible values are: error, info, dump, debug. The default is dump.
 
+*--max-command-output-size*='size'::
+  Set the maximum permitted command output to _size_ (in MB) for debugging
+  runs exceeding the default of 8 MB.
+
 *--merged-usr*::
   When using debootstrap to create the chroot, use the '--merged-usr' option
   to create a chroot with /bin, /lib, /sbin being symlinks to their /usr

piuparts.py

@@ -1522,6 +1522,13 @@ class Chroot:
             logging.debug(" reference: %s" % " ".join(reference_chroot_state["avail_md5"]))
             logging.debug(" current  : %s" % " ".join(self.avail_md5_history))
 
+        self.list_paths_with_symlinks()
+        self.check_debsums()
+        self.check_adequate(packages_qualified)
+
+        # Run custom scripts before removing all packages.
+        self.run_scripts("pre_remove")
+
         selections = reference_chroot_state["selections"]
         packages = unqualify(packages_qualified)
 
@@ -1548,13 +1555,6 @@ class Chroot:
         all_to_install += [(name, version) for name, (state, version) in nondeps.iteritems()
                            if state == "install"]
 
-        self.list_paths_with_symlinks()
-        self.check_debsums()
-        self.check_adequate(packages_qualified)
-
-        # Run custom scripts before removing all packages.
-        self.run_scripts("pre_remove")
-
         # First remove all packages (and reinstall missing ones).
         self.remove_packages(deps_to_remove)
         if all_to_install:
@@ -2973,6 +2973,10 @@ def parse_command_line():
                       default="dump",
                       help="Displays messages from LEVEL level, possible values are: error, info, dump, debug. The default is dump.")
 
+    parser.add_option("--max-command-output-size", action="store", metavar='SIZE',
+                      default=0,
+                      help="Set maximum permitted command output to SIZE (in MB).")
+
     (opts, args) = parser.parse_args()
 
     # expand combined options
@@ -2987,6 +2991,8 @@ def parse_command_line():
     settings.tmpdir = opts.tmpdir
     settings.keep_env = opts.keep_env
     settings.shell_on_error = opts.shell_on_error
+    if opts.max_command_output_size:
+        settings.max_command_output_size = int(opts.max_command_output_size) * 1024 * 1024;
     settings.single_changes_list = opts.single_changes_list
     settings.single_packages = opts.single_packages
     settings.args_are_package_files = not opts.apt

piupartslib/conf.py

@@ -246,12 +246,14 @@ class DistroConfig(UserDict.UserDict):
                         c))
         return lines
 
-    def get_basetgz(self, distro, arch):
+    def get_basetgz(self, distro, arch, merged_usr=False):
         # look for the first base distribution
         for d in self._expand_depends(distro):
             if self.get(d, "depends"):
                 next  # skip partial distro
-            return "%s_%s.tar.gz" % (self.get_distribution(d), arch)
+            return "%s%s_%s.tar.gz" % (self.get_distribution(d),
+                                       "-merged-usr" if merged_usr else "",
+                                       arch)
         return None