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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit c9fbb829dda55f848ab59420bcd0058ce02ee3e0
Author: Rohan Garg <rohan at garg.io>
Date:   Thu Dec 10 16:42:38 2015 +0100

    Add support for format 1.0
---
 lib/ci/build_source.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/ci/build_source.rb b/lib/ci/build_source.rb
index bf36894..a24f0e4 100644
--- a/lib/ci/build_source.rb
+++ b/lib/ci/build_source.rb
@@ -29,7 +29,7 @@ module CI
 
       @source.name = changelog.name
       @source.build_version = CI::BuildVersion.new(changelog)
-      if @source.type == :quilt
+      if @source.type == :quilt || @source.type.nil?
         @source.version = @source.build_version.full
       else
         @source.version = @source.build_version.base
@@ -43,7 +43,8 @@ module CI
       FileUtils.rm_rf(BUILD_DIR, verbose: true)
       FileUtils.mkpath("#{BUILD_DIR}/source")
 
-      if @source.type == :quilt
+      # Allow support for format 1.0 and quilt
+      if @source.type == :quilt || @source.type.nil?
         source_dir = 'source'
       else
         source_dir = 'packaging'

-- 
ci-tooling packaging