r4733 - in glibc-package/trunk/debian: . debhelper.in
Author: aurel32
Date: 2011-06-12 10:44:52 +0000 (Sun, 12 Jun 2011)
New Revision: 4733
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc.preinst
Log:
* debhelper.in/libc.preinst: improve error message when an old copy of ld.so
is found. Closes: #629983.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-06-12 10:39:31 UTC (rev 4732)
+++ glibc-package/trunk/debian/changelog 2011-06-12 10:44:52 UTC (rev 4733)
@@ -11,6 +11,8 @@
to fix multi-arch support on sparc. Update sysdeps/sparc.mk and
sysdeps/sparc64.mk to re-enable multi-arch support on sparc and sparc64.
Closes: #625607.
+ * debhelper.in/libc.preinst: improve error message when an old copy of ld.so
+ is found. Closes: #629983.
-- Aurelien Jarno <aurel32@debian.org> Sat, 11 Jun 2011 18:11:51 +0200
Modified: glibc-package/trunk/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.preinst 2011-06-12 10:39:31 UTC (rev 4732)
+++ glibc-package/trunk/debian/debhelper.in/libc.preinst 2011-06-12 10:44:52 UTC (rev 4733)
@@ -246,9 +246,11 @@
fi
# Stop the upgrade if there is a risk of crash after the upgrade
echo
- echo "A non-dpkg owned copy of the C library was found in $dir."
+ echo "A non-dpkg owned copy of the C library was found:"
+ echo " '$i'"
echo "It is not safe to upgrade the C library in this situation;"
- echo "please remove that copy of the C library and try again."
+ echo "please remove that copy of the C library or get it out of"
+ echo "'$dir' and try again."
exit 1
done
done
Reply to: