Accepting request 110100 from devel:openSUSE:Factory:rpmlint

- better deal with spaces in logrotate config
- add colord-sane dbus service to whitelist (bnc#752518)

- fix parsing of update-alternatives and clarify info message

OBS-URL: https://build.opensuse.org/request/show/110100
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpmlint?expand=0&rev=158

CheckAlternativesGhostFiles.py

@@ -32,8 +32,12 @@ class CheckAlternativesGhostFiles(AbstractCheck.AbstractCheck):
                 if cls.INSTALL in c):
 
             #parse install
-            xs = command.split(None, 4)
+            command_args = []
-            ghost_files.append(xs[1])
+            for arg in command.split(None):
+                if not arg.startswith("--"):
+                    command_args.append(arg)
+                 
+            ghost_files.append(command_args[0])
             
             if cls.SLAVE in command:
                 for sc in ( \
@@ -70,12 +74,12 @@ if Config.info:
     addDetails(
 
 'generic-name-not-marked-as-ghost',
-'''The generic name is not marked as a ghost, which may cause a problems during
+'''The update-alternatives generic name is not marked as a ghost in the %files section.
-update. Mark it as a %ghost in %files section.''',
+This causes problems during update. Mark it as a %ghost in %files section.''',
 
 'generic-name-not-in-filelist',
-'''The generic name is not in a filelist of package, add it to list marked as
+'''The update-alternatives generic name is not in a filelist of package.
-%ghost. Note: this error will be raised, if you use a hash ($) in file name,
+Add it to list marked as %ghost. Note: this error will be raised, 
-use rpm macros in spec file instead.''',
+if you use a hash ($) in file name, use rpm macros in spec file instead.''',
 
 )

CheckLogrotate.py

@@ -63,7 +63,8 @@ class LogrotateCheck(AbstractCheck.AbstractCheck):
                 if line.endswith('{'):
                     insection = True
                     for logfile in line.split(' '):
-                        if logfile == '{':
+                        logfile = logfile.strip()
+                        if len(logfile) == 0 or logfile == '{':
                             continue
                         dn = os.path.dirname(logfile)
                         if not dn in dirs:

config

@@ -1,5 +1,5 @@
 # -*- python -*-
-# vim: syntax=python
+# vim: syntax=python sw=4 et
 # Configuration for the rpmlint utility.
 # Loaded before ~/.rpmlintrc
 # $Id: config,v 1.39 2003/12/22 11:20:55 flepied Exp $
@@ -481,6 +481,9 @@ setOption("DBUSServices.WhiteList", (
     # colord (bnc#698250)
     "org.freedesktop.ColorManager.service",
     "org.freedesktop.ColorManager.conf",
+    # colord-sane (bnc#752518)
+    "org.freedesktop.colord-sane.service",
+    "org.freedesktop.colord-sane.conf",
     # lightdm (bnc#708205)
     "org.freedesktop.DisplayManager.conf",
     # kdepim4/kalarm (bnc#707723)

rpmlint.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Mar 20 08:32:33 UTC 2012 - lnussel@suse.de
+
+- better deal with spaces in logrotate config
+- add colord-sane dbus service to whitelist (bnc#752518)
+
+-------------------------------------------------------------------
+Fri Mar 16 14:26:34 CET 2012 - dmueller@suse.de
+
+- fix parsing of update-alternatives and clarify info message 
+
 -------------------------------------------------------------------
 Tue Mar 13 15:14:07 CET 2012 - dmueller@suse.de