forked from pool/rpmlint
Ludwig Nussel
bda5d592a2
- add script update_git.sh based on qemu's to simplify importing a patch series from git after rebasing. * Patches dropped: 0001-Python-3-compatibility-tweaks.patch (upstream) 0001-Set-Python-3.4-magic-number-to-3310.patch (upstream) add-scoring-support.diff (different upstream solution) check-buildroot-during-install.diff (need to fix no-cleaning-of-buildroot check upstream) fix-versioned-prereq.diff (was disabled, not sure what it's useful for) ignore-non-readable-in-etc.diff (filtered anyways) locale-support.diff (drop) locale-update.diff (different upstream solution now) more-verbose-lsb-check.diff (drop) perl-versioned-rpath-deps.diff (upstream) rpmlint-1.5-disallow-var-run-and-var-lock.diff (upstream) rpmlint-1.5-Fix-setgroups-error-name.diff (upstream) rpmlint-decode-fix.diff (different upstream solution) rpmlint-fix-unexpanded-macros-for-array-values.patch (different upstream solution) stricter-tags-check.diff (merged in weak deps and check-for-self-provides.diff) suppress-for-perl-python.diff (use filter instead) suse-binary-info-compile-opts.diff (drop) suse-changelog.patch (change config instead) suse-mono-deps-checks.diff (useful?) suse-required-lsb-tags.diff (different upstream solution) verify-buildrequires.diff (very build system specific, drop) xdg-check-exception.diff (upstream) * renamed patches: script-interpreter-only-for-exec-scripts.diff -> script-interpreter-only-for-exec-sc.diff confusing-invalid-spec-name.patch OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=317
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
From aecc6b2cfb248014dd769a31a0aeb8f1bcec180b Mon Sep 17 00:00:00 2001
|
|
From: Some One <nobody@opensuse.org>
|
|
Date: Thu, 9 Apr 2015 14:55:39 +0200
|
|
Subject: [PATCH] selfconflicts-provide.diff
|
|
|
|
===================================================================
|
|
---
|
|
TagsCheck.py | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
diff --git a/TagsCheck.py b/TagsCheck.py
|
|
index 6528d5b..18cbb6e 100644
|
|
--- a/TagsCheck.py
|
|
+++ b/TagsCheck.py
|
|
@@ -829,6 +829,7 @@ class TagsCheck(AbstractCheck.AbstractCheck):
|
|
|
|
obs_names = [x[0] for x in pkg.obsoletes()]
|
|
prov_names = [x[0].split(':/')[0] for x in pkg.provides()]
|
|
+ conf_names = map(lambda x: x[0].split(':/')[0], pkg.conflicts())
|
|
|
|
for o in (x for x in obs_names if x not in prov_names):
|
|
printWarning(pkg, 'obsolete-not-provided', o)
|
|
@@ -840,6 +841,8 @@ class TagsCheck(AbstractCheck.AbstractCheck):
|
|
# https://bugzilla.redhat.com/460872
|
|
useless_provides = []
|
|
for p in prov_names:
|
|
+ if p in conf_names:
|
|
+ printWarning(pkg, 'conflicts-with-provides', p)
|
|
if prov_names.count(p) != 1 and p not in useless_provides:
|
|
useless_provides.append(p)
|
|
for p in useless_provides:
|
|
@@ -999,6 +1002,10 @@ the Release tag.''',
|
|
'''There is no Name tag in your package. You have to specify a name using the
|
|
Name tag.''',
|
|
|
|
+'conflicts-with-provides',
|
|
+'''The same symbolic name is provided and conflicted. This package might be
|
|
+uninstallable, if versioning matches''',
|
|
+
|
|
'non-coherent-filename',
|
|
'''The file which contains the package should be named
|
|
<NAME>-<VERSION>-<RELEASE>.<ARCH>.rpm.''',
|