[Piuparts-devel] [Git][debian/piuparts][develop] 16 commits: rewrap logrotate_exits_with_error_after_package_removal

Holger Levsen gitlab at salsa.debian.org
Thu Dec 20 17:59:30 GMT 2018 

Holger Levsen pushed to branch develop at Debian / piuparts


Commits:
9ac909ef by Andreas Beckmann at 2018-12-19T13:08:43Z
rewrap logrotate_exits_with_error_after_package_removal

Signed-off-by: Andreas Beckmann <anbe at debian.org>

- - - - -
3d7f3c63 by Andreas Beckmann at 2018-12-19T20:16:35Z
distros.conf: add jessie-lts as a full distro

Signed-off-by: Andreas Beckmann <anbe at debian.org>

- - - - -
c429860a by Andreas Beckmann at 2018-12-19T20:16:39Z
clarify uses-dpkg-database-directly

Signed-off-by: Andreas Beckmann <anbe at debian.org>

- - - - -
3bbe56ee by Andreas Beckmann at 2018-12-19T20:16:39Z
p: print the file name, not the file object

Signed-off-by: Andreas Beckmann <anbe at debian.org>

- - - - -
8adb9651 by Andreas Beckmann at 2018-12-19T20:17:00Z
post_distupgrade_exceptions: ->buster: normalize ca-certificates.conf

Signed-off-by: Andreas Beckmann <anbe at debian.org>

- - - - -
30099e99 by Andreas Beckmann at 2018-12-19T20:17:04Z
p.conf.anbe: rename [jessie-proposed] to [jessie-lts]

Signed-off-by: Andreas Beckmann <anbe at debian.org>

- - - - -
0f7e39af by Andreas Beckmann at 2018-12-19T20:17:04Z
p.conf.anbe: rename [jessie2proposed] to [jessie2lts]

Signed-off-by: Andreas Beckmann <anbe at debian.org>

- - - - -
243aa458 by Andreas Beckmann at 2018-12-19T20:17:05Z
p.conf.anbe: drop [jessie-pu]

Signed-off-by: Andreas Beckmann <anbe at debian.org>

- - - - -
f12e450d by Andreas Beckmann at 2018-12-19T20:17:05Z
p.conf.anbe: drop [jessie-updates]

Signed-off-by: Andreas Beckmann <anbe at debian.org>

- - - - -
f515b58a by Andreas Beckmann at 2018-12-19T20:17:05Z
p.conf: rename (inactive) [jessie-proposed] to [jessie-lts]

Signed-off-by: Andreas Beckmann <anbe at debian.org>

- - - - -
37b2130f by Andreas Beckmann at 2018-12-19T20:17:05Z
p.conf: rename [jessie2proposed] to [jessie2lts]

Signed-off-by: Andreas Beckmann <anbe at debian.org>

- - - - -
c276c971 by Andreas Beckmann at 2018-12-19T20:17:05Z
p.conf: [wheezy2bpo2jessie]: use jessie-lts as final upgrade target

Signed-off-by: Andreas Beckmann <anbe at debian.org>

- - - - -
7fe296ee by Andreas Beckmann at 2018-12-19T20:17:05Z
p.conf: add [wheezy2jessie-lts]

Signed-off-by: Andreas Beckmann <anbe at debian.org>

- - - - -
9eb11a1f by Andreas Beckmann at 2018-12-19T20:17:06Z
p.conf: add [jessie-lts2stretch]

Signed-off-by: Andreas Beckmann <anbe at debian.org>

- - - - -
7d29ce3b by Andreas Beckmann at 2018-12-19T20:17:06Z
p.conf: disable [wheezy-pu] and [jessie-pu]

Signed-off-by: Andreas Beckmann <anbe at debian.org>

- - - - -
978a1830 by Andreas Beckmann at 2018-12-19T20:17:22Z
scripts-broken-symlinks: unbreak more symlinks

