[maemo-commits] [maemo-commits] r12713 - projects/haf/trunk/dpkg/scripts

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Wed Jul 11 15:03:27 EEST 2007
Author: marivoll
Date: 2007-07-11 15:03:26 +0300 (Wed, 11 Jul 2007)
New Revision: 12713

Modified:
   projects/haf/trunk/dpkg/scripts/dpkg-divert.sh
Log:
	* scripts/dpkg-divert.sh: Corrected quoting when passing $divertto
	to awk.  Thanks to Leif Ryge!  Changed quotes around version to
	double quotes so that the Makefile can modify it.


Modified: projects/haf/trunk/dpkg/scripts/dpkg-divert.sh
===================================================================
--- projects/haf/trunk/dpkg/scripts/dpkg-divert.sh	2007-07-11 12:01:26 UTC (rev 12712)
+++ projects/haf/trunk/dpkg/scripts/dpkg-divert.sh	2007-07-11 12:03:26 UTC (rev 12713)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-version='1.0.11'; # This line modified by Makefile
+version="1.0.11"; # This line modified by Makefile
 admindir="/var/lib/dpkg"; # This line modified by Makefile
 dpkglibdir="/usr/lib/dpkg"; # This line modified by Makefile
 
@@ -208,7 +208,7 @@
              for (file in alts) { print file; print alts[file]; print packages[file]; }
         } '
        awk \
-           'BEGIN { dfile="'$file'"; divertto='"$divertto"'; package="'$package'"}'" $parser $handler"  < $divs > $divs-new
+           'BEGIN { dfile="'$file'"; divertto="'$divertto'"; package="'$package'"}'" $parser $handler"  < $divs > $divs-new
        ret=$?
        case $ret in
 	   101) 
@@ -243,7 +243,7 @@
              exit 103;
         } '
        awk \
-           'BEGIN { dfile="'$file'"; divertto='"$divertto"'; package="'$package'"}'" $parser $handler"  < $divs > $divs-new
+           'BEGIN { dfile="'$file'"; divertto="'$divertto'"; package="'$package'"}'" $parser $handler"  < $divs > $divs-new
        ret=$?
        case $ret in
 	   101) 


More information about the maemo-commits mailing list