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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 9c4f9b255677bd512239cd149e0d38ea98485ee1
Author: Rohan Garg <rohan at garg.io>
Date:   Fri Mar 13 18:03:45 2015 +0100

    Fix parsing logic
---
 dci/source.rb | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/dci/source.rb b/dci/source.rb
index ac410b1..b335a02 100644
--- a/dci/source.rb
+++ b/dci/source.rb
@@ -64,17 +64,16 @@ 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
 
-  Dir.chdir('source') do
-    break unless File.exist? 'debian/source/format'
+  if File.exist? 'debian/source/format'
+    PACKAGING_DIR = 'source/'
+  else
+    PACKAGING_DIR = 'packaging/'
+  end
+
+  Dir.chdir(PACKAGING_DIR) do
     s = Debian::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
+    FORMAT = s.format.type
   end
 
   fail 'Source contains packaging but is not a native package' unless defined? PACKAGING_DIR
@@ -104,7 +103,7 @@ Dir.chdir(ARGV[1]) do
   version_suffix = "+git#{DateTime.now.strftime('%Y%m%d.%H%M')}"
   version = "#{cl.version(Changelog::EPOCH | Changelog::BASE)}#{version_suffix}" # <-- needs git version and bzr version possibly
   tar_version = "#{cl.version(Changelog::BASE)}#{version_suffix}"
-  version += '-1' unless FORMAT == :native
+  version += '-1' unless FORMAT == 'native'
 
   Dir.chdir('source/') do
     FileUtils.rm_rf(Dir.glob('**/.bzr'))
@@ -118,7 +117,7 @@ Dir.chdir(ARGV[1]) do
   fail 'Failed to create a tarball' unless system("tar -cf #{tar} source")
   fail 'Failed to compress the tarball' unless system("xz -6 #{tar}")
 
-  system('cp -aR packaging/debian source/') if FORMAT == :quilt
+  system('cp -aR packaging/debian source/') if FORMAT == 'quilt'
 
   Dir.chdir('source/') do
     fail 'Failed to create changelog entry' unless system({ 'DEBFULLNAME' => 'Debian CI',

-- 
ci-tooling packaging