From f248b2e87ef8d97caaedbd36ed0f2c009aeedd1a Mon Sep 17 00:00:00 2001
From: Hisham Muhammad <hisham@gobolinux.org>
Date: Wed, 28 Feb 2024 21:12:03 -0300
Subject: fix: don't try to lock when using --pack-binary-rock

---
 src/luarocks/cmd.lua         | 2 +-
 src/luarocks/cmd/build.lua   | 7 ++++++-
 src/luarocks/cmd/init.lua    | 2 +-
 src/luarocks/cmd/install.lua | 7 ++++++-
 src/luarocks/cmd/make.lua    | 7 ++++++-
 src/luarocks/cmd/purge.lua   | 2 +-
 src/luarocks/cmd/remove.lua  | 2 +-
 7 files changed, 22 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/luarocks/cmd.lua b/src/luarocks/cmd.lua
index 8d70f127..ca22c0db 100644
--- a/src/luarocks/cmd.lua
+++ b/src/luarocks/cmd.lua
@@ -729,7 +729,7 @@ function cmd.run_command(description, commands, external_namespace, ...)
    local cmd_mod = cmd_modules[args.command]
 
    local lock
-   if cmd_mod.needs_lock then
+   if cmd_mod.needs_lock and cmd_mod.needs_lock(args) then
       lock, err = fs.lock_access(path.root_dir(cfg.root_dir), args.force_lock)
       if not lock then
          local try_force = args.force_lock
diff --git a/src/luarocks/cmd/build.lua b/src/luarocks/cmd/build.lua
index c73ceebe..710c89f2 100644
--- a/src/luarocks/cmd/build.lua
+++ b/src/luarocks/cmd/build.lua
@@ -193,6 +193,11 @@ function cmd_build.command(args)
    return name, version
 end
 
-cmd_build.needs_lock = true
+cmd_build.needs_lock = function(args)
+   if args.pack_binary_rock then
+      return false
+   end
+   return true
+end
 
 return cmd_build
diff --git a/src/luarocks/cmd/init.lua b/src/luarocks/cmd/init.lua
index 65513104..b5161a9f 100644
--- a/src/luarocks/cmd/init.lua
+++ b/src/luarocks/cmd/init.lua
@@ -212,6 +212,6 @@ function init.command(args)
    return true
 end
 
-init.needs_lock = true
+init.needs_lock = function() return true end
 
 return init
diff --git a/src/luarocks/cmd/install.lua b/src/luarocks/cmd/install.lua
index e221f611..a6dddd2b 100644
--- a/src/luarocks/cmd/install.lua
+++ b/src/luarocks/cmd/install.lua
@@ -261,6 +261,11 @@ function install.command(args)
    end
 end
 
-install.needs_lock = true
+install.needs_lock = function(args)
+   if args.pack_binary_rock then
+      return false
+   end
+   return true
+end
 
 return install
diff --git a/src/luarocks/cmd/make.lua b/src/luarocks/cmd/make.lua
index b75a9043..4502696f 100644
--- a/src/luarocks/cmd/make.lua
+++ b/src/luarocks/cmd/make.lua
@@ -156,6 +156,11 @@ function make.command(args)
    end
 end
 
-make.needs_lock = true
+make.needs_lock = function(args)
+   if args.pack_binary_rock then
+      return false
+   end
+   return true
+end
 
 return make
diff --git a/src/luarocks/cmd/purge.lua b/src/luarocks/cmd/purge.lua
index 09380ef1..16d96531 100644
--- a/src/luarocks/cmd/purge.lua
+++ b/src/luarocks/cmd/purge.lua
@@ -73,6 +73,6 @@ function purge.command(args)
    return writer.make_manifest(cfg.rocks_dir, "one")
 end
 
-purge.needs_lock = true
+purge.needs_lock = function() return true end
 
 return purge
diff --git a/src/luarocks/cmd/remove.lua b/src/luarocks/cmd/remove.lua
index affeda25..91aa8914 100644
--- a/src/luarocks/cmd/remove.lua
+++ b/src/luarocks/cmd/remove.lua
@@ -72,6 +72,6 @@ function cmd_remove.command(args)
    return true
 end
 
-cmd_remove.needs_lock = true
+cmd_remove.needs_lock = function() return true end
 
 return cmd_remove
-- 
cgit v1.2.3-55-g6feb