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 12069139084 for ; Wed, 29 Nov 2017 17:20:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1CA78E0BF3; Wed, 29 Nov 2017 17:20:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 DB358E0BE7 for ; Wed, 29 Nov 2017 17:20:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 5FC8E33C770 for ; Wed, 29 Nov 2017 17:20:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E769EABCE for ; Wed, 29 Nov 2017 17:20:44 +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: <1511313380.03d8e9d832dcf2b3e52f4aa84e0782e47f3c9b71.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 03d8e9d832dcf2b3e52f4aa84e0782e47f3c9b71 X-VCS-Branch: master Date: Wed, 29 Nov 2017 17:20:44 +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: b30129c8-dbb1-48b2-9e8a-44340feabe59 X-Archives-Hash: a4117014bb2d56bae5ed92c5ad4a17b4 Message-ID: <20171129172044.9W60WGEJRBNLGbp8qwZh0uxZGW0MNqC3O9ju27a_S1U@z> commit: 03d8e9d832dcf2b3e52f4aa84e0782e47f3c9b71 Author: Brian Dolbec gentoo org> AuthorDate: Thu Mar 9 08:56:45 2017 +0000 Commit: Brian Dolbec 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"]: