[23313] in Source-Commits

home help back first fref pref prev next nref lref last post

/svn/athena r22969 - trunk/debathena/config/cupsys-hack/debian

daemon@ATHENA.MIT.EDU (broder@MIT.EDU)
Fri May 9 20:56:14 2008

Date: Fri, 9 May 2008 20:55:59 -0400 (EDT)
From: broder@MIT.EDU
Message-Id: <200805100055.UAA15899@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: broder
Date: 2008-05-09 20:55:59 -0400 (Fri, 09 May 2008)
New Revision: 22969

Modified:
   trunk/debathena/config/cupsys-hack/debian/postinst
Log:
Make debathena-cupsys-hack follow diversions


Modified: trunk/debathena/config/cupsys-hack/debian/postinst
===================================================================
--- trunk/debathena/config/cupsys-hack/debian/postinst	2008-05-10 00:22:42 UTC (rev 22968)
+++ trunk/debathena/config/cupsys-hack/debian/postinst	2008-05-10 00:55:59 UTC (rev 22969)
@@ -20,11 +20,13 @@
 
 case "$1" in
     configure)
+	file="/etc/cups/cupsd.conf"
+	truename="$(/usr/sbin/dpkg-divert --truename "$file")"
 	dpkg-query --showformat='${Conffiles}\n' --show "cupsys" | \
-	    grep -F " /etc/cups/cupsd.conf " | \
-	    sed 's/^ \(.*\) \(.*\)$/\2  \1/' | \
+	    grep -F " $truename " | \
+	    sed -n "s,^ $file \([0-9a-f]*\)$,\2  $truename, p" | \
 	    md5sum -c
-	chmod o+r /etc/cups/cupsd.conf
+	chmod o+r $file
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)


home help back first fref pref prev next nref lref last post