Author: aurel32
Date: 2015-09-09 11:17:56 +0000 (Wed, 09 Sep 2015)
New Revision: 6532
Modified:
glibc-package/branches/glibc-2.21/debian/changelog
glibc-package/branches/glibc-2.21/debian/debhelper.in/locales-all.prerm
Log:
debhelper.in/locales-all.prerm: do not specify a path to check for
locale-gen.
Modified: glibc-package/branches/glibc-2.21/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.21/debian/changelog 2015-09-09 07:02:29 UTC
(rev 6531)
+++ glibc-package/branches/glibc-2.21/debian/changelog 2015-09-09 11:17:56 UTC
(rev 6532)
@@ -27,6 +27,8 @@
the conversion to the new format.
* testsuite-checking/expected-results-mips*: sort the files. Remove
failures due to old kernel now that all buildds run jessie.
+ * debhelper.in/locales-all.prerm: do not specify a path to check for
+ locale-gen.
[ Helmut Grohne ]
* Fix some issues with stage 1. Closes: #797831.
Modified:
glibc-package/branches/glibc-2.21/debian/debhelper.in/locales-all.prerm
===================================================================
--- glibc-package/branches/glibc-2.21/debian/debhelper.in/locales-all.prerm
2015-09-09 07:02:29 UTC (rev 6531)
+++ glibc-package/branches/glibc-2.21/debian/debhelper.in/locales-all.prerm
2015-09-09 11:17:56 UTC (rev 6532)
@@ -1,10 +1,23 @@
#!/bin/sh
set -e
+pathfind() {
+ OLDIFS="$IFS"
+ IFS=:
+ for p in $PATH; do
+ if [ -x "$p/$*" ]; then
+ IFS="$OLDIFS"
+ return 0
+ fi
+ done
+ IFS="$OLDIFS"
+ return 1
+}
+
case "$1" in
remove|purge)
# Is locales installed?
- if [ -x /usr/sbin/locale-gen ] ; then
+ if pathfind locale-gen ; then
# If yes, generate locales selected in the debconf question
locale-gen
fi
