config: fix --unset

2 files changed, 22 insertions, 1 deletions

diff --git a/spec/config_spec.lua b/spec/config_spec.lua
index 2e76ae0c..f4a793c4 100644
--- a/spec/config_spec.lua
+++ b/spec/config_spec.lua
@@ -170,6 +170,27 @@ describe("LuaRocks config tests #integration", function()
       end)
    end)
 
+   describe("unset config keys", function()
+      it("unsets a simple config key", function()
+         test_env.run_in_tmp(function(tmpdir)
+            local myproject = tmpdir .. "/myproject"
+            lfs.mkdir(myproject)
+            lfs.chdir(myproject)
+            
+            assert(run.luarocks("init"))
+            assert.truthy(run.luarocks_bool("config my_var my_value"))
+
+            local output = run.luarocks("config my_var")
+            assert.match("my_value", output)
+
+            assert.truthy(run.luarocks_bool("config my_var --unset"))
+
+            output = run.luarocks("config my_var")
+            assert.not_match("my_value", output)
+         end, finally)
+      end)
+   end)
+
    describe("write config keys", function()
       it("rejects invalid --scope", function()
          assert.is_false(run.luarocks_bool("config web_browser foo --scope=foo"))
diff --git a/src/luarocks/cmd/config.lua b/src/luarocks/cmd/config.lua
index 59dafdb5..6d3543b5 100644
--- a/src/luarocks/cmd/config.lua
+++ b/src/luarocks/cmd/config.lua
@@ -302,7 +302,7 @@ function config_cmd.command(args)
    if args.key then
       if args.value or args.unset then
          local scope = get_scope(args)
-         return write_entries({ [args.key] = args.value }, scope, args.unset)
+         return write_entries({ [args.key] = args.value or args.unset }, scope, args.unset)
       else
          return print_entry(args.key, cfg, args.json)
       end