# read a full log and tries to extract the interesting stuff
import sys,re
-m_show_line=re.compile(".* BEG (RPM|VSERVER).*|.*'boot'.*|\* .*|.*is not installed.*")
+m_show_line=re.compile(".* BEG (RPM|VSERVER).*|.*'boot'.*|\* .*|.*is not installed.*|.*PROPFIND.*|.*Starting.*:runtest.*")
m_installing_any=re.compile('\r (Installing:[^\]]*]) ')
m_installing_err=re.compile('\r (Installing:[^\]]*])(..+)')
m_installing_end=re.compile('Installed:.*')
if in_root_context ; then
echo PLDISTROTAGS="$PLDISTROTAGS"
else
- echo "XXXXXXXXXXXXXXXXXXXX Contents of tags definition file /build/$PLDISTROTAGS"
- cat /build/$PLDISTROTAGS
- echo "XXXXXXXXXXXXXXXXXXXX end tags definition"
+ if [ -f /build/$PLDISTROTAGS ] ; then
+ echo "XXXXXXXXXXXXXXXXXXXX Contents of tags definition file /build/$PLDISTROTAGS"
+ cat
+ echo "XXXXXXXXXXXXXXXXXXXX end tags definition"
+ else
+ echo "XXXXXXXXXXXXXXXXXXXX Cannot find tags definition file /build/$PLDISTROTAGS, assuming remote pldistro"
+ fi
fi
set -x
}
if [ -n "$OVERBASE" ] ; then
sedargs="-e s,@DATE@,${DATE},g"
- BASE=(echo ${OVERBASE} | sed $sedargs)
+ BASE=$(echo ${OVERBASE} | sed $sedargs)
else
sedargs="-e s,@DATE@,${DATE},g -e s,@FCDISTRO@,${FCDISTRO},g -e s,@PLDISTRO@,${PLDISTRO},g -e s,@PERSONALITY@,${PERSONALITY},g"
BASE=$(echo ${BASE} | sed $sedargs)
# get environment from the first run
FCDISTRO=$(vserver ${BASE} exec /build/getdistroname.sh)
- PLDISTRO=$(vserver ${BASE} exec make --no-print-directory -C /build +PLDISTRO)
- PLDISTROTAGS=$(vserver ${BASE} exec make --no-print-directory -C /build +PLDISTROTAGS)
- build_SVNPATH=$(vserver ${BASE} exec make --no-print-directory -C /build +build-SVNPATH)
- PERSONALITY=$(vserver ${BASE} exec make --no-print-directory -C /build +PERSONALITY)
- MAILTO=$(vserver ${BASE} exec make --no-print-directory -C /build +MAILTO)
+ PLDISTRO=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +PLDISTRO)
+ PLDISTROTAGS=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +PLDISTROTAGS)
+ build_SVNPATH=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +build-SVNPATH)
+ PERSONALITY=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +PERSONALITY)
+ MAILTO=$(vserver ${BASE} exec make --no-print-directory -C /build stage1=skip +MAILTO)
show_env
else
# create vserver: check it does not exist yet