From e4ed00c052b0448b7c7e930959ec60ba2aaa5c69 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: Fri, 24 Jan 2020 18:45:08 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20master64=20=D1=82=D0=BE?= =?UTF-8?q?=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=B4=D0=BB=D1=8F=20calculate,distr?= =?UTF-8?q?os,gentoo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/update/update.py | 4 ++++ pym/update/variables/update.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pym/update/update.py b/pym/update/update.py index 24a4249..b0edba6 100644 --- a/pym/update/update.py +++ b/pym/update/update.py @@ -377,6 +377,10 @@ class Update(MethodsInterface): dv.Select(["cl_update_rep_url", "cl_update_rep_path", "cl_update_rep_rev"], where="cl_update_rep_name", eq=repname, limit=1)) + + if revision == "master" and ( + repname in ("calculate", "distros", "gentoo", "portage")): + revision = "master64" if not url or not rpath: raise UpdateError(_("Configuration variables for repositories " "are not setup")) diff --git a/pym/update/variables/update.py b/pym/update/variables/update.py index 11ac8ac..8d5906f 100644 --- a/pym/update/variables/update.py +++ b/pym/update/variables/update.py @@ -246,7 +246,7 @@ class VariableClUpdateBranch(Variable): def get(self): arch = self.Get(self.arch_var) if arch == "x86_64": - return "master64" + return "master" else: return "master" @@ -1030,7 +1030,7 @@ class VariableClUpdateProfileBranch(Variable): def get(self): arch = self.Get("main.os_arch_machine") if arch == "x86_64": - return "master64" + return "master" else: return "master"