r2772 - in glibc-package/trunk/debian: . debhelper.in
Author: aurel32
Date: 2008-01-07 10:44:17 +0000 (Mon, 07 Jan 2008)
New Revision: 2772
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc.preinst
Log:
* debhelper.in/libc.preinst: also check for libc6-xen in non-dpkg-owned
files test. Closes: #459523.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2008-01-06 04:22:07 UTC (rev 2771)
+++ glibc-package/trunk/debian/changelog 2008-01-07 10:44:17 UTC (rev 2772)
@@ -13,13 +13,15 @@
* patches/amd64/cvs-vdso_clock_gettime.diff: new patch from CVS to fix
static linking on amd64.
* patches/any/local-linuxthreads-fd.diff: new patch to make sure
- linuxthreads doesn't use stdin, stdout or stderr for its internal
+ linuxthreads doesn't use stdin, stdout or stderr for its internal
use.
+ * debhelper.in/libc.preinst: also check for libc6-xen in non-dpkg-owned
+ files test. Closes: #459523.
[ Clint Adams ]
* debhelper.in/nscd.init: use lsb output functions. Closes: #457661.
- -- Aurelien Jarno <aurel32@debian.org> Sun, 06 Jan 2008 05:21:38 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 07 Jan 2008 11:43:47 +0100
glibc (2.7-5) unstable; urgency=low
Modified: glibc-package/trunk/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.preinst 2008-01-06 04:22:07 UTC (rev 2771)
+++ glibc-package/trunk/debian/debhelper.in/libc.preinst 2008-01-07 10:44:17 UTC (rev 2772)
@@ -194,8 +194,10 @@
fi
done
if [ -e /lib/tls/i686/cmov/libc.so.6 ] || [ -e /lib/i686/cmov/libc.so.6 ] ; then
- status=$(dpkg -s libc6-i686 2>/dev/null | grep ^Status: | sed -e 's/^Status: \(.*\) \(.*\) \(.*\)/\3/g')
- if [ -z "$status" ] || [ "$status" = "not-installed" ] || [ "$status" = "config-files" ]; then
+ status_i686=$(dpkg -s libc6-i686 2>/dev/null | grep ^Status: | sed -e 's/^Status: \(.*\) \(.*\) \(.*\)/\3/g')
+ status_xen=$(dpkg -s libc6-xen 2>/dev/null | grep ^Status: | sed -e 's/^Status: \(.*\) \(.*\) \(.*\)/\3/g')
+ if ([ -z "$status_i686" ] || [ "$status_i686" = "not-installed" ] || [ "$status_i686" = "config-files" ]) && \
+ ([ -z "$status_xen" ] || [ "$status_xen" = "not-installed" ] || [ "$status_xen" = "config-files" ]); then
echo
echo "A non-dpkg owned copy of the libc6-i686 package was found."
echo "It is not safe to upgrade the C library in this situation;"
Reply to: