From 60f21c96d97f498d7711fbf12366dedcd4f7e01cf3fc0fc904f451a0da51b067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 18 Nov 2016 13:14:56 +0000 Subject: [PATCH] Accepting request 440807 from home:alarrosa:branches:devel:tools:building - Do not mix tabs and spaces in cmake.prov OBS-URL: https://build.opensuse.org/request/show/440807 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=277 --- cmake.changes | 5 +++++ cmake.prov | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/cmake.changes b/cmake.changes index f86138a..0fcb8eb 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 18 09:30:47 UTC 2016 - alarrosa@suse.com + +- Do not mix tabs and spaces in cmake.prov + ------------------------------------------------------------------- Wed Nov 16 14:30:02 UTC 2016 - foss@grueninger.de diff --git a/cmake.prov b/cmake.prov index eb7850c..1156923 100644 --- a/cmake.prov +++ b/cmake.prov @@ -32,8 +32,8 @@ class CMakeParser: paths = map(lambda x: x.rstrip(), filelist.readlines()) for path in paths: for (modulePath, cmakeModule, lowercase) in self.parseCmakeModuleConfig(path): - version = self.resolveCMakeModuleVersion(modulePath, cmakeModule, lowercase) - + version = self.resolveCMakeModuleVersion(modulePath, cmakeModule, lowercase) + if version: print("cmake(%s) = %s" % (cmakeModule, version)) else: @@ -46,15 +46,15 @@ class CMakeParser: result = [] for configFile in glob.glob("%s/*Config.cmake" % modulePath): - moduleName = configFile[len(modulePath) + 1:-len("Config.cmake")] - result.append( (modulePath, moduleName, False) ) + moduleName = configFile[len(modulePath) + 1:-len("Config.cmake")] + result.append( (modulePath, moduleName, False) ) for configFile in glob.glob("%s/*-config.cmake" % modulePath): - moduleName = configFile[len(modulePath) + 1:-len("-config.cmake")] + moduleName = configFile[len(modulePath) + 1:-len("-config.cmake")] if (modulePath, moduleName, False) not in result: - result.append( (modulePath, moduleName, True) ) + result.append( (modulePath, moduleName, True) ) - return result + return result def resolveCMakeModuleVersion(self, modulePath, cmakeModule, lowercase): versionFile = ("%s/%s-config-version.cmake" if lowercase else "%s/%sConfigVersion.cmake") % (modulePath, cmakeModule)