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 1SdmIO-00021K-RO for garchives@archives.gentoo.org; Sun, 10 Jun 2012 17:51:25 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1CD0CE0566; Sun, 10 Jun 2012 17:51:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CFF37E055E for ; Sun, 10 Jun 2012 17:51:02 +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 B72E81B4016 for ; Sun, 10 Jun 2012 17:51:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 76D0CE542E for ; Sun, 10 Jun 2012 17:51:00 +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: <1339337708.de5ae2fa059a0d463283be466396a4f7093288ec.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: de5ae2fa059a0d463283be466396a4f7093288ec X-VCS-Branch: master Date: Sun, 10 Jun 2012 17:51:00 +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: fa66f89f-31da-409f-8c60-f281b6eb7895 X-Archives-Hash: 0111b5cdf7f60ee30ab9f3d23a274e4b commit: de5ae2fa059a0d463283be466396a4f7093288ec Author: Slava Bacherikov bacher09 org> AuthorDate: Sun Jun 10 14:15:08 2012 +0000 Commit: Slava Bacherikov bacherikov org ua> CommitDate: Sun Jun 10 14:15:08 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoo-packag= es.git;a=3Dcommit;h=3Dde5ae2fa Fix bug in update_package --- gpackages/apps/packages/scan.py | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/gpackages/apps/packages/scan.py b/gpackages/apps/packages/sc= an.py index a7a77b9..37ba159 100644 --- a/gpackages/apps/packages/scan.py +++ b/gpackages/apps/packages/scan.py @@ -247,7 +247,9 @@ class Scanner(object): for repo in portage.iter_trees(): self.output("Scaning repository '%s'\n", repo.name, 3) =20 - repo_obj, repo_created =3D models.RepositoryModel.objects.ge= t_or_create(name =3D repo.name) + repo_obj, repo_created =3D models.RepositoryModel.objects \ + .get_or_create(name =3D repo.name) + self.scanpackages(repo, repo_obj) #cache_dict.close() =20 @@ -367,9 +369,10 @@ class Scanner(object): =20 self.output("ebuild updated '%s'\n", ebuild_object, 3) if delete: - models.EbuildModel.objects.filter(package =3D package_object= ).exclude(pk__in =3D not_del).delete() + models.EbuildModel.objects.filter(package =3D package_object= ) \ + .exclude(pk__in =3D not_del).delete() =20 - def update_package(package, package_object, force_update =3D False): + def update_package(self, package, package_object, force_update =3D F= alse): if package_object.need_update_metadata(package) or force_update: #Updating related objects to package self.update_related_to_package(package, package_object) @@ -386,7 +389,9 @@ class Scanner(object): existend_categorys =3D [] for category in porttree.iter_categories(): existend_packages =3D [] - category_object, category_created =3D models.CategoryModel.o= bjects.get_or_create(category =3D category) + category_object, category_created =3D models.CategoryModel \ + .objects.get_or_create(category =3D category) + existend_categorys.append(category_object.pk) for package in category.iter_packages(): #if use_cache: @@ -397,8 +402,11 @@ class Scanner(object): #if val is not None and val =3D=3D package.manifest_= sha1: #continue self.output('%-44s [%s]\n', (package, porttree)) - package_object, package_created =3D models.PackageModel.= objects.only('changelog_hash', 'manifest_hash', 'metadata_hash') \ - .get_or_create(package =3D package, category= =3D category_object, repository =3D porttree_obj) + package_object, package_created =3D models.PackageModel.= objects \ + .only('changelog_hash', 'manifest_hash', 'metadata_h= ash') \ + .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 @@ -415,7 +423,9 @@ class Scanner(object): self.create_ebuilds(package, package_object) =20 if delete: - models.PackageModel.objects.filter(category =3D category= _object, repository =3D porttree_obj).exclude(pk__in =3D existend_package= s).delete() + models.PackageModel.objects \ + .filter(category =3D category_object, repository =3D por= ttree_obj) \ + .exclude(pk__in =3D existend_packages).delete() =20 =20 =20