Skip to content

Commit

Permalink
Port saltstack#49310 to master
Browse files Browse the repository at this point in the history
  • Loading branch information
importepeu authored and twangboy committed Nov 14, 2022
1 parent 1736155 commit a4661b2
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions salt/modules/file.py
Original file line number Diff line number Diff line change
Expand Up @@ -3525,9 +3525,13 @@ def touch(name, atime=None, mtime=None):
simply update the atime and mtime if it already does.
atime:
Access time in Unix epoch time
Access time in Unix epoch time. Set it to 0 to set atime of the
file with Unix date of birth. If this parameter isn't set, atime
will be set with current time.
mtime:
Last modification in Unix epoch time
Last modification in Unix epoch time. Set it to 0 to set mtime of
the file with Unix date of birth. If this parameter isn't set,
mtime will be set with current time.
CLI Example:
Expand All @@ -3546,11 +3550,11 @@ def touch(name, atime=None, mtime=None):
with salt.utils.files.fopen(name, "a"):
pass

if not atime and not mtime:
if atime is None and mtime is None:
times = None
elif not mtime and atime:
elif mtime is None and atime is not None:
times = (atime, time.time())
elif not atime and mtime:
elif atime is None and mtime is not None:
times = (time.time(), mtime)
else:
times = (atime, mtime)
Expand Down

0 comments on commit a4661b2

Please sign in to comment.