Удалён параметр для очистки build deps пакетов

pym/builder/builder.py

@@ -1029,9 +1029,13 @@ class Builder(Update):
         dv = self.clVars.Get('builder.cl_builder_linux_datavars')
         if dv:
             deo = dv.Get('cl_emerge_default_opts')
+            if dv.GetBool('update.cl_update_with_bdeps_set'):
+                bdeps = " --with-bdeps=y"
+            else:
+                bdeps = " --with-bdeps=n"
+            return deo + bdeps
         else:
-            deo = super(Builder, self).get_default_emerge_opts()
-        return deo
+            return super(Builder, self).get_default_emerge_opts()
 
     def emerge(self, builder_path, use, *params):
         """

pym/builder/utils/cl_builder_update.py

@@ -293,7 +293,7 @@ class ClBuilderUpdateAction(Action):
                  'tasks': [
                      {'name': 'update_depclean',
                       'message': __("Calculating dependencies"),
-                      'method': 'Builder.depclean(cl_builder_clean_bdeps_set)',
+                      'method': 'Builder.depclean()',
                       },
                  ]
                  },

pym/builder/variables/builder.py

@@ -1700,15 +1700,3 @@ class VariableClBuilderCheckAutomagicSet(Variable):
         self.label = _("Check for auto depends")
         self.help = _("check for auto depends")
 
-class VariableClBuilderCleanBdepsSet(Variable):
-    """
-    Отключить --with-bdeps при выполнении --depclean
-    """
-    type = "bool"
-    value = "off"
-
-    opt = ["--clean-bdeps"]
-
-    def init(self):
-        self.label = _("Remove packages required only for build")
-        self.help = _("remove packages required only for build")

pym/builder/variables/linux.py

@@ -76,6 +76,7 @@ class DataVarsBuilderLinux(linux.LinuxDataVars):
                     env.VariableClEnvData(),
                     env.VariableClEnvPath(),
                     env.VariableClEbuildPhase(),
+                    update.VariableClUpdateWithBdepsSet(section="update"),
                     update.VariableClUpdateRepData(section="update"),
                     update.VariableClUpdateRepPath(section="update"),
                     update.VariableClUpdateRepName(section="update"),

pym/builder/wsdl_builder.py

@@ -193,7 +193,6 @@ class Wsdl(WsdlBase):
                         'update.cl_update_skip_rb_set',
                         'update.cl_update_onedepth_set',
                         'update.cl_update_cleanpkg_set',
-                        'builder.cl_builder_clean_bdeps_set',
                         'builder.cl_builder_check_automagic_set',
                         'cl_builder_branch_data',
                         'cl_templates_locate',
@@ -213,7 +212,6 @@ class Wsdl(WsdlBase):
                         'update.cl_update_egencache_force',
                         'update.cl_update_eixupdate_force',
                         'cl_builder_rebuild_changed_set',
-                        'builder.cl_builder_clean_bdeps_set',
                         'update.cl_update_skip_rb_set',
                         'update.cl_update_onedepth_set',
                         'update.cl_update_cleanpkg_set',
@@ -240,7 +238,6 @@ class Wsdl(WsdlBase):
                         'update.cl_update_skip_rb_set',
                         'update.cl_update_onedepth_set',
                         'update.cl_update_cleanpkg_set',
-                        'builder.cl_builder_clean_bdeps_set',
                         'builder.cl_builder_check_automagic_set',
                         'cl_builder_brief_branch_data',
                     ),