[Piuparts-commits] [piuparts] 01/03: separate scripts-lenny from scripts-squeeze
Holger Levsen
holger at layer-acht.org
Sun Sep 10 14:03:47 UTC 2017
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch develop
in repository piuparts.
commit d49ca64073e46fa0bb20562a9a83d6b508d679d0
Author: Andreas Beckmann <anbe at debian.org>
Date: Sat Sep 9 22:28:56 2017 +0200
separate scripts-lenny from scripts-squeeze
Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
.../post_remove_exceptions_lenny | 6 ++--
.../scripts-lenny/post_setup_lenny-fake-essential | 40 ++++++++++++++++++++++
.../post_setup_squeeze-fake-essential | 21 +-----------
custom-scripts/scripts/is_testable_uninstallable | 4 +++
debian/changelog | 1 +
debian/piuparts.maintscript | 1 +
instances/piuparts.conf.anbe | 2 +-
7 files changed, 51 insertions(+), 24 deletions(-)
diff --git a/custom-scripts/scripts-squeeze/post_remove_exceptions_lenny b/custom-scripts/scripts-lenny/post_remove_exceptions_lenny
similarity index 58%
rename from custom-scripts/scripts-squeeze/post_remove_exceptions_lenny
rename to custom-scripts/scripts-lenny/post_remove_exceptions_lenny
index 389c72c..819c00a 100755
--- a/custom-scripts/scripts-squeeze/post_remove_exceptions_lenny
+++ b/custom-scripts/scripts-lenny/post_remove_exceptions_lenny
@@ -12,9 +12,9 @@ esac
case ${PIUPARTS_OBJECTS%%=*} in
postgis)
- #WORKSAROUND #560409: postgis can't be purged if postgresql
- # is not installed due to missing directory
+ #560409: postgis can't be purged if postgresql is no longer installed
+ # (fails due to a missing directory)
log_debug
- mkdir -p /usr/lib/postgresql/8.3/lib
+ mkdir -p -v /usr/lib/postgresql/8.3/lib
;;
esac
diff --git a/custom-scripts/scripts-lenny/post_setup_lenny-fake-essential b/custom-scripts/scripts-lenny/post_setup_lenny-fake-essential
new file mode 100755
index 0000000..429d6b7
--- /dev/null
+++ b/custom-scripts/scripts-lenny/post_setup_lenny-fake-essential
@@ -0,0 +1,40 @@
+#!/bin/sh
+set -e
+
+# The following issues won't be fixed in lenny:
+# - unconditional use of deluser during postrm purge
+# - unconditional use of ucf during postrm purge
+# so add these packages to the "fake" essential set.
+USED_DURING_PURGE="adduser ucf"
+
+
+case ${PIUPARTS_OBJECTS%%=*} in
+ TARBALL)
+ # don't install fake essential packages while creating the tarball
+ exit 0
+ ;;
+ adduser|ucf)
+ # allow testing of the fake essential packages
+ exit 0
+ ;;
+ docbookwiki)
+ USED_DURING_PURGE="$USED_DURING_PURGE mysql-client"
+ ;;
+ prelude-manager)
+ #660455
+ USED_DURING_PURGE="$USED_DURING_PURGE dbconfig-common"
+ ;;
+ drupal6|moodle|moodle-book|moodle-debian-edu-theme|scuttle)
+ USED_DURING_PURGE="$USED_DURING_PURGE wwwconfig-common"
+ ;;
+ octave-audio|octave-symbolic|octave-vrml)
+ USED_DURING_PURGE="$USED_DURING_PURGE octave3.0"
+ ;;
+ ttf-beteckna)
+ #502707
+ USED_DURING_PURGE="$USED_DURING_PURGE defoma"
+ ;;
+esac
+
+echo "*** Adding fake essential packages ***"
+apt-get install -yf $USED_DURING_PURGE
diff --git a/custom-scripts/scripts-squeeze/post_setup_squeeze-fake-essential b/custom-scripts/scripts-squeeze/post_setup_squeeze-fake-essential
index 1394dc3..838e8eb 100755
--- a/custom-scripts/scripts-squeeze/post_setup_squeeze-fake-essential
+++ b/custom-scripts/scripts-squeeze/post_setup_squeeze-fake-essential
@@ -27,32 +27,13 @@ case ${PIUPARTS_OBJECTS%%=*} in
;;
esac
;;
- docbookwiki)
- USED_DURING_PURGE="$USED_DURING_PURGE mysql-client"
- ;;
phpbb3)
USED_DURING_PURGE="$USED_DURING_PURGE dbconfig-common"
;;
prelude-manager)
- #WORKSAROUND #660455
+ #660455
USED_DURING_PURGE="$USED_DURING_PURGE dbconfig-common"
;;
- drupal6|moodle|moodle-book|moodle-debian-edu-theme|scuttle)
- if [ "$PIUPARTS_DISTRIBUTION" = "lenny" ]; then
- USED_DURING_PURGE="$USED_DURING_PURGE wwwconfig-common"
- fi
- ;;
- octave-audio|octave-symbolic|octave-vrml)
- if [ "$PIUPARTS_DISTRIBUTION" = "lenny" ]; then
- USED_DURING_PURGE="$USED_DURING_PURGE octave3.0"
- fi
- ;;
- ttf-beteckna)
- #502707
- if [ "$PIUPARTS_DISTRIBUTION" = "lenny" ]; then
- USED_DURING_PURGE="$USED_DURING_PURGE defoma"
- fi
- ;;
esac
echo "*** Adding fake essential packages ***"
diff --git a/custom-scripts/scripts/is_testable_uninstallable b/custom-scripts/scripts/is_testable_uninstallable
index f99937c..c14af29 100755
--- a/custom-scripts/scripts/is_testable_uninstallable
+++ b/custom-scripts/scripts/is_testable_uninstallable
@@ -82,6 +82,10 @@ case ${PIUPARTS_OBJECTS%%=*}@${PIUPARTS_DISTRIBUTION} in
dnscache-run at lenny)
skip_distupgrade "#664848: breaks dns resolution in chroot"
;;
+ docbookwiki at lenny)
+ # removed after lenny
+ skip_distupgrade "unconditionally uses mysql-client during purge"
+ ;;
drupal6-trans-ru at squeeze)
# removed after squeeze
skip_distupgrade "#689252: installs files in /usr/share/drupal6/profiles which is a symlink in the drupal package"
diff --git a/debian/changelog b/debian/changelog
index 6ef4672..e9dc4ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
piuparts (0.81) UNRELEASED; urgency=medium
[ Andreas Beckmann ]
+ * Separate scripts-lenny/ from scripts-squeeze/.
* master-bin/distill_alternatives_log: Parse piuparts.conf to find the
sections that use scripts-log-alternatives.
* Use copyright notices without FSF street address.
diff --git a/debian/piuparts.maintscript b/debian/piuparts.maintscript
index 9d4a3e9..25b2b48 100644
--- a/debian/piuparts.maintscript
+++ b/debian/piuparts.maintscript
@@ -6,3 +6,4 @@ rm_conffile /etc/piuparts/scripts/post_distupgrade_experimental 0.74~
rm_conffile /etc/piuparts/scripts-debug-prerm/pre_remove_prerm_set-x 0.74~
rm_conffile /etc/piuparts/scripts/post_distupgrade_hack_debsums 0.75~
rm_conffile /etc/piuparts/scripts/post_setup_experimental 0.76~
+rm_conffile /etc/piuparts/scripts-squeeze/post_remove_exceptions_lenny 0.81~
diff --git a/instances/piuparts.conf.anbe b/instances/piuparts.conf.anbe
index d819461..3151392 100644
--- a/instances/piuparts.conf.anbe
+++ b/instances/piuparts.conf.anbe
@@ -60,7 +60,7 @@ flags-end-lenny =
--skip-cronfiles-test
--warn-on-debsums-errors
--warn-on-install-over-symlink
- --scriptsdir /etc/piuparts/scripts-squeeze
+ --scriptsdir /etc/piuparts/scripts-lenny
-i /etc/udev/
-i /etc/udev/rules.d/
--
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