From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3E3D0139695 for ; Fri, 10 Mar 2017 18:38:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 33E73E0C0D; Fri, 10 Mar 2017 18:38:48 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0CFCDE0C0D for ; Fri, 10 Mar 2017 18:38:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CC45434105A for ; Fri, 10 Mar 2017 18:38:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71C51639A for ; Fri, 10 Mar 2017 18:38:45 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1489171053.b5410d12852222fca19e01cfdcbb37e87b6f21ff.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/targets/snapshot.py X-VCS-Directories: catalyst/targets/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: b5410d12852222fca19e01cfdcbb37e87b6f21ff X-VCS-Branch: pending Date: Fri, 10 Mar 2017 18:38:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: aa3786c0-3f62-4084-99fc-6f36b6841801 X-Archives-Hash: 7daed02adfaf23926f2dd687e9829c56 commit: b5410d12852222fca19e01cfdcbb37e87b6f21ff Author: Brian Dolbec gentoo org> AuthorDate: Thu Mar 9 09:17:07 2017 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Fri Mar 10 18:37:33 2017 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b5410d12 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. catalyst/targets/snapshot.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/catalyst/targets/snapshot.py b/catalyst/targets/snapshot.py index 8a9acdd..087834e 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'])