Author: glen Date: Mon Jun 30 10:21:43 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- $LANG should be exported
---- Files affected:
SPECS:
builder (1.561 -> 1.562)
---- Diffs:
================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.561 SPECS/builder:1.562
--- SPECS/builder:1.561 Mon Jun 30 10:46:52 2008
+++ SPECS/builder Mon Jun 30 12:21:38 2008
@@ -1715,7 +1715,6 @@
_rpm_prov_check()
{
local DEPS
- LANG=C
if [ $# -gt 0 ]; then
DEPS="$@"
@@ -1723,7 +1722,7 @@
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_cnfl_check()
{
local DEPS
- LANG=C
if [ $# -gt 0 ]; then
DEPS="$@"
@@ -1746,7 +1744,7 @@
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 @@
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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/builder?r1=1.561&r2=1.562&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
