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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit d0cb9d2b997f75feedcb05cfbdbd3d1b15e81099
Author: Harald Sitter <sitter at kde.org>
Date:   Wed May 6 06:45:43 2015 +0200

    make code slightly more readable by reducing chainging and branching
---
 lib/ci/build_version.rb | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/ci/build_version.rb b/lib/ci/build_version.rb
index 4d570b6..46dc34f 100644
--- a/lib/ci/build_version.rb
+++ b/lib/ci/build_version.rb
@@ -48,15 +48,13 @@ module CI
     end
 
     def version_id
-      return OS::VERSION_ID if OS.to_h.key?(:VERSION_ID) &&
-                               !OS::VERSION_ID.nil? &&
-                               !OS::VERSION_ID.empty?
-
-      if OS::ID == 'debian'
-        '9'
-      else
-        fail 'VERSION_ID not defined!'
+      if OS.to_h.key?(:VERSION_ID)
+        id = OS::VERSION_ID
+        return OS::VERSION_ID unless id.nil? || id.empty?
       end
+
+      return '9' if OS::ID == 'debian'
+      fail 'VERSION_ID not defined!'
     end
   end
 end

-- 
ci-tooling packaging