From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Sat, 19 Jul 2008 10:01:01 +0000 (+0000)
Subject: review 9915 that is not working for me
X-Git-Tag: 4.2-rc21~21
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0d30f02fa0c21b5f249d7b7c0e7374bed6ed4189;p=build.git

review 9915 that is not working for me
---

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index d295fc5b..c83076b3 100755
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -230,6 +230,10 @@ function runtest () {
     echo -n "============================== End $COMMAND:runtest on $(date)"
 }
 
+function in_root_context () {
+    rpm -q util-vserver > /dev/null 
+}
+
 function show_env () {
     set +x
     echo FCDISTRO=$FCDISTRO
@@ -242,7 +246,7 @@ function show_env () {
     echo TAGSRELEASE="$TAGSRELEASE"
     echo -n "(might be unexpanded)"
     echo WEBPATH="$WEBPATH"
-    if [ -d /etc/vservers ] ; then
+    if in_root_context ; then
 	echo PLDISTROTAGS="$PLDISTROTAGS"
     else
 	echo "XXXXXXXXXXXXXXXXXXXX Contents of tags definition file /build/$PLDISTROTAGS"
@@ -344,7 +348,7 @@ function main () {
     BASE=$(echo ${BASE} | sed $sedargs)
     WEBPATH=$(echo ${WEBPATH} | sed $sedargs)
 
-    if [ ! -d /etc/vservers ] ; then
+    if ! in_root_context ; then
         # in the vserver
 	echo "==================== Within vserver BEG $(date)"
 	build