[24224] in Source-Commits
/svn/athena r23825 - in trunk/debathena/config/linerva: debian files/etc files/etc/apt/apt.conf.d files/usr/sbin
daemon@ATHENA.MIT.EDU (Anders Kaseorg)
Thu May 21 00:25:21 2009
Date: Thu, 21 May 2009 00:25:10 -0400
From: Anders Kaseorg <andersk@MIT.EDU>
Message-Id: <200905210425.n4L4PAvP025270@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: andersk
Date: 2009-05-21 00:25:10 -0400 (Thu, 21 May 2009)
New Revision: 23825
Added:
trunk/debathena/config/linerva/files/etc/apt-zephyr.conf
trunk/debathena/config/linerva/files/etc/apt/apt.conf.d/90zephyr
trunk/debathena/config/linerva/files/usr/sbin/apt-zephyr
Removed:
trunk/debathena/config/linerva/files/etc/apt/apt.conf.d/99debathena-zephyr
trunk/debathena/config/linerva/files/usr/sbin/linerva-apt-zephyr
Modified:
trunk/debathena/config/linerva/debian/changelog
Log:
In linerva:
* Upgrade the apt-zephyr hook to version AWESOME!!!.
package=$1
oldver=$2
cmp=$3
newver=$4
if [ "$newver" = '-' ] && [ "$oldver" = '-' ]; then
elif [ "$newver" = '-' ]; then
elif [ "$oldver" = '-' ]; then
elif [ "$cmp" = '<' ]; then
elif [ "$cmp" = '=' ]; then
elif [ "$cmp" = '>' ]; then
else
fi
'VERSION 2')
'VERSION *')
'')
*)
zwrite ${CLASS:+-c "$CLASS"} ${INSTANCE:+-i "$INSTANCE"} ${REALM:+-r "$REALM"} ${SIG:+-s "$SIG"} ${OPCODE:+-O "$OPCODE"} ${ZAUTH:--d} ${RECIPIENTS:+$RECIPIENTS}
Modified: trunk/debathena/config/linerva/debian/changelog
===================================================================
--- trunk/debathena/config/linerva/debian/changelog 2009-05-21 00:07:45 UTC (rev 23824)
+++ trunk/debathena/config/linerva/debian/changelog 2009-05-21 04:25:10 UTC (rev 23825)
@@ -1,3 +1,9 @@
+debathena-linerva (1.29) unstable; urgency=low
+
+ * Upgrade the apt-zephyr hook to version AWESOME!!!.
+
+ -- Anders Kaseorg <andersk@mit.edu> Thu, 21 May 2009 00:24:22 -0400
+
debathena-linerva (1.28) unstable; urgency=low
* Add the hostname to the APT zephyr instance.
Copied: trunk/debathena/config/linerva/files/etc/apt/apt.conf.d/90zephyr (from rev 23823, trunk/debathena/config/linerva/files/etc/apt/apt.conf.d/99debathena-zephyr)
===================================================================
--- trunk/debathena/config/linerva/files/etc/apt/apt.conf.d/99debathena-zephyr 2009-05-20 05:01:45 UTC (rev 23823)
+++ trunk/debathena/config/linerva/files/etc/apt/apt.conf.d/90zephyr 2009-05-21 04:25:10 UTC (rev 23825)
@@ -0,0 +1,2 @@
+DPkg::Pre-Install-Pkgs {"/usr/sbin/apt-zephyr || :";};
+DPkg::Tools::options::/usr/sbin/apt-zephyr::Version "2";
Property changes on: trunk/debathena/config/linerva/files/etc/apt/apt.conf.d/90zephyr
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: trunk/debathena/config/linerva/files/etc/apt/apt.conf.d/99debathena-zephyr
Added: trunk/debathena/config/linerva/files/etc/apt-zephyr.conf
===================================================================
--- trunk/debathena/config/linerva/files/etc/apt-zephyr.conf 2009-05-21 00:07:45 UTC (rev 23824)
+++ trunk/debathena/config/linerva/files/etc/apt-zephyr.conf 2009-05-21 04:25:10 UTC (rev 23825)
@@ -0,0 +1,2 @@
+CLASS="linerva"
+INSTANCE="apt.$(hostname)"
Copied: trunk/debathena/config/linerva/files/usr/sbin/apt-zephyr (from rev 23823, trunk/debathena/config/linerva/files/usr/sbin/linerva-apt-zephyr)
===================================================================
--- trunk/debathena/config/linerva/files/usr/sbin/linerva-apt-zephyr 2009-05-20 05:01:45 UTC (rev 23823)
+++ trunk/debathena/config/linerva/files/usr/sbin/apt-zephyr 2009-05-21 04:25:10 UTC (rev 23825)
@@ -0,0 +1,79 @@
+#!/bin/sh
+set -e
+
+# Defaults
+CLASS=
+INSTANCE=
+REALM=
+RECIPIENTS=
+SIG="$(hostname -f)"
+OPCODE=auto
+ZAUTH=
+
+# Read configuration
+. /etc/apt-zephyr.conf
+
+package ()
+{
+ package=$1
+ oldver=$2
+ cmp=$3
+ newver=$4
+
+ if [ "$newver" = '-' ] && [ "$oldver" = '-' ]; then
+ echo "Purging $package"
+ elif [ "$newver" = '-' ]; then
+ echo "Removing $package $oldver"
+ elif [ "$oldver" = '-' ]; then
+ echo "Installing $package $newver"
+ elif [ "$cmp" = '<' ]; then
+ echo "Upgrading $package $oldver to $newver"
+ elif [ "$cmp" = '=' ]; then
+ echo "Reinstalling $package $newver"
+ elif [ "$cmp" = '>' ]; then
+ echo "Downgrading $package $oldver to $newver"
+ else
+ echo "I'm confused: $*"
+ fi
+}
+
+read -r line
+case "$line" in
+ 'VERSION 2')
+ while read -r line && [ -n "$line" ]; do :; done
+ while read -r package oldver cmp newver action; do
+ case "$action" in
+ '**CONFIGURE**' | '**REMOVE**')
+ package "$package" "$oldver" "$cmp" "$newver"
+ ;;
+ '**ERROR**')
+ echo "ERROR on $package $newver"
+ ;;
+ esac
+ done
+ ;;
+ 'VERSION *')
+ echo "$0: unrecognized version: $line"
+ ;;
+ '')
+ ;;
+ *)
+ oldpkgs=$(mktemp -t "apt-zephyr-old.XXXXXX") || exit $?
+ newpkgs=$(mktemp -t "apt-zephyr-new.XXXXXX") || exit $?
+ (echo "$line"; cat) | xargs -r -d '\n' dpkg-deb -W | sort -o "$newpkgs"
+ cut -f 1 "$newpkgs" | xargs -r -d '\n' dpkg-query -W | \
+ sort -o "$oldpkgs"
+ join -t ' ' -j 1 -e '-' "$oldpkgs" "$newpkgs" | \
+ while IFS=' ' read -r package oldver newver; do
+ if dpkg --compare-versions "$oldver" lt "$newver"; then
+ package "$package" "$oldver" '<' "$newver"
+ elif dpkg --compare-versions "$oldver" eq "$newver"; then
+ package "$package" "$oldver" '=' "$newver"
+ else
+ package "$package" "$oldver" '>' "$newver"
+ fi
+ done
+ rm -f "$oldpkgs" "$newpkgs"
+ ;;
+esac | \
+ zwrite ${CLASS:+-c "$CLASS"} ${INSTANCE:+-i "$INSTANCE"} ${REALM:+-r "$REALM"} ${SIG:+-s "$SIG"} ${OPCODE:+-O "$OPCODE"} ${ZAUTH:--d} ${RECIPIENTS:+$RECIPIENTS}
Property changes on: trunk/debathena/config/linerva/files/usr/sbin/apt-zephyr
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: trunk/debathena/config/linerva/files/usr/sbin/linerva-apt-zephyr