From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id EB80E138A87 for ; Thu, 26 Feb 2015 19:25:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 959BCE0996; Thu, 26 Feb 2015 19:25:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 352C4E0996 for ; Thu, 26 Feb 2015 19:25:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 57FB9340BAC for ; Thu, 26 Feb 2015 19:25:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7D49C129D0 for ; Thu, 26 Feb 2015 19:25:31 +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: <1424978103.f811fbc991ba1a9fef8e62f84ecc21e56d1191fb.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/, catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py catalyst/targets/livecd_stage2.py X-VCS-Directories: catalyst/base/ catalyst/targets/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: f811fbc991ba1a9fef8e62f84ecc21e56d1191fb X-VCS-Branch: pending Date: Thu, 26 Feb 2015 19:25:31 +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: e0c41b6c-c667-438d-8a88-3f38ea60c1c9 X-Archives-Hash: a652fb9cdbc43013a927843d345f5b44 commit: f811fbc991ba1a9fef8e62f84ecc21e56d1191fb Author: Brian Dolbec gentoo org> AuthorDate: Sat Jun 1 06:32:49 2013 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Feb 26 19:15:03 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=f811fbc9 Remove some dead code --- catalyst/base/stagebase.py | 2 -- catalyst/targets/livecd_stage2.py | 2 -- 2 files changed, 4 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index edb6032..f8443d8 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -508,8 +508,6 @@ class StageBase(TargetBase, ClearBase, GenBase): "setup_confdir","portage_overlay",\ "base_dirs","bind","chroot_setup","setup_environment",\ "run_local","preclean","unbind","clean"] -# if "TARBALL" in self.settings or \ -# "fetch" not in self.settings["options"]: if "fetch" not in self.settings["options"]: self.settings["action_sequence"].append("capture") self.settings["action_sequence"].append("clear_autoresume") diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py index 78bed82..38b6884 100644 --- a/catalyst/targets/livecd_stage2.py +++ b/catalyst/targets/livecd_stage2.py @@ -111,10 +111,8 @@ class livecd_stage2(StageBase): self.mount_safety_check() if invalid_snapshot: print "No Valid Resume point detected, cleaning up ..." - #os.remove(self.settings["autoresume_path"]+"dir_setup") self.clear_autoresume() self.clear_chroot() - #self.dir_setup() ensure_dirs(self.settings["chroot_path"]+"/tmp", mode=1777) From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 066BA138ADA for ; Thu, 26 Feb 2015 20:13:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45587E08CA; Thu, 26 Feb 2015 20:13:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CB0F6E08C5 for ; Thu, 26 Feb 2015 20:12:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1B5CA340BCD for ; Thu, 26 Feb 2015 20:12:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9ACB0129E1 for ; Thu, 26 Feb 2015 20:12:43 +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: <1424978103.f811fbc991ba1a9fef8e62f84ecc21e56d1191fb.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/, catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py catalyst/targets/livecd_stage2.py X-VCS-Directories: catalyst/targets/ catalyst/base/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: f811fbc991ba1a9fef8e62f84ecc21e56d1191fb X-VCS-Branch: master Date: Thu, 26 Feb 2015 20:12:43 +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: ba82c26d-3aed-4470-92ac-5356dc65599d X-Archives-Hash: 1dffcabdcb1565637cbf40957584994e Message-ID: <20150226201243.E2ZQnu9uFmkxPSXoiNr2hlm3vcoe3pVKPEJvXfAVUnQ@z> commit: f811fbc991ba1a9fef8e62f84ecc21e56d1191fb Author: Brian Dolbec gentoo org> AuthorDate: Sat Jun 1 06:32:49 2013 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Feb 26 19:15:03 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=f811fbc9 Remove some dead code --- catalyst/base/stagebase.py | 2 -- catalyst/targets/livecd_stage2.py | 2 -- 2 files changed, 4 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index edb6032..f8443d8 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -508,8 +508,6 @@ class StageBase(TargetBase, ClearBase, GenBase): "setup_confdir","portage_overlay",\ "base_dirs","bind","chroot_setup","setup_environment",\ "run_local","preclean","unbind","clean"] -# if "TARBALL" in self.settings or \ -# "fetch" not in self.settings["options"]: if "fetch" not in self.settings["options"]: self.settings["action_sequence"].append("capture") self.settings["action_sequence"].append("clear_autoresume") diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py index 78bed82..38b6884 100644 --- a/catalyst/targets/livecd_stage2.py +++ b/catalyst/targets/livecd_stage2.py @@ -111,10 +111,8 @@ class livecd_stage2(StageBase): self.mount_safety_check() if invalid_snapshot: print "No Valid Resume point detected, cleaning up ..." - #os.remove(self.settings["autoresume_path"]+"dir_setup") self.clear_autoresume() self.clear_chroot() - #self.dir_setup() ensure_dirs(self.settings["chroot_path"]+"/tmp", mode=1777)