* change saveRepo to importRepoFromConfig.
This commit is contained in:
@@ -566,7 +566,7 @@ class upgradeModel extends model
|
||||
case '12_0_1':
|
||||
$this->saveLogs('Execute 12_0_1');
|
||||
$this->execSQL($this->getUpgradeFile('12.0.1'));
|
||||
$this->saveRepo();
|
||||
$this->importRepoFromConfig();
|
||||
$this->appendExec('12_0_1');
|
||||
}
|
||||
|
||||
@@ -3641,9 +3641,9 @@ class upgradeModel extends model
|
||||
* Save repo from svn and git config.
|
||||
*
|
||||
* @access public
|
||||
* @return void
|
||||
* @return bool
|
||||
*/
|
||||
public function saveRepo()
|
||||
public function importRepoFromConfig()
|
||||
{
|
||||
$this->app->loadConfig('svn');
|
||||
if(isset($this->config->svn->repos))
|
||||
@@ -3667,7 +3667,7 @@ class upgradeModel extends model
|
||||
$svnRepo->encrypt = 'base64';
|
||||
$svnRepo->encoding = zget($repo, 'encoding', $this->config->svn->encoding);
|
||||
|
||||
$scm->setEngine($repo);
|
||||
$scm->setEngine($svnRepo);
|
||||
$info = $scm->info('');
|
||||
$svnRepo->prefix = empty($info->root) ? '' : trim(str_ireplace($info->root, '', str_replace('\\', '/', $svnRepo->path)), '/');
|
||||
if($svnRepo->prefix) $svnRepo->prefix = '/' . $svnRepo->prefix;
|
||||
@@ -3701,6 +3701,7 @@ class upgradeModel extends model
|
||||
$this->dao->insert(TABLE_REPO)->data($gitRepo)->exec();
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user