From: Brian Dolbec <dolsen@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Subject: Re: [gentoo-catalyst] [PATCH] stagebase: fix path to snapshot hash file
Date: Thu, 8 Oct 2015 18:33:01 -0700 [thread overview]
Message-ID: <20151008183301.17e00130.dolsen@gentoo.org> (raw)
In-Reply-To: <1444344777-32497-1-git-send-email-vapier@gentoo.org>
On Thu, 8 Oct 2015 18:52:57 -0400
Mike Frysinger <vapier@gentoo.org> 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.
>
> 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'])
>
works for me. It was probably a bug introduced by me removing trailing
slashes in pretty much all variables. I kept running into issues with
slashes causing problems. Sometimes they were needed other times they
caused failures.
It was easier to remove them by default then add them only when needed.
--
Brian Dolbec <dolsen>
prev parent reply other threads:[~2015-10-09 1:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-08 22:52 [gentoo-catalyst] [PATCH] stagebase: fix path to snapshot hash file Mike Frysinger
2015-10-08 22:57 ` [gentoo-catalyst] [PATCH] stagebase: replace read_from_clst with snakeoil Mike Frysinger
2015-10-09 0:23 ` [gentoo-catalyst] [PATCH v2] stagebase: fix path to snapshot hash file Mike Frysinger
2015-10-09 1:38 ` Brian Dolbec
2015-10-09 1:33 ` Brian Dolbec [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151008183301.17e00130.dolsen@gentoo.org \
--to=dolsen@gentoo.org \
--cc=gentoo-catalyst@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox