forked from pool/rpmlint
Dirk Mueller
1cdbc13b57
* test: Skip fedoradev GPG checks at least for now * test: Refresh fedora* packages on image build * test: Use assertEqual where appropriate, thanks to flake8/hacking * test: Update fedora24 config to fedora26, run it on Travis * Add a new test for tmpfiles.d snippets in the /etc/ tree. * Add new tests for systemd units and udev rules in /etc/ tree * test: Disable hacking for now until it's flake8 3.4+ compatible * test: Set up flake8-bugbear, enable it in fedoradev container * rpmlint: Avoid unused loop control variable * ZipCheck: Add TODO * *: Avoid mutable argument defaults * Be aware of -debugsource packages * rpmdiff: Fix unused variable from previous commit * rpmdiff: Support soft dependencies * BinariesCheck, FilesCheck: Ignore various .build-id dirs * Add python3-devel and rpm-build to fedoradev container to provoke some issues * BinariesCheck: Popen env consistency fix * Pkg.getstatusoutput: Set LC_ALL for all Popens, defaulting to C * rpmlint: Fix checking specfile from stdin * test.sh: Extract rpmlint command to run_rpmlint * Revert "Remove unused spec_lines check_spec argument" * BinariesCheck: Trivial cleanups * travis: Run make install too * FilesCheck: Allow multiple bytecode magic values per Python version * tests: Make output test tools easier to reuse * FilesCheck: hg.python.org -> github.com/python * Pkg: Return vendor and distribution as unicode strings * FilesCheck: Add Python 3.7 bytecode magic value * Pkg.b2s: Add some more test cases OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=482
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
|
|
@@ -324,6 +324,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('/share/.*/(?:x86|i.86|x86_64|ppc|ppc64|s390|s390x|ia64|m68k|arm|aarch64)')
|
|
|
|
|
|
def dir_base(path):
|
|
@@ -397,7 +398,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 ?
|