[Pkg-bazaar-commits] ./bzr-builddeb/trunk r216: * Remove the .bzr-builddeb from merge builds not in "larstiq" mode.

[James Westby]

------------------------------------------------------------
revno: 216
committer: James Westby <jw+debian at jameswestby.net>
branch nick: trunk
timestamp: Thu 2008-03-06 16:47:37 +0000
message:
  * Remove the .bzr-builddeb from merge builds not in "larstiq" mode.
    (Closes: #464033)
modified:
  builder.py
  debian/changelog
  tests/__init__.py
  tests/test_builder.py
    ------------------------------------------------------------
    revno: 214.1.1
    committer: James Westby <jw+debian at jameswestby.net>
    branch nick: remove_builddeb_dir
    timestamp: Thu 2008-03-06 15:46:17 +0000
    message:
      * Remove the .bzr-builddeb from merge builds not in "larstiq" mode.
        (Closes: #464033)
    modified:
      builder.py
      debian/changelog
      tests/__init__.py
      tests/test_builder.py
-------------- next part --------------
=== modified file 'builder.py'
--- a/builder.py	2008-03-05 17:00:51 +0000
+++ b/builder.py	2008-03-06 15:46:17 +0000
@@ -424,7 +424,10 @@
       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"))
+    if self._properties.larstiq():
+        remove_bzrbuilddeb_dir(os.path.join(source_dir, "debian"))
+    else:
+        remove_bzrbuilddeb_dir(source_dir)
 
 class DebNativeBuild(DebBuild):
   """A subclass of DebBuild that builds native packages."""

=== modified file 'debian/changelog'
--- a/debian/changelog	2008-03-06 14:44:17 +0000
+++ b/debian/changelog	2008-03-06 16:47:37 +0000
@@ -22,8 +22,10 @@
   * Don't silently skip unkown types when extracting a tarball, error
     instead.
   * Don't use relative imports. Thanks Robert Collins. (LP: #189429)
+  * Remove the .bzr-builddeb from merge builds not in "larstiq" mode.
+    (Closes: #464033)
 
- -- James Westby <jw+debian at jameswestby.net>  Wed, 05 Mar 2008 16:58:12 +0000
+ -- James Westby <jw+debian at jameswestby.net>  Thu, 06 Mar 2008 15:45:21 +0000
 
 bzr-builddeb (0.92) unstable; urgency=low
 

=== modified file 'tests/__init__.py'
--- a/tests/__init__.py	2008-03-05 17:00:51 +0000
+++ b/tests/__init__.py	2008-03-06 15:46:17 +0000
@@ -185,7 +185,7 @@
     c.distributions = 'unstable'
     c.urgency = 'low'
     c.author = 'James Westby <jw+debian at jameswestby.net>'
-    c.date = 'The,  3 Aug 2006 19:16:22 +0100'
+    c.date = 'Thu,  3 Aug 2006 19:16:22 +0100'
     c.add_change('')
     c.add_change('  *  test build')
     c.add_change('')

=== modified file 'tests/test_builder.py'
--- a/tests/test_builder.py	2008-03-05 17:00:51 +0000
+++ b/tests/test_builder.py	2008-03-06 15:46:17 +0000
@@ -656,8 +656,7 @@
     wt = self.make_branch_and_tree('.')
     basedir = 'debian/'
     files = [basedir]
-    files = files + [join(basedir, f) for f in ['.bzr-builddeb/',
-                             '.bzr-builddeb/default.conf']]
+    files = files + ['.bzr-builddeb/', '.bzr-builddeb/default.conf']
     files = files + [join(basedir, f) for f in self.debian_files]
     self.build_tree(files)
     wt.add(files)
@@ -675,6 +674,9 @@
     wt = self.make_branch_and_tree('.')
     self.build_tree(self.debian_files)
     wt.add(self.debian_files)
+    builddeb_dir = ['.bzr-builddeb/', '.bzr-builddeb/default.conf']
+    self.build_tree(builddeb_dir)
+    wt.add(builddeb_dir)
     wt.commit('commit one')
     self.build_tree(['rules', 'unknown'])
     wt.add('rules')
@@ -691,6 +693,8 @@
       self.failUnlessExists(join(self.source_dir, f))
     for f in ['control', 'unknown']:
       self.failIfExists(join(self.source_dir, f))
+    self.failIfExists(join(self.source_dir, basedir, '.bzr-builddeb'))
+    self.failIfExists(join(self.source_dir, '.bzr-builddeb'))
 
   def test_export_handles_debian_in_upstream(self):
     """Make sure export can handle upstream shipping debian/ as well."""