[SCM] pkg-kde-jenkins packaging branch, master, updated. 51996e8744d33ec5c16fcae3843fca711c4aa7b3

Maximiliano Curia maxy at moszumanska.debian.org
Thu Feb 22 07:47:50 UTC 2018


Gitweb-URL: http://git.debian.org/?p=pkg-kde/pkg-kde-jenkins.git;a=commitdiff;h=135edb3

The following commit has been merged in the master branch:
commit 135edb38de6de1fb0656719daa20425cb32a56ee
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Feb 7 13:07:32 2018 +0100

    cmake_update_deps, find_package, Check the version as long as we are in state 0
---
 hooks/prepare/cmake_update_deps | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/hooks/prepare/cmake_update_deps b/hooks/prepare/cmake_update_deps
index d6a0437..200c64f 100755
--- a/hooks/prepare/cmake_update_deps
+++ b/hooks/prepare/cmake_update_deps
@@ -646,19 +646,16 @@ class CMakeParser(Parser):
             'NAMES': 4, 'CONFIGS': 4, 'HINTS': 4, 'PATHS': 4,
             'PATH_SUFFIXES': 4,
         }
-        if i < len(invocation):
-            arg = self.expand(invocation[i])
-            logging.debug("Is a version: {} ?".format(arg))
-            if re_version.match(arg):
-                version = Version(arg)
-                i += 1
         state = 0
         while i < len(invocation):
             arg = self.expand(invocation[i])
             # logging.debug(arg)
             i += 1
             if arg not in keywords:
-                if state == 0 or state & 1:
+                if state == 0 and re_version.match(arg):
+                    logging.debug("Is a version: {} ?".format(arg))
+                    version = Version(arg)
+                elif state == 0 or state & 1:
                     components.append(arg)
                 elif state & 2:
                     optional_components.append(arg)

-- 
pkg-kde-jenkins packaging



More information about the pkg-kde-commits mailing list