Standardize env vars

Author: pavinjosdev

zypperoni

@@ -29,8 +29,9 @@ from shlex import quote
 import xml.etree.ElementTree as ET
 
 # Constants
-ZYPPERONI_VERSION = "1.0.2"
+ZYPPERONI_VERSION = "1.0.3"
 ZYPPER_PID_FILE = "/run/zypp.pid"
+ZYPPER_ENV = "ZYPP_CURL2=1 ZYPP_PCK_PRELOAD=1 ZYPP_SINGLE_RPMTRANS=1"
 
 ################################
 
@@ -262,15 +263,15 @@ async def main_task(num_jobs, task_type, task_items, no_confirm=None):
             msg = "Zypperoni has finished its tasks. Handing you over to zypper..."
             if task_type == "dup":
                 logging.info(color("info", msg))
-                command = f"env ZYPP_SINGLE_RPMTRANS=1 zypper {'--non-interactive' if no_confirm else ''} --no-cd dist-upgrade"
+                command = f"env {ZYPPER_ENV} zypper {'--non-interactive' if no_confirm else ''} --no-cd dist-upgrade"
                 os.system(command)
             elif task_type == "in":
                 logging.info(color("info", msg))
-                command = f"env ZYPP_SINGLE_RPMTRANS=1 zypper {'--non-interactive' if no_confirm else ''} --no-cd install {' '.join(install_pkgs)}"
+                command = f"env {ZYPPER_ENV} zypper {'--non-interactive' if no_confirm else ''} --no-cd install {' '.join(install_pkgs)}"
                 os.system(command)
             elif task_type == "inr":
                 logging.info(color("info", msg))
-                command = f"env ZYPP_SINGLE_RPMTRANS=1 zypper {'--non-interactive' if no_confirm else ''} --no-cd install-new-recommends"
+                command = f"env {ZYPPER_ENV} zypper {'--non-interactive' if no_confirm else ''} --no-cd install-new-recommends"
                 os.system(command)
 
 ################################
@@ -396,7 +397,7 @@ mount -o bind,ro /var/lib/ca-certificates {ZYPPERONI_TMP_DIR}/{{uuid}}/rootfs/va
 
 # Shell commands to perform zypper refresh / force-refresh
 refresh_shell_commands = f"""
-chroot {ZYPPERONI_TMP_DIR}/{{uuid}}/rootfs env -i ZYPP_CURL2=1 zypper --non-interactive {{refresh_type}} {{repo_alias}};
+chroot {ZYPPERONI_TMP_DIR}/{{uuid}}/rootfs env -i {ZYPPER_ENV} zypper --non-interactive {{refresh_type}} {{repo_alias}};
 """
 
 # Shell commands to prepare temp mounts for zypper download
@@ -420,7 +421,7 @@ mount -o bind,ro /var/lib/ca-certificates {ZYPPERONI_TMP_DIR}/{{uuid}}/rootfs/va
 
 # Shell commands to perform zypper download
 download_shell_commands = f"""
-chroot {ZYPPERONI_TMP_DIR}/{{uuid}}/rootfs env -i zypper --non-interactive download {{pkg_name}};
+chroot {ZYPPERONI_TMP_DIR}/{{uuid}}/rootfs env -i {ZYPPER_ENV} zypper --non-interactive download {{pkg_name}};
 """
 
 # Dirs to unmount (one per line)
@@ -439,7 +440,7 @@ if args.command_name in ["refresh", "ref"]:
     # get all enabled repos
     logging.info(color("info", "Getting all enabled repos"))
     REPO_ALIAS = []
-    xml_output, ret = shell_exec("env -i zypper --non-interactive --no-cd --xmlout repos")
+    xml_output, ret = shell_exec(f"env -i {ZYPPER_ENV} zypper --non-interactive --no-cd --xmlout repos")
     logging.debug(xml_output)
     get_zypp_lock()
     docroot = ET.fromstring(xml_output)
@@ -462,7 +463,7 @@ if args.command_name in ["refresh", "ref"]:
 elif args.command_name in ["dist-upgrade", "dup"]:
     # get info about dup packages
     logging.info(color("info", "Getting all packages to be downloaded for distribution upgrade"))
-    xml_output, ret = shell_exec("env -i zypper --non-interactive --no-cd --xmlout dist-upgrade --dry-run")
+    xml_output, ret = shell_exec(f"env -i {ZYPPER_ENV} zypper --non-interactive --no-cd --xmlout dist-upgrade --dry-run")
     logging.debug(xml_output)
     if ret == 0 and xml_output.find("Nothing to do") != -1:
         logging.info(color("info", "Nothing to do. Exiting..."))
