valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix ISO and Unix time of the package for RPM systems on C locale.

Browse Source
This commit is contained in:
Bo Maryniuk 2016-01-11 12:19:59 +01:00
parent 54b9641330
commit 39e70ef762
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
salt/modules/rpm.py
View File

@ -399,18 +399,6 @@ def diff(package, path):
return res return res
def _pkg_time_to_iso(pkg_time):
'''
Convert package time to ISO 8601.
:param pkg_time:
:return:
'''
ptime = time.strptime(pkg_time, '%a %d %b %Y %H:%M:%S %p %Z')
return datetime.datetime(ptime.tm_year, ptime.tm_mon, ptime.tm_mday,
ptime.tm_hour, ptime.tm_min, ptime.tm_sec).isoformat() + "Z"
def info(*packages): def info(*packages):
''' '''
Return a detailed package(s) summary information. Return a detailed package(s) summary information.
@ -435,7 +423,7 @@ def info(*packages):
"Vendor: %{VENDOR}\n" "Vendor: %{VENDOR}\n"
"Release: %{RELEASE}\n" "Release: %{RELEASE}\n"
"Build Date: %{BUILDTIME:date}\n" "Build Date: %{BUILDTIME:date}\n"
"Install Date: %|INSTALLTIME?{%{INSTALLTIME:date}}:{(not installed)}|\n" "Install Date: %|INSTALLTIME?{%{INSTALLTIME}}:{(not installed)}|\n"
"Build Host: %{BUILDHOST}\n" "Build Host: %{BUILDHOST}\n"
"Group: %{GROUP}\n" "Group: %{GROUP}\n"
"Source RPM: %{SOURCERPM}\n" "Source RPM: %{SOURCERPM}\n"
@ -447,7 +435,7 @@ def info(*packages):
"Summary: %{SUMMARY}\n" "Summary: %{SUMMARY}\n"
"Description:\n%{DESCRIPTION}\n" "Description:\n%{DESCRIPTION}\n"
"-----\n'"), "-----\n'"),
output_loglevel='trace', env={'LC_ALL': 'en_US', 'TZ': 'UTC'}, clean_env=True) output_loglevel='trace', env={'TZ': 'UTC'}, clean_env=True)
if call['retcode'] != 0: if call['retcode'] != 0:
comment = '' comment = ''
if 'stderr' in call: if 'stderr' in call:
@ -484,7 +472,10 @@ def info(*packages):
if key == 'name': if key == 'name':
pkg_name = value pkg_name = value
if key in ['build_date', 'install_date']: if key in ['build_date', 'install_date']:
value = _pkg_time_to_iso(value) try:
pkg_data['{0}_iso'.format(key)] = datetime.datetime.fromtimestamp(int(value)).isoformat()
except ValueError:
log.warning('Could not convert "{0}" into Unix time'.format(value))
if key != 'description' and value: if key != 'description' and value:
pkg_data[key] = value pkg_data[key] = value
pkg_data['description'] = os.linesep.join(descr) pkg_data['description'] = os.linesep.join(descr)