[24159] in Source-Commits

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

/svn/athena r23761 - trunk/debathena/third/cyrus-sasl2-mit

daemon@ATHENA.MIT.EDU (Evan Broder)
Thu Apr 23 19:05:10 2009

Date: Thu, 23 Apr 2009 19:05:02 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200904232305.n3NN5283010974@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: broder
Date: 2009-04-23 19:05:02 -0400 (Thu, 23 Apr 2009)
New Revision: 23761

Modified:
   trunk/debathena/third/cyrus-sasl2-mit/debathenify-cyrus-sasl2-mit
Log:
Add quoting to the debathenification script for cyrus-sasl2-mit in
case that package's version number ever has a + or some other
metacharacter in it.


Modified: trunk/debathena/third/cyrus-sasl2-mit/debathenify-cyrus-sasl2-mit
===================================================================
--- trunk/debathena/third/cyrus-sasl2-mit/debathenify-cyrus-sasl2-mit	2009-04-23 23:00:18 UTC (rev 23760)
+++ trunk/debathena/third/cyrus-sasl2-mit/debathenify-cyrus-sasl2-mit	2009-04-23 23:05:02 UTC (rev 23761)
@@ -47,6 +47,10 @@
 schr() { schroot -r -c "$sid" -u root -- "$@"; }  # Run in the chroot as root
 schr apt-get -qq -y update || exit 3
 
+quote() {
+  echo "$1" | sed 's/[^[:alnum:]]/\\&/g'
+}
+
 name=cyrus-sasl2-mit
 daversionappend=$(dpkg-parsechangelog -l$(dirname "$0")/debian/changelog |
   sed -nre 's/Version: .*(debathena.*)$/\1/p')
@@ -130,7 +134,7 @@
 daversion=$origversion-0$daversionappend
 
 if zcat "$DEBATHENA_APT/dists/$dist/debathena/binary-$arch/Packages.gz" | \
-  dpkg-awk -f - "Source:^$name\$" "Version:^$daversion$tag\$" -- Architecture | \
+  dpkg-awk -f - "Source:^$name\$" "Version:^$(quote "$daversion$tag")\$" -- Architecture | \
   if [ "$a" = "-A" ]; then cat; else fgrep -vx 'Architecture: all'; fi | \
   grep -q .; then
   echo "$name $daversion already exists for $dist_arch." >&2


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