Signed-off-by: Andreas Beckmann <anbe at debian.org>

- - - - -


9 changed files:

- bug-templates/logrotate_exits_with_error_after_package_removal.mail
- conf/distros.conf
- custom-scripts/scripts-broken-symlinks/post_install_extras_unbreak_symlinks
- custom-scripts/scripts/post_distupgrade_exceptions
- debian/changelog
- debian/piuparts.lintian-overrides
- instances/piuparts.conf-template.pejacevic
- instances/piuparts.conf.anbe
- piuparts.py


Changes:

=====================================
bug-templates/logrotate_exits_with_error_after_package_removal.mail
=====================================
@@ -9,14 +9,16 @@ Usertags: piuparts
 
 Hi,
 
-during a test with piuparts I noticed your package's logrotate configuration
-causes logrotate to exit with an error after the package has been removed (*) or
-when logrote is run but no logfile exists.
+during a test with piuparts I noticed your package's logrotate
+configuration causes logrotate to exit with an error after the package
+has been removed (*) or when logrote is run but no logfile exists.
 
-Usually the solution is to specify 'missingok' in the logrotate configuration.
+Usually the solution is to specify 'missingok' in the logrotate
+configuration.
 
-*) logrotate configuration files remain installed and executed after a package
-has been removed, they only get removed when the package is purged.
+*) logrotate configuration files remain installed and executed after a
+package has been removed, they only get removed when the package is
+purged.
 
 From the attached log (scroll to the bottom...):
 


=====================================
conf/distros.conf
=====================================
@@ -98,6 +98,11 @@ uri = None
 depends = jessie jessie/updates jessie-updates jessie-proposed-updates
 candidates = jessie jessie/updates jessie-proposed-updates
 
+[jessie-lts]
+uri = None
+depends = jessie jessie/updates
+candidates = jessie jessie/updates
+
 [jessie-backports]
 depends = jessie jessie/updates
 target-release = jessie-backports


=====================================
custom-scripts/scripts-broken-symlinks/post_install_extras_unbreak_symlinks
=====================================
@@ -72,6 +72,22 @@ install_extra_package firefox			hunspell-en-us
 # python-wxversion, alternative set up by python-wxgtk3.0, #857757
 install_extra_package python-wxversion		python-wxgtk3.0
 
+# /usr/lib/qflow/bin/netgen -> ../../../bin/netgen-lvs
+# qflow: Suggests: netgen-lvs
+install_extra_package qflow			netgen-lvs
+
+# /usr/lib/ruby/vendor_ruby/psych.jar -> ../../../share/java/psych.jar
+# ruby-psych: Suggests: libpsych-java
+install_extra_package ruby-psych		libpsych-java
+
+# /usr/lib/slepcdir/slepc3.9/x86_64-linux-gnu-complex/share/slepc/datafiles -> ../../../../../../share/doc/libslepc3.9-dev-examples/datafiles
+# libslepc-complex3.9-dev: Suggests: libslepc3.9-dev-examples, slepc3.9-doc
+install_extra_package libslepc-complex3.9-dev	libslepc3.9-dev-examples slepc3.9-doc
+
+# /usr/lib/slepcdir/slepc3.9/x86_64-linux-gnu-real/share/slepc/datafiles -> ../../../../../../share/doc/libslepc3.9-dev-examples/datafiles
+# libslepc-real3.9-dev: Suggests: libslepc3.9-dev-examples, slepc3.9-doc
+install_extra_package libslepc-real3.9-dev	libslepc3.9-dev-examples slepc3.9-doc
+
 # /usr/lib/wml/exec/wml_aux_weblint -> ../../../bin/weblint
 # /usr/lib/wml/exec/wml_aux_freetable -> ../../../bin/freetable
 # wml: Suggests: freetable, weblint-perl
