From bfa23b0075b0e2c5100cc396a4360255f47303d3 Mon Sep 17 00:00:00 2001 From: Girish S Date: Mon, 26 Oct 2015 17:09:15 +0530 Subject: adds trailing slash if missing from Directory in config.json does it only if "DriverName" == model.IMAGE_DRIVER_LOCAL, not sure if required for other drivers too --- utils/config.go | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'utils') diff --git a/utils/config.go b/utils/config.go index fd9856a67..6b34c76ed 100644 --- a/utils/config.go +++ b/utils/config.go @@ -159,6 +159,13 @@ func LoadConfig(fileName string) { configureLog(&config.LogSettings) TestConnection(&config) + if config.FileSettings.DriverName == model.IMAGE_DRIVER_LOCAL { + dir := config.FileSettings.Directory + if len(dir) > 0 && dir[len(dir)-1:] != "/" { + config.FileSettings.Directory += "/" + } + } + Cfg = &config SanitizeOptions = getSanitizeOptions(Cfg) ClientCfg = getClientConfig(Cfg) -- cgit v1.2.3-1-g7c22