SHA256
1
0
forked from pool/rpmlint
rpmlint/usr-arch.diff
OBS User autobuild eaf5a8d432 Accepting request 20532 from Base:System
Copy from Base:System/rpmlint based on submit request 20532 from user dirkmueller

OBS-URL: https://build.opensuse.org/request/show/20532
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpmlint?expand=0&rev=46
2009-09-16 16:41:21 +00:00

22 lines
1.1 KiB
Diff

Index: BinariesCheck.py
===================================================================
--- BinariesCheck.py.orig
+++ BinariesCheck.py
@@ -177,6 +177,7 @@ path_regex = re.compile('(.*/)([^/]+)')
numeric_dir_regex = re.compile('/usr(?:/share)/man/man./(.*)\.[0-9](?:\.gz|\.bz2)')
versioned_dir_regex = re.compile('[^.][0-9]')
usr_share = re.compile('^/usr/share/')
+usr_arch_share = re.compile('/share/.*/(?:x86|i.86|x86_64|ppc|ppc64|s390|s390x|ia64)')
etc = re.compile('^/etc/')
not_stripped = re.compile('not stripped')
unstrippable = re.compile('\.o$|\.static$')
@@ -251,7 +252,7 @@ class BinariesCheck(AbstractCheck.Abstra
printError(pkg, 'arch-independent-package-contains-binary-or-object', fname)
else:
# in /usr/share ?
- if usr_share.search(fname):
+ if usr_share.search(fname) and not usr_arch_share.search(i[0]):
printError(
pkg, 'arch-dependent-file-in-usr-share', fname)
# in /etc ?