[zypp-devel] [PATCH for libzypp-bindings] Fix readlink error
From 244df83a7c0b95c27e5d8cfe931ae4afed93d31e Mon Sep 17 00:00:00 2001 From: Yi Yang
Date: Tue, 21 Dec 2010 10:27:16 +0800 Subject: [PATCH] Fix readlink error
Note: readlink path may be /bin/readlink or /usr/bin/readlink, this depends on Linux distros, so using FIND_PROGRAM is better. --- CMakeLists.txt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c24a4a8..e823062 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,7 +47,8 @@ FIND_PACKAGE(SWIG REQUIRED) FIND_PACKAGE(Zypp REQUIRED) # determine zypp version -EXECUTE_PROCESS(COMMAND "/usr/bin/readlink" ${ZYPP_LIBRARY} OUTPUT_VARIABLE ZYPP_SOFILE) +FIND_PROGRAM(READ_LINK readlink) +EXECUTE_PROCESS(COMMAND "${READ_LINK}" ${ZYPP_LIBRARY} OUTPUT_VARIABLE ZYPP_SOFILE) # match number at end, strip trailing \n by using a sub-match STRING(REGEX MATCH "([0-9]+)\n$" ZYPP_VERSION "${ZYPP_SOFILE}") -- 1.6.0.6 -- To unsubscribe, e-mail: zypp-devel+unsubscribe@opensuse.org For additional commands, e-mail: zypp-devel+help@opensuse.org
On Tuesday 21 December 2010 03:42:27 Yi Yang wrote:
Note: readlink path may be /bin/readlink or /usr/bin/readlink, this depends on Linux distros, so using FIND_PROGRAM is better.
Thank for the patch. It's in git master branch for v. 0.5.9. -- cu, Michael Andres +------------------------------------------------------------------+ Key fingerprint = 2DFA 5D73 18B1 E7EF A862 27AC 3FB8 9E3A 27C6 B0E4 +------------------------------------------------------------------+ Michael Andres ZYPP Development ma@suse.de SUSE LINUX Products GmbH, GF: Markus Rex, HRB 16746 (AG Nuernberg) Maxfeldstrasse 5, D-90409 Nuernberg, Germany, ++49 (0)911 - 740 53-0 +------------------------------------------------------------------+ -- To unsubscribe, e-mail: zypp-devel+unsubscribe@opensuse.org For additional commands, e-mail: zypp-devel+help@opensuse.org
participants (2)
-
Michael Andres
-
Yi Yang