Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Wrong init var to bool and missing call to total_seconds()

Browse Source 
fix https://github.com/QubesOS/qubes-issues/issues/3661
This commit is contained in:
donoban 2018-03-07 16:37:44 -05:00
parent a8784df349
commit b3b18f97f8
No known key found for this signature in database
GPG Key ID: 141310D8E3ED08A5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qubes/firewall.py
View File

@ -556,7 +556,7 @@ class Firewall(object):
def save(self): def save(self):
'''Save firewall rules to a file''' '''Save firewall rules to a file'''
firewall_conf = os.path.join(self.vm.dir_path, self.vm.firewall_conf) firewall_conf = os.path.join(self.vm.dir_path, self.vm.firewall_conf)
nearest_expire = False nearest_expire = None
xml_root = lxml.etree.Element('firewall', version=str(2)) xml_root = lxml.etree.Element('firewall', version=str(2))
@ -595,7 +595,7 @@ class Firewall(object):
# necessary must be the same as time module; calculate delay and # necessary must be the same as time module; calculate delay and
# use call_later instead # use call_later instead
expire_when = nearest_expire - datetime.datetime.now() expire_when = nearest_expire - datetime.datetime.now()
loop.call_later(expire_when, self._expire_rules) loop.call_later(expire_when.total_seconds(), self._expire_rules)
def qdb_entries(self, addr_family=None): def qdb_entries(self, addr_family=None):
'''Return firewall settings serialized for QubesDB entries '''Return firewall settings serialized for QubesDB entries