commit: 20f6cd7ab2662ec23031b5a843a175a1236e83d3
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 20 21:23:59 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 21:24:31 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=20f6cd7a
stagebase.py: Fix the empty .../build/default/stage* directory creation
self.settings["target_path"] contained a trailing slash.
This made the os.path.dirname() operation on it only drop the trailing slash.
What was desired was the for the .../build/default path.
catalyst/base/stagebase.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 69b7b0d..62950b5 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1263,7 +1263,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
else:
log.notice('Capture target in a tarball')
# Remove filename from path
- mypath = os.path.dirname(self.settings["target_path"])
+ mypath =
os.path.dirname(self.settings["target_path"].rstrip('/'))
# Now make sure path exists
ensure_dirs(mypath)
