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

Return RPM package time in UTC timezone

Browse Source
This commit is contained in:
Bo Maryniuk 2015-09-18 18:55:57 +02:00
parent f3fa7bc405
commit 159fce9f31
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
salt/modules/rpm.py
View File

@ -406,9 +406,9 @@ def _pkg_time_to_iso(pkg_time):
:param pkg_time:
:return:
'''
ptime = time.strptime(pkg_time)
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()
ptime.tm_hour, ptime.tm_min, ptime.tm_sec).isoformat() + "Z"
def info(*packages):
@ -427,7 +427,10 @@ def info(*packages):
'''
cmd = packages and "rpm -qi {0}".format(' '.join(packages)) or "rpm -qai"
call = __salt__['cmd.run_all'](cmd + " --queryformat '-----\n'", output_loglevel='trace')
# Locale needs to be en_US instead of C, because RPM otherwise will yank the timezone from the timestamps
call = __salt__['cmd.run_all'](cmd + " --queryformat '-----\n'",
output_loglevel='trace', env={'LC_ALL': 'en_US', 'TZ': 'UTC'}, clean_env=True)
if call['retcode'] != 0:
comment = ''
if 'stderr' in call: