diff options
| author | Richard Maw <richard.maw@gmail.com> | 2017-01-08 15:38:32 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@gmail.com> | 2017-01-08 15:38:32 +0000 |
| commit | 9e57ec6e7d98ba6bc46d6bb12ff2669640413170 (patch) | |
| tree | 526d1e9265f217c380cded991da1dcc3c916f70b | |
| parent | 1b2f2d79f3956374540d914d3d17d6a1cd80d561 (diff) | |
| download | gitano-9e57ec6e7d98ba6bc46d6bb12ff2669640413170.tar.gz | |
keyring: Make keyring name variable consistently named
It was named keyring when listing keyrings,
but all the other keyring commands called it keyringname.
| -rw-r--r-- | doc/admin/000.mdwn | 3 | ||||
| -rw-r--r-- | lib/gitano/admincommand.lua | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/doc/admin/000.mdwn b/doc/admin/000.mdwn index 6ba1733..096a660 100644 --- a/doc/admin/000.mdwn +++ b/doc/admin/000.mdwn @@ -335,8 +335,7 @@ group modify member/$N Component N of user or group when name is split group modify member/suffix Last component of user or group when name is split by "-". group modify member/prefix All but the last component of user or group when name is split by "-". graveyard target Name of destination when restoring. Name of entry when purging. -keyring list keyring Name of the keyring to be listed -keyring keyringname Name of keyring being manipluated for everything except `keyring list`. +keyring keyringname Name of keyring being manipluated or inspected. ref update ref Name of the ref being updated. ref update newtype Object type of the new tip of the ref (e.g. "tag" or "commit"). ref update oldtype Object type of the tip of the ref before the update. diff --git a/lib/gitano/admincommand.lua b/lib/gitano/admincommand.lua index bd9b6b6..c0af7a3 100644 --- a/lib/gitano/admincommand.lua +++ b/lib/gitano/admincommand.lua @@ -753,7 +753,7 @@ local function builtin_keyring_run(conf, _, cmdline, env) local keyrings = {} for k, ktab in pairs(conf.keyrings) do local ctx = util.deep_copy(cmdline._stolen_context) - ctx.keyring = k + ctx.keyringname = k local result = conf.repo:run_lace(ctx) if result == "allow" then keyrings[#keyrings+1] = k end end |