Merge lp:~james-w/bzr-builder/fix-nest-part-manifest into lp:bzr-builder

[James Westby]

Hi,

This fixes the bug that you just found.

Thanks,

James

[lp:~james-w/bzr-builder/fix-nest-part-manifest]

110. By James Westby on 2010-10-27

Also fix the case where there is no revspec and no target path. Thanks Aaron.

[Aaron Bentley (abentley)]

review: Approve

=== modified file 'recipe.py'
--- recipe.py	2010-09-29 22:35:56 +0000
+++ recipe.py	2010-10-27 18:24:47 +0000
@@ -520,11 +520,16 @@
 
     def as_text(self):
         revid_part = self._get_revid_part()
-        if self.target_subdir is not None:
+        if revid_part:
+            target_subdir = self.target_subdir
+            if target_subdir is None:
+                target_subdir = self.subpath
             target_revid_part = " %s%s" % (
-                self.target_subdir, revid_part)
+                target_subdir, revid_part)
+        elif self.target_subdir is not None:
+            target_revid_part = " %s" % self.target_subdir
         else:
-            target_revid_part = revid_part
+            target_revid_part = ""
         return "%s %s %s %s%s" % (
             NEST_PART_INSTRUCTION, self.recipe_branch.name,
             self.recipe_branch.url, self.subpath, target_revid_part)

=== modified file 'tests/test_recipe.py'
--- tests/test_recipe.py	2010-09-29 22:35:56 +0000
+++ tests/test_recipe.py	2010-10-27 18:24:47 +0000
@@ -1087,6 +1087,29 @@
                 "nest-part nested1 nested1_url foo bar tag:foo\n",
                 manifest)
 
+    def test_with_nest_part_with_no_target_dir(self):
+        base_branch = BaseRecipeBranch("base_url", "1", 0.1)
+        base_branch.revid = "base_revid"
+        nested_branch1 = RecipeBranch("nested1", "nested1_url",
+                revspec="tag:foo")
+        base_branch.nest_part_branch(nested_branch1, "foo", None)
+        manifest = base_branch.get_recipe_text()
+        self.assertEqual("# bzr-builder format 0.1 deb-version 1\n"
+                "base_url revid:base_revid\n"
+                "nest-part nested1 nested1_url foo foo tag:foo\n",
+                manifest)
+
+    def test_with_nest_part_with_no_target_dir_no_revspec(self):
+        base_branch = BaseRecipeBranch("base_url", "1", 0.1)
+        base_branch.revid = "base_revid"
+        nested_branch1 = RecipeBranch("nested1", "nested1_url")
+        base_branch.nest_part_branch(nested_branch1, "foo", None)
+        manifest = base_branch.get_recipe_text()
+        self.assertEqual("# bzr-builder format 0.1 deb-version 1\n"
+                "base_url revid:base_revid\n"
+                "nest-part nested1 nested1_url foo\n",
+                manifest)
+
 
 class RecipeBranchTests(TestCaseInTempDir):