r4768 - glibc-package/trunk/debian/debhelper.in
Author: aurel32
Date: 2011-06-30 05:40:35 +0000 (Thu, 30 Jun 2011)
New Revision: 4768
Modified:
glibc-package/trunk/debian/debhelper.in/libc.preinst
Log:
Improve preinst check
Modified: glibc-package/trunk/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.preinst 2011-06-29 22:34:50 UTC (rev 4767)
+++ glibc-package/trunk/debian/debhelper.in/libc.preinst 2011-06-30 05:40:35 UTC (rev 4768)
@@ -197,10 +197,17 @@
fi
# Binaries owned packages are considered to do the right thing
+ # First try a quick lookup which should catch all cases on a
+ # normal system
if echo $libcfiles | grep -q "[ ^]$lib[ $]" ; then
continue
fi
+ # Slower lookup to confirm
+ if dpkg-query -S "$lib" >/dev/null 2>&1 ; then
+ continue
+ fi
+
# Output an error message and exit
echo
echo "A copy of the C library was found $msg:"
Reply to: