ooo-build r15577 - in trunk: . bin/piece

[pmladek svn gnome org]

Author: pmladek
Date: Thu Mar 19 14:54:50 2009
New Revision: 15577
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15577&view=rev

Log:
2009-03-19  Petr Mladek  <pmladek suse cz>

	* bin/piece/link-to-ooo-home: more conservative approach to remove
	  the compat symlinks; the old link-to-ooo-home removed the symlinks
	  and empty directories when they were moved to another package and
	  the old package was obsoleted (bnc#471280)




Modified:
   trunk/ChangeLog
   trunk/bin/piece/link-to-ooo-home

Modified: trunk/bin/piece/link-to-ooo-home
==============================================================================
--- trunk/bin/piece/link-to-ooo-home	(original)
+++ trunk/bin/piece/link-to-ooo-home	Thu Mar 19 14:54:50 2009
@@ -42,14 +42,18 @@
 	if $link_mode ; then
 	    ln -sf $file $linkedfile
 	else
-	    test -L $linkedfile && rm -f $linkedfile
+	    # do not remove still valid symlinks
+	    # they might have another meaning; they might be another package...
+	    test -L $linkedfile -a ! -r $linkedfile && rm -f $linkedfile
 	fi
     done
 
-    if ! $link_mode ; then
-	for dir in `grep "%dir" $filelist | sed "s|%dir ||" | sort -r` ; do
-	    linkdir=`echo $dir | sed "s|$datadir|$libdir|"`
-	    rmdir $linkdir 2>/dev/null || true
-	done
-    fi
+# FIXME: do not remove empty directories
+#        they might be in another package that is not longer noarch, ...
+#    if ! $link_mode ; then
+#	for dir in `grep "%dir" $filelist | sed "s|%dir ||" | sort -r` ; do
+#	    linkdir=`echo $dir | sed "s|$datadir|$libdir|"`
+#	    rmdir $linkdir 2>/dev/null || true
+#	done
+#    fi
 done