4b2f3c5454
See https://github.com/NixOS/nixpkgs/pull/323753 for details. Changes: * git: temporarily comment out dottime patch (it doesn't apply, but it's not critical) * third-party/cgit: use an older git version where dottime patch still applies * 3p/crate2nix: remove crate2nix patches included in latest release * tvix: remove unneeded defaultCrateOverrides (upstreamed to nixpkgs) * tvix: regenerate Cargo.nix * tvix/nix-compat: remove unnused AtermWriteable::aterm_bytes pub(crate) function * tvix/nix-compat: remove redundant trait bounds * tvix/glue: use clone_into() to set drv.{builder,system} * tools/crate2nix: apply workaround for https://github.com/numtide/treefmt/issues/327 * toold/depotfmt: expose treefmt config as passthru * tools/crate2nix: undo some more hacks in the crate2nix-check drv Change-Id: Ifbcedeb3e8f81b2f6ec1dbf10189bfa6dfd9c75c Co-Authored-By: Florian Klink <flokli@flokli.de> Reviewed-on: https://cl.tvl.fyi/c/depot/+/11907 Reviewed-by: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI Reviewed-by: flokli <flokli@flokli.de>
43 lines
1.2 KiB
Diff
43 lines
1.2 KiB
Diff
From 601af097720079ea40db100b1dd6aefba4685e7c Mon Sep 17 00:00:00 2001
|
|
From: Florian Klink <flokli@flokli.de>
|
|
Date: Mon, 1 Jul 2024 17:34:08 +0300
|
|
Subject: [PATCH] fix: only try opening the cache if cache is enabled
|
|
|
|
Otherwise `--no-cache` still fails to open the cache.
|
|
---
|
|
cli/format.go | 12 ++++++++----
|
|
1 file changed, 8 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/cli/format.go b/cli/format.go
|
|
index 492a4f3..8ccf578 100644
|
|
--- a/cli/format.go
|
|
+++ b/cli/format.go
|
|
@@ -118,9 +118,11 @@ func (f *Format) Run() (err error) {
|
|
f.formatters[name] = formatter
|
|
}
|
|
|
|
- // open the cache
|
|
- if err = cache.Open(f.TreeRoot, f.ClearCache, f.formatters); err != nil {
|
|
- return err
|
|
+ // open the cache if configured
|
|
+ if !f.NoCache {
|
|
+ if cache.Open(f.TreeRoot, f.ClearCache, f.formatters); err != nil {
|
|
+ return err
|
|
+ }
|
|
}
|
|
|
|
// create an app context and listen for shutdown
|
|
@@ -148,7 +150,9 @@ func (f *Format) Run() (err error) {
|
|
f.processedCh = make(chan *walk.File, cap(f.filesCh))
|
|
|
|
// start concurrent processing tasks in reverse order
|
|
- eg.Go(f.updateCache(ctx))
|
|
+ if !f.NoCache {
|
|
+ eg.Go(f.updateCache(ctx))
|
|
+ }
|
|
eg.Go(f.applyFormatters(ctx))
|
|
eg.Go(f.walkFilesystem(ctx))
|
|
|
|
--
|
|
2.44.1
|
|
|