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 3929E13888F for ; Thu, 8 Oct 2015 22:53:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A033E080A; Thu, 8 Oct 2015 22:53:01 +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 3AC5EE080A for ; Thu, 8 Oct 2015 22:53:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 4B4DB33E3A9 for ; Thu, 8 Oct 2015 22:53:00 +0000 (UTC) From: Mike Frysinger To: gentoo-catalyst@lists.gentoo.org Subject: [gentoo-catalyst] [PATCH] stagebase: fix path to snapshot hash file Date: Thu, 8 Oct 2015 18:52:57 -0400 Message-Id: <1444344777-32497-1-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 2.5.2 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: 94baed8f-1622-4d63-ba9c-6d5064f0b900 X-Archives-Hash: 6912b36f00ab4270d04e9fc6e20deda0 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. Add the missing / to the read logic. --- catalyst/base/stagebase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index f81c51b..a2a8520 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -817,7 +817,7 @@ class StageBase(TargetBase, ClearBase, GenBase): if "snapcache" in self.settings["options"]: snapshot_cache_hash=\ read_from_clst(self.settings["snapshot_cache_path"]+\ - "catalyst-hash") + "/" + "catalyst-hash") unpack_info['mode'] = self.decompressor.determine_mode( unpack_info['source']) -- 2.5.2