From fe346e9223f51368144c6f83154f8fcdb85117e6 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 3 Dec 2007 20:01:42 +0000 Subject: Make config.load_infodir() more fault tolerant for cases like bug #201082. (trunk r8826) svn path=/main/branches/2.1.2/; revision=8827 --- pym/portage.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pym/portage.py b/pym/portage.py index 4614c85cb..6582a3738 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1813,6 +1813,7 @@ class config: def load_infodir(self,infodir): self.modifying() + backup_pkg_metadata = dict(self.configdict["pkg"].iteritems()) if "pkg" in self.configdict: self.configdict["pkg"].clear() else: @@ -1820,6 +1821,8 @@ class config: noiselevel=-1) sys.exit(17) + retval = 0 + category_corrupt = False if os.path.exists(infodir): if os.path.exists(infodir+"/environment"): self.configdict["pkg"]["PORT_ENV_FILE"] = infodir+"/environment" @@ -1852,17 +1855,25 @@ class config: # strange errors later on, so we'll validate it and # print a warning if necessary. if filename == "CATEGORY": - matchobj = re.match("[-a-zA-Z0-9_.+]+", mydata) - if not matchobj or matchobj.start() != 0 or \ - matchobj.end() != len(mydata): + matchobj = re.match(r'^[-\w_.+]+', mydata) + if not matchobj: writemsg("!!! CATEGORY file is corrupt: %s\n" % \ os.path.join(infodir, filename), noiselevel=-1) + self.configdict["pkg"].pop(filename, None) + self.configdict["env"].pop(filename, None) + category_corrupt = True except (OSError, IOError): writemsg("!!! Unable to read file: %s\n" % infodir+"/"+filename, noiselevel=-1) pass - return 1 - return 0 + retval = 1 + if "CATEGORY" not in self.configdict["pkg"]: + if not category_corrupt: + writemsg("!!! CATEGORY file is missing: %s\n" % \ + os.path.join(infodir, "CATEGORY"), noiselevel=-1) + self.configdict["pkg"].update(backup_pkg_metadata) + retval = 0 + return retval def setcpv(self, mycpv, use_cache=1, mydb=None): """ -- cgit v1.2.3-1-g7c22