From 6b2ce92454d61576b9821b979d13c977d59fab36 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 17 Jun 2007 22:42:52 +0000 Subject: In dblink.isowner() don't bother to stat the file when it's contained in the contents. svn path=/main/trunk/; revision=6865 --- pym/portage/dbapi/vartree.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'pym') diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 3920fd096..dcc673c79 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1305,15 +1305,18 @@ class dblink(object): """ destfile = normalize_path( os.path.join(destroot, filename.lstrip(os.path.sep))) - try: - mylstat = os.lstat(destfile) - except (OSError, IOError): - return True pkgfiles = self.getcontents() if pkgfiles and destfile in pkgfiles: return True if pkgfiles: + try: + mylstat = os.lstat(destfile) + except EnvironmentError, e: + if e.errno != errno.ENOENT: + raise + del e + return True if self._contents_inodes is None: self._contents_inodes = set() for x in pkgfiles: -- cgit v1.2.3-1-g7c22