Gentoo Archives: gentoo-commits

From: Brian Dolbec <dolsen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/
Date: Wed, 29 Nov 2017 17:20:49
Message-Id: 1511313380.03d8e9d832dcf2b3e52f4aa84e0782e47f3c9b71.dolsen@gentoo
1 commit: 03d8e9d832dcf2b3e52f4aa84e0782e47f3c9b71
2 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 9 08:56:45 2017 +0000
4 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 22 01:16:20 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=03d8e9d8
7
8 base/stagebase.py: Rename unpack_portage resume point to unpack_repo
9
10 One part of the effort to separate the portage name from the repository.
11
12 catalyst/base/stagebase.py | 6 +++---
13 1 file changed, 3 insertions(+), 3 deletions(-)
14
15 diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
16 index b857a64b..93c13902 100644
17 --- a/catalyst/base/stagebase.py
18 +++ b/catalyst/base/stagebase.py
19 @@ -808,7 +808,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
20
21 def unpack_snapshot(self):
22 unpack = True
23 - snapshot_hash = self.resume.get("unpack_portage")
24 + snapshot_hash = self.resume.get("unpack_repo")
25
26 unpack_errmsg = "Error unpacking snapshot using mode %(mode)s"
27
28 @@ -847,7 +847,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
29
30 if "autoresume" in self.settings["options"] \
31 and os.path.exists(target_portdir) \
32 - and self.resume.is_enabled("unpack_portage") \
33 + and self.resume.is_enabled("unpack_repo") \
34 and self.settings["snapshot_path_hash"] == snapshot_hash:
35 log.notice('Valid Resume point detected, skipping unpack of portage tree...')
36 unpack = False
37 @@ -868,7 +868,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
38 myf.write(self.settings["snapshot_path_hash"])
39 else:
40 log.info('Setting snapshot autoresume point')
41 - self.resume.enable("unpack_portage",
42 + self.resume.enable("unpack_repo",
43 data = self.settings["snapshot_path_hash"])
44
45 if "snapcache" in self.settings["options"]: