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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 304bef711d9840a43d01ce9557b6b47601848279
Author: Rohan Garg <rohan at garg.io>
Date:   Thu Dec 10 17:12:27 2015 +0100

    Selectively filter out native packages
---
 lib/ci/build_source.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/ci/build_source.rb b/lib/ci/build_source.rb
index a24f0e4..7b24070 100644
--- a/lib/ci/build_source.rb
+++ b/lib/ci/build_source.rb
@@ -29,10 +29,10 @@ module CI
 
       @source.name = changelog.name
       @source.build_version = CI::BuildVersion.new(changelog)
-      if @source.type == :quilt || @source.type.nil?
-        @source.version = @source.build_version.full
-      else
+      if @source.type == :native
         @source.version = @source.build_version.base
+      else
+        @source.version = @source.build_version.full
       end
 
       @tar_version = @source.build_version.tar
@@ -44,10 +44,10 @@ module CI
       FileUtils.mkpath("#{BUILD_DIR}/source")
 
       # Allow support for format 1.0 and quilt
-      if @source.type == :quilt || @source.type.nil?
-        source_dir = 'source'
-      else
+      if @source.type == :native
         source_dir = 'packaging'
+      else
+        source_dir = 'source'
       end
 
       FileUtils.cp_r(Dir.glob("#{source_dir}/*"), 'build/source/', verbose: true)

-- 
ci-tooling packaging