From 5e7cf66fb35780f930ad0bc5fe21ac330df4411d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 4 Nov 2020 15:57:00 +0100 Subject: publish: Do not path the empty string to 'query-path-info'. Fixes . Regression introduced in 2b2ab7796ac186d88060793b8873fc0e21462758. * guix/scripts/publish.scm (render-nar/cached): Do not call 'bypass-cache?' when ITEM is the empty string. * tests/publish.scm ("with cache, cache bypass, unmapped hash part"): New test. --- guix/scripts/publish.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'guix/scripts/publish.scm') diff --git a/guix/scripts/publish.scm b/guix/scripts/publish.scm index 9706b52844..e8faf379e2 100644 --- a/guix/scripts/publish.scm +++ b/guix/scripts/publish.scm @@ -681,7 +681,8 @@ return it; otherwise, return 404. When TTL is true, use it as the (item (and hash (guard (c ((store-error? c) #f)) (hash-part->path store hash))))) - (and item (bypass-cache? store item))) + (and item (not (string-null? item)) + (bypass-cache? store item))) ;; Render STORE-ITEM live. We reach this because STORE-ITEM is ;; being baked but clients are already asking for it. Thus, we're ;; duplicating work, but doing so allows us to reduce delays. -- cgit v1.2.3