Skip to content
Commits on Source (9)
Hide whitespace changes
Inline Side-by-side
Makefile
View file @ c71831b3
......@@ -90,12 +90,12 @@ install-doc: build-stamp
install -m 0644 README.txt README.html README_server.txt README_server.html docbook-xsl.css $(DESTDIR)$(docdir)/
install -d $(DESTDIR)$(man1dir)
install -m 0644 piuparts.1 $(DESTDIR)$(man1dir)/
gzip -9fn $(DESTDIR)$(man1dir)/piuparts.1
install -d $(DESTDIR)$(man8dir)
install -m 0644 piuparts_slave_run.8 piuparts_slave_join.8 piuparts_slave_stop.8 $(DESTDIR)$(man8dir)/
gzip -9f $(DESTDIR)$(man1dir)/piuparts.1
gzip -9f $(DESTDIR)$(man8dir)/piuparts_slave_run.8
gzip -9f $(DESTDIR)$(man8dir)/piuparts_slave_join.8
gzip -9f $(DESTDIR)$(man8dir)/piuparts_slave_stop.8
gzip -9fn $(DESTDIR)$(man8dir)/piuparts_slave_run.8
gzip -9fn $(DESTDIR)$(man8dir)/piuparts_slave_join.8
gzip -9fn $(DESTDIR)$(man8dir)/piuparts_slave_stop.8
install -m 0644 piuparts.1.html $(DESTDIR)$(docdir)/
install-conf: build-stamp
......
custom-scripts/scripts/is_testable_uninstallable
View file @ c71831b3
......@@ -117,10 +117,9 @@ if [ "${PIUPARTS_DISTRIBUTION}" = "squeeze" ]; then
ora2pg)
skip_always "libdbd-oracle-perl/contrib depends on third-party oracle-instantclient11.2-basic"
;;
mini-buildd-bld|\
mini-buildd-rep)
skip_distupgrade "#632955, #656746: time limit exceeded during install"
fail_test "#632955, #656746: time limit exceeded during install"
mini-buildd-bld)
skip_distupgrade "#632955: time limit exceeded during install"
fail_test "#632955: time limit exceeded during install"
;;
esac
......
custom-scripts/scripts/post_distupgrade_exceptions
View file @ c71831b3
......@@ -99,6 +99,18 @@ if [ "$PIUPARTS_DISTRIBUTION" = "stretch" ]; then
fi
if [ "$PIUPARTS_DISTRIBUTION_PREV" = "stretch" ]; then
case ${PIUPARTS_OBJECTS%%=*} in
design-desktop*)
#850948: needrestart/stretch may hang during upgrade
log_debug
dpkg-divert --remove --rename /usr/lib/needrestart/apt-pinvoke
;;
esac
fi
if [ "$PIUPARTS_DISTRIBUTION" = "buster" ] || \
[ "$PIUPARTS_DISTRIBUTION" = "sid" -a "$PIUPARTS_DISTRIBUTION_PREV" = "stretch" ]; then
......
custom-scripts/scripts/pre_distupgrade_exceptions
View file @ c71831b3
......@@ -143,6 +143,19 @@ if [ "$PIUPARTS_DISTRIBUTION_NEXT" = "jessie" ]; then
cyrus-makedirs --cleansquat
fi
;;
debian-edu-archive-keyring|\
debian-ports-archive-keyring|\
emdebian-archive-keyring|\
emdebian-grip-server)
# https://bugs.debian.org/687611
log_debug
for keyring in /etc/apt/trusted.gpg.d/*.gpg~
do
if [ -f "${keyring}" ]; then
mv -v "${keyring}" "${keyring%~}"
fi
done
;;
ekeyd-uds)
# ekeyd-uds was removed after squeeze, maintainer scripts are incompatible with udev/jessie
log_debug
......@@ -175,3 +188,15 @@ if [ "$PIUPARTS_DISTRIBUTION_NEXT" = "jessie" ]; then
fi
fi
if [ "$PIUPARTS_DISTRIBUTION" = "stretch" ]; then
case ${PIUPARTS_OBJECTS%%=*} in
design-desktop*)
#850948: needrestart/stretch may hang during upgrade
log_debug
dpkg-divert --rename /usr/lib/needrestart/apt-pinvoke
;;
esac
fi
custom-scripts/scripts/pre_distupgrade_zz_database-server
View file @ c71831b3
......@@ -152,16 +152,16 @@ case "${PIUPARTS_DISTRIBUTION}:${PIUPARTS_DISTRIBUTION_NEXT}" in
lenny:squeeze)
upgrade_pg_cluster 8.3 8.4
;;
squeeze:wheezy)
squeeze*:wheezy)
upgrade_pg_cluster 8.4 9.1
;;
wheezy:jessie)
wheezy*:jessie)
upgrade_pg_cluster 9.1 9.4 --restart-first
;;
jessie:stretch)
jessie*:stretch)
upgrade_pg_cluster 9.4 9.6
;;
stretch:buster)
stretch*:buster)
upgrade_pg_cluster 9.6 11
;;
stretch:sid)
......
custom-scripts/scripts/pre_install_database-server
View file @ c71831b3
......@@ -18,18 +18,25 @@ case ${PIUPARTS_OBJECTS%%=*} in
auth2db-common) MYSQL=yes ; CLIENT=yes ;;
auth2db-frontend) MYSQL=yes ; CLIENT=yes ;;
b2evolution) MYSQL=yes ;;
bacula) POSTGRESQL=yes ;;
bacula-director) POSTGRESQL=yes ;;
bacula-director-dbgsym) POSTGRESQL=yes ;;
bacula-director-mysql) MYSQL=yes ;;
bacula-director-mysql-dbg) MYSQL=yes ;;
bacula-director-pgsql) POSTGRESQL=yes ;;
bacula-director-pgsql-dbg) POSTGRESQL=yes ;;
bacula-server) POSTGRESQL=yes ;;
bandwidthd-pgsql) POSTGRESQL=yes ;;
bareos) POSTGRESQL=yes ;;
bareos-database-common) POSTGRESQL=yes ;;
bareos-database-common-dbgsym) POSTGRESQL=yes ;;
bareos-database-mysql) POSTGRESQL=yes ; MYSQL=yes ;;
bareos-database-postgresql) POSTGRESQL=yes ;;
bareos-database-sqlite3) POSTGRESQL=yes ; SQLITE3=yes ;;
bareos-database-tools) POSTGRESQL=yes ;;
bareos-database-tools-dbgsym) POSTGRESQL=yes ;;
bareos-director) POSTGRESQL=yes ;;
bareos-director-dbgsym) POSTGRESQL=yes ;;
bley) POSTGRESQL=yes ;;
blootbot) MYSQL=yes ;;
buddycloud-server) POSTGRESQL=yes ;;
......@@ -37,6 +44,7 @@ case ${PIUPARTS_OBJECTS%%=*} in
cacti) MYSQL=yes ;;
cacti-cactid) MYSQL=yes ;;
cacti-spine) MYSQL=yes ;;
cacti-spine-dbgsym) MYSQL=yes ;;
chado-utils) POSTGRESQL=yes ;;
convirt) MYSQL=yes ;;
docbookwiki) MYSQL=yes ;;
......@@ -86,10 +94,14 @@ case ${PIUPARTS_OBJECTS%%=*} in
icinga-web-config-icinga2-ido-pgsql) POSTGRESQL=yes ;;
icinga-web-pnp) POSTGRESQL=yes ;;
icinga2-ido-mysql) MYSQL=yes ;;
icinga2-ido-mysql-dbgsym) MYSQL=yes ;;
icinga2-ido-pgsql) POSTGRESQL=yes ;;
icinga2-ido-pgsql-dbgsym) POSTGRESQL=yes ;;
jclicmoodle) POSTGRESQL=yes ;;
jffnms) MYSQL=yes ;;
kopano-core) MYSQL=yes ;;
kopano-server) MYSQL=yes ;;
kopano-server-dbgsym) MYSQL=yes ;;
letodms) MYSQL=yes ;;
letodms-webdav) MYSQL=yes ;;
libchado-perl) POSTGRESQL=yes ;;
......@@ -116,6 +128,8 @@ case ${PIUPARTS_OBJECTS%%=*} in
ocsinventory-reports) MYSQL=yes ;;
ocsinventory-server) MYSQL=yes ;;
openacs) POSTGRESQL=yes ;;
opendmarc) MYSQL=yes ;;
opendmarc-dbgsym) MYSQL=yes ;;
openstack-dashboard) SQLITE3=yes ;;
openstack-dashboard-apache) SQLITE3=yes ;;
otrs) POSTGRESQL=yes ;;
......@@ -141,6 +155,7 @@ case ${PIUPARTS_OBJECTS%%=*} in
prelude-manager) MYSQL=yes ;;
prelude-manager-dbgsym) MYSQL=yes ;;
prewikka) MYSQL=yes ;;
puppetdb) POSTGRESQL=yes ;;
pybit-web) POSTGRESQL=yes ;;
python-django-horizon) SQLITE3=yes ;;
python-quantum) SQLITE3=yes ;;
......@@ -159,7 +174,9 @@ case ${PIUPARTS_OBJECTS%%=*} in
roundcube-plugins) MYSQL=yes ;;
roundcube-plugins-extra) MYSQL=yes ;;
rsyslog-mysql) MYSQL=yes ;;
rsyslog-mysql-dbgsym) MYSQL=yes ;;
rsyslog-pgsql) POSTGRESQL=yes ;;
rsyslog-pgsql-dbgsym) POSTGRESQL=yes ;;
scuttle) MYSQL=yes ;;
semanticscuttle) MYSQL=yes ;;
serendipity) MYSQL=yes ;;
......@@ -170,8 +187,10 @@ case ${PIUPARTS_OBJECTS%%=*} in
sympa) MYSQL=yes ;;
tango-accesscontrol) MYSQL=yes ;;
tango-accesscontrol-dbg) MYSQL=yes ;;
tango-accesscontrol-dbgsym) MYSQL=yes ;;
tango-db) MYSQL=yes ;;
tango-db-dbg) MYSQL=yes ;;
tango-db-dbgsym) MYSQL=yes ;;
textpattern) MYSQL=yes ;;
torrentflux) MYSQL=yes ;;
tt-rss) MYSQL=yes ;;
......
custom-scripts/scripts/pre_install_exceptions
View file @ c71831b3
......@@ -191,6 +191,11 @@ if [ "$PIUPARTS_DISTRIBUTION" = "squeeze" ]; then
apt-get -y install bootcd-i386
fi
;;
mini-buildd-rep)
#656746: mini-buildd-rep: fails to install: missing dependency on lvm2
log_debug
apt-get -y install udev lvm2
;;
esac
fi
......
custom-scripts/scripts/pre_remove_50_find_bad_permissions
View file @ c71831b3
......@@ -44,6 +44,15 @@ wheezy*)
test ! -f "$file" || chmod -c o-w "$file"
done
;;
ilisp)
#WORKSAROUND #682826: ilisp: creates world writable directory /usr/lib/ilisp
# package was not in wheezy
for dir in /usr/lib/ilisp
do
test ! -d "$dir" || chmod -c o-w "$dir"
done
;;
esac
;;
......
debian/changelog
View file @ c71831b3
......@@ -5,6 +5,7 @@ piuparts (1.0.1) UNRELEASED; urgency=medium
- 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.
- Fix spurious failure to remove packages with names ending with '+'.
* piuparts.conf.anbe: Add some more example sections.
* piuparts-slave.py:
- Generate separate tarball names for --merged-usr chroots.
......
instances/piuparts.conf.anbe
View file @ c71831b3
......@@ -3258,8 +3258,8 @@ piuparts-flags =
arch = amd64
area = main
components = main
distro = wheezy
upgrade-test-distros = wheezy jessie stretch buster testing
distro = wheezy-lts
upgrade-test-distros = wheezy-lts jessie-lts stretch-next buster testing
max-reserved = 25
reschedule-old-count = 100
......@@ -3273,8 +3273,8 @@ piuparts-flags =
depends-sections = wheezy222testing/main wheezy222testing/non-free
arch = amd64
area = contrib
distro = wheezy
upgrade-test-distros = wheezy jessie stretch buster testing
distro = wheezy-lts
upgrade-test-distros = wheezy-lts jessie-lts stretch-next buster testing
max-reserved = 25
reschedule-old-count = 100
......@@ -3288,8 +3288,8 @@ piuparts-flags =
depends-sections = wheezy222testing/main wheezy222testing/contrib
arch = amd64
area = non-free
distro = wheezy
upgrade-test-distros = wheezy jessie stretch buster testing
distro = wheezy-lts
upgrade-test-distros = wheezy-lts jessie-lts stretch-next buster testing
max-reserved = 25
reschedule-old-count = 100
......@@ -3305,8 +3305,8 @@ arch = i386
setarch = linux32
area = main
components = main
distro = wheezy
upgrade-test-distros = wheezy jessie stretch buster testing
distro = wheezy-lts
upgrade-test-distros = wheezy-lts jessie-lts stretch-next buster testing
max-reserved = 25
reschedule-old-count = 100
......@@ -3321,8 +3321,8 @@ depends-sections = wheezy222testing_i386/main wheezy222testing_i386/non-free
arch = i386
setarch = linux32
area = contrib
distro = wheezy
upgrade-test-distros = wheezy jessie stretch buster testing
distro = wheezy-lts
upgrade-test-distros = wheezy-lts jessie-lts stretch-next buster testing
max-reserved = 25
reschedule-old-count = 100
......@@ -3337,8 +3337,8 @@ depends-sections = wheezy222testing_i386/main wheezy222testing_i386/contrib
arch = i386
setarch = linux32
area = non-free
distro = wheezy
upgrade-test-distros = wheezy jessie stretch buster testing
distro = wheezy-lts
upgrade-test-distros = wheezy-lts jessie-lts stretch-next buster testing
max-reserved = 25
reschedule-old-count = 100
......
piuparts.py
View file @ c71831b3
......@@ -393,7 +393,6 @@ class Settings:
"/var/mail/.*",
"/var/run/.*",
# package management
"/etc/apt/trusted.gpg.d/.*.gpg~",
"/var/lib/apt/lists/.*",
"/var/lib/dpkg/alternatives/.*",
"/var/lib/dpkg/triggers/.*",
......@@ -1506,7 +1505,7 @@ class Chroot:
def remove_packages(self, packages, ignore_errors=False):
"""Remove packages in a chroot."""
if packages:
self.run(["apt-get", "remove"] + unqualify(packages), ignore_errors=ignore_errors)
self.run(["apt-get", "remove"] + ["%s-" % x if x.endswith('+') else x for x in unqualify(packages)], ignore_errors=ignore_errors)
def purge_packages(self, packages, ignore_errors=False):
"""Purge packages in a chroot."""
......