[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r1495 - in glibc-package/trunk/debian: . debhelper.in



Author: aurel32
Date: 2006-05-20 05:09:19 +0000 (Sat, 20 May 2006)
New Revision: 1495

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/debhelper.in/libc.preinst
Log:
  * debian/debhelper.in/libc.preinst: use the original path if readlink -f 
    fails to canonicalize the path.  (Closes: bug#368116)



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2006-05-19 05:50:03 UTC (rev 1494)
+++ glibc-package/trunk/debian/changelog	2006-05-20 05:09:19 UTC (rev 1495)
@@ -1,6 +1,8 @@
 glibc (2.3.6-10) UNRELEASED; urgency=low
 
-  * 
+  [ Aurelien Jarno ]
+  * debian/debhelper.in/libc.preinst: use the original path if readlink -f 
+    fails to canonicalize the path.  (Closes: bug#368116)
 
  -- Aurelien Jarno <aurel32@debian.org>  Fri, 19 May 2006 05:49:18 +0000
 

Modified: glibc-package/trunk/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.preinst	2006-05-19 05:50:03 UTC (rev 1494)
+++ glibc-package/trunk/debian/debhelper.in/libc.preinst	2006-05-20 05:09:19 UTC (rev 1495)
@@ -114,7 +114,8 @@
 check_dirs () {
   for dir in $*; do
     # Follow symlinks
-    dir=$(readlink -f $dir)
+    dirlink=$(readlink -f $dir)
+    [ -n "$dirlink" ] && dir=$dirlink 
     
     # Handle /lib in LD_LIBRARY_PATH.
     if expr $dir : "/lib.*" > /dev/null; then



Reply to: