[gentoo-commits] proj/gentoo-packages:master commit in: gpackages/apps/packages/, gpackages/libs/

[Slava Bacherikov]

commit:     20ce0df8e5a4a3a08973f595a900ef6f5309b28e
Author:     Slava Bacherikov <slava <AT> bacher09 <DOT> org>
AuthorDate: Wed Jun  6 21:32:40 2012 +0000
Commit:     Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua>
CommitDate: Wed Jun  6 21:32:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=20ce0df8

Changes in portage layer

---
 gpackages/apps/packages/scan.py |    1 -
 gpackages/libs/generic.py       |    6 +++++-
 gpackages/libs/porttree.py      |   20 ++++++++++++++------
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/gpackages/apps/packages/scan.py b/gpackages/apps/packages/scan.py
index add62f1..f316900 100644
--- a/gpackages/apps/packages/scan.py
+++ b/gpackages/apps/packages/scan.py
@@ -330,7 +330,6 @@ def scanpackages(porttree, porttree_obj, delete = True, force_update = False):
             existend_packages.append(package_object.pk)
             if not package_created:
                 if package_object.check_or_need_update(package) or force_update:
-                    print package
                     # need update
                     update_package(package, package_object)
                 else:

diff --git a/gpackages/libs/generic.py b/gpackages/libs/generic.py
index c3d8d2b..bc1cd55 100644
--- a/gpackages/libs/generic.py
+++ b/gpackages/libs/generic.py
@@ -2,8 +2,12 @@ import os.path
 import hashlib
 from datetime import datetime
 
+__all__ = ('StrThatIgnoreCase', 'ToStrMixin', 'file_get_content', 'file_sha1', \
+           'file_mtime', 'cached_property' )
+
 class StrThatIgnoreCase(unicode):
-    
+    __slots__ = ('_forcmp',)
+
     def __init__(self, value):
         super(StrThatIgnoreCase, self).__init__(value)
         self._forcmp = value.lower()

diff --git a/gpackages/libs/porttree.py b/gpackages/libs/porttree.py
index 5b1dba8..dec4867 100644
--- a/gpackages/libs/porttree.py
+++ b/gpackages/libs/porttree.py
@@ -6,6 +6,7 @@ from portage.exception import PortageException, FileNotFound, InvalidAtom, \
 
 from gentoolkit.package import Package as PackageInfo
 from gentoolkit.metadata import MetaData
+from gentoolkit import errors
 from generic import ToStrMixin, file_sha1, file_mtime, cached_property, \
                     file_get_content, StrThatIgnoreCase
 from use_info import get_uses_info, get_local_uses_info
@@ -266,12 +267,9 @@ class Package(ToStrMixin):
         ebuilds = PORTDB.cp_list(self.package,
                                  mytree = self.category.porttree.porttree)
         for ebuild in ebuilds:
-            try:
-                PORTDB.aux_get(ebuild, [], mytree = self.category.porttree_path)
-            except KeyError:
-                pass
-            else:
-                yield Ebuild(self ,ebuild)
+            ebuild_obj = Ebuild(self, ebuild)
+            if ebuild_obj.is_valid:
+                yield ebuild_obj
 
     def __unicode__(self):
         return '%s' % self.package
@@ -345,6 +343,16 @@ class Ebuild(ToStrMixin):
         return self.package_object.environment("KEYWORDS", prefer_vdb = False)
 
     @property
+    def is_valid(self):
+        try:
+            self.package_object.environment("EAPI")
+        except errors.GentoolkitFatalError:
+            return False
+        else:
+            return True
+
+
+    @property
     def keywords(self):
         return list(set(self.keywords_env.split()))