Merge lp:~jelmer/bzr-builddeb/gather-orig-files-non-utf8 into lp:bzr-builddeb

[Jelmer Vernooij]

In gather_orig_files() we scan a directory for relevant orig tarballs. Cope with filenames that are not valid in the current file system locale - we are only interested in files with a particular prefix anyway.

The test isn't protected by a Feature. I'm not aware of a relevant feature, and bzr-builddeb is only used on POSIX-based systems anyway, which allow arbitrary byte filenames.

[lp:~jelmer/bzr-builddeb/gather-orig-files-non-utf8]

652. By Jelmer Vernooij on 2011-11-30

Encode package/version as ascii rather than utf8.

Unmerged revisions

=== modified file '__init__.py'
--- __init__.py	2011-11-22 14:05:25 +0000
+++ __init__.py	2011-11-30 15:41:24 +0000
@@ -27,7 +27,10 @@
 
 import bzrlib
 from bzrlib.commands import plugin_cmds
-from bzrlib.directory_service import directories
+from bzrlib.directory_service import (
+    AliasDirectory,
+    directories,
+    )
 
 from info import (
     bzr_plugin_version as version_info,
@@ -69,6 +72,20 @@
         'VcsDirectory',
         "Directory that uses Debian Vcs-* control fields to look up branches")
 
+branch_aliases = getattr(AliasDirectory, "branch_aliases", None)
+if branch_aliases is not None:
+    def upstream_branch_alias(b):
+        from bzrlib.plugins.builddeb.util import debuild_config
+        b.lock_read()
+        try:
+            tree = b.basis_tree()
+            config = debuild_config(tree, False)
+            return directories.dereference(config.upstream_branch)
+        finally:
+            b.unlock()
+    branch_aliases.register("upstream", upstream_branch_alias,
+        help="upstream branch (for packaging branches)")
+
 
 def debian_changelog_commit_message(commit, start_message):
     if start_message is not None:
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-11-29 14:39:05 +0000
+++ debian/changelog	2011-11-30 15:41:24 +0000
@@ -25,8 +25,10 @@
     unless 'commit-message-from-changelog' is explicitly set to True. LP: #812749
   * Support running dep3-patch against remote repositories, and with
     open-ended revision ranges. LP: #893608
+  * Fix finding orig tarballs in directories also containing filenames
+    with non-utf8 characters. LP: #865753
 
- -- Jelmer Vernooij <[e-mail]>  Sat, 26 Nov 2011 16:01:16 +0100
+ -- Jelmer Vernooij <[e-mail]>  Wed, 30 Nov 2011 16:32:05 +0100
 
 bzr-builddeb (2.7.9) unstable; urgency=low
 
 
=== modified file 'tests/test_upstream.py'
--- tests/test_upstream.py	2011-11-08 10:10:05 +0000
+++ tests/test_upstream.py	2011-11-30 15:41:24 +0000
@@ -1010,3 +1010,21 @@
         self.assertEquals(
             [os.path.join(self.test_dir, "mypkg_1.0.orig.tar.gz")],
             gather_orig_files("mypkg", "1.0", "."))
+
+    def test_multiple(self):
+        self.build_tree(["mypkg_1.0.orig.tar.gz", "mypkg_1.0.orig-foo.tar.gz"])
+        self.assertEquals(
+            set([os.path.join(self.test_dir, "mypkg_1.0.orig.tar.gz"),
+             os.path.join(self.test_dir, "mypkg_1.0.orig-foo.tar.gz")]),
+            set(gather_orig_files("mypkg", "1.0", ".")))
+
+    def test_utf8_invalid_file(self):
+        f = open("\xf6o.tar.gz", "w")
+        try:
+            f.write("foo")
+        finally:
+            f.close()
+        self.build_tree(["mypkg_1.0.orig.tar.gz"])
+        self.assertEquals(
+            [os.path.join(self.test_dir, "mypkg_1.0.orig.tar.gz")],
+            gather_orig_files(u"mypkg", "1.0", "."))
 
=== modified file 'upstream/__init__.py'
--- upstream/__init__.py	2011-11-08 10:10:05 +0000
+++ upstream/__init__.py	2011-11-30 15:41:24 +0000
@@ -372,7 +372,14 @@
 
 
 def gather_orig_files(package, version, path):
-    prefix = "%s_%s.orig" % (package, version)
+    """Grab the orig files for a particular package.
+
+    :param package: package name
+    :param version: package upstream version string
+    :return: List of orig tarfile paths, or None if none were found
+    """
+    prefix = "%s_%s.orig" % (osutils.safe_utf8(package),
+            osutils.safe_utf8(version))
     ret = []
     path = os.path.abspath(path)
     if not os.path.isdir(path):