Исправлен фиксирование pkdir в stable

pym/builder/builder.py

@@ -28,7 +28,8 @@ from calculate.lib.cl_template import templateFunction, SystemIni
 from calculate.lib.datavars import DataVars, Variable
 from calculate.lib.utils.colortext import (TextState, get_color_print)
 from calculate.lib.utils.common import CmdlineParams, getTupleVersion
-from calculate.lib.utils.portage import BinaryPackage, get_binary_file
+from calculate.lib.utils.portage import (BinaryPackage, get_binary_file,
+                                         clear_binhost_garbage)
 from calculate.lib.utils.files import (
     pathJoin, PercentProgress, getProgPath, process, STDOUT, removeDir,
     makeDirectory, writeFile, readLinesFile, chmod, chown, FilePermission,
@@ -1810,6 +1811,10 @@ class Builder(Update):
         :param stabledir:
         :return:
         """
+        try:
+            clear_binhost_garbage(pkgdir)
+        except OSError as e:
+            raise BuilderError(_("Failed to clear binary directory: %s")%str(e))
         drcs = DirectoryRCS(pkgdir, trunkdir, stabledir)
         if drcs.not_prepared():
             try:
@@ -1819,7 +1824,8 @@ class Builder(Update):
                     _("Failed to update trunk binaries: %s") % str(e))
         else:
             try:
-                drcs.indexing()
+                if drcs.is_worked():
+                    drcs.indexing()
             except RCSError as e:
                 raise BuilderError(
                     _("Failed to prepare stable binaries: %s") % str(e))
@@ -1833,6 +1839,10 @@ class Builder(Update):
         :param stabledir:
         :return:
         """
+        try:
+            clear_binhost_garbage(pkgdir)
+        except OSError as e:
+            raise BuilderError(_("Failed to clear binary directory: %s")%str(e))
         try:
             drcs = DirectoryRCS(pkgdir, trunkdir, stabledir)
             drcs.fixing()

pym/builder/utils/cl_builder_update.py

@@ -369,7 +369,7 @@ class ClBuilderUpdateAction(Action):
                  },
                 {'name': 'use_base_binhost:fix_pkgdir',
                  'message': _("Update binary package directory"),
-                 'method': 'Builder.index_pkgdir(cl_builder_pkgdir,'
+                 'method': 'Builder.fix_pkgdir(cl_builder_pkgdir,'
                            'cl_builder_pkgdir_trunk,'
                            'cl_builder_pkgdir_stable)'
                  },