forked from pool/rpmlint
Accepting request 990955 from devel:openSUSE:Factory:rpmlint
- Update to version 2.3.0+git20220725.8b1e5f2a: * Port 2 usages of toml library to tomli. * Port TOML configs to tomli library - Update to version 2.3.0+git20220724.d9fd8cf3: * Reflect README with toml library change. * Use tomllib from the standard library on Python 3.11+ - Update to version 2.3.0+git20220721.32c15c31: * dbus-services: really adjust location from etc -> usr - Update to version 2.3.0+git20220715.9ec62e45: * Skip shlib-policy-name-error for HPC libraries - Update to version 2.3.0+git20220714.7cb9607: * Remove trailing ': x%' from 'package-with-huge-docs' error * Fix useless-provides * digest whitelists: remove now redundant sha256 algorithm specification * FileDigestCheck: use sha256 digest algorithm by default * dbus-services: adjust to PackageKit etc -> usr config file move (bsc#1201347) * dbus-services: adjust to cups etc -> usr config file move (bsc#1201346) * dbus-services: adjust to avahi etc -> usr config file move (bsc#1201345) - Remove upstreamed patch skip-rpmlint-for-rpmlint.patch. OBS-URL: https://build.opensuse.org/request/show/990955 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpmlint?expand=0&rev=405
This commit is contained in:
Richard Brown
Git OBS Bridge
commit
b04164bb2c
2
_service
2
_service
@ -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">761ddf0910eaed2614433c57fc1a7c14b1983ee8</param>
|
||||
<param name="revision">opensuse</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://github.com/rpm-software-management/rpmlint.git</param>
|
||||
<param name="changesrevision">761ddf0910eaed2614433c57fc1a7c14b1983ee8</param></service></servicedata>
|
||||
<param name="changesrevision">e4213a0e9eea05f374802dfd982663544c9982dd</param></service></servicedata>
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:20bfe965b97393e8c2f170976bda97404e77619117862c0d93466c82164453d2
|
||||
size 6752004
|
||||
3
rpmlint-2.3.0+git20220725.8b1e5f2a.tar.xz
Normal file
3
rpmlint-2.3.0+git20220725.8b1e5f2a.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6f7e7bd2dab0fc4942c00813379140c58d6a8733c97a2cde2e588b16394fa5c0
|
||||
size 6754004
|
||||
@ -1,3 +1,42 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 25 07:58:17 UTC 2022 - mliska@suse.cz
|
||||
|
||||
- Update to version 2.3.0+git20220725.8b1e5f2a:
|
||||
* Port 2 usages of toml library to tomli.
|
||||
* Port TOML configs to tomli library
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 24 14:30:23 UTC 2022 - mliska@suse.cz
|
||||
|
||||
- Update to version 2.3.0+git20220724.d9fd8cf3:
|
||||
* Reflect README with toml library change.
|
||||
* Use tomllib from the standard library on Python 3.11+
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 21 11:32:30 UTC 2022 - mliska@suse.cz
|
||||
|
||||
- Update to version 2.3.0+git20220721.32c15c31:
|
||||
* dbus-services: really adjust location from etc -> usr
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 15 15:22:25 UTC 2022 - mliska@suse.cz
|
||||
|
||||
- Update to version 2.3.0+git20220715.9ec62e45:
|
||||
* Skip shlib-policy-name-error for HPC libraries
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 15 11:55:14 UTC 2022 - mliska@suse.cz
|
||||
|
||||
- Update to version 2.3.0+git20220714.7cb9607:
|
||||
* Remove trailing ': x%' from 'package-with-huge-docs' error
|
||||
* Fix useless-provides
|
||||
* digest whitelists: remove now redundant sha256 algorithm specification
|
||||
* FileDigestCheck: use sha256 digest algorithm by default
|
||||
* dbus-services: adjust to PackageKit etc -> usr config file move (bsc#1201347)
|
||||
* dbus-services: adjust to cups etc -> usr config file move (bsc#1201346)
|
||||
* dbus-services: adjust to avahi etc -> usr config file move (bsc#1201345)
|
||||
- Remove upstreamed patch skip-rpmlint-for-rpmlint.patch.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 12 20:38:18 UTC 2022 - Martin Liška <mliska@suse.cz>
|
||||
|
||||
|
||||
@ -23,14 +23,13 @@
|
||||
%define name_suffix -%{flavor}
|
||||
%endif
|
||||
Name: rpmlint%{name_suffix}
|
||||
Version: 2.3.0+git20220712.761ddf0
|
||||
Version: 2.3.0+git20220725.8b1e5f2a
|
||||
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
|
||||
@ -51,7 +50,8 @@ BuildRequires: python3-pytest-cov
|
||||
BuildRequires: python3-pytest-xdist
|
||||
BuildRequires: python3-pyxdg
|
||||
BuildRequires: python3-rpm
|
||||
BuildRequires: python3-toml
|
||||
BuildRequires: python3-tomli
|
||||
BuildRequires: python3-tomli-w
|
||||
BuildRequires: python3-zstandard
|
||||
BuildRequires: xz
|
||||
%ifarch x86_64
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
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
|
||||
Loading…
Reference in New Issue
Block a user