]> Frank Brehm's Git Trees - pixelpark/create-vmware-tpl.git/commitdiff
Minor changes on generating and ensuring authorized keys for root 2.7.3
authorFrank Brehm <frank.brehm@pixelpark.com>
Mon, 23 Jan 2023 17:50:25 +0000 (18:50 +0100)
committerFrank Brehm <frank.brehm@pixelpark.com>
Mon, 23 Jan 2023 17:50:25 +0000 (18:50 +0100)
lib/cr_vmware_tpl/cobbler.py

index 38c64c430db52e79380fc07bc0f97eb1d34580fa..89dbc1bfd6537ca4858892344afc9bc712c89075 100644 (file)
@@ -45,7 +45,7 @@ from .config import CrTplConfiguration
 
 from .xlate import XLATOR
 
-__version__ = '0.9.2'
+__version__ = '0.9.3'
 
 LOG = logging.getLogger(__name__)
 
@@ -233,11 +233,10 @@ class Cobbler(BaseHandler):
                     h=self.host, p=self.ssh_port, u=self.ssh_user))
 
             if self.simulate:
-                if self.verbose > 1:
-                    LOG.debug(_(
-                        "Simulating SCP of {local!r} to {user}@{host}:{remote} ...").format(
-                        local=str(local_file), user=self.ssh_user,
-                        host=self.host, remote=str(remote_file)))
+                LOG.debug(_(
+                    "Simulating SCP of {local!r} to {user}@{host}:{remote} ...").format(
+                    local=str(local_file), user=self.ssh_user,
+                    host=self.host, remote=str(remote_file)))
 
             else:
                 ssh.connect(
@@ -246,10 +245,9 @@ class Cobbler(BaseHandler):
 
                 sftp = ssh.open_sftp()
 
-                if self.verbose > 1:
-                    LOG.debug(_("SCP of {local!r} to {user}@{host}:{remote} ...").format(
-                        local=str(local_file), user=self.ssh_user,
-                        host=self.host, remote=str(remote_file)))
+                LOG.debug(_("SCP of {local!r} to {user}@{host}:{remote} ...").format(
+                    local=str(local_file), user=self.ssh_user,
+                    host=self.host, remote=str(remote_file)))
 
                 sftp.put(str(local_file), str(remote_file))