Changeset 4250

Show
Ignore:
Timestamp:
06/27/07 14:50:21 (6 years ago)
Author:
p_lindheimer
Message:

Merged revisions 4249 via svnmerge from
https://amportal.svn.sourceforge.net/svnroot/amportal/freepbx/branches/2.3

........

r4249 | p_lindheimer | 2007-06-27 11:46:41 -0700 (Wed, 27 Jun 2007) | 1 line


#2031 - changed engine_getinfo() to handle Asterisk SVN tags as the normal version number, and to handle SVN pulls from a branch where it is formatted as (example): Asterisk SVN-branch-1.2-r61786, it will return 1.2.61786 as the version with 61786 in addtional. This will allow it to work with version control although is not perfect, because if they are notkeeping up with their svn pulls, it may be lower than a proper version number. However, the previous way just hardcoded it to 99 which effectively did the same so ...

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.2

    • Property svnmerge-integrated changed from /freepbx/branches/2.3:1-4135,4219 /freepbx/trunk:1-3224,3231,3245-3246,3291-3295,3297,3299-3332,3336,3338-3365,3367-3373,3375-3388,3390-3391,3393-3395,3419,3437,3567,3614-3622,3624,3652,3688,3696,3756,3850,3885,4005,4084,4105 to /freepbx/branches/2.3:1-4135,4219,4249 /freepbx/trunk:1-3224,3231,3245-3246,3291-3295,3297,3299-3332,3336,3338-3365,3367-3373,3375-3388,3390-3391,3393-3395,3419,3437,3567,3614-3622,3624,3652,3688,3696,3756,3850,3885,4005,4084,4105

  • freepbx/branches/2.2/amp_conf/htdocs/admin/functions.inc.php

    r4247 r4250  
    192192      } 
    193193       
    194       if (preg_match('/Asterisk SVN.+/', $verinfo)) { 
    195         return array('engine'=>'asterisk', 'version' => '99', 'additional' => '99'); 
    196       } 
    197194      if (preg_match('/Asterisk (\d+(\.\d+)*)(-?(\S*))/', $verinfo, $matches)) { 
    198195        return array('engine'=>'asterisk', 'version' => $matches[1], 'additional' => $matches[4]); 
     196      } elseif (preg_match('/Asterisk SVN-(\d+(\.\d+)*)(-?(\S*))/', $verinfo, $matches)) { 
     197        return array('engine'=>'asterisk', 'version' => $matches[1], 'additional' => $matches[4]); 
     198      } elseif (preg_match('/Asterisk SVN-branch-(\d+(\.\d+)*)-r(-?(\S*))/', $verinfo, $matches)) { 
     199        return array('engine'=>'asterisk', 'version' => $matches[1].'.'.$matches[4], 'additional' => $matches[4]); 
    199200      } 
    200201