Merge lp:~jelmer/bzr-builddeb/mu-unicode-tarfile-version into lp:bzr-builddeb

[Jelmer Vernooij]

Make sure to only return bytestrings for upstream versions in TarfileSource, rather than unicode strings.

[James Westby (james-w)]

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2012-01-02 18:01:36 +0000
+++ cmds.py	2012-01-04 21:22:35 +0000
@@ -82,6 +82,48 @@
     type=str)
 
 
+def _get_changelog_info(tree, last_version=None, package=None, distribution=None):
+    from bzrlib.plugins.builddeb.util import (
+        find_changelog,
+        find_last_distribution,
+        lookup_distribution,
+        )
+    from bzrlib.plugins.builddeb.errors import (
+        MissingChangelogError,
+        )
+    current_version = last_version
+    try:
+        (changelog, top_level) = find_changelog(tree, False, max_blocks=2)
+        if last_version is None:
+            current_version = changelog.version.upstream_version
+        if package is None:
+            package = changelog.package
+        if distribution is None:
+            distribution = find_last_distribution(changelog)
+            if distribution is not None:
+                note(gettext("Using distribution %s") % distribution)
+    except MissingChangelogError:
+        top_level = False
+        changelog = None
+    if distribution is None:
+        note("No distribution specified, and no changelog, "
+                "assuming 'debian'")
+        distribution = "debian"
+    if package is None:
+        raise BzrCommandError("You did not specify --package, and "
+                "there is no changelog from which to determine the "
+                "package name, which is needed to know the name to "
+                "give the .orig.tar.gz. Please specify --package.")
+    distribution = distribution.lower()
+    distribution_name = lookup_distribution(distribution)
+    if distribution_name is None:
+        raise BzrCommandError(gettext("Unknown target distribution: %s") \
+                    % distribution)
+    return (current_version, package, distribution, distribution_name,
+            changelog, top_level)
+
+
+
 class cmd_builddeb(Command):
     """Builds a Debian package from a branch.
 
@@ -633,46 +675,6 @@
         return self._fetch_tarball(package, version, orig_dir,
             locations, v3)
 
-    def _get_changelog_info(self, tree, last_version, package, distribution):
-        from bzrlib.plugins.builddeb.util import (
-            find_changelog,
-            find_last_distribution,
-            lookup_distribution,
-            )
-        from bzrlib.plugins.builddeb.errors import (
-            MissingChangelogError,
-            )
-        current_version = last_version
-        try:
-            (changelog, top_level) = find_changelog(tree, False, max_blocks=2)
-            if last_version is None:
-                current_version = changelog.version.upstream_version
-            if package is None:
-                package = changelog.package
-            if distribution is None:
-                distribution = find_last_distribution(changelog)
-                if distribution is not None:
-                    note(gettext("Using distribution %s") % distribution)
-        except MissingChangelogError:
-            top_level = False
-            changelog = None
-        if distribution is None:
-            note("No distribution specified, and no changelog, "
-                    "assuming 'debian'")
-            distribution = "debian"
-        if package is None:
-            raise BzrCommandError("You did not specify --package, and "
-                    "there is no changelog from which to determine the "
-                    "package name, which is needed to know the name to "
-                    "give the .orig.tar.gz. Please specify --package.")
-        distribution = distribution.lower()
-        distribution_name = lookup_distribution(distribution)
-        if distribution_name is None:
-            raise BzrCommandError(gettext("Unknown target distribution: %s") \
-                        % distribution)
-        return (current_version, package, distribution, distribution_name,
-                changelog, top_level)
-
     def run(self, location=None, upstream_branch=None, version=None,
             distribution=None, package=None,
             directory=".", revision=None, merge_type=None,
@@ -710,7 +712,7 @@
                         "command.")
             config = debuild_config(tree, tree)
             (current_version, package, distribution, distribution_name,
-             changelog, top_level) = self._get_changelog_info(tree, last_version,
+             changelog, top_level) = _get_changelog_info(tree, last_version,
                  package, distribution)
             contains_upstream_source = tree_contains_upstream_source(tree)
             if changelog is None:
@@ -1160,10 +1162,25 @@
         from bzrlib.plugins.builddeb.hooks import run_hook
         from bzrlib.plugins.builddeb.util import (
             find_changelog,
+            guess_build_type,
+            tree_contains_upstream_source,
             )
         t = WorkingTree.open_containing('.')[0]
+        self.add_cleanup(t.lock_read().unlock)
         config = debuild_config(t, t)
-        if config.build_type != BUILD_TYPE_MERGE:
+        (current_version, package, distribution, distribution_name,
+         changelog, top_level) = _get_changelog_info(t)
+        contains_upstream_source = tree_contains_upstream_source(t)
+        if changelog is None:
+            changelog_version = None
+        else:
+            changelog_version = changelog.version
+        build_type = config.build_type
+        if build_type is None:
+            build_type = guess_build_type(t, changelog_version,
+                contains_upstream_source)
+
+        if build_type != BUILD_TYPE_MERGE:
             raise BzrCommandError(gettext("This command only works for merge "
                 "mode packages. See /usr/share/doc/bzr-builddeb"
                 "/user_manual/merge.html for more information."))

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-02 18:01:36 +0000
+++ debian/changelog	2012-01-04 21:22:35 +0000
@@ -5,8 +5,10 @@
     commands like 'bzr bash-completion'. LP: #903650
   * Provide merge-package functionality as a hook for 'bzr merge'.
     LP: #486075, LP: #910900
+  * Cope with unicode strings being specified to TarfileSource. Based on
+    patch by Gediminas Paulauskas. LP: #911262
 
- -- Jelmer Vernooij <[e-mail]>  Mon, 02 Jan 2012 17:57:33 +0100
+ -- Jelmer Vernooij <[e-mail]>  Wed, 04 Jan 2012 22:14:07 +0100
 
 bzr-builddeb (2.8.0) unstable; urgency=low
 

=== modified file 'tests/test_upstream.py'
--- tests/test_upstream.py	2011-11-30 15:32:08 +0000
+++ tests/test_upstream.py	2012-01-04 21:22:35 +0000
@@ -858,7 +858,20 @@
 
     def test_version(self):
         source = TarfileSource("foo-1.0.tar.gz", "1.0")
-        self.assertEquals("1.0", source.get_latest_version("foo", "0.9"))
+        self.assertEquals(
+            "1.0", source.get_latest_version("foo", "0.9"))
+
+    def test_version_unicode(self):
+        source = TarfileSource(u"foo-1.0.tar.gz", u"1.0")
+        latest_version = source.get_latest_version("foo", "0.9")
+        self.assertEquals("1.0", latest_version)
+        self.assertIsInstance(latest_version, str)
+
+    def test_version_unicode_not_specified(self):
+        source = TarfileSource(u"foo-1.0.tar.gz")
+        latest_version = source.get_latest_version("foo", "0.9")
+        self.assertEquals("1.0", latest_version)
+        self.assertIsInstance(latest_version, str)
 
     def test_get_latest_version_parses(self):
         source = TarfileSource("foo-1.0.tar.gz")

=== modified file 'upstream/__init__.py'
--- upstream/__init__.py	2011-12-02 22:26:26 +0000
+++ upstream/__init__.py	2012-01-04 21:22:35 +0000
@@ -509,11 +509,11 @@
     # Debian style tarball
     m = re.match(packagename+"_(.*).orig", basename)
     if m:
-        return m.group(1)
+        return str(m.group(1))
     # Traditional, PACKAGE-VERSION.tar.gz
     m = re.match(packagename+"-(.*)", basename)
     if m:
-        return m.group(1)
+        return str(m.group(1))
     return None
 
 
@@ -522,7 +522,10 @@
 
     def __init__(self, path, version=None):
         self.path = path
-        self.version = version
+        if version is not None:
+            self.version = str(version)
+        else:
+            self.version = None
 
     def fetch_tarballs(self, package, version, target_dir, components=None):
         if version != self.version:
@@ -534,7 +537,8 @@
     def get_latest_version(self, package, version):
         if self.version is not None:
             return self.version
-        return extract_tarball_version(self.path, package)
+        self.version = extract_tarball_version(self.path, package)
+        return self.version
 
 
 class LaunchpadReleaseFileSource(UpstreamSource):