Show
Ignore:
Timestamp:
01/04/12 10:19:05 (1 year ago)
Author:
mbrevda
Message:

upstream changes (bug fixes/formating)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/branches/2.10/package.php

    r13126 r13160  
    100100  $vars['checkphp'] = false; 
    101101  unset($vars['L']); 
    102 } elseif (isset($vars['checkphp']) && $vars['checkphp'] != 'false') { 
     102} elseif (!isset($vars['checkphp']) || isset($vars['checkphp']) && $vars['checkphp'] != 'false') { 
    103103  $vars['checkphp'] = true; 
    104104} 
     
    119119} 
    120120 
     121$vars['svn_q'] = $vars['debug'] || $vars['verbose'] ? '' : ' --quiet '; 
    121122//set re 
    122123//move re to an array if there are commas as part of the value 
     
    189190 
    190191//ensure the module and release directorys are up to date 
    191 run_cmd('svn up ' . $vars['reldir'] . ' . '); 
     192run_cmd('svn up ' . $vars['svn_q'] . $vars['reldir'] . ' . '); 
    192193 
    193194foreach ($vars['module'] as $mod) { 
     
    305306  run_cmd('svn st ' . $mod_dir . '|wc -l', $lines); 
    306307  if ( $lines > 0) { 
    307     run_cmd('svn ci -m "[Auto Check-in of any outstanding changes in ' . $mod . '] ' . $vars['msg'] . '" ' . $mod_dir); 
     308    run_cmd('svn ci ' . $vars['svn_q'] . '-m "[Auto Check-in of any outstanding changes in ' . $mod . '] ' . $vars['msg'] . '" ' . $mod_dir); 
    308309  } 
    309310   
     
    361362   
    362363  //add tarball to release repository 
    363   run_cmd('svn add ' . $vars['reldir'] . '/' . $filename); 
     364  run_cmd('svn add ' . $vars['reldir'] . '/' . $filename . ' ' . $vars['svn_q']); 
    364365   
    365366  //set mimetype of tarball 
    366   run_cmd('svn ps svn:mime-type application/tgz ' . $vars['reldir'] . '/' . $filename); 
     367  run_cmd('svn ps svn:mime-type application/tgz ' . $vars['reldir'] . '/' . $filename . ' ' . $vars['svn_q']); 
    367368   
    368369  //set latpublished property 
    369370  run_cmd('svn info ' . $mod_dir . ' | grep Revision: | awk \'{print $2}\'', $lastpub, false, true); 
    370   run_cmd('svn ps lastpublish ' . $lastpub . ' ' . $mod_dir); 
     371  run_cmd('svn ps lastpublish ' . $vars['svn_q'] . $lastpub . ' ' . $mod_dir); 
    371372   
    372373  // appears we need to do an svn up here or it fails, maybe because of the propset above? 
    373374  //Lets reaserch this more, SHMZ hasn't found this nesesary -MB 
    374375  //+1 although I dont (either) get why -MB 
    375   run_cmd('svn up ' . $vars['reldir'] . '/' . $filename . ' ' . $mod_dir); 
     376  run_cmd('svn up ' . $vars['svn_q'] . $vars['reldir'] . '/' . $filename . ' ' . $mod_dir); 
    376377 
    377378  //check in new tarball and module.xml 
    378   run_cmd('svn ci ' . $mod_dir . ' ' . $vars['reldir'] . '/' . $filename  
     379  run_cmd('svn ci ' . $vars['svn_q'] . $mod_dir . ' ' . $vars['reldir'] . '/' . $filename  
    379380          . ' -m"[Module package script: ' . $rawname . ' ' . $ver . '] ' . $vars['msg'] . '"'); 
    380381           
     
    391392 
    392393//print report 
    393 echo PHP_EOL . PHP_EOL . PHP_EOL . PHP_EOL . PHP_EOL
     394echo PHP_EOL . PHP_EOL . PHP_EOL
    394395echo 'Package Script Report:' . PHP_EOL; 
    395396echo '---------------------' . PHP_EOL;