[Piuparts-commits] [piuparts] 02/04: scripts: reorder and rewrap the package lists for some exceptions
Holger Levsen
holger at moszumanska.debian.org
Sun Nov 16 11:59:18 UTC 2014
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch develop
in repository piuparts.
commit 4e521842972177d1a0a5ff32222b613bc291f9fc
Author: Andreas Beckmann <anbe at debian.org>
Date: Sat Nov 15 23:09:53 2014 +0100
scripts: reorder and rewrap the package lists for some exceptions
Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
.../scripts-leftovers/post_remove_cleanup | 3 -
custom-scripts/scripts/post_purge_exceptions | 13 +--
custom-scripts/scripts/post_remove_extras | 3 -
custom-scripts/scripts/pre_install_exceptions | 93 ++++++++++++----------
custom-scripts/scripts/pre_install_extras | 9 +--
custom-scripts/scripts/pre_remove_exceptions | 3 -
6 files changed, 58 insertions(+), 66 deletions(-)
diff --git a/custom-scripts/scripts-leftovers/post_remove_cleanup b/custom-scripts/scripts-leftovers/post_remove_cleanup
index a1606ab..b9443a2 100755
--- a/custom-scripts/scripts-leftovers/post_remove_cleanup
+++ b/custom-scripts/scripts-leftovers/post_remove_cleanup
@@ -5,9 +5,6 @@ log_debug() {
echo "Debug: piuparts exception for package $PIUPARTS_OBJECTS"
}
-#
-# deal with exceptions:
-#
case ${PIUPARTS_OBJECTS%%=*} in
dovecot-core)
# #330519 - does not remove certificates on purge
diff --git a/custom-scripts/scripts/post_purge_exceptions b/custom-scripts/scripts/post_purge_exceptions
index a7eea3f..185e959 100755
--- a/custom-scripts/scripts/post_purge_exceptions
+++ b/custom-scripts/scripts/post_purge_exceptions
@@ -5,22 +5,11 @@ log_debug() {
echo "Debug: piuparts exception for package $PIUPARTS_OBJECTS"
}
-#
-# deal with packages depending on exceptions:
-#
-case ${PIUPARTS_OBJECTS%%=*} in
- ltsp-client) log_debug
- PIUPARTS_OBJECTS=ltsp-client-core
- ;;
-esac
-
-#
-# deal with exceptions:
-#
case ${PIUPARTS_OBJECTS%%=*} in
fai-nfsroot) log_debug
rm -f /.THIS_IS_THE_FAI_NFSROOT
;;
+ ltsp-client|\
ltsp-client-core) log_debug
rm -f /etc/ltsp_chroot
;;
diff --git a/custom-scripts/scripts/post_remove_extras b/custom-scripts/scripts/post_remove_extras
index f36a35e..f1c4a6f 100755
--- a/custom-scripts/scripts/post_remove_extras
+++ b/custom-scripts/scripts/post_remove_extras
@@ -5,9 +5,6 @@ log_debug() {
echo "Debug: piuparts exception for package $PIUPARTS_OBJECTS"
}
-#
-# deal with exceptions:
-#
case ${PIUPARTS_OBJECTS%%=*} in
resolvconf)
log_debug
diff --git a/custom-scripts/scripts/pre_install_exceptions b/custom-scripts/scripts/pre_install_exceptions
index fd5b0b9..398acf7 100755
--- a/custom-scripts/scripts/pre_install_exceptions
+++ b/custom-scripts/scripts/pre_install_exceptions
@@ -5,34 +5,6 @@ log_debug() {
echo "Debug: piuparts exception for package $PIUPARTS_OBJECTS"
}
-#
-# deal with packages depending on exceptions:
-#
-case ${PIUPARTS_OBJECTS%%=*} in
- ltsp-client|education-thin-client)
- log_debug
- PIUPARTS_OBJECTS=ltsp-client-core
- ;;
- upstart-dconf-bridge|upstart-monitor)
- log_debug
- PIUPARTS_OBJECTS=upstart
- ;;
- netscript-2.4-upstart) log_debug
- PIUPARTS_OBJECTS=upstart
- ;;
- live-config-upstart) log_debug
- PIUPARTS_OBJECTS=upstart
- ;;
- clvm|dtc-xen|ganeti|ganeti2|mylvmbackup|redhat-cluster-suite|libvirt0|libcollectdclient0|liblinux-lvm-perl|autopkgtest-xenlvm|collectd-dbg|collectd|cman|libsys-virt-perl|libvirt-dev|libvirt-ocaml|libvirt-ruby1.8|libvirt0-dbg|python-libvirt|virt-top|virt-viewer|xenwatch|gfs-tools|gfs2-tools|rgmanager|virtinst|collectd-utils|libcollectdclient-dev|libvirt-ocaml-dev|libvirt-ruby|mozilla-virt-viewer|munin-libvirt-plugins)
- # skip mini-buildd-bld here due to resource violation, see below
- log_debug
- PIUPARTS_OBJECTS=lvm2
- ;;
-esac
-
-#
-# deal with exceptions:
-#
case ${PIUPARTS_OBJECTS%%=*} in
samhain) log_debug
# work around #749602
@@ -43,10 +15,16 @@ case ${PIUPARTS_OBJECTS%%=*} in
# fai-nfsroot refuses installation unless this file exist
touch /.THIS_IS_THE_FAI_NFSROOT
;;
+ education-thin-client|\
+ ltsp-client|\
ltsp-client-core) log_debug
# ltsp-client-core refuses installation unless this file exist
touch /etc/ltsp_chroot
;;
+ live-config-upstart|\
+ netscript-2.4-upstart|\
+ upstart-dconf-bridge|\
+ upstart-monitor|\
upstart) log_debug
# force installation and removal of essential package sysvinit
yes 'Yes, do as I say!' | apt-get -y --force-yes install upstart
@@ -59,18 +37,6 @@ case ${PIUPARTS_OBJECTS%%=*} in
# force installation and removal of essential package sysvinit
yes 'Yes, do as I say!' | apt-get -y --force-yes install systemd-sysv
;;
- lvm2)
- if [ "$PIUPARTS_PHASE" = "install" ] && ( \
- [ "$PIUPARTS_DISTRIBUTION" = "squeeze" ] || \
- [ "$PIUPARTS_DISTRIBUTION" = "squeeze-proposed" ] || \
- [ "$PIUPARTS_DISTRIBUTION" = "squeeze-backports" ] || \
- [ "$PIUPARTS_DISTRIBUTION" = "lenny" ] )
- then
- # work around lvm2 bug https://bugs.debian.org/603036 which is squeeze-ignore
- log_debug
- apt-get -y install udev
- fi
- ;;
bugzilla3)
# checksetup.pl goes into infinite loop asking for them
log_debug
@@ -102,6 +68,53 @@ if [ "$PIUPARTS_DISTRIBUTION" = "squeeze-backports" ]; then
fi
+if [ "$PIUPARTS_DISTRIBUTION" = "squeeze" ] || \
+ [ "$PIUPARTS_DISTRIBUTION" = "squeeze-proposed" ] || \
+ [ "$PIUPARTS_DISTRIBUTION" = "squeeze-backports" ] || \
+ [ "$PIUPARTS_DISTRIBUTION" = "lenny" ]; then
+
+ case ${PIUPARTS_OBJECTS%%=*} in
+ autopkgtest-xenlvm|\
+ clvm|\
+ cman|\
+ collectd|\
+ collectd-dbg|\
+ collectd-utils|\
+ dtc-xen|\
+ ganeti|\
+ ganeti2|\
+ gfs-tools|\
+ gfs2-tools|\
+ libcollectdclient0|\
+ libcollectdclient-dev|\
+ liblinux-lvm-perl|\
+ libsys-virt-perl|\
+ libvirt0|\
+ libvirt0-dbg|\
+ libvirt-dev|\
+ libvirt-ocaml|\
+ libvirt-ocaml-dev|\
+ libvirt-ruby|\
+ libvirt-ruby1.8|\
+ mozilla-virt-viewer|\
+ munin-libvirt-plugins|\
+ mylvmbackup|\
+ python-libvirt|\
+ redhat-cluster-suite|\
+ rgmanager|\
+ virtinst|\
+ virt-top|\
+ virt-viewer|\
+ xenwatch|\
+ lvm2)
+ # work around lvm2 bug https://bugs.debian.org/603036 which is squeeze-ignore
+ log_debug
+ apt-get -y install udev
+ ;;
+ esac
+
+fi
+
if [ "$PIUPARTS_DISTRIBUTION" = "squeeze" ]; then
case ${PIUPARTS_OBJECTS%%=*} in
diff --git a/custom-scripts/scripts/pre_install_extras b/custom-scripts/scripts/pre_install_extras
index b9c7255..653ff68 100755
--- a/custom-scripts/scripts/pre_install_extras
+++ b/custom-scripts/scripts/pre_install_extras
@@ -5,11 +5,9 @@ log_debug() {
echo "Debug: piuparts extra for package $PIUPARTS_OBJECTS"
}
-#
-# deal with extras:
-#
if [ "$PIUPARTS_PHASE" = "install" ]; then
-case ${PIUPARTS_OBJECTS%%=*} in
+
+ case ${PIUPARTS_OBJECTS%%=*} in
*dkms)
log_debug
# Install kernel headers, so that dkms tries to build a module
@@ -37,5 +35,6 @@ case ${PIUPARTS_OBJECTS%%=*} in
echo "Debug: contents of /etc/resolv.conf"
cat /etc/resolv.conf
;;
-esac
+ esac
+
fi
diff --git a/custom-scripts/scripts/pre_remove_exceptions b/custom-scripts/scripts/pre_remove_exceptions
index 0b8f3a4..edd24ba 100755
--- a/custom-scripts/scripts/pre_remove_exceptions
+++ b/custom-scripts/scripts/pre_remove_exceptions
@@ -5,9 +5,6 @@ log_debug() {
echo "Debug: piuparts exception for package $PIUPARTS_OBJECTS"
}
-#
-# deal with exceptions:
-#
case ${PIUPARTS_OBJECTS%%=*} in
isdnlog|isdnutils)
#WORKSAROUND #431855: fails with "There are still files in /etc/isdn/ that you may want to remove manually."
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git
More information about the Piuparts-commits
mailing list