Merge pull request #4715 from mscherer/fix_4702

Fix #4702, make setup work on windows
11 years ago · a1fcaf5c61
parent 606df0b1b0 3f0b3a71ca
commit a1fcaf5c61
1 changed files with 1 additions and 1 deletions
--- a/library/system/setup
+++ b/library/system/setup
@ -445,7 +445,7 @@ class Facts(object):
        self.facts['date_time']['minute'] = now.strftime('%M')
        self.facts['date_time']['second'] = now.strftime('%S')
        self.facts['date_time']['epoch'] = now.strftime('%s')
-        if self.facts['date_time']['epoch'][0] == '%':
+        if self.facts['date_time']['epoch'] == '' or self.facts['date_time']['epoch'][0] == '%':
            self.facts['date_time']['epoch'] = str(int(time.time()))
        self.facts['date_time']['date'] = now.strftime('%Y-%m-%d')
        self.facts['date_time']['time'] = now.strftime('%H:%M:%S')