[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 01/01: c/fields: Allow versioned provides

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository lintian.

commit 97df0afc0171c1a2ed5592b958492466500c251a
Author: Niels Thykier <niels@thykier.net>
Date:   Sat Apr 23 08:08:40 2016 +0000

    c/fields: Allow versioned provides
    
    Signed-off-by: Niels Thykier <niels@thykier.net>
---
 checks/fields.desc                                       | 9 ++++++---
 checks/fields.pm                                         | 6 ++++--
 debian/changelog                                         | 2 ++
 t/tests/fields-virtual-packages/debian/debian/control.in | 3 ++-
 t/tests/fields-virtual-packages/desc                     | 2 +-
 t/tests/fields-virtual-packages/tags                     | 2 +-
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/checks/fields.desc b/checks/fields.desc
index f187b9e..83459fe 100644
--- a/checks/fields.desc
+++ b/checks/fields.desc
@@ -467,11 +467,14 @@ Info: Only the "Depends", "Recommends", "Suggests" and "Pre-Depends"
  fields may specify alternate dependencies using the "|" symbol.
 Ref: policy 7.1
 
-Tag: versioned-provides
+Tag: invalid-versioned-provides
 Severity: important
 Certainty: certain
-Ref: policy 7.1
-Info: The "Provides" field may not specify a version range.
+Ref: policy 7.1, #761219
+Info: The package declares a provides relation with an invalid version
+ operator (e.g. "&gt;=").
+ .
+ If a provides is versioned, it must use "=".
 
 Tag: obsolete-relation-form
 Ref: policy 7.1
diff --git a/checks/fields.pm b/checks/fields.pm
index d456077..086c79e 100644
--- a/checks/fields.pm
+++ b/checks/fields.pm
@@ -730,8 +730,10 @@ sub run {
                         $part_d_orig)
                       = @$part_d;
 
-                    tag 'versioned-provides', $part_d_orig
-                      if ($field eq 'provides' && $d_version->[0]);
+                    tag 'invalid-versioned-provides', $part_d_orig
+                      if ( $field eq 'provides'
+                        && $d_version->[0]
+                        && $d_version->[0] ne '=');
 
                     tag 'bad-provided-package-name', $d_pkg
                       if $d_pkg !~ /^[a-z0-9][-+\.a-z0-9]+$/;
diff --git a/debian/changelog b/debian/changelog
index 2248f98..1a6db8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,8 @@ lintian (2.5.44) UNRELEASED; urgency=medium
       Asked for by Dominic Hargreaves.
     + [NT] Apply patch from Mattia Rizzolo to make lintian know and check
       the Build-Depends-Arch field.  (Closes: #822281)
+    + [NT] Stop emitting tags for (valid) versioned provides.  Thanks to
+      Thorsten Glaser for the bug report.  (Closes: #800438)
   * checks/files.pm:
     + [JW] Apply patch from Mathieu Parent to fix directories for PHP INI
       files.
diff --git a/t/tests/fields-virtual-packages/debian/debian/control.in b/t/tests/fields-virtual-packages/debian/debian/control.in
index f40ce01..69de514 100644
--- a/t/tests/fields-virtual-packages/debian/debian/control.in
+++ b/t/tests/fields-virtual-packages/debian/debian/control.in
@@ -12,7 +12,8 @@ Provides:
     123456789,
     {$source}-$\{source:Version\},
     arch-specific [i386],
-    provides-are-allowed [!i386]
+    provides-are-allowed [!i386],
+    valid-versioned-provides (= 1.0)
 Description: {$description}
  This is a test package designed to exercise some feature or tag of
  Lintian.  It is part of the Lintian test suite and may do very odd
diff --git a/t/tests/fields-virtual-packages/desc b/t/tests/fields-virtual-packages/desc
index 84583fe..c3cff6f 100644
--- a/t/tests/fields-virtual-packages/desc
+++ b/t/tests/fields-virtual-packages/desc
@@ -4,5 +4,5 @@ Version: 1.0
 Description: Tests related to virtual packages
 Test-For:
  bad-provided-package-name
- versioned-provides
+ invalid-versioned-provides
  virtual-package-depends-without-real-package-depends
diff --git a/t/tests/fields-virtual-packages/tags b/t/tests/fields-virtual-packages/tags
index f295bf7..955a83e 100644
--- a/t/tests/fields-virtual-packages/tags
+++ b/t/tests/fields-virtual-packages/tags
@@ -1,4 +1,4 @@
 E: fields-virtual-packages2: bad-provided-package-name a
 E: fields-virtual-packages2: bad-provided-package-name iNvAlId-NaMe
-E: fields-virtual-packages2: versioned-provides versioned (>> 0.1)
+E: fields-virtual-packages2: invalid-versioned-provides versioned (>> 0.1)
 W: fields-virtual-packages: virtual-package-depends-without-real-package-depends depends: httpd

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: