[SCM] ci-tooling packaging branch, master, updated. 2e377746f59167d08570690e3041d3109f7f1376

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=2e37774

The following commit has been merged in the master branch:
commit 2e377746f59167d08570690e3041d3109f7f1376
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Oct 21 08:34:20 2015 +0200

    make sure to wipe any existing build dir in orig sourcer
---
 lib/ci/orig_source_builder.rb       | 2 ++
 test/test_ci_orig_source_builder.rb | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/lib/ci/orig_source_builder.rb b/lib/ci/orig_source_builder.rb
index 2b2981f..4c126cb 100644
--- a/lib/ci/orig_source_builder.rb
+++ b/lib/ci/orig_source_builder.rb
@@ -19,6 +19,8 @@ module CI
 
       @packagingdir = File.absolute_path('packaging')
 
+      # This is probably behavior that should be in a base sourcer?
+      FileUtils.rm_r('build') if Dir.exist?('build')
       Dir.mkdir('build')
       @builddir = File.absolute_path('build')
 
diff --git a/test/test_ci_orig_source_builder.rb b/test/test_ci_orig_source_builder.rb
index a809b87..b4e76c3 100644
--- a/test/test_ci_orig_source_builder.rb
+++ b/test/test_ci_orig_source_builder.rb
@@ -23,5 +23,14 @@ module CI
       assert_path_exist('build/dragon_15.08.1-0kubuntu1.dsc')
       assert_path_exist('build/dragon_15.08.1.orig.tar.xz')
     end
+
+    def test_existing_builddir
+      # Now with build dir.
+      Dir.mkdir('build')
+      assert_nothing_raised do
+        OrigSourceBuilder.new
+      end
+      assert_path_exist('build')
+    end
   end
 end

-- 
ci-tooling packaging