update for egroupware module was missing

This commit is contained in:
Ralf Becker 2012-03-28 11:45:34 +00:00
parent 45f22ee1b6
commit f1495f93aa

View File

@ -88,7 +88,7 @@ function do_merge(array $args)
$cmds = array(); $cmds = array();
foreach($modules as $n => $module) foreach($modules as $n => $module)
{ {
system('svn -q update '.$module); // svn >= 1.7 brings an error otherwise system('svn -q update '.($module == 'egroupware' ? '.' : $module)); // svn >= 1.7 brings an error otherwise
$cmds[] = 'svn merge '.implode(' ',$args).'/'.$module.($module != 'egroupware'?' '.$module:''); $cmds[] = 'svn merge '.implode(' ',$args).'/'.$module.($module != 'egroupware'?' '.$module:'');
if ($module == 'egroupware') $modules[$n] = '.'; if ($module == 'egroupware') $modules[$n] = '.';
} }