Merge pull request #9185 from m-czernek/spacecmd-bootstrap-fix

Fix spacecmd type issue during bootstrap
uyuni-project · Sep 9, 2024 · cf15ddb · cf15ddb
2 parents 9f7a168 + b31e453
commit cf15ddb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/spacecmd/spacecmd.changes.mczernek.spacecmd-bootstrap-fix b/spacecmd/spacecmd.changes.mczernek.spacecmd-bootstrap-fix
@@ -0,0 +1 @@
+- Spacecmd bootstrap now works with specified port (bsc#1229437)
diff --git a/spacecmd/src/spacecmd/system.py b/spacecmd/src/spacecmd/system.py
@@ -4563,6 +4563,12 @@ def do_system_bootstrap(self, args):
         if answer in ['y', 'Y']:
             options.saltssh = True
 
+    if isinstance(options.port, str):
+        if not options.port.isnumeric():
+            logging.error(_N("Provided port must be numeric"))
+            return 1
+        options.port = int(options.port)
+
     if not options.hostname:
         logging.error(_N("Hostname must be provided"))
         return 1