From 6d32cb3e6d6eabf29a32bdbdc104898f08c5965e Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Wed, 16 Aug 2006 20:47:14 +0200 Subject: [PATCH] 2006-08-16 Tollef Fog Heen * 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 --- ChangeLog | 5 +++++ parse.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d3c92f..49a13a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2006-08-16 Tollef Fog Heen + * 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] == '$' && -- 2.39.5