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 3D957138247 for ; Mon, 30 Dec 2013 01:44:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F41F9E0ACF; Mon, 30 Dec 2013 01:44:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 73FA1E0ACF for ; Mon, 30 Dec 2013 01:44:52 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9B74933F777 for ; Mon, 30 Dec 2013 01:44:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 0B6EFE5538 for ; Mon, 30 Dec 2013 01:44:49 +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: <1388343246.7895f714e63b060baef970424c2a843d17b841be.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: modules/ X-VCS-Repository: proj/catalyst X-VCS-Files: modules/generic_stage_target.py X-VCS-Directories: modules/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 7895f714e63b060baef970424c2a843d17b841be X-VCS-Branch: pending Date: Mon, 30 Dec 2013 01:44:49 +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: 7494b8df-19a5-4011-99dd-324c9567519b X-Archives-Hash: 80159691ab43542b664e5a160a359078 commit: 7895f714e63b060baef970424c2a843d17b841be Author: Brian Dolbec gentoo org> AuthorDate: Tue Dec 17 06:22:41 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Sun Dec 29 18:54:06 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=7895f714 Remove some troublesome trailing slashes from paths --- modules/generic_stage_target.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index bbea57a..f69f192 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -459,7 +459,7 @@ class generic_stage_target(generic_target): if "SNAPCACHE" in self.settings: self.settings["snapshot_cache_path"]=\ normpath(self.settings["snapshot_cache"]+"/"+\ - self.settings["snapshot"]+"/") + self.settings["snapshot"]) self.snapcache_lock=\ catalyst_lock.LockDir(self.settings["snapshot_cache_path"]) print "Caching snapshot to "+self.settings["snapshot_cache_path"] @@ -470,14 +470,14 @@ class generic_stage_target(generic_target): Things *will* break without it! """ self.settings["chroot_path"]=normpath(self.settings["storedir"]+\ - "/tmp/"+self.settings["target_subpath"]+"/") + "/tmp/"+self.settings["target_subpath"]) self.chroot_lock=catalyst_lock.LockDir(self.settings["chroot_path"]) def set_autoresume_path(self): self.settings["autoresume_path"]=normpath(self.settings["storedir"]+\ "/tmp/"+self.settings["rel_type"]+"/"+".autoresume-"+\ self.settings["target"]+"-"+self.settings["subarch"]+"-"+\ - self.settings["version_stamp"]+"/") + self.settings["version_stamp"]) if "AUTORESUME" in self.settings: print "The autoresume path is " + self.settings["autoresume_path"] if not os.path.exists(self.settings["autoresume_path"]):