[gentoo-commits] proj/catalyst:master commit in: catalyst/base/

["Brian Dolbec" <dolsen@gentoo.org>]

commit:     5de472ce61d13d242e185a9f6d88b26610fb014b
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  8 06:26:27 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Sep  8 14:05:13 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5de472ce

stagebase.py: strip a trailing slash from the croot_path for consistency

target_subpath must have a trailing slash to prevent some failures.
See commit: 5b08b471611670b4cc996e45c387ecd951fb2142
Subject: Fix livecd source and target paths not ending with a slash
Author: Brian Dolbec <dolsen <AT> gentoo.org> (Wed 12 Jun 2013 07:40:12 AM PDT)

 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 8f12ac6..a6694e6 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -500,7 +500,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
 		Things *could* break if you don't use a proper join()
 		"""
 		self.settings["chroot_path"]=normpath(self.settings["storedir"]+\
-			"/tmp/"+self.settings["target_subpath"])
+			"/tmp/"+self.settings["target_subpath"].rstrip('/'))
 		self.chroot_lock=LockDir(self.settings["chroot_path"])
 
 	def set_autoresume_path(self):