[python-debian/master] Allow any number of spaces before "urgency" in the header line of a changelog, see lvm2's changelog in Ubuntu.

James Westby jw+debian at jameswestby.net
Thu Jun 12 11:17:47 UTC 2008


---
 debian/changelog             |    4 +++-
 debian_bundle/changelog.py   |    2 +-
 tests/test_strange_changelog |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1f67068..9b82114 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ python-debian (0.1.11) UNRELEASED; urgency=low
   [ James Westby ]
   * Allow urgency=HIGH and other words made of capital letters there, see
     fuse's changelog.
+  * Allow any number of spaces before "urgency" in the header line of a
+    changelog, see lvm2's changelog in Ubuntu.
 
   [ John Wright ]
   * debian/control:
@@ -12,7 +14,7 @@ python-debian (0.1.11) UNRELEASED; urgency=low
   * debfile.py: add has_key (same implementation of __contains__) to better
     emulate dictionary containers
 
- -- John Wright <jsw at debian.org>  Fri, 30 May 2008 19:16:40 -0600
+ -- John Wright <jsw at debian.org>  Thu, 12 Jun 2008 12:16:53 +0100
 
 python-debian (0.1.10) unstable; urgency=low
 
diff --git a/debian_bundle/changelog.py b/debian_bundle/changelog.py
index 61c0b5a..9c546b5 100644
--- a/debian_bundle/changelog.py
+++ b/debian_bundle/changelog.py
@@ -181,7 +181,7 @@ class ChangeBlock(object):
     return block
 
 topline = re.compile('^([a-z0-9][-a-z0-9.+]+) \(([-0-9a-zA-Z.:~+]+)\) '
-      +'([-+.0-9a-zA-Z ]+); urgency=([a-zA-Z]+)')
+      +'([-+.0-9a-zA-Z ]+); *urgency=([a-zA-Z]+)')
 blankline = re.compile('^[ \t]*$')
 change = re.compile('^[ ][ ]+.*$')
 endline = re.compile('^ -- (.*)  (\w\w\w, +(\d| \d|\d\d) \w\w\w \d\d\d\d '+
diff --git a/tests/test_strange_changelog b/tests/test_strange_changelog
index 4b1132b..c7b4b98 100644
--- a/tests/test_strange_changelog
+++ b/tests/test_strange_changelog
@@ -18,7 +18,7 @@ python-debian (0.1.2) unstable; urgency=low
 
  -- Reinhard Tartler <siretart at tauware.de>  Thu, 14 Jun 2007 19:54:13 +0100  
 
-python-debian (0.1.1) unstable; urgency=low
+python-debian (0.1.1) unstable;  urgency=low
 
   [ John Wright ]
   * changelog.py:
-- 
1.5.4.2




More information about the pkg-python-debian-commits mailing list