Исправлено использование базового сервера обновлений

pym/builder/builder.py

@@ -31,6 +31,7 @@ from calculate.lib.utils.common import CmdlineParams, getTupleVersion
 from calculate.lib.utils.portage import (BinaryPackage, get_binary_file,
                                          EixVersionParser,
                                          clear_binhost_garbage, WorldFile)
+from calculate.lib.utils.binhosts import Binhosts
 from calculate.lib.utils.files import (
     pathJoin, PercentProgress, getProgPath, process, STDOUT, removeDir,
     makeDirectory, writeFile, readLinesFile, chmod, chown, FilePermission,
@@ -106,6 +107,7 @@ class Builder(Update):
         self.refresh_binhost = False
         self.gpgdata_md5 = []
         self.gpg_changed = False
+        self.base = False
 
     def mount_target(self, target):
         dir_distro = target.convertToDirectory()
@@ -2082,8 +2084,28 @@ class Builder(Update):
         self.clVars.Set('cl_update_package_cache_set', 'on')
         self.clVars.Set('cl_update_binhost_list', [binhost], force=True)
         self.clVars.Set('cl_update_binhost_unstable_list', [binhost], force=True)
+        self.base = True
         return True
 
+    def create_binhost_data(self):
+        dv = self.clVars
+        last_ts = dv.Get('update.cl_update_last_timestamp')
+        if dv.GetBool('update.cl_update_binhost_stable_opt_set'):
+            binhost_list = dv.Get('update.cl_update_binhost_list')
+        else:
+            binhost_list = dv.Get('update.cl_update_binhost_unstable_list')
+        self.binhosts_data = Binhosts(
+            # значение малозначимо, поэтому берётся из собирающей системы
+            dv.GetInteger('update.cl_update_binhost_timeout'),
+            dv.Get('update.cl_update_binhost_revision_path'),
+            dv.Get('update.cl_update_binhost_timestamp_path'),
+            last_ts, binhost_list,
+            self.get_arch_machine(),
+            gpg=dv.Get('update.cl_update_gpg'),
+            base=self.base)
+        return True
+
+
     def index_pkgdir(self, pkgdir, trunkdir, stabledir):
         """
         Спрять pkgdir при использование base binhost, для корректного вычисления