Vinzenz Feenstra has uploaded a new change for review. Change subject: Cleanup the getApplications code ......................................................................
Cleanup the getApplications code Change-Id: Iceb493bb6b6703e426606febb0cdbce9a8890953 Signed-off-by: Vinzenz Feenstra <[email protected]> --- M ovirt-guest-agent/GuestAgentWin32.py 1 file changed, 12 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-guest-agent refs/changes/99/28399/1 diff --git a/ovirt-guest-agent/GuestAgentWin32.py b/ovirt-guest-agent/GuestAgentWin32.py index 8b4e8bc..016c8d9 100644 --- a/ovirt-guest-agent/GuestAgentWin32.py +++ b/ovirt-guest-agent/GuestAgentWin32.py @@ -318,6 +318,17 @@ def getAllNetworkInterfaces(self): return GetNetworkInterfaces() + def _is_item_update(self, reg_key): + RTPATTERNS = ("Hotfix", "Security Update", "Software Update", "Update") + release_type = QueryStringValue(reg_key, u'ReleaseType') + for pattern in RTPATTERNS: + if release_type.find(pattern) >= 0: + return True + parent_key_name = QueryStringValue(reg_key, u'ParentKeyName') + if parent_key_name.find("OperatingSystem") >= 0: + return True + return False + def getApplications(self): retval = [] key_path = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall" @@ -327,17 +338,7 @@ cur_key_path = _winreg.EnumKey(rootkey, idx) cur_key = _winreg.OpenKey(rootkey, cur_key_path) try: - release_type = QueryStringValue(cur_key, u'ReleaseType') - if release_type.find("Hotfix") >= 0: - continue - if release_type.find("Security Update") >= 0: - continue - if release_type.find("Software Update") >= 0: - continue - if release_type.find("Update") >= 0: - continue - parent_key_name = QueryStringValue(cur_key, u'ParentKeyName') - if parent_key_name.find("OperatingSystem") >= 0: + if self._is_item_update(cur_key): continue display_name = QueryStringValue(cur_key, u'DisplayName') if len(display_name) == 0: -- To view, visit http://gerrit.ovirt.org/28399 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iceb493bb6b6703e426606febb0cdbce9a8890953 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-guest-agent Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
