From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D750E139083 for ; Wed, 6 Dec 2017 17:49:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1CD36E0F57; Wed, 6 Dec 2017 17:49:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E8A82E0F57 for ; Wed, 6 Dec 2017 17:49:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C57C533BEC7 for ; Wed, 6 Dec 2017 17:49:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 68BA5AE66 for ; Wed, 6 Dec 2017 17:49:35 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1511313380.03d8e9d832dcf2b3e52f4aa84e0782e47f3c9b71.robbat2@gentoo> Subject: [gentoo-commits] proj/catalyst:unversioned-cachedir commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 03d8e9d832dcf2b3e52f4aa84e0782e47f3c9b71 X-VCS-Branch: unversioned-cachedir Date: Wed, 6 Dec 2017 17:49:35 +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: 0811b804-1c5e-4c1e-9cf1-df2b2f417a87 X-Archives-Hash: 512a8891ce89863eb792478232cce715 commit: 03d8e9d832dcf2b3e52f4aa84e0782e47f3c9b71 Author: Brian Dolbec gentoo org> AuthorDate: Thu Mar 9 08:56:45 2017 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Wed Nov 22 01:16:20 2017 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=03d8e9d8 base/stagebase.py: Rename unpack_portage resume point to unpack_repo One part of the effort to separate the portage name from the repository. catalyst/base/stagebase.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index b857a64b..93c13902 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -808,7 +808,7 @@ class StageBase(TargetBase, ClearBase, GenBase): def unpack_snapshot(self): unpack = True - snapshot_hash = self.resume.get("unpack_portage") + snapshot_hash = self.resume.get("unpack_repo") unpack_errmsg = "Error unpacking snapshot using mode %(mode)s" @@ -847,7 +847,7 @@ class StageBase(TargetBase, ClearBase, GenBase): if "autoresume" in self.settings["options"] \ and os.path.exists(target_portdir) \ - and self.resume.is_enabled("unpack_portage") \ + and self.resume.is_enabled("unpack_repo") \ and self.settings["snapshot_path_hash"] == snapshot_hash: log.notice('Valid Resume point detected, skipping unpack of portage tree...') unpack = False @@ -868,7 +868,7 @@ class StageBase(TargetBase, ClearBase, GenBase): myf.write(self.settings["snapshot_path_hash"]) else: log.info('Setting snapshot autoresume point') - self.resume.enable("unpack_portage", + self.resume.enable("unpack_repo", data = self.settings["snapshot_path_hash"]) if "snapcache" in self.settings["options"]: