From f632036e9e2778b61ac09da85ad1622151b02ec0 Mon Sep 17 00:00:00 2001 From: vaikas-google Date: Tue, 26 Jan 2016 09:36:56 -0800 Subject: [PATCH] Handle deploy correctly for local files vs. templates --- dm/dm.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dm/dm.go b/dm/dm.go index 71ff4aed3..106bdbba0 100644 --- a/dm/dm.go +++ b/dm/dm.go @@ -375,14 +375,16 @@ func loadTemplate(args []string) *common.Template { } } } else { - if len(args) < 3 { + // See if the first argument is a local file. It could either be a type, or it could be a configuration. If + // it's a local file, it's configuration. + if _, err := os.Stat(args[1]); err == nil { + template, err = expander.NewTemplateFromFileNames(args[1], args[2:]) + } else { if t, err := registry.ParseType(args[1]); err == nil { template = buildTemplateFromType(t) } else { template, err = expander.NewTemplateFromRootTemplate(args[1]) } - } else { - template, err = expander.NewTemplateFromFileNames(args[1], args[2:]) } if err != nil {