| 1 |
commit: 8811c5d189038f092c5d11d5052a6cfadda8b903 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 23 04:26:01 2015 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 23 04:26:01 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=8811c5d1 |
| 7 |
|
| 8 |
targets/livecd_stage2.py: Re-add a set_target_path method |
| 9 |
|
| 10 |
The target path directory is needed to assemble the components which are needed from |
| 11 |
the build chroot. It is from that location that the final iso is created. |
| 12 |
|
| 13 |
catalyst/targets/livecd_stage2.py | 14 ++++++++++++++ |
| 14 |
1 file changed, 14 insertions(+) |
| 15 |
|
| 16 |
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py |
| 17 |
index c42cd4c..df0073c 100644 |
| 18 |
--- a/catalyst/targets/livecd_stage2.py |
| 19 |
+++ b/catalyst/targets/livecd_stage2.py |
| 20 |
@@ -39,6 +39,20 @@ class livecd_stage2(StageBase): |
| 21 |
def set_spec_prefix(self): |
| 22 |
self.settings["spec_prefix"]="livecd" |
| 23 |
|
| 24 |
+ def set_target_path(self): |
| 25 |
+ '''Set the target path for the finished stage. |
| 26 |
+ |
| 27 |
+ This method runs the StageBase.set_target_path mehtod, |
| 28 |
+ and additionally creates a staging directory for assembling |
| 29 |
+ the final components needed to produce the iso image. |
| 30 |
+ ''' |
| 31 |
+ super(livecd_stage2, self).set_target_path() |
| 32 |
+ if os.path.isdir(self.settings["target_path"]): |
| 33 |
+ cmd("rm -rf " + self.settings["target_path"], |
| 34 |
+ "Could not remove existing directory: " + |
| 35 |
+ self.settings["target_path"], env=self.env) |
| 36 |
+ ensure_dirs(self.settings["target_path"]) |
| 37 |
+ |
| 38 |
def run_local(self): |
| 39 |
# what modules do we want to blacklist? |
| 40 |
if "livecd/modblacklist" in self.settings: |
Archives