Ignore useless-provides on debuginfo provides (bz1489096)
Applied upstream patch to rpmlint-1.10 via 'git am -3' to resolve changes in diff context. Upstream issue: https://github.com/rpm-software-management/rpmlint/issues/112 Upstream commit: https://github.com/rpm-software-management/rpmlint/commit/e739876
This commit is contained in:
parent
a325960c04
commit
82c8e3c312
36
rpmlint-1.10-ignore-debuginfo-useless-provides.patch
Normal file
36
rpmlint-1.10-ignore-debuginfo-useless-provides.patch
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
From 7f86c79068be1c83303da30f5f4f030080e6326a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Dirk Mueller <dirk@dmllr.de>
|
||||||
|
Date: Sat, 4 Nov 2017 02:24:30 +0100
|
||||||
|
Subject: [PATCH] Ignore useless-provides on debuginfo provides (#112)
|
||||||
|
|
||||||
|
Also flip to set's rather than lists as the main operation
|
||||||
|
here is lookup, so set()s should be faster.
|
||||||
|
---
|
||||||
|
TagsCheck.py | 10 ++++++----
|
||||||
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/TagsCheck.py b/TagsCheck.py
|
||||||
|
index a8d87aa..dc890b1 100644
|
||||||
|
--- a/TagsCheck.py
|
||||||
|
+++ b/TagsCheck.py
|
||||||
|
@@ -823,11 +823,13 @@ class TagsCheck(AbstractCheck.AbstractCheck):
|
||||||
|
|
||||||
|
# TODO: should take versions, <, <=, =, >=, > into account here
|
||||||
|
# https://bugzilla.redhat.com/460872
|
||||||
|
- useless_provides = []
|
||||||
|
+ useless_provides = set()
|
||||||
|
for p in prov_names:
|
||||||
|
- if prov_names.count(p) != 1 and p not in useless_provides:
|
||||||
|
- useless_provides.append(p)
|
||||||
|
- for p in useless_provides:
|
||||||
|
+ if (prov_names.count(p) != 1 and
|
||||||
|
+ not p.startswith('debuginfo(') and
|
||||||
|
+ p not in useless_provides):
|
||||||
|
+ useless_provides.add(p)
|
||||||
|
+ for p in sorted(useless_provides):
|
||||||
|
printError(pkg, 'useless-provides', p)
|
||||||
|
|
||||||
|
for p in pkg.provides():
|
||||||
|
--
|
||||||
|
2.17.0
|
||||||
|
|
@ -28,6 +28,8 @@ Source3: %{name}-etc.config
|
|||||||
Source4: %{name}.config.el4
|
Source4: %{name}.config.el4
|
||||||
# EL-5 specific config
|
# EL-5 specific config
|
||||||
Source5: %{name}.config.el5
|
Source5: %{name}.config.el5
|
||||||
|
# https://github.com/rpm-software-management/rpmlint/commit/e739876
|
||||||
|
Patch0: rpmlint-1.10-ignore-debuginfo-useless-provides.patch
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
%if %{with python3}
|
%if %{with python3}
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
@ -78,6 +80,7 @@ and source packages as well as spec files can be checked.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{name}-%{version}
|
%setup -q -n %{name}-%{name}-%{version}
|
||||||
|
%patch0 -p1 -b .debuginfo-useless-provides
|
||||||
sed -i -e /MenuCheck/d Config.py
|
sed -i -e /MenuCheck/d Config.py
|
||||||
cp -p config config.example
|
cp -p config config.example
|
||||||
install -pm 644 %{SOURCE3} config
|
install -pm 644 %{SOURCE3} config
|
||||||
@ -129,6 +132,7 @@ make check PYTHON=%{python} PYTEST=%{pytest} FLAKE8=%{flake8}
|
|||||||
%changelog
|
%changelog
|
||||||
* Mon Apr 16 2018 Todd Zullinger <tmz@pobox.com> - 1.10-9
|
* Mon Apr 16 2018 Todd Zullinger <tmz@pobox.com> - 1.10-9
|
||||||
- Update UsrLibBinaryException config to include .build-id
|
- Update UsrLibBinaryException config to include .build-id
|
||||||
|
- Ignore useless-provides on debuginfo provides (bz1489096)
|
||||||
|
|
||||||
* Sun Mar 04 2018 Till Maas <opensource@till.name> - 1.10-8
|
* Sun Mar 04 2018 Till Maas <opensource@till.name> - 1.10-8
|
||||||
- Update URL (RH #1547150)
|
- Update URL (RH #1547150)
|
||||||
|
Loading…
Reference in New Issue
Block a user