diff --git a/setup.py b/setup.py index 768d34fdd51..868a76a4879 100755 --- a/setup.py +++ b/setup.py @@ -605,7 +605,7 @@ INSTALL_VERSION_TEMPLATE = '''\ from salt.version import SaltStackVersion -__saltstack_version__ = SaltStackVersion\'{full_version_info}\' +__saltstack_version__ = SaltStackVersion{full_version_info!r} ''' @@ -613,19 +613,19 @@ INSTALL_SYSPATHS_TEMPLATE = '''\ # This file was auto-generated by salt's setup on \ {date:%A, %d %B %Y @ %H:%m:%S UTC}. -ROOT_DIR = \'{root_dir}\' -CONFIG_DIR = \'{config_dir}\' -CACHE_DIR = \'{cache_dir}\' -SOCK_DIR = \'{sock_dir}\' -SRV_ROOT_DIR = \'{srv_root_dir}\' -BASE_FILE_ROOTS_DIR = \'{base_file_roots_dir}\' -BASE_PILLAR_ROOTS_DIR = \'{base_pillar_roots_dir}\' -BASE_MASTER_ROOTS_DIR = \'{base_master_roots_dir}\' -LOGS_DIR = \'{logs_dir}\' -PIDFILE_DIR = \'{pidfile_dir}\' -SPM_FORMULA_PATH = \'{spm_formula_path}\' -SPM_PILLAR_PATH = \'{spm_pillar_path}\' -SPM_REACTOR_PATH = \'{spm_reactor_path}\' +ROOT_DIR = {root_dir!r} +CONFIG_DIR = {config_dir!r} +CACHE_DIR = {cache_dir!r} +SOCK_DIR = {sock_dir!r} +SRV_ROOT_DIR= {srv_root_dir!r} +BASE_FILE_ROOTS_DIR = {base_file_roots_dir!r} +BASE_PILLAR_ROOTS_DIR = {base_pillar_roots_dir!r} +BASE_MASTER_ROOTS_DIR = {base_master_roots_dir!r} +LOGS_DIR = {logs_dir!r} +PIDFILE_DIR = {pidfile_dir!r} +SPM_FORMULA_PATH = {spm_formula_path!r} +SPM_PILLAR_PATH = {spm_pillar_path!r} +SPM_REACTOR_PATH = {spm_reactor_path!r} '''