summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnas Nashif <anas.nashif@intel.com>2013-02-06 13:11:08 -0800
committerAnas Nashif <anas.nashif@intel.com>2013-02-06 13:11:08 -0800
commite347e7f204d4a8bafcdc32d06de4807fce3c5275 (patch)
treeba30901d1c6b58dccd2f19b4e31400c249945fe9
parentfdd756f4a19a1af7980c03923a1e967eade2f95a (diff)
downloadrpmlint-e347e7f204d4a8bafcdc32d06de4807fce3c5275.tar.gz
rpmlint-e347e7f204d4a8bafcdc32d06de4807fce3c5275.tar.bz2
rpmlint-e347e7f204d4a8bafcdc32d06de4807fce3c5275.zip
docdata-examples.diff
===================================================================
-rw-r--r--FilesCheck.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/FilesCheck.py b/FilesCheck.py
index 2a82cce..ad63bcf 100644
--- a/FilesCheck.py
+++ b/FilesCheck.py
@@ -648,6 +648,7 @@ bin_regex = re.compile('^/(?:usr/(?:s?bin|games)|s?bin)/(.*)')
includefile_regex = re.compile('\.(c|h)(pp|xx)?$', re.IGNORECASE)
develfile_regex = re.compile('\.(a|cmxa?|mli?)$')
buildconfigfile_regex = re.compile('(\.pc|/bin/.+-config)$')
+docdir_examples_regex = re.compile('^/usr/(?:share/doc/packages|lib(?:64))/[^/]+/(?:example|demo|script|contrib)')
# room for improvement with catching more -R, but also for false positives...
buildconfig_rpath_regex = re.compile('(?:-rpath|Wl,-R)\\b')
sofile_regex = re.compile('/lib(64)?/(.+/)?lib[^/]+\.so$')
@@ -1199,7 +1200,7 @@ class FilesCheck(AbstractCheck.AbstractCheck):
includefile_regex.search(f) or \
develfile_regex.search(f) or \
logrotate_regex.search(f)
- if nonexec_file:
+ if nonexec_file and not docdir_examples_regex.search(f):
printWarning(pkg, 'spurious-executable-perm', f)
elif f.startswith('/etc/') and f not in config_files and \
f not in ghost_files:
@@ -1571,7 +1572,10 @@ included in your package.''',
'spurious-executable-perm',
'''The file is installed with executable permissions, but was identified as one
that probably should not be executable. Verify if the executable bits are
-desired, and remove if not.''',
+desired, and remove if not.
+NOTE: example scripts should be packaged under %docdir/examples, which will avoid
+this warning.
+''',
'world-writable',
'''A file or directory in the package is installed with world writable