Simone Tiraboschi has posted comments on this change. Change subject: pacaking: setup: fixing iptables review dialog ......................................................................
Patch Set 6: (7 comments) http://gerrit.ovirt.org/#/c/33467/6/packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager_iptables.py File packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager_iptables.py: Line 126 Line 127 Line 128 Line 129 Line 130 > diff_lines ? Done Line 128: ) Line 129: Line 130: def review_config(self): Line 131: diffl = '' Line 132: curipr = '' > current_rules ? Done Line 133: pre_modified = False Line 134: if os.path.isfile(osetupcons.FileLocations.SYSCONFIG_IPTABLES): Line 135: with open( Line 136: osetupcons.FileLocations.SYSCONFIG_IPTABLES, Line 129: Line 130: def review_config(self): Line 131: diffl = '' Line 132: curipr = '' Line 133: pre_modified = False > current_modified_since_prev_setup ? Done Line 134: if os.path.isfile(osetupcons.FileLocations.SYSCONFIG_IPTABLES): Line 135: with open( Line 136: osetupcons.FileLocations.SYSCONFIG_IPTABLES, Line 137: 'r' Line 135: with open( Line 136: osetupcons.FileLocations.SYSCONFIG_IPTABLES, Line 137: 'r' Line 138: ) as current: Line 139: curipr = current.readlines() > current.read().splitlines() ? Done Line 140: if os.path.isfile(osetupcons.FileLocations.OVIRT_IPTABLES_EXAMPLE): Line 141: with open( Line 142: osetupcons.FileLocations.OVIRT_IPTABLES_EXAMPLE, Line 143: 'r' Line 141: with open( Line 142: osetupcons.FileLocations.OVIRT_IPTABLES_EXAMPLE, Line 143: 'r' Line 144: ) as preexample: Line 145: preexipr = preexample.readlines() > same Done Line 146: diffprecur = difflib.unified_diff( Line 147: curipr, Line 148: preexipr, Line 149: ) Line 151: if len(diffl) > 0: Line 152: pre_modified = True Line 153: diff = difflib.unified_diff( Line 154: curipr, Line 155: self._get_rules().splitlines(True), > splitlines() Done Line 156: fromfile=_('current'), Line 157: tofile=_('proposed'), Line 158: ) Line 159: diffl = ''.join(diff) http://gerrit.ovirt.org/#/c/33467/6/packaging/setup/plugins/ovirt-engine-setup/base/network/firewall_manager.py File packaging/setup/plugins/ovirt-engine-setup/base/network/firewall_manager.py: Line 244: ] Line 245: if m.name == self.environment[ Line 246: osetupcons.ConfigEnv.FIREWALL_MANAGER Line 247: ] Line 248: ).review_config() > and then use here Done Line 249: Line 250: @plugin.event( Line 251: stage=plugin.Stages.STAGE_MISC, Line 252: ) -- To view, visit http://gerrit.ovirt.org/33467 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8f16a90a074052226882d76fc80918ed276d379c Gerrit-PatchSet: 6 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Simone Tiraboschi <[email protected]> Gerrit-Reviewer: Lev Veyde <[email protected]> Gerrit-Reviewer: Sandro Bonazzola <[email protected]> Gerrit-Reviewer: Simone Tiraboschi <[email protected]> Gerrit-Reviewer: Yedidyah Bar David <[email protected]> Gerrit-Reviewer: [email protected] Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
