Base gestion mode debug

lib/rkt.py

@@ -1,21 +1,22 @@
 import system, subprocess, os, tamarin, json, re
 
-def run(args, as_root = False, capture_output=False):
+def run(args, as_root = False, capture_output=False, debug=False):
     """Run rkt with the specified args (use the local copy if rkt is not found in the $PATH)"""
     rkt_bin = system.which('rkt', tamarin.get_workspace_subdir('rkt'))
     cmd = ( ["sudo", "-E", rkt_bin] if os.geteuid() != 0 and as_root == True else [rkt_bin] ) + args
-    print(" ".join(cmd))
+    if debug:
+        print(" ".join(cmd))
     if capture_output:
         return subprocess.check_output(cmd, stdin=subprocess.PIPE)
     else:
         return subprocess.call(cmd, stdin=subprocess.PIPE)
 
-def get_images_list(rkt_flags = []):
+def get_images_list(rkt_flags = [], debug=False):
     output = run([
         "image",
         "list",
         "--format=json"
-    ] + rkt_flags, capture_output=True)
+    ] + rkt_flags, capture_output=True, debug=debug)
     # Fetch the list of installed images
     return json.loads(output.decode('utf-8'))
 
@@ -28,10 +29,10 @@ def find_image_by_name(name_pattern, rkt_flags = []):
             return image
     return None
 
-def export_image(image_id, dest_file, rkt_flags = []):
+def export_image(image_id, dest_file, rkt_flags = [], debug=False):
     run([
         "image",
         "export",
         image_id,
         dest_file,
-    ] + rkt_flags)
+    ] + rkt_flags, debug=debug)

lib/system.py

@@ -1,7 +1,8 @@
 import tarfile, os
 
-def extract_tar(file_path, dest_dir = "."):
-    print('Extracting "{:s}" to "{:s}"'.format(file_path, dest_dir))
+def extract_tar(file_path, dest_dir = ".", debug=False):
+    if debug:
+        print('Extracting "{:s}" to "{:s}"'.format(file_path, dest_dir))
     with tarfile.open(file_path) as tar:
         tar.extractall(dest_dir)
         tar.close()

lib/tamarin.py

@@ -2,7 +2,7 @@ import os, glob, subprocess, configparser
 import web, system
 import codecs
 
-def run_profile_hooks(profile, step, cwd=None, env=None):
+def run_profile_hooks(profile, step, cwd=None, env=None, debug=False):
   hooks_dir = get_hooks_dir()
   step_hooks = profile[step]["hooks"]
   if not step_hooks:
@@ -22,7 +22,7 @@ def get_hooks_dir():
 def get_lib_dir():
   return os.path.realpath(os.path.dirname(os.path.abspath(__file__)) + "/../lib")
 
-def load_profile(profile_name):
+def load_profile(profile_name, debug=False):
   profile_filename = profile_name+".conf"
   for profile_file in get_available_profiles():
     if profile_filename == os.path.basename(profile_file):
@@ -63,25 +63,27 @@ def get_rkt_achive_dest_dir():
     workspace_tmp = get_workspace_subdir('tmp')
     return glob.glob(os.path.join(os.sep, workspace_tmp, 'rkt-v*'))[0]
 
-def download_rkt():
+def download_rkt(debug=False):
     """Download a local copy of rkt in the tamarin workspace and return the absolute path to the archive"""
     url = "https://github.com/coreos/rkt/releases/download/v1.22.0/rkt-v1.22.0.tar.gz"
     file_path=os.path.join(os.sep, get_workspace_subdir('tmp'), "rkt.tar.gz")
     web.download_file(file_url=url, dest_path=file_path)
     return file_path
 
-def download_acbuild():
+def download_acbuild(debug=False):
     """Download a local copy of acbuild in the tamarin workspace and return the absolute path to the archive"""
     url = "https://github.com/containers/build/releases/download/v0.4.0/acbuild-v0.4.0.tar.gz"
     file_path=os.path.join(os.sep, get_workspace_subdir('tmp'), "acbuild.tar.gz")
     web.download_file(file_url=url, dest_path=file_path)
     return file_path
 
-def run_acbuild(args, captureOutput=False):
+def run_acbuild(args, captureOutput=False, as_root=False, debug=False):
     """Run acbuild with the specified args (use the local copy if acbuild is not found in the $PATH)"""
     acbuild_bin = system.which('acbuild', get_workspace_subdir('acbuild'))
-    print(" ".join([acbuild_bin] + args))
+    cmd = ( ["sudo", "-E", acbuild_bin] if os.geteuid() != 0 and as_root == True else [acbuild_bin] ) + args
+    if debug:
+        print(" ".join(cmd))
     if captureOutput:
-        return subprocess.check_output([acbuild_bin] + args, stdin=subprocess.PIPE)
+        return subprocess.check_output(cmd, stdin=subprocess.PIPE)
     else:
-        return subprocess.call([acbuild_bin] + args, stdin=subprocess.PIPE)
+        return subprocess.call(cmd, stdin=subprocess.PIPE)