From 439b9dd1ee8262be349f024b136c89287ccb0284 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?= <mh@calculate.ru>
Date: Fri, 11 Aug 2017 16:16:27 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8B=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD?=
 =?UTF-8?q?=D1=8B=D0=B5=20=D0=B4=D0=BB=D1=8F=20=D0=B1=D0=B0=D0=B7=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=BE=D0=B3=D0=BE=20=D0=B1=D0=B8=D0=BD=D1=85=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0.=20=D0=A0=D0=B0=D1=81=D1=88=D0=B8=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8B=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=20=D0=B2=D1=8B=D0=B7=D0=BE=D0=B2=D0=B0=20eme?=
 =?UTF-8?q?rge.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pym/update/emerge_parser.py    |  8 ++++++--
 pym/update/variables/update.py | 16 ++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/pym/update/emerge_parser.py b/pym/update/emerge_parser.py
index a87fdd3..e7adb40 100644
--- a/pym/update/emerge_parser.py
+++ b/pym/update/emerge_parser.py
@@ -113,9 +113,12 @@ class EmergeCommand(CommandExecutor):
     emerge_cmd = getProgPath("/usr/bin/emerge")
 
     def __init__(self, packages, extra_params=None, env=None, cwd=None,
-                 logfile=None, emerge_default_opts=None, use=""):
+                 logfile=None, emerge_default_opts=None, env_update=None,
+                 use=""):
         extra_params = extra_params or []
         if env is None:
+            env = {}
+            env.update(os.environ)
             if emerge_default_opts is None:
                 env = {'CLEAN_DELAY': '0'}
             else:
@@ -127,7 +130,8 @@ class EmergeCommand(CommandExecutor):
                 }
                 if use:
                     env["USE"] = use
-            env.update(os.environ)
+        if env_update is not None:
+            env.update(env_update)
 
         params = self.default_params + extra_params + packages
         super(EmergeCommand, self).__init__(self.emerge_cmd, params=params,
diff --git a/pym/update/variables/update.py b/pym/update/variables/update.py
index 9b5cc6f..c436564 100644
--- a/pym/update/variables/update.py
+++ b/pym/update/variables/update.py
@@ -1564,6 +1564,22 @@ class VariableClUpdateBinhostUnstableList(Variable):
     value = ["ftp://ftp.calculate-linux.ru/testing"]
 
 
+class VariableClUpdateBinhostBase(Variable):
+    """
+    Базовый бинарный хост, используемый для установки базовых пакетов
+    в небинарных сборочных дистрибутивах
+    """
+    value = ""
+
+
+class VariableClUpdateBinhostBaseSet(Variable):
+    """
+    Использовать или нет базовый бинарный хост
+    """
+    type = Variable.Types.Boolean
+    value = Variable.Off
+
+
 class VariableClUpdateBinhostStableSet(Variable):
     """
     Удлять лишние файлы из репозиториев (например созданные пользователем)