From f4dbf1aa828f18a7e3d9fd7158166b8cedbac0ce Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 24 Apr 2018 20:40:27 +0100 Subject: [PATCH] debian/lib/python/debian_linux/debian.py: Fix binNMU revision parsing In VersionLinux, any binNMU version will currently match the revision_other group in the regexp and therefore never be recognised as an experimental, security, or backport version. This is probably harmless in practice because: - binNMUs don't happen in those suites - Only debian/bin/gencontrol.py cares about the linux_revision_other attribute, and it won't be run for a binNMU version But let's fix it by matching the binNMU suffix separately. --- debian/changelog | 1 + debian/lib/python/debian_linux/debian.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 48b70d0b1..027e041b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ linux (4.16.3-1) UNRELEASED; urgency=medium * Set ABI to 1 * [x86,arm64] Disable code signing for upload to unstable * debian/lib/python/debian_linux/debian.py: Fix binNMU changelog parsing + * debian/lib/python/debian_linux/debian.py: Fix binNMU revision parsing [ Vagrant Cascadian ] * [arm64] Add patches to support SATA on Tegra210/Jetson-TX1. diff --git a/debian/lib/python/debian_linux/debian.py b/debian/lib/python/debian_linux/debian.py index 92df1d7ed..759f777d0 100644 --- a/debian/lib/python/debian_linux/debian.py +++ b/debian/lib/python/debian_linux/debian.py @@ -181,9 +181,10 @@ class VersionLinux(Version): )? | (?P - [^-]+ + [^-+]+ ) ) +(?:\+b\d+)? $ """ _version_linux_re = re.compile(_version_linux_rules, re.X)