[glibc] 02/03: debian/debhelper.in/libc.{preinst, postinst}, debian/script.in/nohwcap.sh: Remove fallback to dpkg --print-architecture for pre-multiarch systems.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit 2d1919b5a891e3fc8b57e1443cb8b1443c366d6f
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Tue Jul 26 12:04:19 2016 +0200
debian/debhelper.in/libc.{preinst,postinst}, debian/script.in/nohwcap.sh: Remove fallback to dpkg --print-architecture for pre-multiarch systems.
---
debian/changelog | 2 ++
debian/debhelper.in/libc.postinst | 11 +----------
debian/debhelper.in/libc.preinst | 11 +----------
debian/script.in/nohwcap.sh | 2 +-
4 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f70baae..a4c3427 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ glibc (2.23-4) UNRELEASED; urgency=medium
glibc-bsd).
* debian/debhelper.in/libc.postinst: drop code to handle the /var/mail
transition for pre-Potato installations.
+ * debian/debhelper.in/libc.{preinst,postinst}, debian/script.in/nohwcap.sh:
+ Remove fallback to dpkg --print-architecture for pre-multiarch systems.
-- Aurelien Jarno <aurel32@debian.org> Tue, 26 Jul 2016 07:51:45 +0200
diff --git a/debian/debhelper.in/libc.postinst b/debian/debhelper.in/libc.postinst
index 8a234d8..ce925d3 100644
--- a/debian/debhelper.in/libc.postinst
+++ b/debian/debhelper.in/libc.postinst
@@ -5,15 +5,6 @@ export LC_ALL=C
type=$1
preversion=$2
-package_name()
-{
- if dpkg --assert-multi-arch 2>/dev/null; then
- echo LIBC:${DPKG_MAINTSCRIPT_ARCH}
- else
- echo LIBC
- fi
-}
-
# element() is a helper function for file-rc:
element() {
local element list IFS
@@ -194,7 +185,7 @@ then
echo
echo "You will need to start these manually by running \`/etc/init.d/<service> start'"
echo "If the service still fails to start, you may need to file a bug on"
- echo "$(package_name) or the service involved."
+ echo "${DPKG_MAINTSCRIPT_PACKAGE}:${DPKG_MAINTSCRIPT_ARCH} or the service involved."
frontend=`echo "$DEBIAN_FRONTEND" | tr '[:upper:]' '[:lower:]'`
if [ "$frontend" != noninteractive ]; then
echo
diff --git a/debian/debhelper.in/libc.preinst b/debian/debhelper.in/libc.preinst
index 92124b9..d0d379f 100644
--- a/debian/debhelper.in/libc.preinst
+++ b/debian/debhelper.in/libc.preinst
@@ -5,15 +5,6 @@ export LC_ALL=C
type=$1
preversion=$2
-package_name()
-{
- if dpkg --assert-multi-arch 2>/dev/null; then
- echo LIBC:${DPKG_MAINTSCRIPT_ARCH}
- else
- echo LIBC
- fi
-}
-
linux_compare_versions () {
verA=$(($(echo "$1" | sed 's/^\([0-9]*\.[0-9]*\)\([^.0-9]\|$\)/\1.0\2/; s/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 10000 + \2 \* 100 + \3/')))
verB=$(($(echo "$3" | sed 's/^\([0-9]*\.[0-9]*\)\([^.0-9]\|$\)/\1.0\2/; s/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 10000 + \2 \* 100 + \3/')))
@@ -245,7 +236,7 @@ then
# libraries found will be ignored.
ldbytes=""
fi
- libcfiles=$(dpkg-query -L $(package_name) 2>/dev/null)
+ libcfiles=$(dpkg-query -L ${DPKG_MAINTSCRIPT_PACKAGE}:${DPKG_MAINTSCRIPT_ARCH} 2>/dev/null)
dirs="SLIBDIR /lib /lib/tls /lib32 /lib64 /usr/local/lib /usr/local/lib32 /usr/local/lib64"
for dir in $dirs ; do
diff --git a/debian/script.in/nohwcap.sh b/debian/script.in/nohwcap.sh
index 0158d46..b952b88 100644
--- a/debian/script.in/nohwcap.sh
+++ b/debian/script.in/nohwcap.sh
@@ -6,7 +6,7 @@
# Get the list of optimized packages for a given architecture
# Before removing a package from this list, make sure it appears
# in the Conflicts: line of libc.
- case $(dpkg --print-architecture) in
+ case ${DPKG_MAINTSCRIPT_ARCH} in
alpha)
hwcappkgs="libc6-alphaev67"
;;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: