Merge lp:~jelmer/bzr-builder/strip-dfsg into lp:bzr-builder

[Jelmer Vernooij]

Drop the dfsg suffix from versions when expanding {debupstream-base}.

[James Westby (james-w)]

review: Approve

=== modified file 'deb_version.py'
--- deb_version.py	2011-12-15 17:08:16 +0000
+++ deb_version.py	2012-03-25 12:23:18 +0000
@@ -88,16 +88,25 @@
                 "No previous changelog to take the version from")
         return str(self._version)
 
+dfsg_regex = lazy_regex.lazy_compile(
+    r'[+.]*dfsg[.]*[0-9]+')
+
+version_regex = lazy_regex.lazy_compile(
+    r'([~+])(svn[0-9]+|bzr[0-9]+|git[0-9a-f]+)')
+
+def version_extract_base(version):
+    version = dfsg_regex.sub("", version)
+    return version_regex.sub("\\1", version)
+
 
 class DebUpstreamBaseVariable(DebUpstreamVariable):
 
     basename = "debupstream-base"
-    version_regex = lazy_regex.lazy_compile(r'([~+])(svn[0-9]+|bzr[0-9]+|git[0-9a-f]+)')
     minimum_format = 0.4
 
     def get(self):
         version = super(DebUpstreamBaseVariable, self).get()
-        version = self.version_regex.sub("\\1", version)
+        version = version_extract_base(version)
         if version[-1] not in ("~", "+"):
             version += "+"
         return version
@@ -169,7 +178,7 @@
     if cl_file_id is not None:
         tree.lock_read()
         try:
-            cl = changelog.Changelog(tree.get_file(cl_file_id))
+            cl = changelog.Changelog(tree.get_file_text(cl_file_id))
             substitute_changelog_vars(base_branch, branch_name, cl)
         finally:
             tree.unlock()

=== modified file 'tests/test_deb_version.py'
--- tests/test_deb_version.py	2011-12-15 17:32:56 +0000
+++ tests/test_deb_version.py	2012-03-25 12:23:18 +0000
@@ -29,6 +29,7 @@
     DebVersionVariable,
     SubstitutionUnavailable,
     check_expanded_deb_version,
+    version_extract_base,
     substitute_branch_vars,
     substitute_time,
     )
@@ -313,6 +314,31 @@
         self.assertEquals("2.4+", var.get())
 
 
+class VersionExtractBaseTests(TestCase):
+
+    def test_simple_extract(self):
+        self.assertEquals("2.4", version_extract_base("2.4"))
+        self.assertEquals("2.4+foobar", version_extract_base("2.4+foobar"))
+
+    def test_with_bzr(self):
+        self.assertEquals("2.4+", version_extract_base("2.4+bzr32"))
+        self.assertEquals("2.4~", version_extract_base("2.4~bzr32"))
+
+    def test_with_git(self):
+        self.assertEquals("2.4+", version_extract_base("2.4+git20101010"))
+        self.assertEquals("2.4~", version_extract_base("2.4~gitaabbccdd"))
+
+    def test_with_svn(self):
+        self.assertEquals("2.4+", version_extract_base("2.4+svn45"))
+        self.assertEquals("2.4~", version_extract_base("2.4~svn45"))
+
+    def test_with_dfsg(self):
+        self.assertEquals("2.4+", version_extract_base("2.4+bzr32+dfsg1"))
+        self.assertEquals("2.4~", version_extract_base("2.4~bzr32+dfsg.1"))
+        self.assertEquals("2.4~", version_extract_base("2.4~bzr32.dfsg.1"))
+        self.assertEquals("2.4~", version_extract_base("2.4~bzr32dfsg.1"))
+
+
 class DebVersionVariableTests(TestCase):
 
     def write_changelog(self, version):