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 18CB51382C5 for ; Thu, 4 Jan 2018 19:09:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A435E09C9; Thu, 4 Jan 2018 19:09:26 +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 1B6DAE09C9 for ; Thu, 4 Jan 2018 19:09:26 +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 2E0E4335C36 for ; Thu, 4 Jan 2018 19:09:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E98BB1A1 for ; Thu, 4 Jan 2018 19:09:23 +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: <1515092928.b55d6967fcbf9b2d10c324d4eb523f28f0829909.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/targets/livecd_stage2.py X-VCS-Directories: catalyst/targets/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: b55d6967fcbf9b2d10c324d4eb523f28f0829909 X-VCS-Branch: master Date: Thu, 4 Jan 2018 19:09:23 +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: ab8b24a8-9591-4152-8c78-62cf7d35649d X-Archives-Hash: 5d3060cb4a11d7036cbe177898b1d963 commit: b55d6967fcbf9b2d10c324d4eb523f28f0829909 Author: Brian Dolbec gentoo org> AuthorDate: Thu Jan 4 15:14:11 2018 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Jan 4 19:08:48 2018 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b55d6967 targets/livecd_stage2.py: Add "clean" action Add clean to clear out the tree used to build with. Seems "empty" used to be hard coded to clean it out. catalyst/targets/livecd_stage2.py | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py index a3b5e5e6..63f77ac3 100644 --- a/catalyst/targets/livecd_stage2.py +++ b/catalyst/targets/livecd_stage2.py @@ -68,13 +68,33 @@ class livecd_stage2(StageBase): print_traceback=True) def set_action_sequence(self): - self.settings["action_sequence"]=["unpack","unpack_snapshot",\ - "config_profile_link","setup_confdir","portage_overlay",\ - "bind","chroot_setup","setup_environment","run_local",\ - "build_kernel"] + self.settings["action_sequence"]=[ + "unpack", + "unpack_snapshot", + "config_profile_link", + "setup_confdir", + "portage_overlay", + "bind", + "chroot_setup", + "setup_environment", + "run_local", + "build_kernel" + ] if "fetch" not in self.settings["options"]: - self.settings["action_sequence"] += ["bootloader","preclean",\ - "livecd_update","root_overlay","fsscript","rcupdate","unmerge",\ - "unbind","remove","empty","target_setup",\ - "setup_overlay","create_iso"] + self.settings["action_sequence"] += [ + "bootloader", + "preclean", + "livecd_update", + "root_overlay", + "fsscript", + "rcupdate", + "unmerge", + "unbind", + "remove", + "empty", + "clean", + "target_setup", + "setup_overlay", + "create_iso" + ] self.settings["action_sequence"].append("clear_autoresume")