From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1ScasI-0008CT-Ck for garchives@archives.gentoo.org; Thu, 07 Jun 2012 11:27:34 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52AD2E05B9; Thu, 7 Jun 2012 11:27:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0C03AE05B9 for ; Thu, 7 Jun 2012 11:27:20 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D21E21B403E for ; Thu, 7 Jun 2012 11:27:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 7A0ADE5404 for ; Thu, 7 Jun 2012 11:27:17 +0000 (UTC) From: "Slava Bacherikov" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Slava Bacherikov" Message-ID: <1339068428.54d392ff2ead7a3f4af92805cdf6e6578869d8b2.bacher09@gentoo> Subject: [gentoo-commits] proj/gentoo-packages:master commit in: gpackages/apps/packages/ X-VCS-Repository: proj/gentoo-packages X-VCS-Files: gpackages/apps/packages/scan.py X-VCS-Directories: gpackages/apps/packages/ X-VCS-Committer: bacher09 X-VCS-Committer-Name: Slava Bacherikov X-VCS-Revision: 54d392ff2ead7a3f4af92805cdf6e6578869d8b2 X-VCS-Branch: master Date: Thu, 7 Jun 2012 11:27:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: e2b9315c-b70b-4d46-a329-fc4ced9fea35 X-Archives-Hash: 6114ddaff9aebbb1e8afcd55e70d44db commit: 54d392ff2ead7a3f4af92805cdf6e6578869d8b2 Author: Slava Bacherikov bacher09 org> AuthorDate: Thu Jun 7 11:27:08 2012 +0000 Commit: Slava Bacherikov bacherikov org ua> CommitDate: Thu Jun 7 11:27:08 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoo-packag= es.git;a=3Dcommit;h=3D54d392ff Fix bug in delete. --- gpackages/apps/packages/scan.py | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/gpackages/apps/packages/scan.py b/gpackages/apps/packages/sc= an.py index 9c5c193..5bd9b0b 100644 --- a/gpackages/apps/packages/scan.py +++ b/gpackages/apps/packages/scan.py @@ -330,18 +330,19 @@ def scanpackages(porttree, porttree_obj, delete =3D= True, force_update =3D False, category_object, category_created =3D models.CategoryModel.objec= ts.get_or_create(category =3D category) existend_categorys.append(category_object.pk) for package in category.iter_packages(): - if use_cache: - key =3D str(porttree.name)+'/'+str(package) - val =3D None - if key in cache_dict: - val =3D cache_dict[key] - if val is not None and val =3D=3D package.manifest_sha1: - continue + #if use_cache: + #key =3D str(porttree.name)+'/'+str(package) + #val =3D None + #if key in cache_dict: + #val =3D cache_dict[key] + #if val is not None and val =3D=3D package.manifest_sha1= : + #continue print('%s [%s]' % (package, porttree)) - package_object, package_created =3D models.PackageModel.obje= cts.get_or_create(package =3D package, category =3D category_object, repo= sitory =3D porttree_obj) - if update_cache: - key =3D str(porttree.name)+'/'+str(package) - cache_dict[key] =3D package.manifest_sha1 + package_object, package_created =3D models.PackageModel.obje= cts.only('changelog_hash', 'manifest_hash', 'metadata_hash') \ + .get_or_create(package =3D package, category =3D= category_object, repository =3D porttree_obj) + #if update_cache: + #key =3D str(porttree.name)+'/'+str(package) + #cache_dict[key] =3D package.manifest_sha1 =20 existend_packages.append(package_object.pk) if not package_created: @@ -357,16 +358,16 @@ def scanpackages(porttree, porttree_obj, delete =3D= True, force_update =3D False, create_ebuilds(package, package_object) =20 if delete: - models.PackageModel.objects.filter(category =3D category_obj= ect).exclude(pk__in =3D existend_packages).delete() + models.PackageModel.objects.filter(category =3D category_obj= ect, repository =3D porttree_obj).exclude(pk__in =3D existend_packages).d= elete() # del=20 #models.CategoryModel.objects.exclude(pk__in =3D existend_categorys)= .delete() =20 =20 def scan_all_repos(): - global cache_dict - cache_dict =3D anydbm.open('cache.db','c') + #global cache_dict + #cache_dict =3D anydbm.open('cache.db','c') herds_cache, maintainers_cache =3D scan_herds() for repo in portage.iter_trees(): repo_obj, repo_created =3D models.RepositoryModel.objects.get_or= _create(name =3D repo.name) scanpackages(repo, repo_obj) - cache_dict.close() + #cache_dict.close()