saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "setup.py: remove raw string formatting"

Browse source 
This reverts commit b6c732219c.

We actually need the `repr()` version of the object.

Fixes #26774
This commit is contained in:
Pedro Algarvio 2015-08-31 12:12:43 +01:00
parent 2188867b3d
commit 58df84e0d1
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
setup.py
View file

@ -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}
'''