summaryrefslogtreecommitdiff
path: root/fileattrs
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2011-06-10 12:08:45 +0300
committerPanu Matilainen <pmatilai@redhat.com>2011-06-10 12:11:55 +0300
commitdb4905f51eb80b55c408e3a659bab6b4ec5d9e3b (patch)
tree1f84b401b8e2041f3d9576669ab8bd7a2b5c95b5 /fileattrs
parentaa6fd62222ae13f84b65e919aa381a259244f0dc (diff)
downloadlibrpm-tizen-db4905f51eb80b55c408e3a659bab6b4ec5d9e3b.tar.gz
librpm-tizen-db4905f51eb80b55c408e3a659bab6b4ec5d9e3b.tar.bz2
librpm-tizen-db4905f51eb80b55c408e3a659bab6b4ec5d9e3b.zip
Adjust script detection rules to work with file >= 5.07 too (RhBug:712251)
- Somewhere between file 5.05 and 5.07 it started adding encoding to script descriptions, eg "<mumble> script text executable" became "<mumble> script, <encoding> text executable" breaking what had been working for 10+ years in the case of old find-requires. - Permit either comma or space after "script", this works for both old and new file.
Diffstat (limited to 'fileattrs')
-rw-r--r--fileattrs/script.attr2
1 files changed, 1 insertions, 1 deletions
diff --git a/fileattrs/script.attr b/fileattrs/script.attr
index 13b8ba0b6..79f4d7374 100644
--- a/fileattrs/script.attr
+++ b/fileattrs/script.attr
@@ -1,3 +1,3 @@
%__script_requires %{_rpmconfigdir}/script.req
-%__script_magic ^.* script text.*$
+%__script_magic ^.* script[, ].*$
%__script_flags exeonly