| 1 |
commit: 8246af3caeb234f9b739683a37ea175d81eb12a2 |
| 2 |
Author: Slava Bacherikov <slava <AT> bacher09 <DOT> org> |
| 3 |
AuthorDate: Tue Jun 5 17:32:48 2012 +0000 |
| 4 |
Commit: Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua> |
| 5 |
CommitDate: Tue Jun 5 17:32:48 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=8246af3c |
| 7 |
|
| 8 |
Changes in ebuild deletetion |
| 9 |
|
| 10 |
--- |
| 11 |
gpackages/apps/packages/scan.py | 34 ++++++++++++++++++++-------------- |
| 12 |
1 files changed, 20 insertions(+), 14 deletions(-) |
| 13 |
|
| 14 |
diff --git a/gpackages/apps/packages/scan.py b/gpackages/apps/packages/scan.py |
| 15 |
index 994adbf..f739c69 100644 |
| 16 |
--- a/gpackages/apps/packages/scan.py |
| 17 |
+++ b/gpackages/apps/packages/scan.py |
| 18 |
@@ -196,7 +196,7 @@ def scan_uses_description(): |
| 19 |
use_desc_obj.save(force_update = True) |
| 20 |
models.UseFlagDescriptionModel.objects.bulk_create(to_create) |
| 21 |
|
| 22 |
-def scanpackages(): |
| 23 |
+def scanpackages(delete = True, force_update = False): |
| 24 |
licenses_cache = {} |
| 25 |
def get_licenses_objects(ebuild): |
| 26 |
licenses = ebuild.licenses |
| 27 |
@@ -297,33 +297,36 @@ def scanpackages(): |
| 28 |
update_related_to_ebuild(ebuild, ebuild_object) |
| 29 |
ebuild_object.save(force_update = True) |
| 30 |
if delete: |
| 31 |
- models.EbuildModel.objects.exclude(pk__in = not_del).delete() |
| 32 |
+ models.EbuildModel.objects.filter(package = package_object).exclude(pk__in = not_del).delete() |
| 33 |
+ |
| 34 |
+ def update_package(package, package_object, force_update = False): |
| 35 |
+ if package_object.need_update_metadata(package) or force_update: |
| 36 |
+ package_object.herds.clear() |
| 37 |
+ package_object.maintainers.clear() |
| 38 |
+ |
| 39 |
+ if package_object.need_update_ebuilds(package) or force_update: |
| 40 |
+ update_ebuilds(package, package_object) |
| 41 |
+ |
| 42 |
+ package_object.update_info(package) |
| 43 |
+ package_object.save(force_update = True) |
| 44 |
|
| 45 |
# Load homepages to cache |
| 46 |
#for homepage in models.HomepageModel.objects.all(): |
| 47 |
#homepages_cache[homepage.url] = homepage |
| 48 |
existend_categorys = [] |
| 49 |
- existend_packages = [] |
| 50 |
for category in porttree.iter_categories(): |
| 51 |
+ existend_packages = [] |
| 52 |
category_object, category_created = models.CategoryModel.objects.get_or_create(category = category) |
| 53 |
existend_categorys.append(category_object.pk) |
| 54 |
for package in category.iter_packages(): |
| 55 |
- #print package |
| 56 |
+ print package |
| 57 |
package_object, package_created = models.PackageModel.objects.get_or_create(package = package, category = category_object) |
| 58 |
existend_packages.append(package_object.pk) |
| 59 |
if not package_created: |
| 60 |
- if package_object.check_or_need_update(package): |
| 61 |
+ if package_object.check_or_need_update(package) or force_update: |
| 62 |
print package |
| 63 |
# need update |
| 64 |
- if package_object.need_update_metadata(package): |
| 65 |
- package_object.herds.clear() |
| 66 |
- package_object.maintainers.clear() |
| 67 |
- |
| 68 |
- if package_object.need_update_ebuilds(package): |
| 69 |
- update_ebuilds(package, package_object) |
| 70 |
- |
| 71 |
- package_object.update_info(package) |
| 72 |
- package_object.save(force_update = True) |
| 73 |
+ update_package(package, package_object) |
| 74 |
else: |
| 75 |
# not need to update, ebuilds too |
| 76 |
continue |
| 77 |
@@ -331,6 +334,9 @@ def scanpackages(): |
| 78 |
package_object.maintainers.add(*get_maintainers_objects(package)) |
| 79 |
if package_created: |
| 80 |
create_ebuilds(package, package_object) |
| 81 |
+ |
| 82 |
+ if delete: |
| 83 |
+ models.PackageModel.objects.filter(category = category_object).exclude(pk__in = existend_packages).delete() |
| 84 |
# del |
| 85 |
#models.CategoryModel.objects.exclude(pk__in = existend_categorys).delete() |
Archives