[oe-commits] Marcin Juszkiewicz : java.bbclass: fixed oe_jarinstall for broken symlinks

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: 4270cb2928afa95117bde026244fb877ee8e2a6e
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=4270cb2928afa95117bde026244fb877ee8e2a6e

Author: Marcin Juszkiewicz <marcin at buglabs.net>
Date:   Thu Nov  5 15:37:36 2009 +0100

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 at buglabs.net>

---

 classes/java.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/java.bbclass b/classes/java.bbclass
index cacd2ce..b68035c 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
 }