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 88B94138247 for ; Wed, 18 Dec 2013 01:12:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B5E9E0AD4; Wed, 18 Dec 2013 01:12:30 +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 90AA5E0AD0 for ; Wed, 18 Dec 2013 01:12:29 +0000 (UTC) Received: from big_daddy.dol-sen.ca (S010600222de111ff.vc.shawcable.net [96.49.5.156]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id 8D69233EDF8; Wed, 18 Dec 2013 01:12:28 +0000 (UTC) From: Brian Dolbec To: gentoo-catalyst@lists.gentoo.org Cc: Brian Dolbec Subject: [gentoo-catalyst] [PATCH 1/3] Remove some troublesome trailing slashes from paths Date: Tue, 17 Dec 2013 17:12:09 -0800 Message-Id: <1387329131-25890-2-git-send-email-dolsen@gentoo.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1387329131-25890-1-git-send-email-dolsen@gentoo.org> References: <1387329131-25890-1-git-send-email-dolsen@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Archives-Salt: ed5d2749-2255-41be-a859-40ce075a471d X-Archives-Hash: ce2caec7f3251728d482bfb383e1a919 --- 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 d9cc499..fea2f64 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -446,7 +446,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"] @@ -457,14 +457,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"]): -- 1.8.3.2