From bc5d169b3b4858dcd72b7fb4bae62f99c09457aa Mon Sep 17 00:00:00 2001
From: Brian Dolbec <[email protected]>
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: [email protected]
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):
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"
@@ -866,7 +866,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
@@ -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 =
self.settings["snapshot_path_hash"])
if "snapcache" in self.settings["options"]:
--
2.12.0
--
Brian Dolbec <dolsen>
