1 |
From bc5d169b3b4858dcd72b7fb4bae62f99c09457aa Mon Sep 17 00:00:00 2001 |
2 |
From: Brian Dolbec <dolsen@g.o> |
3 |
Date: Thu, 9 Mar 2017 00:56:45 -0800 |
4 |
Subject: [PATCH 2/7] base/stagebase.py: Rename unpack_portage resume point to |
5 |
unpack_repo |
6 |
To: gentoo-catalyst@l.g.o |
7 |
|
8 |
One part of the effort to separate the portage name from the repository. |
9 |
--- |
10 |
catalyst/base/stagebase.py | 6 +++--- |
11 |
1 file changed, 3 insertions(+), 3 deletions(-) |
12 |
|
13 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
14 |
index eed14589..35556dae 100644 |
15 |
--- a/catalyst/base/stagebase.py |
16 |
+++ b/catalyst/base/stagebase.py |
17 |
@@ -827,7 +827,7 @@ class StageBase(TargetBase, ClearBase, GenBase): |
18 |
|
19 |
def unpack_snapshot(self): |
20 |
unpack = True |
21 |
- snapshot_hash = self.resume.get("unpack_portage") |
22 |
+ snapshot_hash = self.resume.get("unpack_repo") |
23 |
|
24 |
unpack_errmsg = "Error unpacking snapshot using mode %(mode)s" |
25 |
|
26 |
@@ -866,7 +866,7 @@ class StageBase(TargetBase, ClearBase, GenBase): |
27 |
|
28 |
if "autoresume" in self.settings["options"] \ |
29 |
and os.path.exists(target_portdir) \ |
30 |
- and self.resume.is_enabled("unpack_portage") \ |
31 |
+ and self.resume.is_enabled("unpack_repo") \ |
32 |
and self.settings["snapshot_path_hash"] == snapshot_hash: |
33 |
log.notice('Valid Resume point detected, skipping unpack of portage tree...') |
34 |
unpack = False |
35 |
@@ -887,7 +887,7 @@ class StageBase(TargetBase, ClearBase, GenBase): |
36 |
myf.write(self.settings["snapshot_path_hash"]) |
37 |
else: |
38 |
log.info('Setting snapshot autoresume point') |
39 |
- self.resume.enable("unpack_portage", |
40 |
+ self.resume.enable("unpack_repo", |
41 |
data = self.settings["snapshot_path_hash"]) |
42 |
|
43 |
if "snapcache" in self.settings["options"]: |
44 |
-- |
45 |
2.12.0 |
46 |
|
47 |
|
48 |
|
49 |
-- |
50 |
Brian Dolbec <dolsen> |