From 29869a8911ef101871b22eb685414eecc7a93f3e 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: Mon, 14 Aug 2017 15:07:02 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D1=84=D0=B8=D0=BA=D1=81=D0=B8=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B5=20pkdir=20=D0=B2=20stable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/builder/builder.py | 14 ++++++++++++-- pym/builder/utils/cl_builder_update.py | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pym/builder/builder.py b/pym/builder/builder.py index bd09f49..d7df484 100644 --- a/pym/builder/builder.py +++ b/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() diff --git a/pym/builder/utils/cl_builder_update.py b/pym/builder/utils/cl_builder_update.py index c17b148..3d76895 100644 --- a/pym/builder/utils/cl_builder_update.py +++ b/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)' },