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

Don't obfuscate the internal version attribute

Browse source 
Fixes #21522
This commit is contained in:
Pedro Algarvio 2015-03-11 19:21:26 +00:00
parent a531ab0066
commit e5a7158069
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
setup.py
View file

@ -532,7 +532,7 @@ class SaltDistribution(distutils.dist.Distribution):
self.salt_transport = None self.salt_transport = None
self.name = 'salt-ssh' if PACKAGED_FOR_SALT_SSH else 'salt' self.name = 'salt-ssh' if PACKAGED_FOR_SALT_SSH else 'salt'
self.version = __version__ # pylint: disable=undefined-variable self.salt_version = __version__ # pylint: disable=undefined-variable
self.description = 'Portable, distributed, remote execution and configuration management system' self.description = 'Portable, distributed, remote execution and configuration management system'
self.author = 'Thomas S Hatch' self.author = 'Thomas S Hatch'
self.author_email = 'thatch45@gmail.com' self.author_email = 'thatch45@gmail.com'
@ -562,6 +562,8 @@ class SaltDistribution(distutils.dist.Distribution):
attrvalue = getattr(self, attrname, None) attrvalue = getattr(self, attrname, None)
if attrvalue == 0: if attrvalue == 0:
continue continue
if attrname == 'salt_version':
attrname = 'version'
if hasattr(self.metadata, 'set_{0}'.format(attrname)): if hasattr(self.metadata, 'set_{0}'.format(attrname)):
getattr(self.metadata, 'set_{0}'.format(attrname))(attrvalue) getattr(self.metadata, 'set_{0}'.format(attrname))(attrvalue)
elif hasattr(self.metadata, attrname): elif hasattr(self.metadata, attrname):