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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit ab4f2bd76042337f4d402db5fff2a17602099898
Author: Rohan Garg <rohan at garg.io>
Date:   Thu Oct 8 18:02:39 2015 +0200

    Skip if package is native
---
 dci/source.rb          | 2 +-
 lib/ci/build_source.rb | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dci/source.rb b/dci/source.rb
index e5fdd67..db33f8e 100644
--- a/dci/source.rb
+++ b/dci/source.rb
@@ -92,7 +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'))
+    FileUtils.rm_rf(Dir.glob('**/debian')) unless s.format.type == :native
   end
 
   # create orig tar
diff --git a/lib/ci/build_source.rb b/lib/ci/build_source.rb
index 47fd4fe..bebc8bd 100644
--- a/lib/ci/build_source.rb
+++ b/lib/ci/build_source.rb
@@ -43,6 +43,9 @@ class VcsSourceBuilder
     end
 
     %w(.bzr .git .hg .svn debian).each do |vcsdir|
+      # Skip debian dir if native package
+      next if vcsdir == 'debian' && @source.type == :native
+
       FileUtils.rm_rf(Dir.glob("build/source/**/#{vcsdir}"))
     end
   end

-- 
ci-tooling packaging