[Pkg-bazaar-commits] r120 ./bzr-builddeb/trunk: * Remove any 'debian/' directory from the upstream tarball in merge mode,

[James Westby]

------------------------------------------------------------
revno: 120
committer: James Westby <jw+debian at jameswestby.net>
branch nick: trunk
timestamp: Mon 2007-06-25 08:24:31 +0100
message:
  * Remove any 'debian/' directory from the upstream tarball in merge mode,
    so that the branch contains all of the files that will appear there.
modified:
  builder.py
  debian/changelog
  tests/test_builder.py
-------------- next part --------------
=== modified file 'builder.py'
--- a/builder.py	2007-05-03 18:40:14 +0000
+++ b/builder.py	2007-06-25 07:24:31 +0000
@@ -246,6 +246,8 @@
       export(tree,export_dir,None,None)
     finally:
       tree.unlock()
+    if os.path.exists(os.path.join(source_dir, 'debian')):
+      shutil.rmtree(os.path.join(source_dir, 'debian'))
     recursive_copy(tempdir, source_dir)
     shutil.rmtree(basetempdir)
     remove_bzrbuilddeb_dir(os.path.join(source_dir, "debian"))

=== modified file 'debian/changelog'
--- a/debian/changelog	2007-06-18 21:57:14 +0000
+++ b/debian/changelog	2007-06-25 07:24:31 +0000
@@ -1,3 +1,10 @@
+bzr-builddeb (0.17.1) unstable; urgency=low
+
+  * Remove any 'debian/' directory from the upstream tarball in merge mode,
+    so that the branch contains all of the files that will appear there.
+
+ -- James Westby <jw+debian at jameswestby.net>  Mon, 25 Jun 2007 08:23:34 +0100
+
 bzr-builddeb (0.17) unstable; urgency=low
 
   [ James Westby ]

=== modified file 'tests/test_builder.py'
--- a/tests/test_builder.py	2007-06-17 19:26:50 +0000
+++ b/tests/test_builder.py	2007-06-25 07:24:31 +0000
@@ -767,6 +767,34 @@
     for f in ['control', 'unknown']:
       self.failIfExists(join(self.source_dir, f))
 
+  def test_export_handles_debian_in_upstream(self):
+    """Make sure export can handle upstream shipping debian/ as well."""
+    self.upstream_files = self.upstream_files + ['debian/', 'debian/changelog',
+                                                 'debian/install']
+    wt = self._make_branch()
+    basedir = 'debian/'
+    files = [basedir]
+    files = files + [join(basedir, f) for f in self.debian_files]
+    self.build_branch_tree(files)
+    f = open(join(self.branch_dir, basedir, 'changelog'), 'wb')
+    try:
+      f.write("branch")
+    finally:
+      f.close()
+    wt.add(files)
+    wt.commit('commit one')
+    builder = self.get_builder(wt=wt)
+    self.make_orig_tarball()
+    builder.prepare()
+    builder.export()
+    f = open(join(self.source_dir, basedir, 'changelog'))
+    try:
+      contents = f.read()
+    finally:
+      f.close()
+    self.assertEqual(contents, 'branch')
+    self.failIfExists(join(self.source_dir, basedir, 'install'))
+
 
 class TestMergeExportUpstreamBuilder(BuilderTestCase):