| 1 |
commit: b4ed7c713d263ea8389b93e25fae0f43a69d10e2 |
| 2 |
Author: Slava Bacherikov <slava <AT> bacher09 <DOT> org> |
| 3 |
AuthorDate: Sat Jun 2 15:15:28 2012 +0000 |
| 4 |
Commit: Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua> |
| 5 |
CommitDate: Sat Jun 2 15:15:28 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=b4ed7c71 |
| 7 |
|
| 8 |
Profile and optimize scaning. |
| 9 |
|
| 10 |
--- |
| 11 |
.../packages/management/commands/scanpackages.py | 8 ++++---- |
| 12 |
gpackages/apps/packages/models.py | 2 +- |
| 13 |
gpackages/libs/porttree.py | 3 ++- |
| 14 |
3 files changed, 7 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/gpackages/apps/packages/management/commands/scanpackages.py b/gpackages/apps/packages/management/commands/scanpackages.py |
| 17 |
index cbf8f66..2968d65 100644 |
| 18 |
--- a/gpackages/apps/packages/management/commands/scanpackages.py |
| 19 |
+++ b/gpackages/apps/packages/management/commands/scanpackages.py |
| 20 |
@@ -10,11 +10,11 @@ import logging |
| 21 |
|
| 22 |
def _get_from_cache(cache, what): |
| 23 |
save_to = [] |
| 24 |
- cached_items = frozenset(cache.keys()) |
| 25 |
geted_items = set() |
| 26 |
- for item in ( cached_items & what): |
| 27 |
- geted_items.add(item) |
| 28 |
- save_to.append(cache[item]) |
| 29 |
+ for item in what: |
| 30 |
+ if item in cache: |
| 31 |
+ geted_items.add(item) |
| 32 |
+ save_to.append(cache[item]) |
| 33 |
return save_to, geted_items |
| 34 |
|
| 35 |
def _get_from_database(Model, field_name, request_items): |
| 36 |
|
| 37 |
diff --git a/gpackages/apps/packages/models.py b/gpackages/apps/packages/models.py |
| 38 |
index d90bbb0..e315c6b 100644 |
| 39 |
--- a/gpackages/apps/packages/models.py |
| 40 |
+++ b/gpackages/apps/packages/models.py |
| 41 |
@@ -148,7 +148,7 @@ class EbuildModel(models.Model): |
| 42 |
self.license = ebuild.license |
| 43 |
self.ebuild_mtime = ebuild.mtime |
| 44 |
self.ebuild_hash = ebuild.sha1 |
| 45 |
- self.homepage = ebuild.homepage |
| 46 |
+ #self.homepage = ebuild.homepage |
| 47 |
self.description = ebuild.description |
| 48 |
|
| 49 |
def init_related(self, ebuild, package = None): |
| 50 |
|
| 51 |
diff --git a/gpackages/libs/porttree.py b/gpackages/libs/porttree.py |
| 52 |
index 3faa150..6ed2629 100644 |
| 53 |
--- a/gpackages/libs/porttree.py |
| 54 |
+++ b/gpackages/libs/porttree.py |
| 55 |
@@ -216,7 +216,7 @@ class Ebuild(ToStrMixin): |
| 56 |
|
| 57 |
@property |
| 58 |
def keywords(self): |
| 59 |
- return list(frozenset(self.keywords_env.split())) |
| 60 |
+ return list(set(self.keywords_env.split())) |
| 61 |
|
| 62 |
def iter_keywords(self): |
| 63 |
keywords = self.keywords |
| 64 |
@@ -243,6 +243,7 @@ class Ebuild(ToStrMixin): |
| 65 |
l.append(use) |
| 66 |
return l |
| 67 |
|
| 68 |
+ #Could be faster |
| 69 |
@property |
| 70 |
def is_masked(self): |
| 71 |
return self.package_object.is_masked() |
Archives