сборка сапфора через гит. если версия собралась с ошибками, больше не будет попыток ее автоматической сборки.( но возможна ручная)
This commit is contained in:
@@ -576,9 +576,9 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
||||
Utils.startScript(Global.TempDirectory,
|
||||
Global.TempDirectory,
|
||||
"get_version",
|
||||
"wget --user dvmhuser --password dvmh2013 -P " +
|
||||
"wget -P " +
|
||||
Utils_.DQuotes(Global.TempDirectory.getAbsolutePath()) +
|
||||
" http://svn.dvm-system.org/svn/dvmhrepo/sapfor/experts/Sapfor_2017/_src/Utils/version.h"
|
||||
" " + Utils_.DQuotes(Constants.SAPFOR_VERSION_URL)
|
||||
).waitFor();
|
||||
if (!versionFile.exists())
|
||||
throw new RepositoryRefuseException("Не удалось загрузить текущую версию SAPFOR из репозитория!");
|
||||
@@ -592,11 +592,14 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
||||
int max_version = db.getInstalledSapforMaxVersion();
|
||||
int current_version = getSapforActualVersion();
|
||||
if (current_version > max_version) {
|
||||
serverSapfor = new ServerSapfor();
|
||||
serverSapfor.sender_name = "server";
|
||||
serverSapfor.sender_address = Constants.MailAddress;
|
||||
serverSapfor.state = ServerSapforState.Queued;
|
||||
db.Insert(serverSapfor);
|
||||
ServerSapfor versionSapfor = db.getSapforForVersion(String.valueOf(current_version));
|
||||
if (versionSapfor == null || !versionSapfor.state.equals(ServerSapforState.DoneWithErrors)) {
|
||||
serverSapfor = new ServerSapfor();
|
||||
serverSapfor.sender_name = "server";
|
||||
serverSapfor.sender_address = Constants.MailAddress;
|
||||
serverSapfor.state = ServerSapforState.Queued;
|
||||
db.Insert(serverSapfor);
|
||||
}
|
||||
}
|
||||
}
|
||||
response.object = serverSapfor;
|
||||
|
||||
Reference in New Issue
Block a user