holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix to kope with current .mrconfig allowing http and git urls

Browse Source
This commit is contained in:
Ralf Becker 2016-06-02 16:46:36 +02:00
parent 152311a6f8
commit d47e4889dc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/rpm-build/checkout-build-archives.php
View File

@ -244,7 +244,7 @@ function get_modules_per_repo()
} }
elseif (isset($module) && preg_match('/^checkout\s*=\s*(git\s+clone\s+(-b\s+[0-9.]+\s+)?((git|http)[^ ]+)|svn\s+checkout\s+((svn|http)[^ ]+))/', $line, $matches)) elseif (isset($module) && preg_match('/^checkout\s*=\s*(git\s+clone\s+(-b\s+[0-9.]+\s+)?((git|http)[^ ]+)|svn\s+checkout\s+((svn|http)[^ ]+))/', $line, $matches))
{ {
$repo = $url = substr($matches[1], 0, 3) == 'svn' ? $matches[4] : $matches[3]; $repo = $url = substr($matches[1], 0, 3) == 'svn' ? $matches[5] : $matches[3];
if (substr($matches[1], 0, 3) == 'svn') $repo = preg_replace('#/(trunk|branches)/.*$#', '', $repo); if (substr($matches[1], 0, 3) == 'svn') $repo = preg_replace('#/(trunk|branches)/.*$#', '', $repo);
$modules[$repo][$config['aliasdir'].($module ? '/'.$module : '')] = $url; $modules[$repo][$config['aliasdir'].($module ? '/'.$module : '')] = $url;
if ($module === '' && !isset($baseurl)) $baseurl = str_replace('/egroupware.git', '', $url); if ($module === '' && !isset($baseurl)) $baseurl = str_replace('/egroupware.git', '', $url);
@ -513,9 +513,10 @@ function do_editchangelog()
} }
// query changelog per repo // query changelog per repo
$changelog = ''; $changelog = '';
$last_tag = $revision = null; $last_tag = null;
foreach($config['modules'] as $branch_url => $modules) foreach($config['modules'] as $branch_url => $modules)
{ {
$revision = null;
if (substr($branch_url, -4) == '.git') if (substr($branch_url, -4) == '.git')
{ {
list($path) = each($modules); list($path) = each($modules);