Merge remote-tracking branch 'origin/master3.4'

pym/builder/utils/cl_builder_profile.py

@@ -66,6 +66,10 @@ class ClBuilderProfileAction(Action):
          'method': 'Builder.invalidateVariables("cl_builder_profile_storage")',
          'depend': Tasks.has('migrate_repository')
          },
+        {'name': 'check_datavars',
+         'error': _("Profile not found in master branch"),
+         'condition': lambda Get: not Get('cl_builder_profile_datavars')
+         },
         {'name': 'drop_binhosts',
          'method': 'Builder.drop_binhosts(cl_builder_profile_datavars)'
          },

pym/builder/utils/cl_builder_update.py

@@ -239,21 +239,6 @@ class ClBuilderUpdateAction(Action):
                       }
                  ]
                  },
-                {'name': 'update_other:update_python',
-                 'group': __("Updating Python"),
-                 'tasks': [
-                     {'name': 'python_updater',
-                      'message': __('Find & rebuild packages broken due '
-                                    'to a Python upgrade'),
-                      'method': 'Builder.chroot_emergelike(cl_builder_path,'
-                                '"python-updater")',
-                      'condition': BuilderConditions.was_installed(
-                          'dev-lang/python$', EmergeMark.PythonUpdater),
-                      'decoration': 'Builder.update_task("%s")' %
-                                    EmergeMark.PythonUpdater
-                      },
-                 ]
-                 },
                 {'name': 'update_other:update_perl',
                  'group': __("Updating Perl"),
                  'tasks': [

pym/builder/variables/builder.py

@@ -1657,7 +1657,7 @@ class VariableClBuilderEixRepositories(ReadonlyVariable):
 class VariableClBuilderBinhostStableSet(
     vars_linux.VariableClBuilderLinuxDatavars):
     """
-    Удлять лишние файлы из репозиториев (например созданные пользователем)
+    Использовать стабильное или нестабильное зеркало
     """
     type = "bool"
     value = "on"

pym/builder/variables/profiles.py

@@ -24,6 +24,7 @@ from calculate.update import profile as update_profile
 
 from calculate.lib.cl_lang import setLocalTranslate
 from calculate.update.variables.update import DataVarsUpdateProfile
+from calculate.builder.variables.action import Actions
 
 _ = lambda x: x
 setLocalTranslate('cl_builder3', sys.modules[__name__])
@@ -55,6 +56,14 @@ class VariableClBuilderProfileUrl(update.VariableClUpdateProfileUrl):
     branch = "builder.cl_builder_profile_branch"
     storage = "builder.cl_builder_profile_storage"
     profiles_shortname = 'builder.cl_builder_profile_shortname'
+    check_action = Actions.ChangeProfile
+
+    @property
+    def rep_names(self):
+        dv = self.Get('cl_builder_linux_datavars')
+        if dv:
+            return dv.Get('cl_update_rep_name')
+        return []
 
 
 class VariableClBuilderProfileBranch(update.VariableClUpdateProfileBranch):

pym/builder/wsdl_builder.py

@@ -390,6 +390,7 @@ class Wsdl(WsdlBase):
                                         'cl_builder_isohybrid_set',
                                         'cl_builder_prelink_set',
                                         'cl_builder_compress',
+                                        'cl_builder_binhost_stable_set',
                                         'cl_templates_locate',
                                         'cl_verbose_set',
                                         'cl_dispatch_conf'),