From 7bf1110560f6cb6708e5948aae150b68cef2a5b0 Mon Sep 17 00:00:00 2001 From: Stefan Hundhammer Date: Mon, 5 Feb 2018 14:29:20 +0100 Subject: [PATCH] Allow 4 digit version numbers --- lib/libyui/tasks.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/libyui/tasks.rb b/lib/libyui/tasks.rb index 5257f8c..989f1bb 100644 --- a/lib/libyui/tasks.rb +++ b/lib/libyui/tasks.rb @@ -55,19 +55,21 @@ def spec_version(spec_filename) def cmake_value(s, key) e_key = Regexp.escape(key) m = /SET\s*\(\s*#{e_key}\s+"([^"]*)"\s*\)/.match(s) - m[1] + m ? m[1] : nil end - # Returns the CMake version from version file + # Returns the CMake version from the version file. + # VERSION_TWEAK is optional. # # @param [String] Version file (VERSION_CMAKE by default) - # @return [String] like "1.2.3" + # @return [String] like "1.2.3" or "1.2.3.4" # @see VERSION_CMAKE def cmake_version(file = nil) f = File.read(file || VERSION_CMAKE) [cmake_value(f, "VERSION_MAJOR"), cmake_value(f, "VERSION_MINOR"), - cmake_value(f, "VERSION_PATCH")].join(".") + cmake_value(f, "VERSION_PATCH"), + cmake_value(f, "VERSION_TWEAK")].compact.join(".") end end end