| 1 |
commit: 54d392ff2ead7a3f4af92805cdf6e6578869d8b2 |
| 2 |
Author: Slava Bacherikov <slava <AT> bacher09 <DOT> org> |
| 3 |
AuthorDate: Thu Jun 7 11:27:08 2012 +0000 |
| 4 |
Commit: Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua> |
| 5 |
CommitDate: Thu Jun 7 11:27:08 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=54d392ff |
| 7 |
|
| 8 |
Fix bug in delete. |
| 9 |
|
| 10 |
--- |
| 11 |
gpackages/apps/packages/scan.py | 31 ++++++++++++++++--------------- |
| 12 |
1 files changed, 16 insertions(+), 15 deletions(-) |
| 13 |
|
| 14 |
diff --git a/gpackages/apps/packages/scan.py b/gpackages/apps/packages/scan.py |
| 15 |
index 9c5c193..5bd9b0b 100644 |
| 16 |
--- a/gpackages/apps/packages/scan.py |
| 17 |
+++ b/gpackages/apps/packages/scan.py |
| 18 |
@@ -330,18 +330,19 @@ def scanpackages(porttree, porttree_obj, delete = True, force_update = False, |
| 19 |
category_object, category_created = models.CategoryModel.objects.get_or_create(category = category) |
| 20 |
existend_categorys.append(category_object.pk) |
| 21 |
for package in category.iter_packages(): |
| 22 |
- if use_cache: |
| 23 |
- key = str(porttree.name)+'/'+str(package) |
| 24 |
- val = None |
| 25 |
- if key in cache_dict: |
| 26 |
- val = cache_dict[key] |
| 27 |
- if val is not None and val == package.manifest_sha1: |
| 28 |
- continue |
| 29 |
+ #if use_cache: |
| 30 |
+ #key = str(porttree.name)+'/'+str(package) |
| 31 |
+ #val = None |
| 32 |
+ #if key in cache_dict: |
| 33 |
+ #val = cache_dict[key] |
| 34 |
+ #if val is not None and val == package.manifest_sha1: |
| 35 |
+ #continue |
| 36 |
print('%s [%s]' % (package, porttree)) |
| 37 |
- package_object, package_created = models.PackageModel.objects.get_or_create(package = package, category = category_object, repository = porttree_obj) |
| 38 |
- if update_cache: |
| 39 |
- key = str(porttree.name)+'/'+str(package) |
| 40 |
- cache_dict[key] = package.manifest_sha1 |
| 41 |
+ package_object, package_created = models.PackageModel.objects.only('changelog_hash', 'manifest_hash', 'metadata_hash') \ |
| 42 |
+ .get_or_create(package = package, category = category_object, repository = porttree_obj) |
| 43 |
+ #if update_cache: |
| 44 |
+ #key = str(porttree.name)+'/'+str(package) |
| 45 |
+ #cache_dict[key] = package.manifest_sha1 |
| 46 |
|
| 47 |
existend_packages.append(package_object.pk) |
| 48 |
if not package_created: |
| 49 |
@@ -357,16 +358,16 @@ def scanpackages(porttree, porttree_obj, delete = True, force_update = False, |
| 50 |
create_ebuilds(package, package_object) |
| 51 |
|
| 52 |
if delete: |
| 53 |
- models.PackageModel.objects.filter(category = category_object).exclude(pk__in = existend_packages).delete() |
| 54 |
+ models.PackageModel.objects.filter(category = category_object, repository = porttree_obj).exclude(pk__in = existend_packages).delete() |
| 55 |
# del |
| 56 |
#models.CategoryModel.objects.exclude(pk__in = existend_categorys).delete() |
| 57 |
|
| 58 |
|
| 59 |
def scan_all_repos(): |
| 60 |
- global cache_dict |
| 61 |
- cache_dict = anydbm.open('cache.db','c') |
| 62 |
+ #global cache_dict |
| 63 |
+ #cache_dict = anydbm.open('cache.db','c') |
| 64 |
herds_cache, maintainers_cache = scan_herds() |
| 65 |
for repo in portage.iter_trees(): |
| 66 |
repo_obj, repo_created = models.RepositoryModel.objects.get_or_create(name = repo.name) |
| 67 |
scanpackages(repo, repo_obj) |
| 68 |
- cache_dict.close() |
| 69 |
+ #cache_dict.close() |
Archives