From 41dddc995500baf887826209945915dbfe3dfa77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20De=C3=A1k?= Date: Wed, 6 Jan 2021 13:31:33 +1100 Subject: [PATCH] Fixes issue version info extraction. --- Scripts/Detail/Config.py | 8 ++++---- Synergy-Core | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Scripts/Detail/Config.py b/Scripts/Detail/Config.py index 40cf292..52fc977 100644 --- a/Scripts/Detail/Config.py +++ b/Scripts/Detail/Config.py @@ -147,12 +147,12 @@ class Configuration(): versionParts = re.findall( r'set \(SYNERGY_VERSION_\w+ "?(\w+)"?\)', versionData ) - if len( versionParts ) != 4: - printError( "Failed to extract version information." ) + if len( versionParts ) == 0: + utility.printError( "Failed to extract version information." ) raise SystemExit( 1 ) - self.productVersion = ".".join( versionParts[ 0:3 ] ) - self.productStage = versionParts[ 3 ] + self.productVersion = ".".join( versionParts[ 0:-1 ] ) + self.productStage = versionParts[ -1 ] self.productRevision = utility.captureCommandOutput( "git rev-parse --short=8 HEAD" ) self.productPackageName = "-".join( [ self.productName, self.productVersion, self.productStage, self.platformVersion ] ).lower() diff --git a/Synergy-Core b/Synergy-Core index 9b29327..ede2721 160000 --- a/Synergy-Core +++ b/Synergy-Core @@ -1 +1 @@ -Subproject commit 9b29327b40ab007dbbeb751ccd62bb1c3b917a08 +Subproject commit ede272185d5acae6466bfd19edeb8efed95ac429