@@ -88,10 +104,6 @@ install_extra_package firebird3.0-server-core	firebird3.0-server
 # /usr/lib/x86_64-linux-gnu/qt-default/qtchooser/default.conf -> ../../../../share/qtchooser/qt4-x86_64-linux-gnu.conf
 install_extra_package libqtcore4		qtchooser
 
-# /usr/share/GNUstep/Libraries/gnustep-base/Versions/1.24/Resources/NSTimeZones/zones -> ../../../../../../../zoneinfo
-# gnustep-base-common, #857153
-install_extra_package gnustep-base-common	tzdata
-
 # /usr/share/bacula-common/dbc_database.conf -> /etc/dbconfig-common/bacula-director-pgsql.conf
 install_extra_package bacula-common-pgsql	bacula-director-pgsql
 install_extra_package bacula-common-mysql	bacula-director-mysql
@@ -127,7 +139,7 @@ install_extra_package gimp-help-common		gimp-help-en
 install_extra_package keyboard-configuration	xkb-data
 
 # /usr/share/doc/libboost1.62-doc/HTML/boost -> ../../../../include/boost
-# libboost1.62-doc: libboost1.62-dev
+# libboost1.XX-doc: Suggests: libboost1.XX-dev
 install_extra_package libboost1.61-doc		libboost1.61-dev
 install_extra_package libboost1.62-doc		libboost1.62-dev
 install_extra_package libboost1.63-doc		libboost1.63-dev
@@ -140,6 +152,19 @@ install_extra_package libembperl-perl		libjs-prototype
 # libgraphicsmagick1-dev: Suggests: graphicsmagick
 install_extra_package libgraphicsmagick1-dev	graphicsmagick
 
+# /usr/share/doc/libjs-sprintf-js/examples/angular.min.js -> ../../../javascript/angular.js/angular.min.js
+# libjs-sprintf-js: Suggests: libjs-angularjs
+install_extra_package libjs-sprintf-js		libjs-angularjs
+
+# /usr/share/doc/libpetsc3.9-dev-examples/include -> ../petsc3.9-doc/include
+# /usr/share/doc/libpetsc3.9-dev-examples/docs -> ../petsc3.9-doc/docs
+# libpetsc3.9-dev-examples: Suggests: petsc3.9-doc
+install_extra_package libpetsc3.9-dev-examples	petsc3.9-doc
+
+# /usr/share/doc/libslepc3.9-dev-examples/examples/docs -> ../../slepc3.9-doc/docs
+# libslepc3.9-dev-examples: Suggests: slepc3.9-doc
+install_extra_package libslepc3.9-dev-examples	slepc3.9-doc
+
 # /usr/share/doc/libvirt-doc/changelog.gz -> ../libvirt0/changelog.gz
 install_extra_package libvirt-doc		libvirt0
 
@@ -197,10 +222,18 @@ install_extra_package libwildmagic-common	libwildmagic5
 # /usr/share/nginx/modules -> ../../lib/nginx/modules
 install_extra_package nginx-common		libnginx-mod-http-echo
 
+# /usr/bin/vmware-user -> vmware-user-suid-wrapper
+# open-vm-tools Suggests: open-vm-tools-desktop
+install_extra_package open-vm-tools		open-vm-tools-desktop
+
 # /usr/share/org-mode/scripts/ditaa.jar -> ../../ditaa/ditaa.jar
 # org-mode: Suggests: ditaa
 install_extra_package org-mode			ditaa
 
+# /usr/lib/python2.7/dist-packages/Bio/Entrez/DTDs/mathml2.dtd -> ../../../../../../share/xml/schema/w3c/mathml/dtd/mathml2.dtd
+# python-biopython: Suggests: w3-dtd-mathml
+install_extra_package python-biopython		w3-dtd-mathml
+
 # /usr/share/pyshared/MoinMoin/words -> /etc/moin/words
 # /etc/moin/words -> /usr/share/dict/words
 install_extra_package python-moinmoin		wamerican
