Fix merge conflict.

oracle · Sep 27, 2018 · 16073e9 · 16073e9
1 parent 472fdd0
commit 16073e9
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/vm/mx.vm/mx_vm.py b/vm/mx.vm/mx_vm.py
@@ -1199,13 +1199,12 @@ def __init__(self, installable, **kw_args):
         if _get_svm_support().is_supported() and _get_launcher_configs(installable.main_component):
             other_comp_names += [c.short_name for c in mx_sdk.graalvm_components() if c.dir_name == 'svm']
 
-        name = '_'.join([installable.main_component.dir_name, 'standalone'] + other_comp_names).upper().replace('-', '_')
-        base_dir = './{comp_name}-{version}-{os}-{arch}/'.format(
-                comp_name=installable.main_component.suite.name,
-                version=_suite.release_version(),
-                os=get_graalvm_os(),
-                arch=mx.get_arch()
-            ).lower().replace('_', '-')
+        self.main_comp_dir_name = installable.main_component.dir_name
+        version = _suite.release_version()
+
+        name = '_'.join([self.main_comp_dir_name, 'standalone'] + other_comp_names).upper().replace('-', '_')
+        self.base_dir_name = '{comp_name}-{version}-{os}-{arch}'.format(comp_name=installable.main_component.suite.name, version=version, os=get_graalvm_os(), arch=mx.get_arch()).lower().replace('_', '-')
+        base_dir = './{}/'.format(self.base_dir_name)
         layout = {}
 
         def is_jar_distribution(val):