mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-02 20:19:27 +01:00
update for egroupware module was missing
This commit is contained in:
parent
12c7df59f4
commit
d4b960e8bb
@ -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] = '.';
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user