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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 5fb756ea14032860e137827830dbd7c9eb8b2595
Author: Harald Sitter <sitter at kde.org>
Date:   Tue May 5 09:36:12 2015 +0200

    extract time into its own method so we can easily alias it
---
 lib/ci/build_version.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/ci/build_version.rb b/lib/ci/build_version.rb
index 0d37111..fac4ae1 100644
--- a/lib/ci/build_version.rb
+++ b/lib/ci/build_version.rb
@@ -15,9 +15,7 @@ module CI
 
     def initialize(changelog)
       @changelog = changelog
-      @suffix = format('+git%s+%s',
-                       DateTime.now.strftime('%Y%m%d.%H%M'),
-                       OS::VERSION_ID)
+      @suffix = format('+git%s+%s', time, OS::VERSION_ID)
       @tar = "#{clean_base}#{@suffix}"
       @base = "#{changelog.version(Changelog::EPOCH)}#{clean_base}#{@suffix}"
       @full = "#{base}-0ubuntu0" if OS::ID == 'ubuntu'
@@ -31,6 +29,11 @@ module CI
 
     private
 
+    # Helper to get the time string for use in the version
+    def time
+      DateTime.now.strftime('%Y%m%d.%H%M')
+    end
+
     # Removes non digits from base version string.
     # This is to get rid of pesky alphabetic suffixes such as 5.2.2a which are
     # lower than 5.2.2+git (which we might have used previously), as + reigns

-- 
ci-tooling packaging