[gentoo-commits] proj/catalyst:unversioned-cachedir commit in: catalyst/base/

[gentoo-commits] proj/catalyst:unversioned-cachedir commit in: catalyst/base/

[Robin H. Johnson]

commit:     03d8e9d832dcf2b3e52f4aa84e0782e47f3c9b71
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  9 08:56:45 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> 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"]:

[gentoo-commits] proj/catalyst:unversioned-cachedir commit in: catalyst/base/

[Robin H. Johnson]

commit:     40c83b1e77efc539ca80709ae3ae0a56b065a7d1
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 08:25:15 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 01:16:21 2017 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=40c83b1e

base/stagebase.py: Update the cleanables to the new repo variables

 catalyst/base/stagebase.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 67382b9a..d44db985 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -452,7 +452,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
 
 	def set_cleanables(self):
 		self.settings["cleanables"] = ["/etc/resolv.conf", "/var/tmp/*", "/tmp/*",
-			"/root/*", self.settings["portdir"]]
+			"/root/*", self.settings["repo_basedir"] + "/" +
+			self.settings["repo_name"]]
 
 	def set_snapshot_path(self):
 		self.settings["snapshot_path"] = file_check(

[gentoo-commits] proj/catalyst:unversioned-cachedir commit in: catalyst/base/

[Robin H. Johnson]

commit:     739a1a78513a27b5234fce708acb64211c43cb74
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  9 08:58:10 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 01:16:20 2017 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=739a1a78

base/stagebase.py: Correctly log the correct function name for unpack_snapshot()

 catalyst/base/stagebase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 93c13902..532f0997 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -822,7 +822,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
 		target_portdir = normpath(self.settings["chroot_path"] +
 			self.settings["repo_basedir"] + "/" + self.settings["repo_name"])
 		log.info('%s', self.settings['chroot_path'])
-		log.info('unpack(), target_portdir = %s', target_portdir)
+		log.info('unpack_snapshot(), target_portdir = %s', target_portdir)
 		if "snapcache" in self.settings["options"]:
 			snapshot_cache_hash_path = pjoin(
 				self.settings['snapshot_cache_path'], 'catalyst-hash')