From 3b671d009048a5e9869d5460d29e024a92929b6eacf567ebf4d43c593f137ba8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 27 Feb 2012 13:57:45 +0000 Subject: [PATCH] Accepting request 107160 from home:saschpe:branches:openSUSE:Tools - avoid breaking shell expansions OBS-URL: https://build.opensuse.org/request/show/107160 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=69 --- obs-service-format_spec_file.changes | 5 +++++ prepare_spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 13f009c..659657f 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 27 13:12:13 UTC 2012 - saschpe@suse.de + +- avoid breaking shell expansions + ------------------------------------------------------------------- Fri Feb 24 09:48:57 UTC 2012 - coolo@suse.com diff --git a/prepare_spec b/prepare_spec index 0630f3d..5bd203e 100644 --- a/prepare_spec +++ b/prepare_spec @@ -320,7 +320,7 @@ sub read_and_parse_old_spec { } my %aa; - while ($cur_tag =~ m{([^,\s]+(\s*[<=>]+\s*[^,\s]+)?)}g) { + while ($cur_tag =~ m{([^,\s]+(\s*[<=>]+\s*(?:\%\(.*\)|[^,\s]+))?)}g) { $aa{$1}=1; } # ignore line if it looks like a "usedforbuild" line, i.e.