Hello community, here is the log from the commit of package rpmlint for openSUSE:Factory checked in at 2014-01-31 09:44:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpmlint (Old) and /work/SRC/openSUSE:Factory/.rpmlint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpmlint" Changes: -------- --- /work/SRC/openSUSE:Factory/rpmlint/rpmlint.changes 2014-01-30 11:37:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpmlint.new/rpmlint.changes 2014-01-31 09:44:45.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 30 09:17:08 UTC 2014 - [email protected] + +- remove suse-rclink-check.diff and implement as separate check for + systemd units instead (bnc#860340). + +------------------------------------------------------------------- Old: ---- suse-rclink-check.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmlint.spec ++++++ --- /var/tmp/diff_new_pack.5A9S29/_old 2014-01-31 09:44:46.000000000 +0100 +++ /var/tmp/diff_new_pack.5A9S29/_new 2014-01-31 09:44:46.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package rpmlint # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,6 +33,7 @@ Source3: config.in Source11: pie.config Source12: licenses.config +Source99: README.packaging.txt Source100: syntax-validator.py Url: https://sourceforge.net/projects/rpmlint/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -114,7 +115,6 @@ Patch81: suse-whitelist-opensuse.diff Patch84: extend-suse-conffiles-check.diff Patch85: suse-changelog.patch -Patch86: suse-rclink-check.diff Patch87: compressed-backup-regex.diff # accepted upstream Patch88: suse-speccheck-utf8.diff @@ -195,7 +195,6 @@ %patch81 %patch84 %patch85 -%patch86 %patch87 %patch88 %patch89 ++++++ config ++++++ --- /var/tmp/diff_new_pack.5A9S29/_old 2014-01-31 09:44:46.000000000 +0100 +++ /var/tmp/diff_new_pack.5A9S29/_new 2014-01-31 09:44:46.000000000 +0100 @@ -39,6 +39,7 @@ addCheck("CheckBuildDate") addCheck("CheckLogrotate") addCheck("CheckPAMModules") +addCheck("CheckRCLinks") # stuff autobuild takes care about addFilter(".*invalid-version.*") ++++++ rpmlint-checks-master.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-checks-master/CheckRCLinks.py new/rpmlint-checks-master/CheckRCLinks.py --- old/rpmlint-checks-master/CheckRCLinks.py 1970-01-01 01:00:00.000000000 +0100 +++ new/rpmlint-checks-master/CheckRCLinks.py 2014-01-30 10:26:12.000000000 +0100 @@ -0,0 +1,66 @@ +############################################################################# +# File : CheckRCLinks.py +# Package : rpmlint +# Author : Ludwig Nussel +# Purpose : Check for missing rc* links and shadowed init scripts +############################################################################# + +from Filter import * +import AbstractCheck +import os +import Config +import stat + +class RCLinksCheck(AbstractCheck.AbstractCheck): + def __init__(self): + AbstractCheck.AbstractCheck.__init__(self, 'CheckRCLinks') + + def check(self, pkg ): + if pkg.isSource(): + return + + rclinks = set() + rccandidates = set() + initscripts = set() + + for fname, pkgfile in pkg.files().items(): + if fname in pkg.ghostFiles(): + continue + + if stat.S_ISLNK(pkgfile.mode) and (fname.startswith('/usr/sbin/rc') \ + or fname.startswith('/sbin/rc')): + rclinks.add(fname.partition('/rc')[2]) + elif fname.startswith('/usr/lib/systemd/system/'): + if '@' in fname: + continue + if fname.endswith('.service'): + rccandidates.add(os.path.basename(fname).split('.service')[0]) + if fname.endswith('.target'): + rccandidates.add(os.path.basename(fname).split('.target')[0]) + elif fname.startswith('/etc/init.d/'): + basename = os.path.basename(fname) + if not basename.startswith('rc') \ + and not basename.startswith('boot.'): + initscripts.add(basename) + + for fname in sorted(initscripts): + if fname in rccandidates: + printWarning(pkg, "suse-systemd-shadowed-initscript", fname) + else: + rccandidates.add(fname) + + for fname in sorted(rccandidates): + if fname not in sorted(rclinks): + printWarning(pkg, "suse-missing-rclink", fname) + +check=RCLinksCheck() + +if Config.info: + addDetails( +'suse-missing-rclink', +'''The package contains an init script or systemd service file but +lacks the symlink /usr/sbin/rcFOO -> /usr/sbin/service''', +'suse-systemd-shadowed-initscript', +'''The package contains both an init script and a systemd service +file. Please decide for one.''' +) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
