diff options
| author |   Brian Dolbec <dolsen@gentoo.org> | 2017-03-09 01:17:07 -0800 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2017-11-21 17:16:21 -0800 |
| commit | 61527e6db7c2ac195741a243f3ab504f2652e26e (patch) | |
| tree | d5fab96985e238ada98bf52363f910fa517f5d41 | |
| parent | base/stagebase.py: Seperate out the writing of the make.conf file (diff) | |
| download | catalyst-61527e6db7c2ac195741a243f3ab504f2652e26e.tar.gz catalyst-61527e6db7c2ac195741a243f3ab504f2652e26e.tar.bz2 catalyst-61527e6db7c2ac195741a243f3ab504f2652e26e.zip | |
targets/snapshot.py: Update the code and log messages to use the configured repo_name
One more portage name seperation from being used to represent the ebuild repository.
| -rw-r--r-- | catalyst/targets/snapshot.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/catalyst/targets/snapshot.py b/catalyst/targets/snapshot.py index 8a9acdd9..087834eb 100644 --- a/catalyst/targets/snapshot.py +++ b/catalyst/targets/snapshot.py @@ -22,7 +22,7 @@ class snapshot(TargetBase, GenBase): TargetBase.__init__(self, myspec, addlargs) GenBase.__init__(self,myspec) #self.settings=myspec - self.settings["target_subpath"]="portage" + self.settings["target_subpath"]="repos" st=self.settings["storedir"] self.settings["snapshot_path"] = normpath(st + "/snapshots/" + self.settings["snapshot_name"] @@ -46,8 +46,9 @@ class snapshot(TargetBase, GenBase): success = True self.setup() - log.notice('Creating Portage tree snapshot %s from %s ...', - self.settings['version_stamp'], self.settings['portdir']) + log.notice('Creating %s tree snapshot %s from %s ...', + self.settings["repo_name"], self.settings['version_stamp'], + self.settings['portdir']) mytmp=self.settings["tmp_path"] ensure_dirs(mytmp) @@ -63,7 +64,7 @@ class snapshot(TargetBase, GenBase): mytmp + '/' + self.settings['repo_name'] + '/'], env=self.env) - log.notice('Compressing Portage snapshot tarball ...') + log.notice('Compressing %s snapshot tarball ...', self.settings["repo_name"]) compressor = CompressMap(self.settings["compress_definitions"], env=self.env, default_mode=self.settings['compression_mode'], comp_prog=self.settings["comp_prog"]) @@ -93,9 +94,9 @@ class snapshot(TargetBase, GenBase): def kill_chroot_pids(self): pass - @staticmethod - def cleanup(): + def cleanup(self): log.info('Cleaning up ...') + self.purge() def purge(self): clear_dir(self.settings['tmp_path']) |