[Piuparts-commits] [piuparts] 05/13: custom-scripts/*: generalize distro patterns
Holger Levsen
holger at moszumanska.debian.org
Sun Nov 24 05:28:34 UTC 2013
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch develop
in repository piuparts.
commit 59530d94efe1df90d9c58b118c8d3bc93097d9e3
Author: Andreas Beckmann <anbe at debian.org>
Date: Sun Nov 24 01:09:44 2013 +0100
custom-scripts/*: generalize distro patterns
and list more distros where exceptions apply
Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
.../scripts-squeeze/post_setup_squeeze-fake-essential | 3 ++-
custom-scripts/scripts/post_distupgrade_exceptions | 3 ++-
.../scripts/pre_distupgrade_foreign_architecture_i386 | 6 ++----
custom-scripts/scripts/pre_install_exceptions | 8 +++++++-
.../scripts/pre_install_foreign_architecture_i386 | 3 +--
.../scripts/pre_remove_50_find_bad_permissions | 17 ++++++++++++++++-
master-bin/report_newly_bugged_packages.in | 4 +++-
7 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/custom-scripts/scripts-squeeze/post_setup_squeeze-fake-essential b/custom-scripts/scripts-squeeze/post_setup_squeeze-fake-essential
index 0b1d263..8b8ffdc 100755
--- a/custom-scripts/scripts-squeeze/post_setup_squeeze-fake-essential
+++ b/custom-scripts/scripts-squeeze/post_setup_squeeze-fake-essential
@@ -21,7 +21,8 @@ case ${PIUPARTS_OBJECTS%%=*} in
;;
gosa-desktop|kde-core|kde-full|kde-plasma-desktop|kde-standard|kdebase-apps|konqueror|konq-plugins|mozart-doc|texlive-full)
# work around #601961: apt: wrongly thinks install-info is essential
- if [ "$PIUPARTS_DISTRIBUTION" = "squeeze" ]; then
+ if [ "$PIUPARTS_DISTRIBUTION" = "squeeze" ] || \
+ [ "$PIUPARTS_DISTRIBUTION" = "squeeze-proposed" ]; then
FAILS_TO_REMOVE="$FAILS_TO_REMOVE install-info"
fi
;;
diff --git a/custom-scripts/scripts/post_distupgrade_exceptions b/custom-scripts/scripts/post_distupgrade_exceptions
index a5af087..8aa33a6 100755
--- a/custom-scripts/scripts/post_distupgrade_exceptions
+++ b/custom-scripts/scripts/post_distupgrade_exceptions
@@ -5,7 +5,8 @@ log_debug() {
echo "Debug: piuparts exception for package $PIUPARTS_OBJECTS"
}
-if [ "$PIUPARTS_DISTRIBUTION" = "wheezy" ]; then
+if [ "$PIUPARTS_DISTRIBUTION" = "wheezy" ] || \
+ [ "$PIUPARTS_DISTRIBUTION" = "wheezy-proposed" ] ; then
# libdb4.8/squeeze is part of the minimal squeeze chroot and
# remains installed after distupgrade even if it no longer
diff --git a/custom-scripts/scripts/pre_distupgrade_foreign_architecture_i386 b/custom-scripts/scripts/pre_distupgrade_foreign_architecture_i386
index 47779cf..0bc6617 100755
--- a/custom-scripts/scripts/pre_distupgrade_foreign_architecture_i386
+++ b/custom-scripts/scripts/pre_distupgrade_foreign_architecture_i386
@@ -2,14 +2,12 @@
set -e
case "$PIUPARTS_DISTRIBUTION" in
- squeeze) ;;
- squeeze-proposed-updates) ;;
+ squeeze*) ;;
*) exit 0 ;;
esac
case "$PIUPARTS_DISTRIBUTION_NEXT" in
- wheezy|testing|sid|experimental) ;;
- *) exit 0 ;;
+ lenny*|squeeze*) exit 0 ;;
esac
test "$(dpkg --print-architecture)" = "amd64" || exit 0
diff --git a/custom-scripts/scripts/pre_install_exceptions b/custom-scripts/scripts/pre_install_exceptions
index a47dfad..8b7df5b 100755
--- a/custom-scripts/scripts/pre_install_exceptions
+++ b/custom-scripts/scripts/pre_install_exceptions
@@ -50,7 +50,12 @@ case ${PIUPARTS_OBJECTS%%=*} in
yes 'Yes, do as I say!' | apt-get -y --force-yes install systemd-sysv
;;
lvm2)
- if [ "$PIUPARTS_PHASE" = "install" ] && ( [ "$PIUPARTS_DISTRIBUTION" = "squeeze" ] || [ "$PIUPARTS_DISTRIBUTION" = "lenny" ] ); then
+ if [ "$PIUPARTS_PHASE" = "install" ] && ( \
+ [ "$PIUPARTS_DISTRIBUTION" = "squeeze" ] || \
+ [ "$PIUPARTS_DISTRIBUTION" = "squeeze-proposed" ] || \
+ [ "$PIUPARTS_DISTRIBUTION" = "squeeze-backports" ] || \
+ [ "$PIUPARTS_DISTRIBUTION" = "lenny" ] )
+ then
# work around lvm2 bug http://bugs.debian.org/603036 which is squeeze-ignore
log_debug
apt-get -y install udev
@@ -90,6 +95,7 @@ if [ "$PIUPARTS_DISTRIBUTION" = "squeeze" ]; then
mini-buildd-bld|mini-buildd-rep)
#632955, #656746 - time limit exceeded during install
log_debug
+ echo "*** ABORT - Installation would deadlock ***"
exit 1
;;
esac
diff --git a/custom-scripts/scripts/pre_install_foreign_architecture_i386 b/custom-scripts/scripts/pre_install_foreign_architecture_i386
index 65f540f..fa5965b 100755
--- a/custom-scripts/scripts/pre_install_foreign_architecture_i386
+++ b/custom-scripts/scripts/pre_install_foreign_architecture_i386
@@ -4,8 +4,7 @@ set -e
test "$PIUPARTS_PHASE" = "install" || exit 0
case "$PIUPARTS_DISTRIBUTION" in
- wheezy|jessie|testing|sid|experimental) ;;
- *) exit 0 ;;
+ lenny*|squeeze*) exit 0 ;;
esac
test "$(dpkg --print-architecture)" = "amd64" || exit 0
diff --git a/custom-scripts/scripts/pre_remove_50_find_bad_permissions b/custom-scripts/scripts/pre_remove_50_find_bad_permissions
index 307d2cd..fecbe0b 100755
--- a/custom-scripts/scripts/pre_remove_50_find_bad_permissions
+++ b/custom-scripts/scripts/pre_remove_50_find_bad_permissions
@@ -1,7 +1,12 @@
#!/bin/sh
set -e
-if [ "$PIUPARTS_DISTRIBUTION" = "squeeze" ] || [ "$PIUPARTS_DISTRIBUTION" = "lenny" ]; then
+if [ "$PIUPARTS_DISTRIBUTION" = "squeeze" ] || \
+ [ "$PIUPARTS_DISTRIBUTION" = "squeeze/updates" ] || \
+ [ "$PIUPARTS_DISTRIBUTION" = "squeeze-updates" ] || \
+ [ "$PIUPARTS_DISTRIBUTION" = "squeeze-proposed-updates" ] || \
+ [ "$PIUPARTS_DISTRIBUTION" = "squeeze-proposed" ] || \
+ [ "$PIUPARTS_DISTRIBUTION" = "lenny" ]; then
case ${PIUPARTS_OBJECTS%%=*} in
bcron-run|capisuite|debbugs|raccess4vbox3|sxid)
@@ -14,6 +19,16 @@ esac
fi
+if [ "$PIUPARTS_DISTRIBUTION" = "wheezy" ] || \
+ [ "$PIUPARTS_DISTRIBUTION" = "wheezy/updates" ] || \
+ [ "$PIUPARTS_DISTRIBUTION" = "wheezy-updates" ] || \
+ [ "$PIUPARTS_DISTRIBUTION" = "wheezy-proposed-updates" ] || \
+ [ "$PIUPARTS_DISTRIBUTION" = "wheezy-proposed" ]; then
+
+ :
+
+fi
+
# find world writables without sticky bit
BADPERMS=$(find / -mount ! -type l ! -type c ! -type p ! -type s -perm -o+w ! -perm -1000)
diff --git a/master-bin/report_newly_bugged_packages.in b/master-bin/report_newly_bugged_packages.in
index d53f1ac..3b722ff 100755
--- a/master-bin/report_newly_bugged_packages.in
+++ b/master-bin/report_newly_bugged_packages.in
@@ -33,7 +33,9 @@ for SECTION in $SECTIONS ; do
test -d $MASTER/$SECTION || continue
cd $MASTER/$SECTION
get_config_value DISTROS $SECTION upgrade-test-distros ''
- @sharedir@/piuparts/piuparts-analyze ${DISTROS##* } 2>&1 > $OUTPUT
+ distro=${DISTROS##* }
+ distro=${distro%-proposed}
+ @sharedir@/piuparts/piuparts-analyze $distro 2>&1 > $OUTPUT
if [ -s $OUTPUT ]; then
echo $SECTION
cat $OUTPUT
--
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