Исправлена определением номера при миграции iso -> linux

pym/builder/variables/builder.py

@@ -767,7 +767,7 @@ class VariableClBuilderImageFilename(Variable):
                     raise VariableError(
                         _("Image %s is already used") % value)
 
-    def _isoname(self, dn, rewrite=False):
+    def _isoname(self, dn, rewrite=False, addon_dn=None):
         shortname = self.Get('os_builder_linux_shortname').lower()
         buildnumber = self.Get('os_builder_linux_build')
         arch = self.Get('os_builder_arch_machine')
@@ -778,8 +778,11 @@ class VariableClBuilderImageFilename(Variable):
             else:
                 isoname = "%s-%s-%s.iso" % (shortname, buildnumber,
                                             arch)
-            fullname = path.join(dn, isoname)
-            if rewrite or not path.exists(fullname):
+            for i_dn in filter(None, (dn, addon_dn)):
+                fullname = path.join(i_dn, isoname)
+                if not rewrite and path.exists(fullname):
+                    break
+            else:
                 return fullname
 
     def get(self):
@@ -789,7 +792,8 @@ class VariableClBuilderImageFilename(Variable):
         if build_id:
             if self.Get('os_root_type_ext') in RootType.RebuildAvailable:
                 base_dn = self.Get('cl_builder_flash_repository')
-                return self._isoname(base_dn, rewrite=False)
+                addon_dn = base_dn.replace("/linux", "/iso")
+                return self._isoname(base_dn, rewrite=False, addon_dn=addon_dn)
             else:
                 return self._isoname(base_dn, rewrite=False)
         return ""