@@ -213,6 +246,9 @@ install_extra_package quassel-data		inxi
 # quilt: Suggests: default-mta | mail-transport-agent
 install_extra_package quilt			nullmailer
 
+# /usr/share/syslinux/themes/debian-wheezy/???linux/*.c32
+install_extra_package syslinux-themes-debian-wheezy	syslinux-common
+
 # /usr/share/tuxpaint/fonts/locale/zh_TW.ttf -> ../../../fonts/truetype/arphic/uming.ttc
 # /usr/share/tuxpaint/fonts/locale/zh_CN.ttf -> ../../../fonts/truetype/arphic-gbsn00lp/gbsn00lp.ttf
 # /usr/share/tuxpaint/fonts/locale/th.ttf -> ../../../fonts/opentype/tlwg/Garuda-Bold.otf
@@ -266,6 +302,11 @@ create_extra_dir()
 	fi
 }
 
+# /etc/motd.d/cockpit -> /run/cockpit/motd
+# /etc/issue.d/cockpit.issue -> /run/cockpit/motd
+create_extra_dir cockpit-ws			/run/cockpit
+create_extra_file cockpit-ws			/run/cockpit/motd
+
 # /etc/lprng/printcap -> ../printcap
 create_extra_file lprng				/etc/printcap
 
@@ -295,6 +336,10 @@ create_extra_file rust-gdb			/usr/share/man/man1/gdb.1.gz
 create_extra_file otrs2				/etc/otrs/Kernel/Config/GenericAgent.pm
 create_extra_dir otrs2				/run/otrs
 
+# /usr/share/texlive/texmf-dist/tex/latex/pdfx/sRGB_IEC61966-2-1_black_scaled.icc -> ../../../../../color/icc/sRGB_IEC61966-2-1_black_scaled.icc
+# sRGB_IEC61966-2-1_black_scaled.icc is provided by icc-profiles in non-free (#880363)
+create_extra_file texlive-latex-extra		/usr/share/color/icc/sRGB_IEC61966-2-1_black_scaled.icc
+
 # /usr/share/uim/loader.scm -> /var/lib/uim/loader.scm
 # /usr/share/uim/installed-modules.scm -> /var/lib/uim/installed-modules.scm
 create_extra_file libuim-data			/var/lib/uim/loader.scm /var/lib/uim/installed-modules.scm


=====================================
custom-scripts/scripts/post_distupgrade_exceptions
=====================================
@@ -90,6 +90,18 @@ if [ "$PIUPARTS_DISTRIBUTION" = "buster" ]; then
 		sed -r -i '/^(passwd|group|shadow):/ s/compat/files/' /etc/nsswitch.conf
 	fi
 
+	# upgrading ca-certificates disables obsolete certificates and appends new certificates
+	# normalize and sort the list to match fresh installations
+	if [ -f "/etc/ca-certificates.conf" ]; then
+		sed -rn '/^#/p' /etc/ca-certificates.conf > /etc/ca-certificates.conf.normalized
+		sed -r '/^[#!]/d' /etc/ca-certificates.conf | sort >> /etc/ca-certificates.conf.normalized
+		if ! cmp -s /etc/ca-certificates.conf.normalized /etc/ca-certificates.conf ; then
+			echo "Normalized /etc/ca-certificates.conf"
+			cp /etc/ca-certificates.conf.normalized /etc/ca-certificates.conf
+		fi
+		rm -f /etc/ca-certificates.conf.normalized
+	fi
+
 	# dpkg does not properly clean up directories getting empty and no longer shipped
 	for dir in /etc/dbus-1/system.d /etc/dbus-1
 	do


=====================================
debian/changelog
=====================================
@@ -2,6 +2,19 @@ piuparts (0.96) UNRELEASED; urgency=medium
 
   * master-bin/detect_piuparts_issues: ignore files which vanish during run.
 
