From 90f09743ecc34e0374120e78ba8a0aee241aaa6e Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 24 Apr 2018 20:20:41 +0100 Subject: [PATCH] debian/lib/python/debian_linux/debian.py: Fix binNMU changelog parsing I incorrectly added a requirement of a newline after urgency in the changelog entry top line as part of "debian/lib/python/debian_linux/debian.py: Parse bottom lines of changelog entries". For a binNMU, there will be ", binary-only=yes" after the urgency. Since we don't currently care about any fields after urgency, allow either a comma or newline. --- debian/changelog | 1 + debian/lib/python/debian_linux/debian.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2ae40db86..48b70d0b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ linux (4.16.3-1) UNRELEASED; urgency=medium * linux-headers: Change linux-kbuild dependency to be versioned * Set ABI to 1 * [x86,arm64] Disable code signing for upload to unstable + * debian/lib/python/debian_linux/debian.py: Fix binNMU changelog 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 c15e048b1..92df1d7ed 100644 --- a/debian/lib/python/debian_linux/debian.py +++ b/debian/lib/python/debian_linux/debian.py @@ -25,7 +25,7 @@ class Changelog(list): (?P \w+ ) -\n +(?:,|\n) """ _top_re = re.compile(_top_rules, re.X) _bottom_rules = r"""