[27200] in Source-Commits
/svn/athena r26011 - trunk/debathena/config/reactivate/debian
daemon@ATHENA.MIT.EDU (Alexander Chernyakhovsky)
Thu May 30 03:40:27 2013
Date: Thu, 30 May 2013 03:40:19 -0400
From: Alexander Chernyakhovsky <achernya@MIT.EDU>
Message-Id: <201305300740.r4U7eJDt025088@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: achernya
Date: 2013-05-30 03:40:19 -0400 (Thu, 30 May 2013)
New Revision: 26011
Modified:
trunk/debathena/config/reactivate/debian/changelog
trunk/debathena/config/reactivate/debian/debathena-reactivate.postinst
trunk/debathena/config/reactivate/debian/debathena-reactivate.preinst
Log:
In reactivate:
* Remove old c-p-d undivert code, it's no longer needed
* Stop processing schroot.conf in the preinst
Modified: trunk/debathena/config/reactivate/debian/changelog
===================================================================
--- trunk/debathena/config/reactivate/debian/changelog 2013-05-30 07:04:49 UTC (rev 26010)
+++ trunk/debathena/config/reactivate/debian/changelog 2013-05-30 07:40:19 UTC (rev 26011)
@@ -1,3 +1,10 @@
+debathena-reactivate (2.0.44) UNRELEASED; urgency=low
+
+ * Remove old c-p-d undivert code, it's no longer needed
+ * Stop processing schroot.conf in the preinst
+
+ -- Alexander Chernyakhovsky <achernya@mit.edu> Thu, 30 May 2013 03:20:55 -0400
+
debathena-reactivate (2.0.43) unstable; urgency=low
[ Jonathan Reed ]
Modified: trunk/debathena/config/reactivate/debian/debathena-reactivate.postinst
===================================================================
--- trunk/debathena/config/reactivate/debian/debathena-reactivate.postinst 2013-05-30 07:04:49 UTC (rev 26010)
+++ trunk/debathena/config/reactivate/debian/debathena-reactivate.postinst 2013-05-30 07:40:19 UTC (rev 26011)
@@ -17,55 +17,6 @@
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
-
-package=debathena-reactivate
-ours=.debathena
-theirs=.debathena-orig
-
-undivert_unlink_symlink()
-{
- file="$1"
- ourfile="$2"
- theirfile="$3"
- if [ ! -L "$file" ] || \
- [ "$(readlink "$file")" != "$(basename "$ourfile")" -a \
- "$(readlink "$file")" != "$(basename "$theirfile")" ]; then
- echo "*** OMINOUS WARNING ***: $file is not linked to either $(basename "$ourfile") or $(basename "$theirfile")" >&2
- else
- rm -f "$file"
- fi
-}
-
-undivert_unlink_divert()
-{
- file="$1"
- if [ ! -L "$file" ] && [ ! -e "$file" ]; then
- dpkg-divert --remove --rename --package "$package" "$file"
- else
- echo "Not removing diversion of $file by $package" >&2
- fi
-}
-
-undivert_unlink()
-{
- prefix=$1
- suffix=$2
-
- file=$prefix$suffix
- ourfile=$prefix$ours$suffix
- theirfile=$prefix$theirs$suffix
-
- undivert_unlink_symlink "$file" "$ourfile" "$theirfile"
- undivert_unlink_divert "$file" "$package"
-}
-
-cleanup_old_diversion() {
- file="$1"
- if dpkg-divert --list "${file}" | grep -Fxq "diversion of ${file} to ${file}${theirs} by ${package}"; then
- undivert_unlink "$file"
- fi
-}
-
. /usr/lib/debathena-cupsys-config/restart-cups.sh
if dpkg-maintscript-helper supports rm_conffile 2> /dev/null; then
@@ -103,10 +54,6 @@
dpkg --compare-versions "$2" ge 1.25.2; then
ln -nsf su.debathena /etc/pam.d/su
fi
-
- cleanup_old_diversion /etc/gdm/PreSession/Default
- cleanup_old_diversion /etc/gdm/PostSession/Default
-
if dpkg --compare-versions "$2" lt 2.0.26~ && \
[ -x /usr/share/update-notifier/notify-reboot-required ]; then
/usr/share/update-notifier/notify-reboot-required
Modified: trunk/debathena/config/reactivate/debian/debathena-reactivate.preinst
===================================================================
--- trunk/debathena/config/reactivate/debian/debathena-reactivate.preinst 2013-05-30 07:04:49 UTC (rev 26010)
+++ trunk/debathena/config/reactivate/debian/debathena-reactivate.preinst 2013-05-30 07:40:19 UTC (rev 26011)
@@ -12,55 +12,6 @@
# * <old-preinst> `abort-upgrade' <new-version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
-
-
-package=debathena-reactivate
-ours=.debathena
-theirs=.debathena-orig
-
-undivert_unlink_symlink()
-{
- file="$1"
- ourfile="$2"
- theirfile="$3"
- if [ ! -L "$file" ] || \
- [ "$(readlink "$file")" != "$(basename "$ourfile")" -a \
- "$(readlink "$file")" != "$(basename "$theirfile")" ]; then
- echo "*** OMINOUS WARNING ***: $file is not linked to either $(basename "$ourfile") or $(basename "$theirfile")" >&2
- else
- rm -f "$file"
- fi
-}
-
-undivert_unlink_divert()
-{
- file="$1"
- if [ ! -L "$file" ] && [ ! -e "$file" ]; then
- dpkg-divert --remove --rename --package "$package" "$file"
- else
- echo "Not removing diversion of $file by $package" >&2
- fi
-}
-
-undivert_unlink()
-{
- prefix=$1
- suffix=$2
-
- file=$prefix$suffix
- ourfile=$prefix$ours$suffix
- theirfile=$prefix$theirs$suffix
-
- undivert_unlink_symlink "$file" "$ourfile" "$theirfile"
- undivert_unlink_divert "$file" "$package"
-}
-
-cleanup_old_diversion() {
- file="$1"
- if dpkg-divert --list "${file}" | grep -Fxq "diversion of ${file} to ${file}${theirs} by ${package}"; then
- undivert_unlink "$file"
- fi
-}
if dpkg-maintscript-helper supports rm_conffile 2> /dev/null; then
dpkg-maintscript-helper rm_conffile /etc/athena/sudo-error 2.0.39 -- "$@"
@@ -94,26 +45,6 @@
esac
fi
-case "$1" in
- install|upgrade)
- cleanup_old_diversion /etc/gdm/PreSession/Default
- cleanup_old_diversion /etc/gdm/PostSession/Default
- if dpkg --compare-versions "$2" lt-nl 2.0~ && \
- [ -w /etc/schroot/schroot.conf ] && \
- grep -q '###ATHENA-BEGIN###' /etc/schroot/schroot.conf; then
- sed -i -e '/###ATHENA-BEGIN###/,/###ATHENA-END###/d' /etc/schroot/schroot.conf
- fi
- ;;
-
- abort-upgrade)
- ;;
-
- *)
- echo "preinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