+  [ Andreas Beckmann ]
+  * distros.conf: Add jessie-lts as a full distro.
+  * piuparts.conf:
+    - Use jessie-lts as upgrade target and rename section
+      [jessie2proposed] => [jessie2lts]
+    - Add sections [wheezy2jessie-lts] and [jessie-lts2stretch].
+    - [wheezy2bpo2jessie]: Use jessie-lts as final upgrade target.
+    - Disable sections [wheezy-pu], [jessie-pu]: not used for lts releases.
+  * scripts/post_distupgrade_exceptions:
+    - Handle /etc/ca-certificates.conf stretch -> buster upgrade by
+      normalizing the file to match fresh installations.  (Closes: #889852)
+  * scripts-broken-symlinks: Unbreak more symlinks.
+
  -- Holger Levsen <holger at debian.org>  Sun, 09 Dec 2018 22:29:43 +0100
 
 piuparts (0.95) unstable; urgency=medium
@@ -27,9 +40,9 @@ piuparts (0.95) unstable; urgency=medium
     - piuparts-report.py: add navigation link to https://piuparts.d.o/logs/
     - htdocs/news.tpl: explain the result of these changes.
   * d/control: use canonical URL for Vcs-Git, thanks lintian.
-  * Add d/piuparts.lintian-overrides to override the incorrect
-    uses-dpkg-database-directly warnings, after confirming we are not doing
-    that.
+  * Add d/piuparts.lintian-overrides to override uses-dpkg-database-directly
+    warnings, this cannot be avoided without breaking compatibility with
+    ancient releases.
   * bug-templates/logrotate_exits_with_error_after_package_removal: clarify
     possibles causes of this problem as well as the solution.
 


=====================================
debian/piuparts.lintian-overrides
=====================================
@@ -1,5 +1,6 @@
-piuparts: uses-dpkg-database-directly etc/piuparts/scripts-debug-purge/post_remove_postrm_set-x
-piuparts: uses-dpkg-database-directly etc/piuparts/scripts-debug-remove/pre_remove_prerm_postrm_set-x
-piuparts: uses-dpkg-database-directly etc/piuparts/scripts/post_remove_exceptions
-piuparts: uses-dpkg-database-directly etc/piuparts/scripts/pre_remove_40_find_missing_md5sums
-piuparts: uses-dpkg-database-directly usr/sbin/piuparts
+# it is impossible not to do this without losing compatibility with ancient releases
+uses-dpkg-database-directly etc/piuparts/scripts-debug-purge/post_remove_postrm_set-x
+uses-dpkg-database-directly etc/piuparts/scripts-debug-remove/pre_remove_prerm_postrm_set-x
+uses-dpkg-database-directly etc/piuparts/scripts/post_remove_exceptions
+uses-dpkg-database-directly etc/piuparts/scripts/pre_remove_40_find_missing_md5sums
+uses-dpkg-database-directly usr/sbin/piuparts


=====================================
instances/piuparts.conf-template.pejacevic
=====================================
@@ -141,14 +141,16 @@ sections =
 	jessie2Xstretch
 	jessie2stretch-rcmd
 	jessie2Xstretch-rcmd
+	jessie-lts2stretch
 	jessie2bpo2stretch
 	jessie2bpo
+#	jessie-lts
+	jessie2lts
 	jessie
 	jessie-rcmd
 	jessie-security
-	jessie-pu
-#	jessie-proposed
-	jessie2proposed
+#	jessie-pu
+	wheezy2jessie-lts
 	wheezy2jessie
 	wheezy2jessie-rcmd
 	wheezy2bpo2jessie
@@ -156,7 +158,7 @@ sections =
 	wheezy2lts
 	wheezy
 	wheezy-security
-	wheezy-pu
+#	wheezy-pu
 	squeeze2wheezy-lts
 	squeeze2wheezy
 	squeeze2bpo-sloppy
@@ -560,6 +562,17 @@ upgrade-test-distros = jessie stretch
 exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
 
 
+[jessie-lts2stretch]
+precedence = 7
+json-sections = none
+piuparts-flags =
+	%(flags-default)s
+	%(flags-start-jessie)s
+	%(flags-end-stretch)s
+distro = jessie-lts
+upgrade-test-distros = jessie-lts stretch
+
+
 [jessie2bpo2stretch]
 precedence = 5
 json-sections = none
@@ -627,17 +640,17 @@ depends-sections = jessie
 distro = jessie-proposed-updates
 
 
-[jessie-proposed]
+[jessie-lts]
 precedence = 4
 json-sections = none
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-jessie)s
 	%(flags-end-jessie)s
