From 74cc775490d569325ef8fadcc924b94657bab8ae Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 26 Mar 2019 17:57:08 +0800 Subject: [PATCH] ceph.in: use get_cmake_variables(*args) and return values in a list for better readability and less repeating Signed-off-by: Kefu Chai (cherry picked from commit 7d633bae7da0e49e808effb6786c91377826b640) --- src/ceph.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/ceph.in b/src/ceph.in index f060023f57c6b..51f844485c0a8 100755 --- a/src/ceph.in +++ b/src/ceph.in @@ -96,7 +96,7 @@ def get_pythonlib_dir(): return "lib.{version[0]}".format(version=sys.version_info) -def get_cmake_variables(names): +def get_cmake_variables(*names): vars = dict((name, None) for name in names) for line in open(os.path.join(MYPDIR, "CMakeCache.txt")): # parse lines like "WITH_ASAN:BOOL=ON" @@ -106,14 +106,13 @@ def get_cmake_variables(names): break if all(vars.values()): break - return vars + return [vars[name] for name in names] if os.path.exists(os.path.join(MYPDIR, "CMakeCache.txt")) \ and os.path.exists(os.path.join(MYPDIR, "bin/init-ceph")): - vars = get_cmake_variables(["ceph_SOURCE_DIR", "ASAN_LIBRARY"]) - src_path = vars["ceph_SOURCE_DIR"] - asan_lib_path = vars["ASAN_LIBRARY"] + src_path, asan_lib_path = \ + get_cmake_variables("ceph_SOURCE_DIR", "ASAN_LIBRARY") if src_path is None: # Huh, maybe we're not really in a cmake environment? pass -- 2.39.5