Vinzenz Feenstra has uploaded a new change for review. Change subject: Filter Windows HotFixes also by ReleaseType value ......................................................................
Filter Windows HotFixes also by ReleaseType value Non-english releases contain a field 'ReleaseType' which contains an english string 'Security Update', 'Hotfix' or 'Software Update' Change-Id: I4ab40ed538a48d79f30ee300d791ce4636371634 Bug-Url: https://bugzilla.redhat.com/1103710 Signed-off-by: Vinzenz Feenstra <vfeen...@redhat.com> --- M ovirt-guest-agent/GuestAgentWin32.py 1 file changed, 22 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-guest-agent refs/changes/78/28278/1 diff --git a/ovirt-guest-agent/GuestAgentWin32.py b/ovirt-guest-agent/GuestAgentWin32.py index 60743d5..ba51e47 100644 --- a/ovirt-guest-agent/GuestAgentWin32.py +++ b/ovirt-guest-agent/GuestAgentWin32.py @@ -326,19 +326,29 @@ for idx in range(items): cur_key_path = _winreg.EnumKey(rootkey, idx) cur_key = _winreg.OpenKey(rootkey, cur_key_path) - try: - cur_key_value = QueryStringValue(cur_key, u"DisplayName") - if len(cur_key_value) == 0: - continue - if cur_key_value.find("Hotfix") >= 0: - continue - if cur_key_value.find("Security Update") >= 0: - continue - if cur_key_value.find("Update for Windows") >= 0: - continue + should_skip = False + for value_name in (u"DisplayName", u"ReleaseType"): + try: + cur_key_value = QueryStringValue(cur_key, value_name) + if len(cur_key_value) == 0: + should_skip = True + break + if cur_key_value.find("Hotfix") >= 0: + should_skip = True + break + if cur_key_value.find("Security Update") >= 0: + should_skip = True + break + if cur_key_value.find("Software Update") >= 0: + should_skip = True + break + if cur_key_value.find("Update for Windows") >= 0: + should_skip = True + break + except: + pass + if should_skip is False: retval.append(cur_key_value) - except: - pass return retval def getAvailableRAM(self): -- To view, visit http://gerrit.ovirt.org/28278 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4ab40ed538a48d79f30ee300d791ce4636371634 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-guest-agent Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra <vfeen...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
