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

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



Author: aurel32
Date: 2007-04-19 22:39:13 +0000 (Thu, 19 Apr 2007)
New Revision: 2099

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/debhelper.in/libc.preinst
Log:
  * debhelper.in/libc.preinst: use dpkg-query instead of looking into
    /var/lib/dpkg/info. Thanks to Guillem Jover for the hint.



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2007-04-19 22:11:52 UTC (rev 2098)
+++ glibc-package/trunk/debian/changelog	2007-04-19 22:39:13 UTC (rev 2099)
@@ -4,8 +4,10 @@
     platform.
   * debian/locales-all.README.Debian: Remove again, it is useless now.
     (Closes: #378191)
+  * debhelper.in/libc.preinst: use dpkg-query instead of looking into
+    /var/lib/dpkg/info. Thanks to Guillem Jover for the hint.
 
- -- Aurelien Jarno <aurel32@debian.org>  Thu, 19 Apr 2007 23:59:56 +0200
+ -- Aurelien Jarno <aurel32@debian.org>  Fri, 20 Apr 2007 00:38:58 +0200
 
 glibc (2.5-3) unstable; urgency=low
 

Modified: glibc-package/trunk/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.preinst	2007-04-19 22:11:52 UTC (rev 2098)
+++ glibc-package/trunk/debian/debhelper.in/libc.preinst	2007-04-19 22:39:13 UTC (rev 2099)
@@ -185,7 +185,7 @@
     fi
   fi
   for i in libc.so.0.1 libc.so.6 libc.so.6.1 libdl.so.2 ; do
-    if [ -e /lib/tls/$i ] && ! grep -q /lib/tls/$i /var/lib/dpkg/info/LIBC.list ; then
+    if [ -e /lib/tls/$i ] && ! dpkg-query -L LIBC 2>/dev/null | grep -q /lib/tls/$i ; then
       echo
       echo "A non-dpkg owned copy of the C library was found in /lib/tls."
       echo "It is not safe to upgrade the C library in this situation;"



Reply to: