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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit 3aa2a047782bc4e4c09cbc42f37f237f6ada15e2
Author: Rohan Garg <rohan at garg.io>
Date:   Mon Mar 16 15:58:21 2015 +0100

    Don't use the constant var
---
 dci/source.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dci/source.rb b/dci/source.rb
index 183e75b..f6c353f 100644
--- a/dci/source.rb
+++ b/dci/source.rb
@@ -99,7 +99,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 s.format.type == :native
 
   Dir.chdir(source_dir) do
     FileUtils.rm_rf(Dir.glob('**/.bzr'))

-- 
ci-tooling packaging