From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 910B41384B4 for ; Wed, 23 Dec 2015 04:30:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A49F21C064; Wed, 23 Dec 2015 04:30:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AA46121C064 for ; Wed, 23 Dec 2015 04:30:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 895C334069A for ; Wed, 23 Dec 2015 04:30:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 274E7CEB for ; Wed, 23 Dec 2015 04:30:43 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1450844922.c607e85594e5db23e0a064fb6c9ac08fb0f5a811.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: c607e85594e5db23e0a064fb6c9ac08fb0f5a811 X-VCS-Branch: master Date: Wed, 23 Dec 2015 04:30:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0de78802-347c-4aea-8302-1d57f1e35a1c X-Archives-Hash: 8ac116fbd41f4dd8081b5db2bfb67830 commit: c607e85594e5db23e0a064fb6c9ac08fb0f5a811 Author: Brian Dolbec gentoo org> AuthorDate: Wed Dec 23 04:28:42 2015 +0000 Commit: Brian Dolbec gentoo 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: