From 9dee71ea215ea8a773bd0bf80f52c5f9ea8a6cc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Wed, 22 Jan 2020 17:51:58 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=B2=D0=B5=D1=82=D0=BA=D1=83=20master64?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/update/variables/update.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pym/update/variables/update.py b/pym/update/variables/update.py index b432567..11ac8ac 100644 --- a/pym/update/variables/update.py +++ b/pym/update/variables/update.py @@ -39,6 +39,7 @@ from ..profile import (RepositoryStorageSet, DEFAULT_BRANCH, from calculate.lib.variables import linux as lib_linux from calculate.lib.variables import env +from calculate.lib.variables import system as lib_system from calculate.update.update_info import UpdateInfo from itertools import chain from urlparse import urlparse @@ -240,6 +241,14 @@ class VariableClUpdateBranch(Variable): не используется синхронизация по тэгам """ value = Git.Reference.Master + arch_var = "main.os_arch_machine" + + def get(self): + arch = self.Get(self.arch_var) + if arch == "x86_64": + return "master64" + else: + return "master" class VariableClUpdateBranchData(TableVariable): @@ -1013,12 +1022,18 @@ class VariableClUpdateProfileBranch(Variable): storage = "cl_update_profile_storage" url = "cl_update_profile_url" - value = DEFAULT_BRANCH def init(self): self.label = _("Repository branch") self.help = _("set the repository branch") + def get(self): + arch = self.Get("main.os_arch_machine") + if arch == "x86_64": + return "master64" + else: + return "master" + class VariableClProfileRepository(ReadonlyVariable): """ @@ -1260,6 +1275,7 @@ class DataVarsUpdateProfile(SimpleDataVars): lib_linux.VariableOsLinuxSubname(), lib_linux.VariableOsLinuxVer(), lib_linux.VariableClProfileSystem(), + lib_system.VariableOsArchMachine(), env.VariableClRepositoryData(), env.VariableClRepositoryName(), env.VariableClRepositoryLocation(),