# HG changeset patch
# User Georges Racinet <georges.racinet@octobus.net>
# Date 1624277186 -7200
#      Mon Jun 21 14:06:26 2021 +0200
# Node ID 513cde8b6595d1e014e2366d850fe92d2e8b655b
# Parent  11c9bbd5cb5b63fec80d2d604793c86573d107da
volumes-dir: reduced duplication before logic change

diff --git a/launch b/launch
--- a/launch
+++ b/launch
@@ -170,9 +170,10 @@
     parsed_args = parser.parse_args()
     simulate = parsed_args.simulate
 
-    etc_vol = expand_join(parsed_args.volumes_dir, parsed_args.volume_conf)
-    var_vol = expand_join(parsed_args.volumes_dir, parsed_args.volume_data)
-    log_vol = expand_join(parsed_args.volumes_dir, parsed_args.volume_logs)
+    volumes_dir = parsed_args.volumes_dir
+    etc_vol = expand_join(volumes_dir, parsed_args.volume_conf)
+    var_vol = expand_join(volumes_dir, parsed_args.volume_data)
+    log_vol = expand_join(volumes_dir, parsed_args.volume_logs)
     src_vol = os.path.expanduser(parsed_args.volume_src)
 
     do_build_dev = do_build_base = False