Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* change saveRepo to importRepoFromConfig.

Browse Source
This commit is contained in:
wangyidong
2020-03-09 15:07:49 +08:00
parent 427a762bbc
commit 224c383d00
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module/upgrade/model.php
View File

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