From 2fa855f6bf4aefe2c4806a8dac1743dbead53b56f1a57ea6ac9a10f1ad5d5245 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 16 Mar 2012 13:26:48 +0000 Subject: [PATCH] - fix parsing of update-alternatives and clarify info message OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=105 --- CheckAlternativesGhostFiles.py | 18 +++++++++++------- rpmlint.changes | 5 +++++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/CheckAlternativesGhostFiles.py b/CheckAlternativesGhostFiles.py index d24f419..7bd7b66 100644 --- a/CheckAlternativesGhostFiles.py +++ b/CheckAlternativesGhostFiles.py @@ -32,8 +32,12 @@ class CheckAlternativesGhostFiles(AbstractCheck.AbstractCheck): if cls.INSTALL in c): #parse install - xs = command.split(None, 4) - ghost_files.append(xs[1]) + command_args = [] + for arg in command.split(None): + if not arg.startswith("--"): + command_args.append(arg) + + ghost_files.append(command_args[1]) 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 -update. Mark it as a %ghost in %files section.''', +'''The update-alternatives generic name is not marked as a ghost in the %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 -%ghost. Note: this error will be raised, if you use a hash ($) in file name, -use rpm macros in spec file instead.''', +'''The update-alternatives generic name is not in a filelist of package. +Add it to list marked as %ghost. Note: this error will be raised, +if you use a hash ($) in file name, use rpm macros in spec file instead.''', ) diff --git a/rpmlint.changes b/rpmlint.changes index ef69485..58ef0ed 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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