From 5ce6ccffd289ac2122dfacf37b1a5d47ecec39d9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 30 Jun 2008 10:21:38 +0000 Subject: [PATCH] - $LANG should be exported Changed files: builder.sh -> 1.562 --- builder.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/builder.sh b/builder.sh index 47fbff9..83432bc 100644 --- a/builder.sh +++ b/builder.sh @@ -1715,7 +1715,6 @@ display_branches() _rpm_prov_check() { local DEPS - LANG=C if [ $# -gt 0 ]; then DEPS="$@" @@ -1723,7 +1722,7 @@ _rpm_prov_check() DEPS=$(cat) fi - DEPS=$(rpm -q --whatprovides $DEPS 2>&1 | awk '/^(error:|no package provides)/ { print }') + DEPS=$(LANG=C rpm -q --whatprovides $DEPS 2>&1 | awk '/^(error:|no package provides)/ { print }') # packages echo "$DEPS" | awk '/^no package provides/ { print $NF }' @@ -1738,7 +1737,6 @@ _rpm_prov_check() _rpm_cnfl_check() { local DEPS - LANG=C if [ $# -gt 0 ]; then DEPS="$@" @@ -1746,7 +1744,7 @@ _rpm_cnfl_check() DEPS=$(cat) fi - rpm -q --whatprovides $DEPS 2>/dev/null | awk '!/no package provides/ { print }' + LANG=C rpm -q --whatprovides $DEPS 2>/dev/null | awk '!/no package provides/ { print }' } # install deps via information from 'rpm-getdeps' or 'rpm --specsrpm' @@ -1776,8 +1774,7 @@ install_build_requires_rpmdeps() { update_shell_title "install deps: $DEPS" echo "Trying to install dependencies ($DEPS):" local log=.${SPECFILE}_poldek.log - LANG=C - $SU_SUDO /usr/bin/poldek --caplookup -uGqQ $DEPS | tee $log + LANG=C $SU_SUDO /usr/bin/poldek --caplookup -uGqQ $DEPS | tee $log failed=$(awk '/^error:/{a=$2; sub(/^error: /, "", a); sub(/:$/, "", a); print a}' $log) rm -f $log local ok -- 2.44.0