Changeset 1594 in ProjectBuilder for devel/pb

Timestamp:

May 24, 2012, 3:41:09 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Fix a bug in VE context around the chown part (no quotes without the sudo)
• Improve mageia 2 deps
• pbtest is nearly at the end

Location:

devel/pb

Files:

• bin/pb (modified) (1 diff)
• t/pbtest (modified) (5 diffs)

devel/pb/bin/pb

@@ -2318 +2318 @@
         if (defined $shcmdroot) {
             # This should help overcome a CentOS 5.8 bug as well as having a simper sequence
-            pb_system("$shcmdroot \"chown -R $mac $tdir\"","Adapt owner in $tdir to $mac");
+            pb_system("$shcmdroot chown -R $mac $tdir","Adapt owner in $tdir to $mac");
         } else {
             pb_system("$shcmd \"sudo chown -R $mac $tdir\"","Adapt owner in $tdir to $mac");

devel/pb/t/pbtest

@@ -12 +12 @@
 
 # You may have multiple distros here
-TESTVEDIST="fedora-16-x86_64 mageia-1-i386 debian-6.0-x86_64 ubuntu-11.04-i386"
+TESTVEDIST="fedora-16-x86_64 mageia-1-i386 debian-6.0-x86_64 ubuntu-12.04-i386"
 # Only one VM is tested for now.
 TESTVMDIST="fedora-16-i386"
@@ -31 +31 @@
     echo "INFO (as pbtest): Now running $cmd [$msg]"
 fi
-sudo -n su - pbtest -c "$cmd"
+sudo -n -E su - pbtest -c "$cmd"
 ret=$?
 if [ $ret -ne 0 ] && [ _"$msg" == _"" ]; then
@@ -83 +83 @@
 # Force pbtest account
 sudocmd "perl -pi -e 's|^pbtest:.*|pbtest:$2a$08$2Q.tEty4v/fU0RyPeDelk.AjLAtXUXU3DpSs/l/8YrFmau1LJRCqC:15483:0:99999:7:::|' /etc/shadow"
-cat > /tmp/.profile << EOF
-export PBPROJ=$PBPROJ
-EOF
-sudocmd "mv /tmp/.profile $PBTEST/.profile"
-sudocmd "chown pbtest:pbtest $PBTEST/.profile"
+sudopbtest "echo export PBPROJ=$PBPROJ >> $PBTEST/.bash_profile"
 sudopbtest "env | grep PBPROJ"
 
@@ -139 +135 @@
 pbparallel pb = 6
 vepath default = $PBTEST/ve
-vmpath default = $PBTEST/tmp
+vmpath default = $PBTEST/vm
 EOF
 sudocmd "mv /tmp/.pbrc $PBTEST/.pbrc"
@@ -149 +145 @@
 vmmonport default = 4000
 EOF
-echo "vmlist default = `echo $TESTVMDIST | sed 's/ */,/g'`" >> /tmp/.pbrc
+echo "vmlist default = `echo $TESTVMDIST | sed 's/ /,/g'`" >> /tmp/.pbrc
 sudocmd "mv /tmp/.pbrc $PBTEST/vm/.pbrc"