chore: replace percent strings for logging

Venefilyn · Venefilyn · commit bf0c24fb50a1 · 2024-12-11T16:56:14.000+01:00
This replaces logging with their best counterpart. Either normal logging
methods with arguments, or by utilizing `.format()`
diff --git a/convert2rhel/actions/system_checks/is_loaded_kernel_latest.py b/convert2rhel/actions/system_checks/is_loaded_kernel_latest.py
@@ -39,8 +39,10 @@ def run(self):
 
         if system_info.id == "oracle" and system_info.eus_system:
             logger.info(
-                "Did not perform the check because there were no publicly available %s %d.%d repositories available."
-                % (system_info.name, system_info.version.major, system_info.version.minor)
+                "Did not perform the check because there were no publicly available %s %d.%d repositories available.",
+                system_info.name,
+                system_info.version.major,
+                system_info.version.minor,
             )
             return
 
diff --git a/convert2rhel/actions/system_checks/package_updates.py b/convert2rhel/actions/system_checks/package_updates.py
@@ -35,17 +35,19 @@ def run(self):
 
         if system_info.id == "oracle" and system_info.eus_system:
             logger.info(
-                "Did not perform the check because there were no publicly available %s %d.%d repositories available."
-                % (system_info.name, system_info.version.major, system_info.version.minor)
+                "Did not perform the check because there were no publicly available {} {}.{} repositories available.".format(
+                    system_info.name, system_info.version.major, system_info.version.minor
+                )
             )
             self.add_message(
                 level="INFO",
                 id="PACKAGE_UPDATES_CHECK_SKIP_NO_PUBLIC_REPOSITORIES",
                 title="Did not perform the package updates check",
                 description="Please refer to the diagnosis for further information",
                 diagnosis=(
-                    "Did not perform the check because there were no publicly available %s %d.%d repositories available."
-                    % (system_info.name, system_info.version.major, system_info.version.minor)
+                    "Did not perform the check because there were no publicly available {} {}.{} repositories available.".format(
+                        system_info.name, system_info.version.major, system_info.version.minor
+                    )
                 ),
             )
             return
diff --git a/convert2rhel/actions/system_checks/rhel_compatible_kernel.py b/convert2rhel/actions/system_checks/rhel_compatible_kernel.py
@@ -116,8 +116,9 @@ def _bad_kernel_version(kernel_release):
         )
 
     logger.debug(
-        "Booted kernel version '%s' corresponds to the version available in RHEL %d"
-        % (kernel_version, system_info.version.major)
+        "Booted kernel version '{}' corresponds to the version available in RHEL {}".format(
+            kernel_version, system_info.version.major
+        )
     )
     return False
 
diff --git a/convert2rhel/applock.py b/convert2rhel/applock.py
@@ -72,7 +72,7 @@ def __str__(self):
             status = "locked"
         else:
             status = "unlocked"
-        return "%s PID %d %s" % (self._pidfile, self._pid, status)
+        return "{} PID {} {}".format(self._pidfile, self._pid, status)
 
     def _try_create(self):
         """Try to create the lock file. If this succeeds, the lock file
@@ -149,10 +149,10 @@ def try_to_lock(self, _recursive=False):
             raise ApplicationLockedError("Lock file {} is corrupt".format(self._pidfile))
 
         if self._pid_exists(pid):
-            raise ApplicationLockedError("%s locked by process %d" % (self._pidfile, pid))
+            raise ApplicationLockedError("{} locked by process {}".format(self._pidfile, pid))
         # The lock file was created by a process that has exited;
         # remove it and try again.
-        logger.info("Cleaning up lock held by exited process %d." % pid)
+        logger.info("Cleaning up lock held by exited process %d.", pid)
         os.unlink(self._pidfile)
         self.try_to_lock(_recursive=True)
 
diff --git a/convert2rhel/backup/packages.py b/convert2rhel/backup/packages.py
@@ -172,8 +172,9 @@ def _install_local_rpms(self, replace=False, critical=True):
                         "one or more packages that we removed as part of the "
                         "conversion."
                     ),
-                    diagnosis="Couldn't install %s packages. Command: %s Output: %s Status: %d"
-                    % (pkgs_as_str, cmd, output, ret_code),
+                    diagnosis="Couldn't install {} packages. Command: {} Output: {} Status: {}".format(
+                        pkgs_as_str, cmd, output, ret_code
+                    ),
                 )
 
             logger.warning("Couldn't install {} packages.".format(pkgs_as_str))
diff --git a/convert2rhel/pkghandler.py b/convert2rhel/pkghandler.py
@@ -318,8 +318,7 @@ def format_pkg_info(pkgs, disable_repos=None):
     max_nvra_length = max(len(nvra) for nvra in package_info)
 
     header = (
-        "%-*s  %-*s  %s"
-        % (
+        "{}-{}  {}-{}  {}".format(
             max_nvra_length,
             "Package",
             max_packager_length,
@@ -329,8 +328,7 @@ def format_pkg_info(pkgs, disable_repos=None):
         + "\n"
     )
     header_underline = (
-        "%-*s  %-*s  %s"
-        % (
+        "{}-{}  {}-{}  {}".format(
             max_nvra_length,
             "-" * len("Package"),
             max_packager_length,
@@ -348,8 +346,7 @@ def format_pkg_info(pkgs, disable_repos=None):
     pkg_list = ""
     for package, info in package_info.items():
         pkg_list += (
-            "%-*s  %-*s  %s"
-            % (
+            "{}-{}  {}-{}  {}".format(
                 max_nvra_length,
                 package,
                 max_packager_length,
diff --git a/convert2rhel/pkgmanager/handlers/dnf/callback.py b/convert2rhel/pkgmanager/handlers/dnf/callback.py
@@ -196,7 +196,7 @@ def end(self, payload, status, err_msg):
         if status:
             # the error message, no trimming
             if status == pkgmanager.callback.STATUS_DRPM and self.total_drpm > 1:
-                message = "(%d/%d) [%s %d/%d]: %s" % (
+                message = "({}/{}) [{} {}/{}]: {}".format(
                     self.done_files,
                     self.total_files,
                     self._STATUS_MAPPING[status],
@@ -206,15 +206,15 @@ def end(self, payload, status, err_msg):
                 )
                 message = "{} - {}".format(message, err_msg)
             else:
-                message = "(%d/%d) [%s]: %s" % (
+                message = "({}/{}) [{}]: {}".format(
                     self.done_files,
                     self.total_files,
                     self._STATUS_MAPPING.get(status, "Unknown"),
                     package,
                 )
         else:
             if self.total_files > 1:
-                message = "(%d/%d): %s" % (self.done_files, self.total_files, package)
+                message = "({}/{}): {}".format(self.done_files, self.total_files, package)
 
         if message:
             logger.info(message)
diff --git a/convert2rhel/subscription.py b/convert2rhel/subscription.py
@@ -155,7 +155,7 @@ def register_system():
     while attempt < MAX_NUM_OF_ATTEMPTS_TO_SUBSCRIBE:
         attempt_msg = ""
         if attempt > 0:
-            attempt_msg = "Attempt %d of %d: " % (
+            attempt_msg = "Attempt {} of {}: ".format(
                 attempt + 1,
                 MAX_NUM_OF_ATTEMPTS_TO_SUBSCRIBE,
             )
diff --git a/convert2rhel/systeminfo.py b/convert2rhel/systeminfo.py
@@ -182,10 +182,10 @@ def resolve_system_info(self):
 
     def print_system_information(self):
         """Print system related information."""
-        self.logger.info("%-20s %s" % ("Name:", self.name))
-        self.logger.info("%-20s %s" % ("OS version:", self.version))
-        self.logger.info("%-20s %s" % ("Architecture:", self.arch))
-        self.logger.info("%-20s %s" % ("Config filename:", self.cfg_filename))
+        self.logger.info("%-20s %s", "Name:", self.name)
+        self.logger.info("%-20s %s", "OS version:", self.version)
+        self.logger.info("%-20s %s", "Architecture:", self.arch)
+        self.logger.info("%-20s %s", "Config filename:", self.cfg_filename)
 
     @staticmethod
     def get_system_release_file_content():
@@ -282,7 +282,7 @@ def _get_architecture(self):
         return arch
 
     def _get_cfg_filename(self):
-        cfg_filename = "%s-%d-%s.cfg" % (
+        cfg_filename = "{}-{}-{}.cfg".format(
             self.id,
             self.version.major,
             self.arch,

Original file line number	Diff line number	Diff line change
`@@ -116,8 +116,9 @@ def _bad_kernel_version(kernel_release):`
`116`	`116`	`)`
`117`	`117`
`118`	`118`	`logger.debug(`
`119`		`- "Booted kernel version '%s' corresponds to the version available in RHEL %d"`
`120`		`- % (kernel_version, system_info.version.major)`
	`119`	`+ "Booted kernel version '{}' corresponds to the version available in RHEL {}".format(`
	`120`	`+ kernel_version, system_info.version.major`
	`121`	`+ )`
`121`	`122`	`)`
`122`	`123`	`return False`
`123`	`124`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ def register_system():`
`155`	`155`	`while attempt < MAX_NUM_OF_ATTEMPTS_TO_SUBSCRIBE:`
`156`	`156`	`attempt_msg = ""`
`157`	`157`	`if attempt > 0:`
`158`		`- attempt_msg = "Attempt %d of %d: " % (`
	`158`	`+ attempt_msg = "Attempt {} of {}: ".format(`
`159`	`159`	`attempt + 1,`
`160`	`160`	`MAX_NUM_OF_ATTEMPTS_TO_SUBSCRIBE,`
`161`	`161`	`)`