perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmd/syncthing: Fix -logfile/-no-restart test on non-Windows.

Browse Source
This commit is contained in:
Jakob Borg
2017-01-18 18:59:48 +01:00
parent d4c4b1fb4c
commit 842e873a94
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/syncthing/main.go
View File

@@ -320,9 +320,11 @@ func main() {
os.Setenv("STGUIAPIKEY", options.guiAPIKey) os.Setenv("STGUIAPIKEY", options.guiAPIKey)
} }
// Check for options which are not compatible with each other // Check for options which are not compatible with each other. We have
// Have to check logfile before it's set to the default below - we only want to complain if they set -logfile explicitly, not if it's set to its default location // to check logfile before it's set to the default below - we only want
if options.noRestart && options.logFile != "" { // to complain if they set -logfile explicitly, not if it's set to its
// default location
if options.noRestart && (options.logFile != "" && options.logFile != "-") {
l.Fatalln("-logfile may not be used with -no-restart or STNORESTART") l.Fatalln("-logfile may not be used with -no-restart or STNORESTART")
} }