From 3ece80cac4a5487150450f72295ab554c194cbd6 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, 16 Oct 2019 17:27:42 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=BE=20=D0=BD=D0=B0=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20with-bdeps?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/update/update.py | 5 ++++- pym/update/variables/update.py | 7 ++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pym/update/update.py b/pym/update/update.py index b95c9ce..d6d168a 100644 --- a/pym/update/update.py +++ b/pym/update/update.py @@ -810,7 +810,10 @@ class Update(MethodsInterface): SystemIni(self.clVars).setVar('system', {'last_check': str(int(time.time()))}) def get_default_emerge_opts(self, depclean=False): - if depclean and self.clVars.GetBool('cl_update_with_bdeps_set'): + bdeps_val = self.clVars.Get('cl_update_with_bdeps_set') + if bdeps_val == "auto": + bdeps = " --with-bdeps-auto=y" + elif bdeps_val == "on": bdeps = " --with-bdeps=y" else: bdeps = " --with-bdeps=n" diff --git a/pym/update/variables/update.py b/pym/update/variables/update.py index 68ed0cd..5dea4f7 100644 --- a/pym/update/variables/update.py +++ b/pym/update/variables/update.py @@ -1719,16 +1719,17 @@ class VariableClUpdateWithBdepsSet(Variable): """ Добавление --with-bdeps при вызове emerge """ - type = Variable.Types.Boolean - value = Variable.On + type = Variable.Types.Tristate + value = Variable.Auto class VariableClUpdateWithBdepsOptSet(Variable): """ Добавление --with-bdeps при вызове emerge (опция) """ - type = Variable.Types.Boolean + type = Variable.Types.Tristate opt = ["--with-bdeps"] + metavalue = "ON/OFF/AUTO" def init(self): self.help = _("save packages used during build")