-distro = jessie-proposed
+distro = jessie-lts
 
 
-[jessie2proposed]
+[jessie2lts]
 precedence = 4
 json-sections = none
 piuparts-flags =
@@ -645,7 +658,18 @@ piuparts-flags =
 	%(flags-start-jessie)s
 	%(flags-end-jessie)s
 distro = jessie
-upgrade-test-distros = jessie jessie-proposed
+upgrade-test-distros = jessie jessie-lts
+
+
+[wheezy2jessie-lts]
+precedence = 7
+json-sections = none
+piuparts-flags =
+	%(flags-default)s
+	%(flags-start-wheezy)s
+	%(flags-end-jessie)s
+distro = wheezy
+upgrade-test-distros = wheezy jessie-lts
 
 
 [wheezy2jessie]
@@ -682,7 +706,7 @@ piuparts-flags =
 	%(flags-end-jessie)s
 depends-sections = wheezy
 distro = wheezy-backports
-upgrade-test-distros = wheezy wheezy-backports jessie
+upgrade-test-distros = wheezy wheezy-backports jessie-lts
 
 
 [wheezy]


=====================================
instances/piuparts.conf.anbe
=====================================
@@ -78,17 +78,25 @@ flags-broken-symlinks =
 	-i :/usr/share/gocode/src/github.com/constabulary/gb/internal/fileutils/_testdata/copyfile/a/rick
 	-i :/usr/share/gocode/src/github.com/hashicorp/atlas-go/archive/test-fixtures/archive-symlink/link/link
 	-i :/usr/share/gocode/src/github.com/prometheus/procfs/fixtures/26231/exe
+	-i :/usr/share/gocode/src/github.com/prometheus/procfs/fixtures/26231/ns/mnt
+	-i :/usr/share/gocode/src/github.com/prometheus/procfs/fixtures/26231/ns/net
 # ignore broken symlinks
 	-i :/etc/systemd/system/display-manager.service
-#   civicrm-common, #857601, /usr/share/civicrm/packages/OpenFlashChart/open-flash-chart.swf -> ../../../../local/open-flash-chart.swf
+#   civicrm-common, #857601, wontfix, /usr/share/civicrm/packages/OpenFlashChart/open-flash-chart.swf -> ../../../../local/open-flash-chart.swf
 	-i :/usr/share/civicrm/packages/OpenFlashChart/open-flash-chart.swf
+#   musescore-common, #910145, wontfix, /usr/share/mscore-2.3/sound/{sf2,sfz} -> ../../sounds/{sf2,sfz}
+	-i :/usr/share/mscore-2.3/sound/sf2
+	-i :/usr/share/mscore-2.3/sound/sfz
 # ignore broken symlinks (patterns)
 	-I :/etc/.*/supervise
 	-I /usr/include/python2\.7_d/.*\.h
 	-I /usr/include/python3\..dm/.*\.h
+	-I /usr/include/python3\..dm/internal
 	-I :/usr/lib/jvm/java-.*-openjdk-.*/src\.zip
 	-I :/usr/share/doc/kde/HTML/.*/common
 	-I :/usr/share/man/man1/(.*-)?python.*-config\.1\.gz
+# ignore broken symlinks (third party game data)
+	-I :/usr/lib/rtcw/main/.*\.(cfg|pk3)
 
 [global]
 # sections may be wrapped with continuation lines being indented
@@ -135,10 +143,8 @@ sections =
 	stretch-backports/main
 	jessie/main
 	jessie-rcmd/main
-	jessie-proposed/main
+	jessie-lts/main
 	jessie-security/main
-	jessie-updates/main
-	jessie-pu/main
 	jessie-backports/main
 	sid2experimental/main
 	testing2sid/main
@@ -155,7 +161,7 @@ sections =
 	stretch3buster-rcmd_i386/main
 	stretch2buster-iri/main
 	stretch2bpo2buster/main
-	jessie2proposed/main
+	jessie2lts/main
 	jessie2stretch/main
 	jessie3stretch/main
 	jessie2stretch_i386/main
@@ -201,10 +207,8 @@ sections =
 	stretch-backports/contrib
 	jessie/contrib
 	jessie-rcmd/contrib
-	jessie-proposed/contrib
+	jessie-lts/contrib
 	jessie-security/contrib
-	jessie-updates/contrib
-	jessie-pu/contrib
 	jessie-backports/contrib
 	sid2experimental/contrib
 	testing2sid/contrib
@@ -221,7 +225,7 @@ sections =
 	stretch3buster-rcmd_i386/contrib
 	stretch2buster-iri/contrib
 	stretch2bpo2buster/contrib
-	jessie2proposed/contrib
+	jessie2lts/contrib
 	jessie2stretch/contrib
 	jessie3stretch/contrib
 	jessie2stretch_i386/contrib
@@ -267,10 +271,8 @@ sections =
 	stretch-backports/non-free
 	jessie/non-free
 	jessie-rcmd/non-free
-	jessie-proposed/non-free
+	jessie-lts/non-free
 	jessie-security/non-free
-	jessie-updates/non-free
-	jessie-pu/non-free
 	jessie-backports/non-free
 	sid2experimental/non-free
 	testing2sid/non-free
@@ -287,7 +289,7 @@ sections =
 	stretch3buster-rcmd_i386/non-free
 	stretch2buster-iri/non-free
 	stretch2bpo2buster/non-free
-	jessie2proposed/non-free
+	jessie2lts/non-free
 	jessie2stretch/non-free
 	jessie3stretch/non-free
 	jessie2stretch_i386/non-free
@@ -1548,109 +1550,39 @@ arch = amd64
 area = non-free
 
 
-[jessie-updates/main]
+[jessie-lts/main]
 precedence = 20
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-jessie)s
 	%(flags-end-jessie)s
-depends-sections = jessie/main
-distro = jessie-updates
-arch = amd64
-area = main
-components = main
-
-[jessie-updates/contrib]
-precedence = 45
-piuparts-flags =
-	%(flags-default)s
-	%(flags-start-jessie)s
-	%(flags-end-jessie)s
-depends-sections = jessie/main
-distro = jessie-updates
-arch = amd64
-area = contrib
-
-[jessie-updates/non-free]
-precedence = 45
-piuparts-flags =
-	%(flags-default)s
-	%(flags-start-jessie)s
-	%(flags-end-jessie)s
-depends-sections = jessie/main
-distro = jessie-updates
-arch = amd64
-area = non-free
-
-
-[jessie-pu/main]
-precedence = 20
-piuparts-flags =
-	%(flags-default)s
-	%(flags-start-jessie)s
-	%(flags-end-jessie)s
-depends-sections = jessie/main
-distro = jessie-proposed-updates
-arch = amd64
-area = main
-components = main
-
-[jessie-pu/contrib]
-precedence = 45
-piuparts-flags =
-	%(flags-default)s
-	%(flags-start-jessie)s
-	%(flags-end-jessie)s
-depends-sections = jessie/main jessie/non-free
-distro = jessie-proposed-updates
-arch = amd64
-area = contrib
-
-[jessie-pu/non-free]
-precedence = 45
-piuparts-flags =
-	%(flags-default)s
-	%(flags-start-jessie)s
-	%(flags-end-jessie)s
-depends-sections = jessie/main jessie/contrib
-distro = jessie-proposed-updates
-arch = amd64
-area = non-free
-
-
-[jessie-proposed/main]
-precedence = 20
-piuparts-flags =
-	%(flags-default)s
-	%(flags-start-jessie)s
-	%(flags-end-jessie)s
-distro = jessie-proposed
+distro = jessie-lts
 arch = amd64
 area = main
 components = main
 reschedule-old-count = 500
 reschedule-old-days = 25
 
