Добавлен параметр --rebuilt-binaries для пересборки бинарных пакетов

pym/builder/utils/cl_builder_update.py

@@ -261,10 +261,10 @@ class ClBuilderUpdateAction(Action):
                       'message': __("Calculating dependencies"),
                       'method': 'Builder.emerge_ask('
                                 'update.cl_update_pretend_set,'
-                                '"-uDN","--changed-deps",'
+                                '"-uDN","--rebuilt-binaries",'
                                 '"@world")',
                       'condition': lambda Get:
-                          Get('cl_builder_rebuild_changed_set') == 'on'
+                          Get('cl_builder_rebuilt_binaries_set') == 'on'
                       },
                      {'name': 'update_world',
                       'message': __("Calculating dependencies"),
@@ -272,7 +272,7 @@ class ClBuilderUpdateAction(Action):
                                 'update.cl_update_pretend_set,'
                                 '"-uDN","@world")',
                       'condition': lambda Get:
-                          Get('cl_builder_rebuild_changed_set') != 'on'
+                          Get('cl_builder_rebuilt_binaries_set') != 'on'
                       }
                  ],
                  'condition': lambda Get: (

pym/builder/variables/builder.py

@@ -1466,9 +1466,9 @@ class VariableClBuilderPrelinkSet(Variable):
     """
     Выполнять ли prelink
     """
-    type = "bool"
+    type = Variable.Types.Boolean
     opt = ["--prelink"]
-    value = "off"
+    value = Variable.Off
 
     def init(self):
         self.help = _("perform prelink")
@@ -1477,17 +1477,32 @@ class VariableClBuilderPrelinkSet(Variable):
 
 class VariableClBuilderRebuildChangedSet(Variable):
     """
-    Выполнять ли prelink
+    
     """
-    type = "bool"
+    type = Variable.Types.Boolean
     opt = ["--rebuild-changed-packages"]
-    value = "on"
+    value = Variable.On
 
     def init(self):
         self.help = _("rebuild changed packages")
         self.label = _("Rebuild changed packages")
 
 
+class VariableClBuilderRebuiltBinariesSet(Variable):
+    """
+    Выполнить замещение пакетов на бинарную версию если их BUILDTIME
+    меньше, чем в Packages
+    """
+    type = Variable.Types.Boolean
+    opt = ["-B", "--rebuilt-binaries"]
+    value = Variable.Off
+
+    def init(self):
+        self.help = _("replace installed packages with binary packages "
+                      "that have been rebuilt")
+        self.label = _("Rebuild installed packages with binary packages")
+
+
 class VariableClBuilderRescratchSet(ReadonlyVariable):
     """
     Сборка iso образа на самой флешке

pym/builder/wsdl_builder.py

@@ -190,6 +190,7 @@ class Wsdl(WsdlBase):
                         'update.cl_update_egencache_force',
                         'update.cl_update_eixupdate_force',
                         'cl_builder_rebuild_changed_set',
+                        'cl_builder_rebuilt_binaries_set',
                         'update.cl_update_skip_rb_set',
                         'update.cl_update_onedepth_set',
                         'update.cl_update_cleanpkg_set',
@@ -212,6 +213,7 @@ class Wsdl(WsdlBase):
                         'update.cl_update_egencache_force',
                         'update.cl_update_eixupdate_force',
                         'cl_builder_rebuild_changed_set',
+                        'cl_builder_rebuilt_binaries_set',
                         'update.cl_update_skip_rb_set',
                         'update.cl_update_onedepth_set',
                         'update.cl_update_cleanpkg_set',
@@ -235,6 +237,7 @@ class Wsdl(WsdlBase):
                         'update.cl_update_egencache_force',
                         'update.cl_update_eixupdate_force',
                         'cl_builder_rebuild_changed_set',
+                        'cl_builder_rebuilt_binaries_set',
                         'update.cl_update_skip_rb_set',
                         'update.cl_update_onedepth_set',
                         'update.cl_update_cleanpkg_set',