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 CE8391387B1 for ; Fri, 3 Jan 2014 05:03:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45C04E0AAB; Fri, 3 Jan 2014 05:03:27 +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 744BDE0A94 for ; Fri, 3 Jan 2014 05:03:26 +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 993B733F540 for ; Fri, 3 Jan 2014 05:03:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id F38EEE5536 for ; Fri, 3 Jan 2014 05:03:22 +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: <1388723968.c0c0a87d2a22a73e9b8a2e754bed5b185ed54aec.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: c0c0a87d2a22a73e9b8a2e754bed5b185ed54aec X-VCS-Branch: pending Date: Fri, 3 Jan 2014 05:03:22 +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: 2f8619f2-eae5-4614-872d-2ac8872f082f X-Archives-Hash: 6d14930bfd3349d5ddbcb5c7a48e7fb0 commit: c0c0a87d2a22a73e9b8a2e754bed5b185ed54aec Author: Brian Dolbec gentoo org> AuthorDate: Tue Dec 17 06:22:41 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Fri Jan 3 04:39:28 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=c0c0a87d Remove some troublesome trailing slashes from paths Change the docstring to warn to use a proper path join function. --- modules/generic_stage_target.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 7919f07..587b903 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -460,18 +460,18 @@ 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"] def set_chroot_path(self): """ - NOTE: the trailing slash is very important! - Things *will* break without it! + NOTE: the trailing slash has been removed + 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"]) self.chroot_lock=catalyst_lock.LockDir(self.settings["chroot_path"]) def set_autoresume_path(self):