Hello community, here is the log from the commit of package rpmlint checked in at Fri Aug 15 01:45:53 CEST 2008. -------- --- rpmlint/rpmlint.changes 2008-08-04 14:30:26.000000000 +0200 +++ rpmlint/rpmlint.changes 2008-08-12 09:40:26.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Aug 12 09:40:01 CEST 2008 - dmueller@suse.de + +- be more verbose in the lsb init script checks + +------------------------------------------------------------------- New: ---- more-verbose-lsb-check.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmlint.spec ++++++ --- /var/tmp/diff_new_pack.g30383/_old 2008-08-15 01:44:04.000000000 +0200 +++ /var/tmp/diff_new_pack.g30383/_new 2008-08-15 01:44:04.000000000 +0200 @@ -22,7 +22,7 @@ BuildRequires: rpm-python Summary: Rpm correctness checker Version: 0.83 -Release: 22 +Release: 27 Source0: %{name}-%{version}.tar.bz2 Source1: config Source1001: config.in @@ -101,6 +101,7 @@ Patch65: suse-shlib-devel-dependency.diff Patch66: suse-no-python-base.diff Patch67: suse-required-lsb-tags.diff +Patch68: more-verbose-lsb-check.diff %py_requires %description @@ -171,6 +172,7 @@ %patch65 %patch66 %patch67 +%patch68 cp -p %{SOURCE1} . cp -p %{SOURCE2} . cp -p %{SOURCE3} . @@ -209,6 +211,8 @@ /usr/share/man/man1/rpmlint.1.gz %changelog +* Tue Aug 12 2008 dmueller@suse.de +- be more verbose in the lsb init script checks * Mon Aug 04 2008 dmueller@suse.de - change mandatory-lsb-keyword check to be in line with insserv * Tue Jul 29 2008 dmueller@suse.de ++++++ more-verbose-lsb-check.diff ++++++ --- InitScriptCheck.py +++ InitScriptCheck.py @@ -101,13 +101,13 @@ class InitScriptCheck(AbstractCheck.AbstractCheck): in_lsb_tag = 0 for i in lsb_tags.keys(): if len(lsb_tags[i]) != 1: - printError(pkg, 'redundant-lsb-keyword', i) + printError(pkg, 'redundant-lsb-keyword', "'%s' in %s" % (i, f)) # TODO: where is it specified that these (or some) # keywords are mandatory? for i in ('Provides', 'Description', 'Short-Description'): if i not in lsb_tags.keys(): - printError(pkg, 'missing-mandatory-lsb-keyword', "%s in %s" % (i, f)) + printError(pkg, 'missing-mandatory-lsb-keyword', "'%s' in %s" % (i, f)) if in_lsb_tag: # TODO maybe we do not have to handle this ? if lastline.endswith('\\'): @@ -118,7 +118,7 @@ class InitScriptCheck(AbstractCheck.AbstractCheck): cres = lsb_cont_regex.search(line) if not (in_lsb_description and cres): in_lsb_description = 0 - printError(pkg, 'malformed-line-in-lsb-comment-block', line) + printError(pkg, 'malformed-line-in-lsb-comment-block', "'%s' in %s" % (line,f)) else: lsb_tags["Description"][-1] += " " + cres.group(1) else: @@ -127,7 +127,7 @@ class InitScriptCheck(AbstractCheck.AbstractCheck): tag not in ('Provides', 'Required-Start', 'Required-Stop', 'Should-Stop', 'Should-Start', 'Default-Stop', 'Default-Start', 'Description', 'Short-Description'): - printError(pkg, 'unknown-lsb-keyword', line) + printError(pkg, 'unknown-lsb-keyword', "'%s' in %s" % (line, f)) else: in_lsb_description = (tag == 'Description') if not tag in lsb_tags.keys(): @@ -135,7 +135,6 @@ class InitScriptCheck(AbstractCheck.AbstractCheck): lsb_tags[tag].append(res.group(2)) lastline = line - if status_regex.search(line): status_found = 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de