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 E27EA138247 for ; Tue, 31 Dec 2013 04:48:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 93C39E0A6F; Tue, 31 Dec 2013 04:48:03 +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 07379E09B1 for ; Tue, 31 Dec 2013 04:48:02 +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 2489F33F6DC for ; Tue, 31 Dec 2013 04:48:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A6A0FE54FB for ; Tue, 31 Dec 2013 04:48:00 +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: <1388464814.ba5d3f23e16077e80f0c967ce9d6401d705d4593.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: ba5d3f23e16077e80f0c967ce9d6401d705d4593 X-VCS-Branch: pending Date: Tue, 31 Dec 2013 04:48:00 +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: 6ff2a5eb-693b-433c-909c-a97607352240 X-Archives-Hash: f17b6f5c84acf913f33d5c356ff00cbc commit: ba5d3f23e16077e80f0c967ce9d6401d705d4593 Author: Brian Dolbec gentoo org> AuthorDate: Tue Dec 17 06:22:41 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Tue Dec 31 04:40:14 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=ba5d3f23 Remove some troublesome trailing slashes from paths --- modules/generic_stage_target.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index c6a06b6..fcffa23 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,7 +470,7 @@ 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):