-[jessie-proposed/contrib]
+[jessie-lts/contrib]
 precedence = 45
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-jessie)s
 	%(flags-end-jessie)s
-depends-sections = jessie-proposed/main jessie-proposed/non-free
-distro = jessie-proposed
+depends-sections = jessie-lts/main jessie-lts/non-free
+distro = jessie-lts
 arch = amd64
 area = contrib
 reschedule-old-days = 25
 
-[jessie-proposed/non-free]
+[jessie-lts/non-free]
 precedence = 45
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-jessie)s
 	%(flags-end-jessie)s
-depends-sections = jessie-proposed/main jessie-proposed/contrib
-distro = jessie-proposed
+depends-sections = jessie-lts/main jessie-lts/contrib
+distro = jessie-lts
 arch = amd64
 area = non-free
 reschedule-old-days = 25
@@ -3184,7 +3116,7 @@ upgrade-test-distros = wheezy jessie stretch testing
 reschedule-old-count = 100
 
 
-[jessie2proposed/main]
+[jessie2lts/main]
 precedence = 60
 piuparts-flags =
 	%(flags-default)s
@@ -3195,31 +3127,31 @@ arch = amd64
 area = main
 components = main
 distro = jessie
-upgrade-test-distros = jessie jessie-proposed
+upgrade-test-distros = jessie jessie-lts
 
-[jessie2proposed/contrib]
+[jessie2lts/contrib]
 precedence = 95
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-jessie)s
 	%(flags-end-jessie)s
-depends-sections = jessie2proposed/main jessie2proposed/non-free
+depends-sections = jessie2lts/main jessie2lts/non-free
 arch = amd64
 area = contrib
 distro = jessie
-upgrade-test-distros = jessie jessie-proposed
+upgrade-test-distros = jessie jessie-lts
 
-[jessie2proposed/non-free]
+[jessie2lts/non-free]
 precedence = 95
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-jessie)s
 	%(flags-end-jessie)s
-depends-sections = jessie2proposed/main jessie2proposed/contrib
+depends-sections = jessie2lts/main jessie2lts/contrib
 arch = amd64
 area = non-free
 distro = jessie
-upgrade-test-distros = jessie jessie-proposed
+upgrade-test-distros = jessie jessie-lts
 
 
 [jessie2stretch/main]


=====================================
piuparts.py
=====================================
@@ -1910,7 +1910,7 @@ class Chroot:
             (retval, output) = self.run(['/usr/sbin/logrotate', vfile])
             if output or retval != 0:
                 failed = True
-                logging.error("FAIL: Logrotate file %s exits with error or has output with package removed" % file)
+                logging.error("FAIL: Logrotate file %s exits with error or has output with package removed" % vfile)
 
         if failed:
             panic()



View it on GitLab: https://salsa.debian.org/debian/piuparts/compare/1a6d962d878321b004acd3dc88861eac456d54fb...978a1830091b89317864870ec28e082351e36b65

-- 
View it on GitLab: https://salsa.debian.org/debian/piuparts/compare/1a6d962d878321b004acd3dc88861eac456d54fb...978a1830091b89317864870ec28e082351e36b65
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/piuparts-devel/attachments/20181220/a3601f00/attachment-0001.html>

More information about the Piuparts-devel mailing list