Changeset 1383


Ignore:
Timestamp:
Dec 23, 2011, 4:06:33 AM (8 years ago)
Author:
bruno
Message:
  • Fix bugs introduced by the CPAN addition in the other cases
File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r1382 r1383  
    20392039
    20402040    # It's already ready for CPAN
     2041    my $shcmdbase = $shcmd;
    20412042    if ($cmt !~ /^CPAN/) {
    2042         $shcmd .= "\"echo \'cd $tdir ; if [ -x $pbscript ]; then ./$pbscript; fi ; rm -f ./$pbscript\' | bash\"";
     2043        $shcmd .= " \"echo \'cd $tdir ; if [ -x $pbscript ]; then ./$pbscript; fi ; rm -f ./$pbscript\' | bash\"";
    20432044    }
    20442045    pb_system("$shcmd","Executing pbscript on $cptarget if needed","verbose");
     
    20792080            print KEEP "$made\n";
    20802081            close(KEEP);
    2081             pb_system("$shcmd \"rm -rf $tdir $bdir\"","$cmt cleanup");
     2082            pb_system("$shcmdbase \"rm -rf $tdir $bdir\"","$cmt cleanup");
    20822083
    20832084            # Sign packages locally
     
    21272128            $hoption = "" ;
    21282129        }
    2129         pb_system("$shcmd \"sudo $hpath $hoption \"; $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $v halt (pid $vmpid)");
     2130        pb_system("$shcmdbase \"sudo $hpath $hoption \"; $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $v halt (pid $vmpid)");
    21302131    }
    21312132    if (($cmt =~ /^VE/) && ($snapme != 0)) {
Note: See TracChangeset for help on using the changeset viewer.