[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=a7d45af

The following commit has been merged in the master branch:
commit a7d45af556f887f1c74aa5fb1baf157daf117ade
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Dec 8 20:26:16 2014 +0000

    test/functions.source: fixed Darwin (macosx) bug in real_path()
---
 test/functions.source | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/test/functions.source b/test/functions.source
index 5e6a05f..cf6e104 100644
--- a/test/functions.source
+++ b/test/functions.source
@@ -347,11 +347,21 @@ extendedTest()
 # real_path - report the absolute path to a file
 real_path ()
 {
-	which realpath 2>/dev/null >/dev/null
-	if [ $? == 0 ]; then
-		realpath "$1"
+	if [ "$PLATFORM" == "Darwin" ]; then
+		if [ -d "$1" ]; then	
+			cd "$1"
+			echo $PWD
+		else
+			cd $(dirname $1)
+			echo "$PWD"/$(basename "$1")
+		fi
 	else
-		readlink -f "$1"
+		which realpath 2>/dev/null >/dev/null
+		if [ $? == 0 ]; then
+			realpath "$1"
+		else
+			readlink -f "$1"
+		fi
     fi
 }
 

-- 
exiv2 packaging