From ee7052a94cf2b14745ec1c83c5f8e8d322e008b2 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 5 Oct 2010 22:35:29 -0700 Subject: Ensure valid Package.metadata['repository']. --- pym/_emerge/Package.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py index 983a3bf9a..8cb9a6d32 100644 --- a/pym/_emerge/Package.py +++ b/pym/_emerge/Package.py @@ -27,7 +27,7 @@ class Package(Task): "category", "counter", "cp", "cpv_split", "inherited", "invalid", "iuse", "masks", "mtime", "pf", "pv_split", "root", "slot", "slot_atom", "visible",) + \ - ("_raw_metadata", "_use", "_repo",) + ("_raw_metadata", "_use",) metadata_keys = [ "BUILD_TIME", "CHOST", "COUNTER", "DEPEND", "EAPI", @@ -65,6 +65,11 @@ class Package(Task): self.pv_split = self.cpv_split[1:] if self.inherited is None: self.inherited = frozenset() + repo = _gen_valid_repo(self.metadata['repository']) + if not repo: + repo = '__unknown__' + self.metadata['repository'] = repo + self._validate_deps() self.masks = self._masks() self.visible = self._visible(self.masks) @@ -316,11 +321,7 @@ class Package(Task): @property def repo(self): - if self._repo is None: - self._repo = _gen_valid_repo(self.metadata['repository']) - if not self._repo: - self._repo = '__unknown__' - return self._repo + return self.metadata['repository'] @property def use(self): -- cgit v1.2.3-1-g7c22