Accepting request 989092 from devel:openSUSE:Factory:rpmlint

- Update to version 2.3.0+git20220712.761ddf0:
  * Improve syntax validation for digests.
- Add skip-rpmlint-for-rpmlint.patch patch that skip linter
  this package.

OBS-URL: https://build.opensuse.org/request/show/989092
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpmlint?expand=0&rev=404
This commit is contained in:
Dominique Leuenberger 2022-07-15 11:52:12 +00:00 committed by Git OBS Bridge
commit 5275cc13cf
7 changed files with 52 additions and 6 deletions

View File

@ -3,7 +3,7 @@
<param name="versionformat">2.3.0+git%cd.%h</param>
<param name="url">https://github.com/rpm-software-management/rpmlint.git</param>
<param name="scm">git</param>
<param name="revision">opensuse</param>
<param name="revision">761ddf0910eaed2614433c57fc1a7c14b1983ee8</param>
<param name="changesgenerate">enable</param>
</service>
<service name="recompress" mode="disabled">

View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/rpm-software-management/rpmlint.git</param>
<param name="changesrevision">43a2c9424d3978250229477fc28426610c79d9a7</param></service></servicedata>
<param name="changesrevision">761ddf0910eaed2614433c57fc1a7c14b1983ee8</param></service></servicedata>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ff3f5fa18ff5cbafd4503b100e5c97e4fce1402d36c4a2dbe6d7354eb22dcddc
size 6752068

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:20bfe965b97393e8c2f170976bda97404e77619117862c0d93466c82164453d2
size 6752004

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Jul 12 20:38:18 UTC 2022 - Martin Liška <mliska@suse.cz>
- Update to version 2.3.0+git20220712.761ddf0:
* Improve syntax validation for digests.
- Add skip-rpmlint-for-rpmlint.patch patch that skip linter
this package.
-------------------------------------------------------------------
Mon Jul 11 12:41:48 UTC 2022 - mliska@suse.cz

View File

@ -23,13 +23,14 @@
%define name_suffix -%{flavor}
%endif
Name: rpmlint%{name_suffix}
Version: 2.3.0+git20220711.46e6323
Version: 2.3.0+git20220712.761ddf0
Release: 0
Summary: RPM file correctness checker
License: GPL-2.0-or-later
URL: https://github.com/rpm-software-management/rpmlint
Source0: rpmlint-%{version}.tar.xz
Patch0: disable-flake.patch
Patch1: skip-rpmlint-for-rpmlint.patch
BuildRequires: fdupes
BuildRequires: python3-setuptools
BuildArch: noarch

View File

@ -0,0 +1,37 @@
diff --git a/rpmlint/lint.py b/rpmlint/lint.py
index 7afadbc3..df5437e4 100644
--- a/rpmlint/lint.py
+++ b/rpmlint/lint.py
@@ -5,6 +5,7 @@ import operator
import os
from pathlib import Path
from pstats import Stats
+import re
import sys
from tempfile import gettempdir
import time
@@ -22,6 +23,8 @@ class Lint(object):
Generic object handling the basic rpmlint operations
"""
+ rpmlint_package = re.compile(r'/home/abuild/rpmbuild/RPMS/noarch/rpmlint-\d')
+
def __init__(self, options):
# initialize configuration
self.checks = {}
@@ -53,6 +56,15 @@ class Lint(object):
self.config.configuration['ExtractDir'] = gettempdir()
# initialize output buffer
self.output = Filter(self.config)
+
+ # Do not run rpmlint on rpmlint package that easily leads
+ # to run-time error as old rpmlint (taken from rpmlint-mini)
+ # uses a modified configuration.
+ for file in self.options['rpmfile']:
+ if self.rpmlint_package.search(str(file)):
+ print('Skipping rpmlint for rpmlint package!')
+ sys.exit(0)
+
# preload the check list if we not print config
# some of the config values are transformed e.g. to regular
# expressions