This commit is contained in:
Stefan Kärst 2017-06-02 09:51:39 +02:00 committed by Stefan Kaerst
parent fb9d8a2f9c
commit 8c2fae27d6

View file

@ -531,13 +531,10 @@ class User(object):
if self.expires:
cmd.append('--expiredate')
try:
if self.clearexpires < 0:
cmd.append('')
else:
cmd.append(time.strftime(self.DATE_FORMAT, self.expires))
except ValueError:
raise
if self.clearexpires < 0:
cmd.append('')
else:
cmd.append(time.strftime(self.DATE_FORMAT, self.expires))
if self.update_password == 'always' and self.password is not None and info[1] != self.password:
cmd.append('-p')