Accepting request 122714 from openSUSE:Tools
do not break kiwi OBS-URL: https://build.opensuse.org/request/show/122714 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/obs-service-format_spec_file?expand=0&rev=34
This commit is contained in:
commit
fdb75fa134
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue May 29 09:51:33 UTC 2012 - adrian@suse.de
|
||||
|
||||
- do not break require lines using %() macros
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 11 09:17:10 UTC 2012 - coolo@suse.com
|
||||
|
||||
|
@ -320,9 +320,15 @@ sub read_and_parse_old_spec {
|
||||
}
|
||||
|
||||
my %aa;
|
||||
if ($cur_tag =~ /%\(/) {
|
||||
# do not touch lines with shell execution
|
||||
$aa{$cur_tag}=1;
|
||||
} else {
|
||||
# seperate tags of all other lines
|
||||
while ($cur_tag =~ m{([^,\s]+(\s*[<=>]+\s*(?:\%\(.*\)|[^,\s]+))?)}g) {
|
||||
$aa{$1}=1;
|
||||
}
|
||||
}
|
||||
# ignore line if it looks like a "usedforbuild" line, i.e.
|
||||
# if it contains too many base packages
|
||||
next if (grep {$aa{$_}} qw{gcc rpm glibc bash}) > 2;
|
||||
|
Loading…
Reference in New Issue
Block a user