SHA256
1
0
forked from pool/rpmlint

Accepting request 423925 from devel:openSUSE:Factory:rpmlint

1

OBS-URL: https://build.opensuse.org/request/show/423925
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpmlint?expand=0&rev=255
This commit is contained in:
Dominique Leuenberger 2016-09-01 12:01:38 +00:00 committed by Git OBS Bridge
commit 6f011d647a
4 changed files with 10 additions and 5 deletions

View File

@ -20,7 +20,7 @@ index c7fadab..62951d6 100644
+ if is_shell: + if is_shell:
+ count= 0 + count= 0
+ for l in file(pkgfile.path, "r"): + for l in open(pkgfile.path, "r"):
+ count = count + 1 + count = count + 1
+ if (l.find("This wrapper script should never be moved out of the build directory") != -1): + if (l.find("This wrapper script should never be moved out of the build directory") != -1):
+ printError(pkg, 'libtool-wrapper-in-package', fname) + printError(pkg, 'libtool-wrapper-in-package', fname)

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Aug 19 20:50:32 UTC 2016 - stefan.bruens@rwth-aachen.de
- Update some checks to work on both Python 2 and 3
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 25 14:27:42 UTC 2016 - lnussel@suse.de Mon Jul 25 14:27:42 UTC 2016 - lnussel@suse.de

View File

@ -16,7 +16,7 @@ index ee5039c..4a698cd 100644
elif interpreter or mode_is_exec or script_regex.search(f): elif interpreter or mode_is_exec or script_regex.search(f):
if interpreter: if interpreter:
- if not interpreter_regex.search(interpreter): - if not interpreter_regex.search(interpreter):
+ if mode & 0111 != 0 and not interpreter_regex.search(interpreter): + if mode & 0o111 != 0 and not interpreter_regex.search(interpreter):
printError(pkg, 'wrong-script-interpreter', printError(pkg, 'wrong-script-interpreter',
f, interpreter) f, interpreter)
elif not nonexec_file and not \ elif not nonexec_file and not \

View File

@ -28,9 +28,9 @@ index f9b13a1..f81a450 100644
initscript_list = [] initscript_list = []
+ +
+ # check chkconfig call in %post and %preun + # check chkconfig call in %post and %preun
+ postin = Pkg.b2s(pkg[rpm.RPMTAG_POSTIN]) or pkg.scriptprog(rpm.RPMTAG_POSTINPROG) + postin = pkg[rpm.RPMTAG_POSTIN] or pkg.scriptprog(rpm.RPMTAG_POSTINPROG)
+ preun = Pkg.b2s(pkg[rpm.RPMTAG_PREUN]) or pkg.scriptprog(rpm.RPMTAG_PREUNPROG) + preun = pkg[rpm.RPMTAG_PREUN] or pkg.scriptprog(rpm.RPMTAG_PREUNPROG)
+ postun = Pkg.b2s(pkg[rpm.RPMTAG_POSTUN]) or pkg.scriptprog(rpm.RPMTAG_POSTUNPROG) + postun = pkg[rpm.RPMTAG_POSTUN] or pkg.scriptprog(rpm.RPMTAG_POSTUNPROG)
+ +
for fname, pkgfile in pkg.files().items(): for fname, pkgfile in pkg.files().items():