From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7B1EB138010 for ; Sat, 8 Sep 2012 20:32:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 901EFE027D; Sat, 8 Sep 2012 20:32:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5B40FE027D for ; Sat, 8 Sep 2012 20:32:24 +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 6996B33D705 for ; Sat, 8 Sep 2012 20:32:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 31013E543D for ; Sat, 8 Sep 2012 20:32:22 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1347136310.08b350a53b52adb18947ce2f1ffc56a8d59b02ba.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/egencache X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 08b350a53b52adb18947ce2f1ffc56a8d59b02ba X-VCS-Branch: master Date: Sat, 8 Sep 2012 20:32:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c67370bb-3cdc-4a3d-a1d2-cebe1829be28 X-Archives-Hash: 01af40491766462e96185b7f839c7da2 commit: 08b350a53b52adb18947ce2f1ffc56a8d59b02ba Author: Zac Medico gentoo org> AuthorDate: Sat Sep 8 20:31:50 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Sep 8 20:31:50 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=08b350a5 egencache: tweak metadata-transfer logic Now is won't force metadata-transfer unless it's absolutely necessary. --- bin/egencache | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/bin/egencache b/bin/egencache index 1b4fa0c..f7b4471 100755 --- a/bin/egencache +++ b/bin/egencache @@ -881,20 +881,14 @@ def egencache_main(args): return 1 if options.update and 'metadata-transfer' not in settings.features: - metadata_transfer = True + # Forcibly enable metadata-transfer if portdbapi has a pregenerated + # cache that does not support eclass validation. repo_config = settings.repositories.get_repo_for_location(repo_path) cache = repo_config.get_pregenerated_cache( portage.dbapi.dbapi._known_keys, readonly=True) - if cache is not None: - if cache.complete_eclass_entries: - # If the portdbapi's pregenerated cache supports eclass - # validation, then there's no need to forcibly enable - # metadata-transfer. - metadata_transfer = False - cache = None - - if metadata_transfer: + if cache is not None and not cache.complete_eclass_entries: settings.features.add('metadata-transfer') + cache = None settings.lock()