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 5F97D1389E2 for ; Thu, 4 Dec 2014 20:16:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 82229E0900; Thu, 4 Dec 2014 20:16:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A707DE08F9 for ; Thu, 4 Dec 2014 20:16:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8C8513405A1 for ; Thu, 4 Dec 2014 20:16:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BDB00B944 for ; Thu, 4 Dec 2014 20:16:10 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1417722994.213b1da7b74a7b392292fca077f9e187eb10a503.dol-sen@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/sync/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/sync/controller.py X-VCS-Directories: pym/portage/sync/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 213b1da7b74a7b392292fca077f9e187eb10a503 X-VCS-Branch: master Date: Thu, 4 Dec 2014 20:16:10 +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: e121286d-f30a-4da9-a250-ce3f5fc1c0e8 X-Archives-Hash: d4de0d22bad2a46900c60a2a1317a5d5 Message-ID: <20141204201610.E0NjxNDnFVNzEN_qmPyPouoefMSMGmGg6NU6WknBdnI@z> commit: 213b1da7b74a7b392292fca077f9e187eb10a503 Author: Zac Medico gentoo org> AuthorDate: Mon Oct 20 20:44:41 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Thu Dec 4 19:56:34 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=213b1da7 _sync_callback: check for md5-cache, not cache This fixes FEATURES=metadata-transfer to work again now that the metadata/cache directory has been replaced with metadata/md5-cache. --- pym/portage/sync/controller.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pym/portage/sync/controller.py b/pym/portage/sync/controller.py index c860e1a..5c58865 100644 --- a/pym/portage/sync/controller.py +++ b/pym/portage/sync/controller.py @@ -227,7 +227,8 @@ class SyncManager(object): updatecache_flg = False if updatecache_flg and \ - os.path.exists(os.path.join(self.repo.location, 'metadata', 'cache')): + os.path.exists(os.path.join( + self.repo.location, 'metadata', 'md5-cache')): # Only update cache for repo.location since that's # the only one that's been synced here.