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

Replace "*_date_iso" with "*_date" and use Unix time as "*_date_time_t"

Browse source
This commit is contained in:
Bo Maryniuk 2016-01-11 16:15:30 +01:00
parent b2b21f877a
commit 7edb0e8f3f
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/modules/rpm.py
View file

@ -488,9 +488,12 @@ def info(*packages, **attr):
pkg_name = value
if key in ['build_date', 'install_date']:
try:
pkg_data['{0}_iso'.format(key)] = datetime.datetime.fromtimestamp(int(value)).isoformat()
value = int(value)
pkg_data['{0}_time_t'.format(key)] = value
value = datetime.datetime.fromtimestamp(value).isoformat()
except ValueError:
log.warning('Could not convert "{0}" into Unix time'.format(value))
continue
if key not in ['description', 'name'] and value:
pkg_data[key] = value
if filter_attrs and 'description' in filter_attrs or not filter_attrs: