| 1 |
commit: f811fbc991ba1a9fef8e62f84ecc21e56d1191fb |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 1 06:32:49 2013 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 26 19:15:03 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=f811fbc9 |
| 7 |
|
| 8 |
Remove some dead code |
| 9 |
|
| 10 |
--- |
| 11 |
catalyst/base/stagebase.py | 2 -- |
| 12 |
catalyst/targets/livecd_stage2.py | 2 -- |
| 13 |
2 files changed, 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
| 16 |
index edb6032..f8443d8 100644 |
| 17 |
--- a/catalyst/base/stagebase.py |
| 18 |
+++ b/catalyst/base/stagebase.py |
| 19 |
@@ -508,8 +508,6 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 20 |
"setup_confdir","portage_overlay",\ |
| 21 |
"base_dirs","bind","chroot_setup","setup_environment",\ |
| 22 |
"run_local","preclean","unbind","clean"] |
| 23 |
-# if "TARBALL" in self.settings or \ |
| 24 |
-# "fetch" not in self.settings["options"]: |
| 25 |
if "fetch" not in self.settings["options"]: |
| 26 |
self.settings["action_sequence"].append("capture") |
| 27 |
self.settings["action_sequence"].append("clear_autoresume") |
| 28 |
|
| 29 |
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py |
| 30 |
index 78bed82..38b6884 100644 |
| 31 |
--- a/catalyst/targets/livecd_stage2.py |
| 32 |
+++ b/catalyst/targets/livecd_stage2.py |
| 33 |
@@ -111,10 +111,8 @@ class livecd_stage2(StageBase): |
| 34 |
self.mount_safety_check() |
| 35 |
if invalid_snapshot: |
| 36 |
print "No Valid Resume point detected, cleaning up ..." |
| 37 |
- #os.remove(self.settings["autoresume_path"]+"dir_setup") |
| 38 |
self.clear_autoresume() |
| 39 |
self.clear_chroot() |
| 40 |
- #self.dir_setup() |
| 41 |
|
| 42 |
ensure_dirs(self.settings["chroot_path"]+"/tmp", mode=1777) |
Archives