[Git][reproducible-builds/diffoscope][master] d/rules: allow all sorts of version suffixes, not just for backports

[Mattia Rizzolo]

Mattia Rizzolo pushed to branch master at Reproducible Builds / diffoscope


Commits:
e07dfbe1 by Mattia Rizzolo at 2019-09-08T13:56:30Z
d/rules: allow all sorts of version suffixes, not just for backports

Closes: #939387
Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


1 changed file:

- debian/rules


Changes:

=====================================
debian/rules
=====================================
@@ -2,18 +2,17 @@
 
 include /usr/share/dpkg/pkg-info.mk
 
+SHELL := /bin/bash  # for the <(echo …) below, this was easiest way.
 PY_VERSION := $(shell awk '/^VERSION = / {gsub(/"/, "", $$3); print $$3}' diffoscope/__init__.py )
+CHECK_VERSION := $(shell grep '^$(PY_VERSION)[^0-9].*$$' <(echo $(DEB_VERSION)))
 
 ifneq ($(DEB_VERSION),$(PY_VERSION))
  ifneq ($(DEB_DISTRIBUTION),UNRELEASED)
-  ifneq (,$(filter %-backports,$(DEB_DISTRIBUTION)))
-    ifeq ($(DEB_VERSION:~bpo10+1=),$(PY_VERSION))
-     $(info Building a Debian backport, accepting version mismatch $(PY_VERSION) <-> $(DEB_VERSION))
-    else
-     $(error Version in debian/changelog does not match diffoscope version or backport policy)
-    endif
+  $(info $(CHECK_VERSION))
+  ifneq (,$(CHECK_VERSION))
+   $(info Accepting version mismatch $(PY_VERSION) <-> $(DEB_VERSION))
   else
-   $(error Version in debian/changelog does not match diffoscope version)
+   $(error Version in debian/changelog ($(DEB_VERSION)) does not match diffoscope version ($(PY_VERSION)))
   endif
  endif
 endif



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/commit/e07dfbe1544f276b7cf0de0c6d35267f98347092

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/commit/e07dfbe1544f276b7cf0de0c6d35267f98347092
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20190908/365ff1a1/attachment.html>