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

fix tag finding code replace hardcoded '14.3' with $config['version']

Browse Source
This commit is contained in:
Ralf Becker 2016-06-02 13:51:57 +02:00
parent d12e2c806d
commit 5d24bc2ab7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -565,7 +565,7 @@ function do_editchangelog()
* @param string $log_pattern =null a preg regular expression or start of line a log message must match, to be returned * @param string $log_pattern =null a preg regular expression or start of line a log message must match, to be returned
* if regular perl regular expression given only first expression in brackets \\1 is used, * if regular perl regular expression given only first expression in brackets \\1 is used,
* for a start of line match, only the first line is used, otherwise whole message is used * for a start of line match, only the first line is used, otherwise whole message is used
* @param string $revision =null from which to HEAD the log should be retrieved, default search revision of latest tag in ^/tags * @param string& $revision =null from which to HEAD the log should be retrieved, default search revision of latest tag in ^/tags
* @param string $prefix ='* ' prefix, which if not presend should be added to all log messages * @param string $prefix ='* ' prefix, which if not presend should be added to all log messages
* @return string with changelog * @return string with changelog
*/ */
@ -579,7 +579,7 @@ function get_changelog_from_svn($branch_url, $log_pattern=null, &$revision=null,
list($tags_url,$branch) = preg_split('#/(branches/|trunk)#',$branch_url); list($tags_url,$branch) = preg_split('#/(branches/|trunk)#',$branch_url);
if (empty($branch)) $branch = $config['version']; if (empty($branch)) $branch = $config['version'];
$tags_url .= '/tags'; $tags_url .= '/tags';
$pattern='/tags\/(14\.3\.[0-9.]+)/';//str_replace('Stylite-EPL-10\.1',preg_quote($branch),'/tags\/(Stylite-EPL-10\.1\.[0-9.]+)/'); $pattern='/tags\/('.preg_quote($config['version'], '/').'\.[0-9.]+)/';
$matches = null; $matches = null;
$revision = get_last_svn_tag($tags_url,$pattern,$matches); $revision = get_last_svn_tag($tags_url,$pattern,$matches);
$tag = $matches[1]; $tag = $matches[1];