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

[git version control]

Module: openembedded.git
Branch: stable/2009
Commit: 003c25c63be3c2d85710806aaee392e4e0df6432
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=003c25c63be3c2d85710806aaee392e4e0df6432

Author: Marcin Juszkiewicz <marcin at buglabs.net>
Date:   Thu Nov  5 04:41:16 2009 +0000

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>
Acked-by: Philip Balister <philip at balister.org>
Acked-by: Koen Kooi <koen at openembedded.org>

---

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

diff --git a/classes/java.bbclass b/classes/java.bbclass
index 38256d7..b68035c 100644
--- a/classes/java.bbclass
+++ b/classes/java.bbclass
@@ -68,7 +68,7 @@ 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