commit: c607e85594e5db23e0a064fb6c9ac08fb0f5a811
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 23 04:28:42 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Dec 23 04:28:42 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=c607e855
base/stagebase.py: Clear up some additional trailing slash issues
Since the target_subpath's trailing slash is neded for several operations.
This code removes that trailing slash for operations outside the python
codebase.
catalyst/base/stagebase.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 67b6653..c800c34 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1330,8 +1330,11 @@ class StageBase(TargetBase, ClearBase, GenBase):
varname = varname.replace(".", "_")
if isinstance(self.settings[x], str):
# Prefix to prevent namespace clashes
- #os.environ[varname]=self.settings[x]
- self.env[varname]=self.settings[x]
+ #os.environ[varname] = self.settings[x]
+ if "path" in x:
+ self.env[varname] =
self.settings[x].rstrip("/")
+ else:
+ self.env[varname] = self.settings[x]
elif isinstance(self.settings[x], list):
#os.environ[varname] = '
'.join(self.settings[x])
self.env[varname] = ' '.join(self.settings[x])
@@ -1631,7 +1634,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
else:
try:
cmd(self.settings["controller_file"]+\
- " bootloader " +
self.settings["target_path"],\
+ " bootloader " +
self.settings["target_path"].rstrip('/'),\
"Bootloader script
failed.",env=self.env)
self.resume.enable("bootloader")
except CatalystError:
