| 1 |
commit: e6da0cc1d918daf5a435d124ea7b556b2a52df6f |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 15 16:49:29 2015 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 15 17:08:38 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e6da0cc1 |
| 7 |
|
| 8 |
targets/livecd_stage2.py: Remove the duplicated set_target_path() |
| 9 |
|
| 10 |
catalyst/targets/livecd_stage2.py | 13 ------------- |
| 11 |
1 file changed, 13 deletions(-) |
| 12 |
|
| 13 |
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py |
| 14 |
index ed5aafa..c42cd4c 100644 |
| 15 |
--- a/catalyst/targets/livecd_stage2.py |
| 16 |
+++ b/catalyst/targets/livecd_stage2.py |
| 17 |
@@ -39,19 +39,6 @@ class livecd_stage2(StageBase): |
| 18 |
def set_spec_prefix(self): |
| 19 |
self.settings["spec_prefix"]="livecd" |
| 20 |
|
| 21 |
- def set_target_path(self): |
| 22 |
- self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]) |
| 23 |
- if "autoresume" in self.settings["options"] \ |
| 24 |
- and self.resume.is_enabled("setup_target_path"): |
| 25 |
- log.notice('Resume point detected, skipping target path setup operation...') |
| 26 |
- else: |
| 27 |
- # first clean up any existing target stuff |
| 28 |
- if os.path.isdir(self.settings["target_path"]): |
| 29 |
- cmd("rm -rf "+self.settings["target_path"], |
| 30 |
- "Could not remove existing directory: "+self.settings["target_path"],env=self.env) |
| 31 |
- self.resume.enable("setup_target_path") |
| 32 |
- ensure_dirs(self.settings["target_path"]) |
| 33 |
- |
| 34 |
def run_local(self): |
| 35 |
# what modules do we want to blacklist? |
| 36 |
if "livecd/modblacklist" in self.settings: |
Archives