Commit fc26c3ad authored by Vitaly Lipatov's avatar Vitaly Lipatov

Merge branch 'master' of git.alt:packages/etersoft-build-utils

parents 7204ee84 3430f57a
...@@ -4,9 +4,16 @@ ...@@ -4,9 +4,16 @@
: :
ssh git.alt task new ssh git.alt task new
ssh git.alt task del PACKAGE ssh git.alt task add del PACKAGE
ssh git.alt task run ssh git.alt task run
[lav@lav ~]$ ssh git.alt task add del python-module-pyclamav
girar-check-perms: access to python-module-pyclamav ALLOWED for lav: approved builder
task #9430: added #1: delete package python-module-pyclamav from sisyphus
[lav@lav ~]$ ssh git.alt task run
task #9430: queued, result will be emailed to lav@altlinux.org
: :
fonts-ttf-%fname-1.04-alt1.src.rpm fonts-ttf-%fname-1.04-alt1.src.rpm
......
...@@ -292,7 +292,7 @@ do ...@@ -292,7 +292,7 @@ do
gear-update "$RPMSOURCEDIR/$FTB" "$CURNAME" gear-update "$RPMSOURCEDIR/$FTB" "$CURNAME"
git commit -m "just import $(basename $RPMSOURCEDIR/$FTB)" git commit -m "just import $(basename $RPMSOURCEDIR/$FTB)"
else else
echo "Run without version. Skip tarball commiting." is_gear && echo "Run without version. Skip tarball commiting."
fi fi
done done
......
...@@ -175,12 +175,17 @@ check_log() ...@@ -175,12 +175,17 @@ check_log()
echo "-------------------------------------------------------" echo "-------------------------------------------------------"
echog "Check log for..." echog "Check log for..."
LOGFILE=$1 LOGFILE=$1
grep 'ld: warning: libstdc++\.so\.5, needed by [^ ]\+, may conflict with libstdc++\.so\.6' $LOGFILE
RES=$? if grep -q 'ld: warning: libstdc++\.so\.5, needed by [^ ]\+, may conflict with libstdc++\.so\.6' $LOGFILE ; then
if [ $RES = 0 ] ; then echog "Error found: libstdc++.so.5/6 conflicts. Check the log."
echog "Error: libstdc++.so.5/6 conflicts"
return 1 return 1
fi fi
if grep -q 'will always overflow destination buffer' $LOGFILE ; then
echog "Error found: will always overflow destination buffer. Check the log."
return 1
fi
grep 'python-strict' $LOGFILE && warning "python-strict used!!!" grep 'python-strict' $LOGFILE && warning "python-strict used!!!"
NC1="command not found" NC1="command not found"
NC2="-march=athlon -mtune=athlon-xp" NC2="-march=athlon -mtune=athlon-xp"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment