Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock Please unblock package piuparts, mostly to update distro.conf for the wonderful time when Stretch will be stable. I'll comment on the other changes now inbetween the changelog entries: +piuparts (0.77) unstable; urgency=medium + + [ Andreas Beckmann ] + * distros.conf: + - Add aliases for oldstable and oldoldstable. very nice to have. + - Update aliases for stretch being released as stable. this change is the reason why we want 0.77 in stretch. + * piuparts.py: + - Add to ignored_files: + + /etc/rc.local + + /etc/X11/Xwrapper.config (Closes: #859929) + + /var/lib/apt/daily_lock trivial one liner changes, reducing some clear false negatives from piuparts runs. + * piuparts-analyze.py: + - Do not ignore Ctrl-C. regression fix compared to 0.76, also trivial one-liner. + * scripts/post_distupgrade_base_cleanup: Remove (transitional) sysvinit from + stretch. (Closes: #860819) + * scripts/pre_distupgrade_zz_database-server: Do not migrate manually from + mysql-server to default-mysql-server (aka mariadb-server), there is now a + transitional mysql-server package in stretch. scripts are generally (+sadly) only used by a very very few users, until #752256 will be fixed, as such, these are very low risk. OTOH they *are* very helpful, when people try to reproduce piuparts.d.o logs by running the commands from those logs. + [ Holger Levsen ] + * piuparts-report.py: + - update navigation to point to piuparts.conf-template.pejacevic. trivial change updating one URL… $ diffstat piuparts_0.77.diff .gitignore | 2 conf/distros.conf | 28 ++++-- custom-scripts/scripts/post_distupgrade_base_cleanup | 1 custom-scripts/scripts/pre_distupgrade_zz_database-server | 62 -------------- debian/.gitignore | 5 - debian/changelog | 25 +++++ piuparts-analyze.py | 2 piuparts-report.py | 2 piuparts.py | 3 9 files changed, 51 insertions(+), 79 deletions(-) I don't know why the .gitignore files were included in the previous upload but I think it's appropriate to drop them now. The full debdiff is attached. unblock piuparts/0.77 Thanks for your "endless" work on Stretch! -- cheers, Holger
diff -Nru piuparts-0.76/conf/distros.conf piuparts-0.77/conf/distros.conf
--- piuparts-0.76/conf/distros.conf 2017-03-12 17:55:07.000000000 +0100
+++ piuparts-0.77/conf/distros.conf 2017-06-03 19:01:54.000000000 +0200
@@ -127,25 +127,33 @@
depends = sid
+[experimental]
+depends = sid
+target-release = experimental
+
+
# alias
-[stable]
+[oldoldstable]
+distribution = wheezy
+
+# alias
+[oldstable]
distribution = jessie
# alias
-[testing]
+[stable]
distribution = stretch
-
-[experimental]
-depends = sid
-target-release = experimental
+# alias
+[testing]
+distribution = buster
# It's also possible to have "virtual" entries by setting uri to
# the string "None". This allows e.g. to combine several partial
# distributions. Such virtual distros can be used for standalone
-# piuparts runs, but not in master-slave setup.
-[squeeze-current]
+# piuparts runs, but not in master-slave setup (due to a missing
+# dependency on a full distro).
+[stretch-current]
uri = None
-depends = squeeze/updates squeeze-updates
-
+depends = stretch/updates stretch-updates
diff -Nru piuparts-0.76/custom-scripts/scripts/post_distupgrade_base_cleanup piuparts-0.77/custom-scripts/scripts/post_distupgrade_base_cleanup
--- piuparts-0.76/custom-scripts/scripts/post_distupgrade_base_cleanup 2016-09-03 14:14:59.000000000 +0200
+++ piuparts-0.77/custom-scripts/scripts/post_distupgrade_base_cleanup 2017-06-03 19:16:02.000000000 +0200
@@ -66,6 +66,7 @@
[ "$PIUPARTS_DISTRIBUTION" = "stretch-proposed" ] ; then
mark_for_purge libprocps3
+ mark_for_purge sysvinit
fi
diff -Nru piuparts-0.76/custom-scripts/scripts/pre_distupgrade_zz_database-server piuparts-0.77/custom-scripts/scripts/pre_distupgrade_zz_database-server
--- piuparts-0.76/custom-scripts/scripts/pre_distupgrade_zz_database-server 2017-03-12 17:55:07.000000000 +0100
+++ piuparts-0.77/custom-scripts/scripts/pre_distupgrade_zz_database-server 2017-06-03 21:55:00.000000000 +0200
@@ -26,6 +26,7 @@
CANDIDATES=
CANDIDATES="$CANDIDATES default-mysql-server"
+CANDIDATES="$CANDIDATES mysql-server"
CANDIDATES="$CANDIDATES postgresql"
CANDIDATES="$CANDIDATES postgresql-8.3"
CANDIDATES="$CANDIDATES postgresql-8.4"
@@ -39,17 +40,7 @@
;;
esac
-case "$PIUPARTS_DISTRIBUTION_NEXT" in
- stretch)
- : # no mysql-server
- ;;
- *)
- CANDIDATES="$CANDIDATES mysql-server"
- ;;
-esac
-
PACKAGES=
-SWITCH_TO_MARIADB=
RETRY="false"
# early upgrade runs into even more trouble for some packages ...
@@ -62,50 +53,6 @@
;;
esac
-if [ "$PIUPARTS_DISTRIBUTION_NEXT" = "stretch" ]; then
- # recommended/suggested/related package mysql-server gets removed during dist-upgrade
- case ${PIUPARTS_OBJECTS%%=*} in
- bacula-director-mysql|\
- bacula-director-mysql-dbg)
- SWITCH_TO_MARIADB=yes
- # (new) transitively recommended package mariadb-server-x.y gets
- # configured (and the server started) too late (after ourselves)
- RETRY="retry_configure_pending"
- ;;
- bareos-database-mysql)
- SWITCH_TO_MARIADB=yes
- ;;
- icinga2-ido-mysql)
- SWITCH_TO_MARIADB=yes
- ;;
- openstack-cloud-services|\
- openstack-cloud-identity)
- SWITCH_TO_MARIADB=yes
- ;;
- pdns-backend-mysql)
- SWITCH_TO_MARIADB=yes
- ;;
- phpmyadmin)
- SWITCH_TO_MARIADB=yes
- ;;
- pnopaste)
- SWITCH_TO_MARIADB=yes
- ;;
- redmine-mysql)
- SWITCH_TO_MARIADB=yes
- ;;
- tango-db|\
- tango-db-dbg|\
- tango-accesscontrol|\
- tango-accesscontrol-dbg)
- SWITCH_TO_MARIADB=yes
- ;;
- yubikey-val)
- SWITCH_TO_MARIADB=yes
- ;;
- esac
-fi
-
for pkg in $CANDIDATES
do
if is_installed "$pkg"
@@ -114,13 +61,6 @@
fi
done
-if [ "$PIUPARTS_DISTRIBUTION_NEXT" = "stretch" ] && [ "$SWITCH_TO_MARIADB" = "yes" ]; then
- if is_installed "mysql-server"
- then
- PACKAGES="$PACKAGES default-mysql-server mysql-server-"
- fi
-fi
-
test ! -x /usr/bin/pg_lsclusters || pg_lsclusters
if [ -n "$PACKAGES" ]
diff -Nru piuparts-0.76/debian/changelog piuparts-0.77/debian/changelog
--- piuparts-0.76/debian/changelog 2017-03-12 17:55:07.000000000 +0100
+++ piuparts-0.77/debian/changelog 2017-06-03 23:08:19.000000000 +0200
@@ -1,3 +1,28 @@
+piuparts (0.77) unstable; urgency=medium
+
+ [ Andreas Beckmann ]
+ * distros.conf:
+ - Add aliases for oldstable and oldoldstable.
+ - Update aliases for stretch being released as stable.
+ * piuparts.py:
+ - Add to ignored_files:
+ + /etc/rc.local
+ + /etc/X11/Xwrapper.config (Closes: #859929)
+ + /var/lib/apt/daily_lock
+ * piuparts-analyze.py:
+ - Do not ignore Ctrl-C.
+ * scripts/post_distupgrade_base_cleanup: Remove (transitional) sysvinit from
+ stretch. (Closes: #860819)
+ * scripts/pre_distupgrade_zz_database-server: Do not migrate manually from
+ mysql-server to default-mysql-server (aka mariadb-server), there is now a
+ transitional mysql-server package in stretch.
+
+ [ Holger Levsen ]
+ * piuparts-report.py:
+ - update navigation to point to piuparts.conf-template.pejacevic.
+
+ -- Holger Levsen <holger@debian.org> Sat, 03 Jun 2017 23:08:19 +0200
+
piuparts (0.76) unstable; urgency=medium
[ Andreas Beckmann ]
diff -Nru piuparts-0.76/debian/.gitignore piuparts-0.77/debian/.gitignore
--- piuparts-0.76/debian/.gitignore 2015-08-26 00:57:21.000000000 +0200
+++ piuparts-0.77/debian/.gitignore 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-files
-piuparts.debhelper.log
-piuparts.postinst.debhelper
-piuparts.prerm.debhelper
-piuparts.substvars
diff -Nru piuparts-0.76/.gitignore piuparts-0.77/.gitignore
--- piuparts-0.76/.gitignore 2015-08-26 00:57:21.000000000 +0200
+++ piuparts-0.77/.gitignore 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-*.pyc
-/deps.png
diff -Nru piuparts-0.76/piuparts-analyze.py piuparts-0.77/piuparts-analyze.py
--- piuparts-0.76/piuparts-analyze.py 2017-03-12 17:55:07.000000000 +0100
+++ piuparts-0.77/piuparts-analyze.py 2017-06-03 21:53:30.000000000 +0200
@@ -222,6 +222,8 @@
break
if not moved:
write_bug_file(failed_log, abugs + bugs)
+ except KeyboardInterrupt:
+ raise
except:
print('ERROR processing %s' % failed_log)
print sys.exc_info()[0]
diff -Nru piuparts-0.76/piuparts.py piuparts-0.77/piuparts.py
--- piuparts-0.76/piuparts.py 2017-03-12 17:55:07.000000000 +0100
+++ piuparts-0.77/piuparts.py 2017-06-03 21:53:21.000000000 +0200
@@ -220,6 +220,7 @@
# system state
"/boot/grub/",
"/etc/X11/",
+ "/etc/X11/Xwrapper.config", #859929
"/etc/X11/default-display-manager",
"/etc/aliases",
"/etc/aliases.db",
@@ -246,6 +247,7 @@
"/etc/passwd",
"/etc/passwd-",
"/etc/passwd.org",
+ "/etc/rc.local",
"/etc/shadow",
"/etc/shadow-",
"/etc/shadow.org",
@@ -277,6 +279,7 @@
"/var/cache/debconf/templates.dat",
"/var/cache/debconf/templates.dat.old",
"/var/cache/debconf/templates.dat-old",
+ "/var/lib/apt/daily_lock",
"/var/lib/apt/extended_states",
"/var/lib/cdebconf/",
"/var/lib/cdebconf/passwords.dat",
diff -Nru piuparts-0.76/piuparts-report.py piuparts-0.77/piuparts-report.py
--- piuparts-0.76/piuparts-report.py 2017-03-12 17:55:07.000000000 +0100
+++ piuparts-0.77/piuparts-report.py 2017-06-03 21:53:21.000000000 +0200
@@ -151,7 +151,7 @@
<tr class="normalrow">
<td class="contentcell">
piuparts.d.o configuration:<br>
- <a href="https://anonscm.debian.org/cgit/piuparts/piuparts.git/tree/instances/piuparts.conf.pejacevic?h=develop"; target="_blank">piuparts.conf</a>,<br>
+ <a href="https://anonscm.debian.org/cgit/piuparts/piuparts.git/tree/instances/piuparts.conf-template.pejacevic?h=develop"; target="_blank">piuparts.conf</a>,<br>
<a href="https://anonscm.debian.org/cgit/piuparts/piuparts.git/tree/conf/distros.conf?h=develop"; target="_blank">distros.conf</a><br> and
<a href="https://anonscm.debian.org/cgit/piuparts/piuparts.git/tree/custom-scripts?h=develop"; target="_blank">scripts</a>
</td>
Attachment:
signature.asc
Description: Digital signature