From f12a5bd06361f5a779f7171a06053dec5e22f037 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 1 Jul 2018 04:35:00 +0100 Subject: [PATCH] debian/lib/python/debian_linux/debian.py: Accept arbitrary revision suffixes Closes: #898087 We always used to match arbitrary revision suffixes, but in commit f4dbf1aa828f ".../debian.py: Fix binNMU revision parsing" I excluded '+' from the revision_other to ensure that it wouldn't match a binNMU suffix (which is matched separately). Stop excluding '+' from the revision_other group, and change the repetition to non-greedy so that any binNMU suffix will still match the following group. --- debian/changelog | 2 ++ debian/lib/python/debian_linux/debian.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6325cfe94..116be9171 100644 --- a/debian/changelog +++ b/debian/changelog @@ -87,6 +87,8 @@ linux (4.17.3-1) UNRELEASED; urgency=medium * debian/rules: Fix pkg.linux.notools build profile * tracing: Check for no filter when processing event filters (CVE-2018-12714) * dm: Enable DM_INTEGRITY as module (except on armel) (Closes: #896649) + * debian/lib/python/debian_linux/debian.py: Accept arbitrary revision + suffixes (Closes: #898087) [ Romain Perier ] * [x86] amdgpu: Enable DCN 1.0 Raven family (Closes: #901349) diff --git a/debian/lib/python/debian_linux/debian.py b/debian/lib/python/debian_linux/debian.py index 3a0f53f3b..692e81abb 100644 --- a/debian/lib/python/debian_linux/debian.py +++ b/debian/lib/python/debian_linux/debian.py @@ -251,7 +251,7 @@ class VersionLinux(Version): )? | (?P - [^-+]+ + [^-]+? ) ) (?:\+b\d+)?