From: Marcin Juszkiewicz <marcin@buglabs.net>
Date: Thu, 5 Nov 2009 14:37:36 +0000 (+0100)
Subject: java.bbclass: fixed oe_jarinstall for broken symlinks
X-Git-Tag: Release-2010-05/1~1764
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4270cb2928afa95117bde026244fb877ee8e2a6e;p=openembedded.git

java.bbclass: fixed oe_jarinstall for broken symlinks

Code checked for existance of JAR file and if it was present then it had
to be removed before symlinking to it. But it was not working sometimes
so we forced symlinking.

Proper fix is to check "does file exists or is a symlink" which we do
now.

Signed-off-by: Marcin Juszkiewicz <marcin@buglabs.net>
---

diff --git a/classes/java.bbclass b/classes/java.bbclass
index cacd2ce525..b68035c13e 100644
--- a/classes/java.bbclass
+++ b/classes/java.bbclass
@@ -68,11 +68,11 @@ oe_jarinstall() {
 
   # Creates symlinks out of the remaining arguments.
   while [ "$#" -gt 0 ]; do
-    if [ -e $dir/$1 ]; then
+    if [ -e $dir/$1 -o -h $dir/$1 ]; then
       oewarn "file was in the way. removing:" $dir/$1
       rm $dir/$1
     fi
-    ln -sf $destname $dir/$1
+    ln -s $destname $dir/$1
     shift
   done
 }