From 3dbc9ffe87307cd8f2ae84ce67824695c7eaf369 Mon Sep 17 00:00:00 2001
From: bigbes <bigbes@gmail.com>
Date: Wed, 30 Dec 2015 18:14:21 +0300
Subject: [PATCH] [tarantoolctl] Fix for last commit
---
extra/dist/tarantoolctl | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/extra/dist/tarantoolctl b/extra/dist/tarantoolctl
index b49b90471f..85d7e41360 100755
--- a/extra/dist/tarantoolctl
+++ b/extra/dist/tarantoolctl
@@ -404,7 +404,11 @@ local function wrapper_cfg(cfg)
-- force these startup options
--
cfg.pid_file = default_cfg.pid_file
- cfg.username = (os.getenv('USER') == default_cfg.username and default_cfg.username) or nil
+ if os.getenv('USER') ~= default_cfg.username then
+ cfg.username = default_cfg.username
+ else
+ cfg.username = nil
+ end
if cfg.background == nil then
cfg.background = true
end
--
GitLab