iso/empanadas/empanadas/util/dnf_utils.py

@@ -1445,7 +1445,6 @@ class RepoSync:
                 "global",
         )
 
-        # Standard ISOs
         self.log.info(Color.INFO + 'Starting to sync ISOs to compose')
 
         if os.path.exists('/usr/bin/fpsync'):
@@ -1468,7 +1467,6 @@ class RepoSync:
         else:
             self.log.info(Color.INFO + message)
 
-        # Live images
         if os.path.exists(live_root):
             self.log.info(Color.INFO + 'Starting to sync live images to compose')
 
@@ -1482,7 +1480,8 @@ class RepoSync:
             else:
                 self.log.info(Color.INFO + message)
 
-        # Cloud images
+        # Sync the cloud images?
+
         if os.path.exists(images_root):
             self.log.info(Color.INFO + 'Starting to sync cloud images to compose')
 
@@ -1500,37 +1499,25 @@ class RepoSync:
         for arch in self.arches:
             iso_arch_root = os.path.join(sync_iso_root, arch)
             iso_arch_checksum = os.path.join(iso_arch_root, 'CHECKSUM')
-            if os.path.exists(iso_arch_root):
+            with open(iso_arch_checksum, 'w+', encoding='utf-8') as fp:
-                with open(iso_arch_checksum, 'w+', encoding='utf-8') as fp:
+                for check in glob.iglob(iso_arch_root + '/*.CHECKSUM'):
-                    for check in glob.iglob(iso_arch_root + '/*.CHECKSUM'):
+                    with open(check, 'r', encoding='utf-8') as sum:
-                        with open(check, 'r', encoding='utf-8') as sum:
+                        for line in sum:
-                            for line in sum:
+                            fp.write(line)
-                                fp.write(line)
+                        sum.close()
-                            sum.close()
+                fp.close()
-                    fp.close()
 
-            live_arch_root = os.path.join(sync_live_root, arch)
+            if arch == 'x86_64' and os.path.exists(sync_live_root):
-            live_arch_checksum = os.path.join(live_arch_root, 'CHECKSUM')
+                live_arch_root = os.path.join(sync_live_root, arch)
-            if os.path.exists(live_arch_root):
+                live_arch_checksum = os.path.join(live_arch_root, 'CHECKSUM')
                 with open(live_arch_checksum, 'w+', encoding='utf-8') as lp:
-                    for lcheck in glob.iglob(live_arch_root + '/*.CHECKSUM'):
+                    for lcheck in glob.iglob(iso_arch_root + '/*.CHECKSUM'):
                         with open(lcheck, 'r', encoding='utf-8') as sum:
                             for line in sum:
                                 lp.write(line)
                             sum.close()
                     lp.close()
 
-            images_arch_root = os.path.join(sync_images_root, arch)
-            images_arch_checksum = os.path.join(sync_images_root, arch)
-            if os.path.exists(images_arch_root):
-                with open(images_arch_checksum, 'w+', encoding='utf-8') as ip:
-                    for icheck in glob.iglob(images_arch_root + '/*.CHECKSUM'):
-                        with open(icheck, 'r', encoding='utf-8') as sum:
-                            for line in sum:
-                                ip.write(line)
-                            sum.close()
-                    ip.close()
-
         # Deploy final metadata for a close out
         self.deploy_metadata(sync_root)