Avoid copying variable file to itself (problem on Windows); remove commented code (#912)

Author: rakillen

core/src/main/python/wlsdeploy/tool/util/variable_injector.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2018, 2020, Oracle Corporation and/or its affiliates.
+Copyright (c) 2018, 2021, Oracle Corporation and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 import copy
@@ -253,7 +253,8 @@ def inject_variables_keyword_file(self, append_option=None):
  if variable_file_location is not None and os.path.exists(variable_file_location):
  # copy the original file first
  append = True
- shutil.copyfile(variable_file_location, new_variable_file_location)
+ if variable_file_location != new_variable_file_location:
+ shutil.copyfile(variable_file_location, new_variable_file_location)
  self._filter_duplicate_properties(new_variable_file_location, variable_dictionary)
 
  variable_file_location = new_variable_file_location

core/src/main/python/wlsdeploy/util/target_configuration_helper.py

@@ -91,11 +91,6 @@ def process_target_arguments(argument_map):
  __logger.throwing(ex, class_name=__class_name, method_name=_method_name)
  raise ex
 
- # Set the -variable_file parameter if not present with default
- # if CommandLineArgUtil.VARIABLE_FILE_SWITCH not in argument_map:
- # path = os.path.join(output_dir, target_name + "_variable.properties")
- # argument_map[CommandLineArgUtil.VARIABLE_FILE_SWITCH] = path
-
 
 def _prepare_k8s_secrets(model_context, token_dictionary, model_dictionary):