[gentoo-commits] proj/catalyst:pending commit in: catalyst/base/, catalyst/targets/

["Brian Dolbec" <dolsen@gentoo.org>]

commit:     f811fbc991ba1a9fef8e62f84ecc21e56d1191fb
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  1 06:32:49 2013 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> 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)