debian/lib/python/debian_linux/debian.py: Accept arbitrary revision suffixes

Closes: #898087

We always used to match arbitrary revision suffixes, but in commit
f4dbf1aa82 ".../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.
This commit is contained in:
Ben Hutchings 2018-07-01 04:35:00 +01:00
parent 6f7e87ee67
commit f12a5bd063
2 changed files with 3 additions and 1 deletions

2
debian/changelog vendored
View File

@ -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)

View File

@ -251,7 +251,7 @@ class VersionLinux(Version):
)?
|
(?P<revision_other>
[^-+]+
[^-]+?
)
)
(?:\+b\d+)?