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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 7b2bfcf244425e6ec453bbf0e500582f23414b6f
Author: Rohan Garg <rohan at garg.io>
Date:   Fri Mar 13 17:20:32 2015 +0100

    Make sure we use the new Source parser
---
 dci/source.rb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/dci/source.rb b/dci/source.rb
index 605aeb4..bc878ef 100644
--- a/dci/source.rb
+++ b/dci/source.rb
@@ -63,15 +63,17 @@ dci_run_cmd('apt-get -y install devscripts lsb-release locales libdistro-info-pe
 
 Dir.chdir(ARGV[1]) do
   # Get source name and what not
-  if File.exist?('source/debian/source/format')
-    if File.readlines('source/debian/source/format').contains? 'native'
-      $logger.info 'Building native package'
+
+  Dir.chdir('source') do
+    s = Source.new(Dir.pwd)
+    $logger.info "Building package of #{s.format.type} type"
+    if s.format.type == 'native'
       PACKAGING_DIR = 'source/'
       FORMAT = :native
+    else
+      PACKAGING_DIR = 'packaging/'
+      FORMAT = :quilt
     end
-  else
-    PACKAGING_DIR = 'packaging/'
-    FORMAT = :quilt
   end
 
   fail 'Source contains packaging but is not a native package' unless defined? PACKAGING_DIR

-- 
ci-tooling packaging