fix incorrect --controllers environment priority if arg was given

Author: rp-

CHANGELOG.md

@@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - resource-definition-list: add more state values CLONING/FAILED...
 - volume-list: show drbd replication state in its own column
 
+### Fixed
+
+- Incorrect environment controllers priority if given by commandline
+
 ## [1.24.0] - 2024-12-17
 
 ### Added

linstor_client_main.py

@@ -155,6 +155,8 @@ def __init__(self):
             self._key_value_store_commands
         ]
 
+        self._dflt_ctrl = 'localhost:%d' % linstor.Linstor.REST_PORT
+
         self._zsh_generator = None
         self._parser = self.setup_parser()
         self._all_commands = self.parser_cmds(self._parser)
@@ -180,7 +182,7 @@ def setup_parser(self):
         parser.add_argument('--curl',
                             action="store_true",
                             help="Do not execute the action, only output a curl equivalent command.")
-        parser.add_argument('--controllers', default='localhost:%d' % linstor.Linstor.REST_PORT,
+        parser.add_argument('--controllers', default=self._dflt_ctrl,
                             help='Comma separated list of controllers (e.g.: "host1:port,host2:port"). '
                             'If the environment variable %s is set, '
                             'the ones set via this argument get appended.' % KEY_LS_CONTROLLERS)
@@ -318,8 +320,14 @@ def parse_and_execute(self, pargs, is_interactive=False):
 
             # only connect if not already connected or a local only command was executed
             conn_errors = []
-            contrl_list = linstor.MultiLinstor.controller_uri_list(
-                os.environ.get(KEY_LS_CONTROLLERS, "") + ',' + args.controllers)
+            ctrls = []
+            if args.controllers != self._dflt_ctrl:
+                ctrls.append(args.controllers)
+            if os.environ.get(KEY_LS_CONTROLLERS):
+                ctrls.append(os.environ.get(KEY_LS_CONTROLLERS))
+            if not ctrls:
+                ctrls.append(self._dflt_ctrl)
+            contrl_list = linstor.MultiLinstor.controller_uri_list(','.join(ctrls))
             if self._linstorapi is None and args.func not in local_only_cmds:
                 username = None
                 password = None