Skip to content

Commit 42e300c

Browse files
committed
make sure only the full path is grabbed
1 parent 9d2220b commit 42e300c

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

release_tester/arangodb/instance.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,10 @@ def launch_manual_from_instance_control_file(
268268
"""launch instance without starter with additional arguments"""
269269
self.load_starter_instance_control_file()
270270
command = [str(sbin_dir / self.instance_string)] + self.instance_arguments[1:] + moreargs
271-
dos_old_install_prefix_fwd = str(old_install_prefix).replace("\\", "/")
272-
dos_new_install_prefix_fwd = str(new_install_prefix).replace("\\", "/")
271+
old_install_prefix = old_install_prefix + os.sep
272+
new_install_prefix = new_install_prefix + os.sep
273+
dos_old_install_prefix_fwd = old_install_prefix.replace("\\", "/")
274+
dos_new_install_prefix_fwd = new_install_prefix.replace("\\", "/")
273275

274276
is_cache_supported = is_column_cache_supported(current_version) and enterprise
275277
# in 'command' list arguments and values are splitted

release_tester/arangodb/starter/manager.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -708,8 +708,8 @@ def manually_launch_instances(self, which_instances, moreargs, waitpid=True, kil
708708
instance.kill_instance()
709709
instance.launch_manual_from_instance_control_file(
710710
self.cfg.sbin_dir,
711-
self.old_install_prefix,
712-
self.cfg.install_prefix,
711+
str(self.old_install_prefix),
712+
str(self.cfg.install_prefix),
713713
self.cfg.version,
714714
self.enterprise,
715715
moreargs,

0 commit comments

Comments
 (0)