From: Tollef Fog Heen <tfheen@err.no>
Date: Wed, 16 Aug 2006 18:47:14 +0000 (+0200)
Subject: 2006-08-16  Tollef Fog Heen  <tfheen@err.no>
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d32cb3e6d6eabf29a32bdbdc104898f08c5965e;p=pkg-config

2006-08-16  Tollef Fog Heen  <tfheen@err.no>

	* parse.c (trim_and_sub): Since %{...} has not been used for a
	long time, there is no point in being able to escape %.  However,
	make the code able to escape $ by doubling the $ to $$.
	Debian #378570
---

diff --git a/ChangeLog b/ChangeLog
index 4d3c92f..49a13a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-08-16  Tollef Fog Heen  <tfheen@err.no>
 
+	* parse.c (trim_and_sub): Since %{...} has not been used for a
+	long time, there is no point in being able to escape %.  However,
+	make the code able to escape $ by doubling the $ to $$.  
+	Debian #378570
+
 	* pkg.c (packages_get_other_cflags, package_get_other_cflags)
 	(packages_get_I_cflags): Always add all cflags.  Debian #340904
 
diff --git a/parse.c b/parse.c
index dbb14df..87740ff 100644
--- a/parse.c
+++ b/parse.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2001, 2002, 2005 Red Hat Inc.
+ * Copyright (C) 2001, 2002, 2005-2006 Red Hat Inc.
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -169,8 +169,8 @@ trim_and_sub (Package *pkg, const char *str, const char *path)
       if (p[0] == '$' &&
           p[1] == '$')
         {
-          /* escaped % */
-          g_string_append_c (subst, '%');
+          /* escaped $ */
+          g_string_append_c (subst, '$');
           p += 2;
         }
       else if (p[0] == '$' &&