--- glsa-check.1 (revision 540) +++ glsa-check.1 (working copy) @@ -12,7 +12,7 @@ This tool is used to locally monitor and manage Gentoo Linux Security Advisories. Please read: .br -http://www.gentoo.org/proj/en/portage/glsa\-integration.xml +http://www.gentoo.org/security .br before reporting a bug. .LP --- glsa-check (revision 540) +++ glsa-check (working copy) @@ -328,12 +328,12 @@ # color doesn't make any sense for mail nocolor() - if glsaconfig.has_key("PORTAGE_ELOG_MAILURI"): + if "PORTAGE_ELOG_MAILURI" in glsaconfig: myrecipient = glsaconfig["PORTAGE_ELOG_MAILURI"].split()[0] else: myrecipient = "root@localhost" - if glsaconfig.has_key("PORTAGE_ELOG_MAILFROM"): + if "PORTAGE_ELOG_MAILFROM" in glsaconfig: myfrom = glsaconfig["PORTAGE_ELOG_MAILFROM"] else: myfrom = "glsa-check" --- glsa.py (revision 540) +++ glsa.py (working copy) @@ -510,7 +510,7 @@ self.packages = {} for p in self.affected.getElementsByTagName("package"): name = p.getAttribute("name") - if not self.packages.has_key(name): + if not name in self.packages: self.packages[name] = [] tmp = {} tmp["arch"] = p.getAttribute("arch")