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 019B7138247 for ; Wed, 22 Jan 2014 05:04:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA2B5E110D; Wed, 22 Jan 2014 05:04:13 +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 129FBE1105 for ; Wed, 22 Jan 2014 05:04:12 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E7ADA33F077 for ; Wed, 22 Jan 2014 05:04:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id B36C6187B5 for ; Wed, 22 Jan 2014 05:04:10 +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: <1388772079.4a9d5b0d05d8de042097be32ae3273f8e2418c7d.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:3.0 commit in: catalyst/base/, catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py catalyst/targets/livecd_stage1.py catalyst/targets/livecd_stage2.py X-VCS-Directories: catalyst/base/ catalyst/targets/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 4a9d5b0d05d8de042097be32ae3273f8e2418c7d X-VCS-Branch: 3.0 Date: Wed, 22 Jan 2014 05:04:10 +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: fb2a69fd-c821-498e-a5df-b69a4b243fc0 X-Archives-Hash: 16bedcd584864bc20e6dabd62f706708 commit: 4a9d5b0d05d8de042097be32ae3273f8e2418c7d Author: Brian Dolbec gentoo org> AuthorDate: Wed Jun 12 14:40:12 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Fri Jan 3 18:01:19 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=4a9d5b0d Fix livecd source and target paths not ending with a slash --- catalyst/base/stagebase.py | 2 +- catalyst/targets/livecd_stage1.py | 3 +-- catalyst/targets/livecd_stage2.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 1db0f81..0105723 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -285,7 +285,7 @@ class StageBase(TargetBase, ClearBase, GenBase): def set_target_subpath(self): self.settings["target_subpath"]=self.settings["rel_type"]+"/"+\ self.settings["target"]+"-"+self.settings["subarch"]+"-"+\ - self.settings["version_stamp"] + self.settings["version_stamp"] +'/' def set_source_subpath(self): if type(self.settings["source_subpath"])!=types.StringType: diff --git a/catalyst/targets/livecd_stage1.py b/catalyst/targets/livecd_stage1.py index 55859bc..8402e7a 100644 --- a/catalyst/targets/livecd_stage1.py +++ b/catalyst/targets/livecd_stage1.py @@ -33,7 +33,7 @@ class livecd_stage1(StageBase): "unbind", "clean","clear_autoresume"] def set_target_path(self): - self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]) + self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]+'/') if "autoresume" in self.settings["options"] \ and self.resume.is_enabled("setup_target_path"): print "Resume point detected, skipping target path setup operation..." @@ -43,7 +43,6 @@ class livecd_stage1(StageBase): cmd("rm -rf "+self.settings["target_path"],\ "Could not remove existing directory: "+self.settings["target_path"],env=self.env) self.resume.enable("setup_target_path") - ensure_dirs(self.settings["target_path"]) def set_spec_prefix(self): diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py index c22fa0f..8fc406b 100644 --- a/catalyst/targets/livecd_stage2.py +++ b/catalyst/targets/livecd_stage2.py @@ -44,7 +44,7 @@ class livecd_stage2(StageBase): self.settings["hash_map"].generate_hash( self.settings["source_path"]) else: - self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]) + self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+'/') if not os.path.exists(self.settings["source_path"]): raise CatalystError("Source Path: " + self.settings["source_path"] + " does not exist.",