| 1 |
commit: 00c77c332fe93ca295ca1ac7a20f7b317d4936a7 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 4 16:39:26 2015 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 4 16:39:56 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=00c77c33 |
| 7 |
|
| 8 |
targets/livecd-stage2.py: Remove the set_source_path() |
| 9 |
|
| 10 |
This is not needed and overrides the stagebase method which handles the auto-extension. |
| 11 |
|
| 12 |
catalyst/targets/livecd_stage2.py | 13 ------------- |
| 13 |
1 file changed, 13 deletions(-) |
| 14 |
|
| 15 |
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py |
| 16 |
index 7d9919b..ed5aafa 100644 |
| 17 |
--- a/catalyst/targets/livecd_stage2.py |
| 18 |
+++ b/catalyst/targets/livecd_stage2.py |
| 19 |
@@ -36,19 +36,6 @@ class livecd_stage2(StageBase): |
| 20 |
|
| 21 |
file_locate(self.settings, ["cdtar","controller_file"]) |
| 22 |
|
| 23 |
- def set_source_path(self): |
| 24 |
- self.settings["source_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]) |
| 25 |
- if os.path.isfile(self.settings["source_path"]): |
| 26 |
- self.settings["source_path_hash"] = \ |
| 27 |
- self.settings["hash_map"].generate_hash( |
| 28 |
- self.settings["source_path"]) |
| 29 |
- else: |
| 30 |
- self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]) |
| 31 |
- if not os.path.exists(self.settings["source_path"]): |
| 32 |
- raise CatalystError("Source Path: " + |
| 33 |
- self.settings["source_path"] + " does not exist.", |
| 34 |
- print_traceback=True) |
| 35 |
- |
| 36 |
def set_spec_prefix(self): |
| 37 |
self.settings["spec_prefix"]="livecd" |
Archives