From 92a4f2e6c3de6d699d7a9446f9d1eb99cb663bd8 Mon Sep 17 00:00:00 2001
From: Mike Khiretskiy <mh@calculate.ru>
Date: Wed, 23 Sep 2015 16:32:44 +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=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=20?=
 =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B1=D0=B8?=
 =?UTF-8?q?=D0=BD=D0=B0=D1=80=D0=BD=D1=8B=D1=85=20=D0=BF=D0=B0=D0=BA=D0=B5?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B2=20=D0=BF=D1=80=D0=B8=20=D0=BF=D1=80=D0=B5?=
 =?UTF-8?q?=D1=80=D1=8B=D0=B2=D0=B0=D0=BD=D0=B8=D0=B8=20=D1=81=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=80=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pym/builder/builder.py                |  3 ++-
 pym/builder/utils/cl_builder_break.py |  3 ++-
 pym/builder/variables/builder.py      | 12 ++++++++++++
 pym/builder/wsdl_builder.py           |  3 ++-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/pym/builder/builder.py b/pym/builder/builder.py
index 057186c..6ebf1c6 100644
--- a/pym/builder/builder.py
+++ b/pym/builder/builder.py
@@ -89,7 +89,7 @@ class Builder(Update):
             target.reserve()
         return True
 
-    def close_build(self, build, clear=False):
+    def close_build(self, build, clear=False, clear_pkg=False):
         """
         @type build:Build
         """
@@ -99,6 +99,7 @@ class Builder(Update):
             if clear:
                 build.distributive.post_clear()
                 pkgdir = self.clVars.Get('cl_builder_pkgdir')
+            if clear_pkg:
                 if '/remote/' in pkgdir:
                     if path.exists(pkgdir):
                         removeDir(pkgdir)
diff --git a/pym/builder/utils/cl_builder_break.py b/pym/builder/utils/cl_builder_break.py
index 9fadab1..72c6096 100644
--- a/pym/builder/utils/cl_builder_break.py
+++ b/pym/builder/utils/cl_builder_break.py
@@ -48,7 +48,8 @@ class ClBuilderBreakAction(Action):
          'method': 'Builder.check_chroot_run()'},
         {'name': 'close_build',
          'message': __("Breaking {cl_builder_id} build"),
-         'method': 'Builder.close_build(cl_builder_build,cl_builder_clear_set)',
+         'method': 'Builder.close_build(cl_builder_build,cl_builder_clear_set,'
+                   'cl_builder_clear_pkg_set)',
          'condition': lambda Get: Get('cl_builder_build')
          },
         {'name': 'failed',
diff --git a/pym/builder/variables/builder.py b/pym/builder/variables/builder.py
index 3e503c4..d6928ee 100644
--- a/pym/builder/variables/builder.py
+++ b/pym/builder/variables/builder.py
@@ -461,6 +461,18 @@ class VariableClBuilderClearSet(Variable):
         self.label = _("Clear after unmount")
         self.help = _("clear data after unmount")
 
+class VariableClBuilderClearPkgSet(Variable):
+    """
+    Удалять бинарные пакеты при отключении сборки
+    """
+    type = "bool"
+    value = "on"
+    opt = ["--clear-pkg"]
+
+    def init(self):
+        self.label = _("Clear binary packages after unmount")
+        self.help = _("clear binary packages after unmount")
+
 
 class VariableClBuilderBuild(Variable):
     """
diff --git a/pym/builder/wsdl_builder.py b/pym/builder/wsdl_builder.py
index 6e6ffc1..cd2c4ec 100644
--- a/pym/builder/wsdl_builder.py
+++ b/pym/builder/wsdl_builder.py
@@ -133,7 +133,8 @@ class Wsdl(WsdlBase):
             'groups': [
                 lambda group: group(_("Break the Build"),
                                     normal=('cl_builder_prepared_id',
-                                            'cl_builder_clear_set'),
+                                            'cl_builder_clear_set',
+                                            'cl_builder_clear_pkg_set'),
                                     brief=('os_builder_linux_fullname',),
                                     next_label=_("Perform"))],
             'brief': {'next': __("Perform"),