Dirk Mueller
680daa4eb0
* Flake8 / Stop leaking filedescriptors - Update rpmlint-tests: * Stop leaking filedescriptors * Address various deprecation warnings * Avoid leaking fds and further Python 3.x porting - drop sourced-dirs.diff, fix-shared-library-matching.diff, suse-python-abi-check.diff, add-check-for-tmpfiles-created-at-r.diff: obsolete ignore-readelf-ar-error.diff, remove-ghostfile-checks.diff OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=499
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
From: Some One <nobody@opensuse.org>
|
|
Date: Thu, 9 Apr 2015 14:55:38 +0200
|
|
Subject: [PATCH] usr-arch.diff
|
|
|
|
===================================================================
|
|
---
|
|
BinariesCheck.py | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
Index: rpmlint-rpmlint-1.10/BinariesCheck.py
|
|
===================================================================
|
|
--- rpmlint-rpmlint-1.10.orig/BinariesCheck.py
|
|
+++ rpmlint-rpmlint-1.10/BinariesCheck.py
|
|
@@ -321,6 +321,7 @@ usr_lib_exception_regex = re.compile(Con
|
|
srcname_regex = re.compile(r'(.*?)-[0-9]')
|
|
invalid_dir_ref_regex = re.compile(r'/(home|tmp)(\W|$)')
|
|
ocaml_mixed_regex = re.compile(r'^Caml1999X0\d\d$')
|
|
+usr_arch_share_regex = re.compile(r'/share/.*/(?:x86|i.86|x86_64|ppc|ppc64|s390|s390x|ia64|m68k|arm|aarch64)')
|
|
|
|
|
|
def dir_base(path):
|
|
@@ -394,7 +395,7 @@ class BinariesCheck(AbstractCheck.Abstra
|
|
# arch dependent packages only from here on
|
|
|
|
# in /usr/share ?
|
|
- if fname.startswith('/usr/share/'):
|
|
+ if fname.startswith('/usr/share/') and not usr_arch_share_regex.search(fname):
|
|
printError(pkg, 'arch-dependent-file-in-usr-share', fname)
|
|
|
|
# in /etc ?
|