Изменена генерация имен в /var/calculate/builder

pym/builder/variables/builder.py

@@ -245,13 +245,18 @@ class VariableClBuilderDiskDev(Variable):
         self.label = _("Build location")
         self.help = _("partition or directory intended for build")
 
-    def get_builder_image_dn(self):
+    def get_builder_image_dn(self, ds=None):
+        base_name = self.Get('cl_builder_id_path')
         if self.Get('os_root_type') != "livecd":
             default_path = self.Get('cl_builder_prepare_path')
-            for i in range(1, 9999):
-                dn = "image%d" % i
+            for i in range(2, 9999):
+                if i:
+                    dn = "%s.%02d" % (base_name, i)
+                else:
+                    dn = base_name
                 full_dn = path.join(default_path, dn)
-                if not path.exists(full_dn) or not isMount(full_dn):
+                if ((not path.exists(full_dn) or not isMount(full_dn)) and
+                    ds is None or ds.lock_device(full_dn)):
                     return full_dn
             else:
                 return ""
@@ -259,7 +264,7 @@ class VariableClBuilderDiskDev(Variable):
 
     def get(self):
         ds = self.Get('cl_builder_device_spool')
-        return ds.get() or self.get_builder_image_dn()
+        return ds.get() or self.get_builder_image_dn(ds)
 
     def choice(self):
         devices = self.Select(