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 E41EB139082 for ; Wed, 29 Nov 2017 17:20:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 140DBE0BE7; Wed, 29 Nov 2017 17:20:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DC4C2E0BEF for ; Wed, 29 Nov 2017 17:20:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CBBCD33FE49 for ; Wed, 29 Nov 2017 17:20:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2BF6CABD4 for ; Wed, 29 Nov 2017 17:20: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: <1511313381.61527e6db7c2ac195741a243f3ab504f2652e26e.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:master 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: 61527e6db7c2ac195741a243f3ab504f2652e26e X-VCS-Branch: master Date: Wed, 29 Nov 2017 17:20: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: 598d8bd3-6153-4c2a-9e55-92542c06d709 X-Archives-Hash: 20f860f17f9ce03ba37826f740bb6a18 commit: 61527e6db7c2ac195741a243f3ab504f2652e26e Author: Brian Dolbec gentoo org> AuthorDate: Thu Mar 9 09:17:07 2017 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Wed Nov 22 01:16:21 2017 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=61527e6d 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 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']) 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 27B9C139083 for ; Wed, 22 Nov 2017 15:52:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2BD75E0EC3; Wed, 22 Nov 2017 15:52:48 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0879CE0EC3 for ; Wed, 22 Nov 2017 15:52:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 18F0C33BEC7 for ; Wed, 22 Nov 2017 15:52:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 789B7A3CF for ; Wed, 22 Nov 2017 15:52:44 +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: <1511313381.61527e6db7c2ac195741a243f3ab504f2652e26e.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: 61527e6db7c2ac195741a243f3ab504f2652e26e X-VCS-Branch: pending Date: Wed, 22 Nov 2017 15:52:44 +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: 7086b2d7-471c-4229-8b11-7893f373a86d X-Archives-Hash: bed95132f16082343a726e7887aa7fcd Message-ID: <20171122155244.hKGcrHCzXjE9Tx8qkP2tX_T-RcLSfGARsSPfpGeA910@z> commit: 61527e6db7c2ac195741a243f3ab504f2652e26e Author: Brian Dolbec gentoo org> AuthorDate: Thu Mar 9 09:17:07 2017 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Wed Nov 22 01:16:21 2017 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=61527e6d 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 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'])