From 8f66a0c5c1cc8d4019954e93579f85a95423a6f6 Mon Sep 17 00:00:00 2001 From: "Manuel Amador (Rudd-O)" Date: Tue, 11 Oct 2016 22:42:20 +0000 Subject: [PATCH] Do not run spurious commands that are empty. --- .../site-packages/qubes/modules/001FortressQubesVm.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/usr/lib64/python2.7/site-packages/qubes/modules/001FortressQubesVm.py b/src/usr/lib64/python2.7/site-packages/qubes/modules/001FortressQubesVm.py index 1562e22..218a040 100644 --- a/src/usr/lib64/python2.7/site-packages/qubes/modules/001FortressQubesVm.py +++ b/src/usr/lib64/python2.7/site-packages/qubes/modules/001FortressQubesVm.py @@ -281,12 +281,11 @@ class QubesVm(OriginalQubesVm): def _add(self, ip, dev, netmask, typ): netmask = sum([bin(int(x)).count('1') for x in netmask.split('.')]) dev = dev.replace("+", "0") - text = self.addrule + text = "" if typ == "forward": text += "addfwrules %s/%s\n" % (pipes.quote(ip), netmask) elif typ == "postrouting": text += "addprrules %s/%s %s\n" % (pipes.quote(ip), netmask, pipes.quote(dev)) - self.addrule = "" if not self.rules: self.rules = [] self.rules.append(text) @@ -299,8 +298,8 @@ class QubesVm(OriginalQubesVm): def commit(self): if not self.rules: - return self.addrule + "\ncommitrules\n" - return "\n".join(self.rules) + "\ncommitrules\n" + return "" + return self.addrule + "\n".join(self.rules) + "\ncommitrules\n" programs = [] staticipvms = []