Merge lp:~jelmer/bzr-builddeb/get-source-format into lp:bzr-builddeb

[Jelmer Vernooij]

Fix the use of get_source_format when debian/source/format is unversioned.

[James Westby (james-w)]

On Fri, 15 Jul 2011 14:20:03 -0000, Jelmer Vernooij <email address hidden> wrote:
> if not tree.has_filename("debian/source/format"):
> return FORMAT_1_0
> - return tree.get_file_text(tree.path2id("debian/source/format")).strip()
> + text = tree.get_file_text(tree.path2id("debian/source/format"),
> + "debian/source/format")
> + return text.strip()

Looks good, but perhaps we could make all those magic strings one
variable?

Thanks,

James

[Jelmer Vernooij (jelmer)]

On Fri, 2011-07-15 at 14:46 +0000, James Westby wrote:
> On Fri, 15 Jul 2011 14:20:03 -0000, Jelmer Vernooij <email address hidden> wrote:
> > if not tree.has_filename("debian/source/format"):
> > return FORMAT_1_0
> > - return tree.get_file_text(tree.path2id("debian/source/format")).strip()
> > + text = tree.get_file_text(tree.path2id("debian/source/format"),
> > + "debian/source/format")
> > + return text.strip()
>
> Looks good, but perhaps we could make all those magic strings one
> variable?
That seems reasonable - updated in the current branch.

Cheers,

Jelmer

[lp:~jelmer/bzr-builddeb/get-source-format]

583. By Jelmer Vernooij on 2011-07-15

factor out variable.

=== modified file 'tests/test_util.py'
--- tests/test_util.py	2011-06-28 08:41:44 +0000
+++ tests/test_util.py	2011-07-15 15:07:18 +0000
@@ -785,6 +785,12 @@
         tree.add(["debian", "debian/source", "debian/source/format"])
         self.assertEquals("3.0 (quilt)", get_source_format(tree))
 
+    def test_source_format_file_unversioned(self):
+        tree = self.make_branch_and_tree('.')
+        self.build_tree_contents([("debian/",), ("debian/source/",),
+            ("debian/source/format", "3.0 (quilt)")])
+        self.assertEquals("3.0 (quilt)", get_source_format(tree))
+
 
 class GuessBuildTypeTests(TestCaseWithTransport):
     """Tests for guess_build_type."""

=== modified file 'util.py'
--- util.py	2011-06-28 08:41:44 +0000
+++ util.py	2011-07-15 15:07:18 +0000
@@ -639,9 +639,11 @@
     :param path: Path to the package
     :return: String with package format
     """
-    if not tree.has_filename("debian/source/format"):
+    filename = "debian/source/format"
+    if not tree.has_filename(filename):
         return FORMAT_1_0
-    return tree.get_file_text(tree.path2id("debian/source/format")).strip()
+    text = tree.get_file_text(tree.path2id(filename), filename)
+    return text.strip()
 
 
 FORMAT_1_0 = "1.0"