[SCM] ci-tooling packaging branch, master, updated. 2416ea11066cb3635d16387d661a31a67e5a0c8f

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 2416ea11066cb3635d16387d661a31a67e5a0c8f
Author: Rohan Garg <rohan at garg.io>
Date:   Thu Oct 8 17:43:19 2015 +0200

    Sometimes people are evil and introduce debian dirs in their sources
---
 dci/source.rb          | 1 +
 lib/ci/build_source.rb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dci/source.rb b/dci/source.rb
index 26f0e4d..e5fdd67 100644
--- a/dci/source.rb
+++ b/dci/source.rb
@@ -92,6 +92,7 @@ Dir.chdir(ARGV[1]) do
     FileUtils.rm_rf(Dir.glob('**/.bzr'))
     FileUtils.rm_rf(Dir.glob('**/.git'))
     FileUtils.rm_rf(Dir.glob('**/.svn'))
+    FileUtils.rm_rf(Dir.glob('**/debian'))
   end
 
   # create orig tar
diff --git a/lib/ci/build_source.rb b/lib/ci/build_source.rb
index 71546f8..47fd4fe 100644
--- a/lib/ci/build_source.rb
+++ b/lib/ci/build_source.rb
@@ -42,7 +42,7 @@ class VcsSourceBuilder
       FileUtils.cp_r(Dir.glob('source/*'), 'build/source/', verbose: true)
     end
 
-    %w(.bzr .git .hg .svn).each do |vcsdir|
+    %w(.bzr .git .hg .svn debian).each do |vcsdir|
       FileUtils.rm_rf(Dir.glob("build/source/**/#{vcsdir}"))
     end
   end

-- 
ci-tooling packaging