Hello community, here is the log from the commit of package rpmlint for openSUSE:Factory checked in at 2017-11-14 14:17:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpmlint (Old) and /work/SRC/openSUSE:Factory/.rpmlint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpmlint" Tue Nov 14 14:17:48 2017 rev:284 rq:540419 version:1.10 Changes: -------- --- /work/SRC/openSUSE:Factory/rpmlint/rpmlint.changes 2017-10-25 17:45:34.380901626 +0200 +++ /work/SRC/openSUSE:Factory/.rpmlint.new/rpmlint.changes 2017-11-14 14:17:50.154275998 +0100 @@ -1,0 +2,23 @@ +Fri Nov 03 08:10:16 UTC 2017 - opensuse-packag...@opensuse.org + +- Update rpmlint-tests to version master: + * Add Flake8 travis check + * Fix scriptprog invocation + * Print the duplicated filenames sorted to be stable accross multiple calls + +------------------------------------------------------------------- +Wed Nov 1 13:01:32 UTC 2017 - dmuel...@suse.com + +- add 0001-Avoid-calling-close-on-undefined-fd-variable.patch + +------------------------------------------------------------------- +Tue Oct 24 12:54:47 UTC 2017 - jeng...@inai.de + +- Description updates. Use the %make_install macro. + +------------------------------------------------------------------- +Tue Oct 24 12:49:34 UTC 2017 - dmuel...@suse.com + +- update suse-whitelist-opensuse.diff to avoid a false positive + +------------------------------------------------------------------- New: ---- 0001-Avoid-calling-close-on-undefined-fd-variable.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmlint.spec ++++++ --- /var/tmp/diff_new_pack.3ByPU2/_old 2017-11-14 14:17:51.974209610 +0100 +++ /var/tmp/diff_new_pack.3ByPU2/_new 2017-11-14 14:17:51.974209610 +0100 @@ -19,7 +19,7 @@ Name: rpmlint Version: 1.10 Release: 0 -Summary: Rpm correctness checker +Summary: RPM file correctness checker License: GPL-2.0+ Group: System/Packages Url: https://github.com/rpm-software-management/rpmlint @@ -87,6 +87,7 @@ Patch68: 0001-Avoid-false-positives-on-is_elf-check.patch Patch69: 0007-Validate-Appdata-also-when-appstream-util-is-unavail.patch Patch70: rpmlint-all-pie.patch +Patch71: 0001-Avoid-calling-close-on-undefined-fd-variable.patch BuildRequires: obs-service-format_spec_file BuildRequires: python3-flake8 BuildRequires: python3-pytest @@ -108,7 +109,7 @@ BuildArch: noarch %description -Rpmlint is a tool to check common errors on rpm packages. Binary and +rpmlint is a tool to check common errors on RPM packages. Binary and source packages can be checked. %prep @@ -123,7 +124,7 @@ make %{?_smp_mflags} PYTHON=%{_bindir}/python3 %install -make install DESTDIR=%{buildroot} PYTHON=%{_bindir}/python3 +%make_install PYTHON=%{_bindir}/python3 # the provided bash-completion does not work and only prints bash errors rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d mv %{buildroot}%{_sysconfdir}/rpmlint/config %{buildroot}%{_datadir}/rpmlint/config ++++++ 0001-Avoid-calling-close-on-undefined-fd-variable.patch ++++++ >From 49611f900047d5397ebbbdb0ed5299580337ea34 Mon Sep 17 00:00:00 2001 From: Dirk Mueller <d...@dmllr.de> Date: Wed, 1 Nov 2017 13:59:01 +0100 Subject: [PATCH] Avoid calling close on undefined fd variable It can happen that open did through an OSError but then the corresponding close UnknownVariableError wasn't caught. we can fix that by putting both in the same try/exception block, which also cleans up the code a bit. --- Pkg.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Pkg.py b/Pkg.py index 47197c9..2622f9a 100644 --- a/Pkg.py +++ b/Pkg.py @@ -719,16 +719,11 @@ class Pkg(AbstractPkg): # use descriptor() method instead try: fd = os.open(pkgfile.path, os.O_RDONLY) - except OSError: - if not pkgfile.is_ghost: - raise - else: pkgfile.magic = b2s(_magic.descriptor(fd)) - # libmagic up to 5.18 already closes the descriptor - try: os.close(fd) except OSError: - pass + if not pkgfile.is_ghost: + raise if pkgfile.magic is None: pkgfile.magic = '' elif Pkg._magic_from_compressed_re.search(pkgfile.magic): -- 2.14.2 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.3ByPU2/_old 2017-11-14 14:17:52.106204795 +0100 +++ /var/tmp/diff_new_pack.3ByPU2/_new 2017-11-14 14:17:52.110204649 +0100 @@ -3,4 +3,4 @@ <param name="url">https://github.com/openSUSE/rpmlint-tests.git</param> <param name="changesrevision">8b163ac0aaf41e8424edbc4074a60f18e9cb9438</param></service><service name="tar_scm"> <param name="url">https://github.com/openSUSE/rpmlint-checks.git</param> - <param name="changesrevision">c90062ef30ec343a060331f1b867e9f30d2951bf</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">9fe029d320afd18bba51bad18cc79324a912c756</param></service></servicedata> \ No newline at end of file ++++++ rpmlint-checks-master.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-checks-master/.travis.yml new/rpmlint-checks-master/.travis.yml --- old/rpmlint-checks-master/.travis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/rpmlint-checks-master/.travis.yml 2017-11-03 07:31:19.000000000 +0100 @@ -0,0 +1,13 @@ +sudo: false +language: python +python: + - "3.5" + +install: + - pip install flake8 + +script: ./flake8.sh + +notifications: + on_success: change + on_failure: always diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-checks-master/CheckSUIDPermissions.py new/rpmlint-checks-master/CheckSUIDPermissions.py --- old/rpmlint-checks-master/CheckSUIDPermissions.py 2017-10-11 10:02:36.000000000 +0200 +++ new/rpmlint-checks-master/CheckSUIDPermissions.py 2017-11-03 07:31:19.000000000 +0100 @@ -190,7 +190,7 @@ '%(file)s is packaged with world writable permissions (0%(mode)o)' % {'file': f, 'mode': mode}) - script = pkg[rpm.RPMTAG_POSTIN] or pkg.scriptprog(pkg[rpm.RPMTAG_POSTINPROG]) + script = pkg[rpm.RPMTAG_POSTIN] or pkg.scriptprog(rpm.RPMTAG_POSTINPROG) found = False if script: for line in script.split("\n"): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-checks-master/CheckSystemdInstall.py new/rpmlint-checks-master/CheckSystemdInstall.py --- old/rpmlint-checks-master/CheckSystemdInstall.py 2017-10-11 10:02:36.000000000 +0200 +++ new/rpmlint-checks-master/CheckSystemdInstall.py 2017-11-03 07:31:19.000000000 +0100 @@ -29,11 +29,11 @@ if pkg.isSource(): return - pre = pkg[rpm.RPMTAG_PREIN] or pkg.scriptprog(pkg[rpm.RPMTAG_PREINPROG]) - post = pkg[rpm.RPMTAG_POSTIN] or pkg.scriptprog(pkg[rpm.RPMTAG_POSTINPROG]) + pre = pkg[rpm.RPMTAG_PREIN] or pkg.scriptprog(rpm.RPMTAG_PREINPROG) + post = pkg[rpm.RPMTAG_POSTIN] or pkg.scriptprog(rpm.RPMTAG_POSTINPROG) - preun = pkg[rpm.RPMTAG_PREUN] or pkg.scriptprog(pkg[rpm.RPMTAG_PREUNPROG]) - postun = pkg[rpm.RPMTAG_POSTUN] or pkg.scriptprog(pkg[rpm.RPMTAG_POSTUNPROG]) + preun = pkg[rpm.RPMTAG_PREUN] or pkg.scriptprog(rpm.RPMTAG_PREUNPROG) + postun = pkg[rpm.RPMTAG_POSTUN] or pkg.scriptprog(rpm.RPMTAG_POSTUNPROG) for fname, pkgfile in pkg.files().items(): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-checks-master/DuplicatesCheck.py new/rpmlint-checks-master/DuplicatesCheck.py --- old/rpmlint-checks-master/DuplicatesCheck.py 2017-10-11 10:02:36.000000000 +0200 +++ new/rpmlint-checks-master/DuplicatesCheck.py 2017-11-03 07:31:19.000000000 +0100 @@ -76,7 +76,7 @@ sum += sizes[f] * diff if sizes[f] and diff > 0: Filter.printWarning(pkg, 'files-duplicate', one, - ":".join(duplicates)) + ":".join(sorted(duplicates))) if sum > 100000: Filter.printError(pkg, 'files-duplicated-waste', sum) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-checks-master/flake8.sh new/rpmlint-checks-master/flake8.sh --- old/rpmlint-checks-master/flake8.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/rpmlint-checks-master/flake8.sh 2017-11-03 07:31:19.000000000 +0100 @@ -0,0 +1,2 @@ +#!/bin/sh +flake8 --ignore=E501,E122,F403,F405 *py ++++++ suse-whitelist-opensuse.diff ++++++ --- /var/tmp/diff_new_pack.3ByPU2/_old 2017-11-14 14:17:52.354195749 +0100 +++ /var/tmp/diff_new_pack.3ByPU2/_new 2017-11-14 14:17:52.354195749 +0100 @@ -28,7 +28,7 @@ if '\n' in summary: printError(pkg, 'summary-on-multiple-lines', lang) - if summary[0] != summary[0].upper(): -+ if (not summary[0].isupper() and ++ if (summary[0] != summary[0].upper() and + summary.partition(' ')[0] not in CAPITALIZED_IGNORE_LIST): printWarning(pkg, 'summary-not-capitalized', lang, summary) if summary[-1] == '.':