@@ -498,7 +499,7 @@ elif args.command_name in ["dist-upgrade", "dup"]:
         logging.warning(color("warning", msg))
         # get info about dup packages from 'zypper lu'
         logging.info(color("info", "Getting all packages to be upgraded"))
-        xml_output, ret = shell_exec("env -i zypper --non-interactive --no-cd --xmlout list-updates --type package --all")
+        xml_output, ret = shell_exec(f"env -i {ZYPPER_ENV} zypper --non-interactive --no-cd --xmlout list-updates --type package --all")
         logging.debug(xml_output)
         docroot = ET.fromstring(xml_output)
         # parse all packages from xml output
@@ -520,7 +521,7 @@ elif args.command_name in ["dist-upgrade", "dup"]:
     if not args.download_only and download_size_bytes == 0:
         zypperoni_cleanup()
         logging.info(color("info", "Zypperoni has finished its tasks. Handing you over to zypper..."))
-        command = f"env ZYPP_SINGLE_RPMTRANS=1 zypper {'--non-interactive' if args.no_confirm else ''} --no-cd dist-upgrade"
+        command = f"env {ZYPPER_ENV} zypper {'--non-interactive' if args.no_confirm else ''} --no-cd dist-upgrade"
         os.system(command)
         sys.exit()
     logging.info(color("info", f"Packages to download: {' '.join(DUP_PKG)}"))
@@ -538,7 +539,7 @@ elif args.command_name in ["dist-upgrade", "dup"]:
 elif args.command_name in ["install", "in"]:
     # get info about install packages
     logging.info(color("info", "Getting packages and their dependencies to be downloaded for installation"))
-    xml_output, ret = shell_exec(f"env -i zypper --non-interactive --no-cd --xmlout install --dry-run {' '.join(args.package)}")
+    xml_output, ret = shell_exec(f"env -i {ZYPPER_ENV} zypper --non-interactive --no-cd --xmlout install --dry-run {' '.join(args.package)}")
     logging.debug(xml_output)
     if ret == 0 and xml_output.find("Nothing to do") != -1:
         logging.info(color("info", "Nothing to do. Exiting..."))
@@ -596,7 +597,7 @@ elif args.command_name in ["install", "in"]:
     if not args.download_only and download_size_bytes == 0:
         zypperoni_cleanup()
         logging.info(color("info", "Zypperoni has finished its tasks. Handing you over to zypper..."))
-        command = f"env ZYPP_SINGLE_RPMTRANS=1 zypper {'--non-interactive' if args.no_confirm else ''} --no-cd install {' '.join(args.package)}"
+        command = f"env {ZYPPER_ENV} zypper {'--non-interactive' if args.no_confirm else ''} --no-cd install {' '.join(args.package)}"
         os.system(command)
         sys.exit()
     logging.info(color("info", f"Packages to download: {' '.join(IN_PKG)}"))
@@ -614,7 +615,7 @@ elif args.command_name in ["install", "in"]:
 elif args.command_name in ["install-new-recommends", "inr"]:
     # get info about recommended install packages
     logging.info(color("info", "Getting new packages and their dependencies to be downloaded for recommended installation"))
-    xml_output, ret = shell_exec(f"env -i zypper --non-interactive --no-cd --xmlout install-new-recommends --dry-run")
+    xml_output, ret = shell_exec(f"env -i {ZYPPER_ENV} zypper --non-interactive --no-cd --xmlout install-new-recommends --dry-run")
     logging.debug(xml_output)
     if ret == 0 and xml_output.find("Nothing to do") != -1:
         logging.info(color("info", "Nothing to do. Exiting..."))
@@ -663,7 +664,7 @@ elif args.command_name in ["install-new-recommends", "inr"]:
     if not args.download_only and download_size_bytes == 0:
         zypperoni_cleanup()
         logging.info(color("info", "Zypperoni has finished its tasks. Handing you over to zypper..."))
-        command = f"env ZYPP_SINGLE_RPMTRANS=1 zypper {'--non-interactive' if args.no_confirm else ''} --no-cd install-new-recommends"
+        command = f"env {ZYPPER_ENV} zypper {'--non-interactive' if args.no_confirm else ''} --no-cd install-new-recommends"
         os.system(command)
         sys.exit()
     logging.info(color("info", f"Packages to download: {' '.join(INR_PKG)}"))