analyze: Reduce branches in analyze_first_layer

Moved the lines that try to retrieve base layer packages to its own function to reduce the number of branches in the analyze_first_layer function. Signed-off-by: Nisha K <[email protected]>
tern-tools · Apr 29, 2020 · 59a6b60 · 59a6b60
1 parent c7ccaab
commit 59a6b60
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/tern/analyze/docker/analyze.py b/tern/analyze/docker/analyze.py
@@ -80,23 +80,28 @@ def analyze_first_layer(image_obj, master_list, redo):
         common.get_os_style(image_obj.layers[0], binary)
         # if there is a binary, extract packages
         if shell and binary:
-            try:
-                target = rootfs.mount_base_layer(image_obj.layers[0].tar_file)
-                rootfs.prep_rootfs(target)
-                common.add_base_packages(image_obj.layers[0], binary, shell)
-            except KeyboardInterrupt:
-                logger.critical(errors.keyboard_interrupt)
-                abort_analysis()
-            finally:
-                # unmount proc, sys and dev
-                rootfs.undo_mount()
-                rootfs.unmount_rootfs()
+            execute_base_layer(image_obj.layers[0], binary, shell)
     # populate the master list with all packages found in the first layer
     for p in image_obj.layers[0].packages:
         master_list.append(p)
     return shell
 
 
+def execute_base_layer(base_layer, binary, shell):
+    '''Execute retrieving base layer packages'''
+    try:
+        target = rootfs.mount_base_layer(base_layer.tar_file)
+        rootfs.prep_rootfs(target)
+        common.add_base_packages(base_layer, binary, shell)
+    except KeyboardInterrupt:
+        logger.critical(errors.keyboard_interrupt)
+        abort_analysis()
+    finally:
+        # unmount proc, sys and dev
+        rootfs.undo_mount()
+        rootfs.unmount_rootfs()
+
+
 def analyze_subsequent_layers(image_obj, shell, master_list, redo, dfobj=None,  # noqa: R0912,R0913
                               dfile_lock=False):
     # get packages for subsequent layers