Vinzenz Feenstra has uploaded a new change for review.

Change subject: Filter Windows HotFixes by ReleaseType value
......................................................................

Filter Windows HotFixes by ReleaseType value

Non-english releases contain a field 'ReleaseType' which contains
an english string 'Security Update', 'Hotfix' or 'Update'
Additionally we're checking for 'ParentKeyName' which contains
'OperatingSystem' in case of an update.

Change-Id: I4ab40ed538a48d79f30ee300d791ce4636371634
Bug-Url: https://bugzilla.redhat.com/1108672
Signed-off-by: Vinzenz Feenstra <[email protected]>
---
M ovirt-guest-agent/GuestAgentWin32.py
1 file changed, 12 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-guest-agent 
refs/changes/80/28780/1

diff --git a/ovirt-guest-agent/GuestAgentWin32.py 
b/ovirt-guest-agent/GuestAgentWin32.py
index 4cf3d9d..3df0080 100644
--- a/ovirt-guest-agent/GuestAgentWin32.py
+++ b/ovirt-guest-agent/GuestAgentWin32.py
@@ -317,16 +317,22 @@
             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:
+                release_type = QueryStringValue(cur_key, u'ReleaseType')
+                if release_type.find("Hotfix") >= 0:
                     continue
-                if cur_key_value.find("Hotfix") >= 0:
+                if release_type.find("Security Update") >= 0:
                     continue
-                if cur_key_value.find("Security Update") >= 0:
+                if release_type.find("Software Update") >= 0:
                     continue
-                if cur_key_value.find("Update for Windows") >= 0:
+                if release_type.find("Update") >= 0:
                     continue
-                retval.append(cur_key_value)
+                parent_key_name = QueryStringValue(cur_key, u'ParentKeyName')
+                if parent_key_name.find("OperatingSystem") >= 0:
+                    continue
+                display_name = QueryStringValue(cur_key, u'DisplayName')
+                if len(display_name) == 0:
+                    continue
+                retval.append(display_name)
             except:
                 pass
         return retval


-- 
To view, visit http://gerrit.ovirt.org/28780
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: ovirt-3.4
Gerrit-Owner: Vinzenz Feenstra <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to