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 5A94B139694 for ; Fri, 10 Mar 2017 19:23:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B79A1E0C3D; Fri, 10 Mar 2017 19:23:03 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 95336E0C3D for ; Fri, 10 Mar 2017 19:23:03 +0000 (UTC) Received: from professor-x (d108-172-194-175.bchsia.telus.net [108.172.194.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id A1CF234105A for ; Fri, 10 Mar 2017 19:23:02 +0000 (UTC) Date: Fri, 10 Mar 2017 11:23:00 -0800 From: Brian Dolbec To: gentoo-catalyst@lists.gentoo.org Subject: [gentoo-catalyst] [PATCH 2/7] base/stagebase.py: Rename unpack_portage resume point to unpack_repo Message-ID: <20170310112300.5ee735e4.dolsen@gentoo.org> Organization: Gentoo Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-Archives-Salt: dd350cf6-d129-47b8-853b-8caa51f904db X-Archives-Hash: 5174eb6a1601bcd3cf5948b302c65d00 =46rom bc5d169b3b4858dcd72b7fb4bae62f99c09457aa Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Thu, 9 Mar 2017 00:56:45 -0800 Subject: [PATCH 2/7] base/stagebase.py: Rename unpack_portage resume point = to unpack_repo To: gentoo-catalyst@lists.gentoo.org 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 eed14589..35556dae 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -827,7 +827,7 @@ class StageBase(TargetBase, ClearBase, GenBase): =20 def unpack_snapshot(self): unpack =3D True - snapshot_hash =3D self.resume.get("unpack_portage") + snapshot_hash =3D self.resume.get("unpack_repo") =20 unpack_errmsg =3D "Error unpacking snapshot using mode %(mode)s" =20 @@ -866,7 +866,7 @@ class StageBase(TargetBase, ClearBase, GenBase): =20 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"] =3D=3D snapshot_hash: log.notice('Valid Resume point detected, skipping unpack of portage tr= ee...') unpack =3D False @@ -887,7 +887,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 =3D self.settings["snapshot_path_hash"]) =20 if "snapcache" in self.settings["options"]: --=20 2.12.0 --=20 Brian Dolbec