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 E85CC13888F for ; Fri, 9 Oct 2015 01:39:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 78A73E081C; Fri, 9 Oct 2015 01:39:25 +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 D7CBEE081C for ; Fri, 9 Oct 2015 01:39:24 +0000 (UTC) Received: from professor-x (S010634bdfa9ecf80.vc.shawcable.net [96.49.31.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id 1D71A340754 for ; Fri, 9 Oct 2015 01:39:24 +0000 (UTC) Date: Thu, 8 Oct 2015 18:38:36 -0700 From: Brian Dolbec To: gentoo-catalyst@lists.gentoo.org Subject: Re: [gentoo-catalyst] [PATCH v2] stagebase: fix path to snapshot hash file Message-ID: <20151008183836.71f5cf96.dolsen@gentoo.org> In-Reply-To: <1444350185-29720-1-git-send-email-vapier@gentoo.org> References: <1444344777-32497-1-git-send-email-vapier@gentoo.org> <1444350185-29720-1-git-send-email-vapier@gentoo.org> Organization: Gentoo 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 MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Archives-Salt: da979cb4-2296-426b-aebf-0f2266056bc2 X-Archives-Hash: fca28f68d977bebd0bad6624665e24b8 On Thu, 8 Oct 2015 20:23:05 -0400 Mike Frysinger wrote: > When we write the hash, we do so by using: > snapshot_cache_path + / + catalyst-hash > > But when we read it, we do so by: > snapshot_cache_path + catalyst-hash > > If the path lacks a trailing /, then we never read the correct hash > file. The current helper returns -1 on missing file errors which is > compared against the existing hash. In essence, we always trigger a > cache miss. > > Clean up the code to properly create the path and use that var in both > places to prevent future breakage. > --- > v2 > - do it better like an all star > > catalyst/base/stagebase.py | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py > index f81c51b..7d069fa 100644 > --- a/catalyst/base/stagebase.py > +++ b/catalyst/base/stagebase.py > @@ -815,9 +815,9 @@ class StageBase(TargetBase, ClearBase, GenBase): > print self.settings["chroot_path"] > print "unpack(), target_portdir = " + target_portdir > if "snapcache" in self.settings["options"]: > - snapshot_cache_hash=\ > - > read_from_clst(self.settings["snapshot_cache_path"]+\ > - "catalyst-hash") > + snapshot_cache_hash_path = pjoin( > + > self.settings['snapshot_cache_path'], 'catalyst-hash') > + snapshot_cache_hash = > read_from_clst(snapshot_cache_hash_path) unpack_info['mode'] = > self.decompressor.determine_mode( unpack_info['source']) > > @@ -862,8 +862,7 @@ class StageBase(TargetBase, ClearBase, GenBase): > print unpack_errmsg %(unpack_info) > > if "snapcache" in self.settings["options"]: > - > myf=open(self.settings["snapshot_cache_path"] + > - "/" + "catalyst-hash","w") > + myf = open(snapshot_cache_hash_path, > 'w') myf.write(self.settings["snapshot_path_hash"]) > myf.close() > else: looks good. There shouldn't be too many like this left now. I did as many as I could when changing the related code. But I know there was still more. -- Brian Dolbec