alex/homemaker
1
Fork 0
Code Releases 1 Activity

Add flagNoMacro guard

Browse Source
This commit is contained in:
Alex Yatskov 2015-07-20 13:57:37 +09:00
parent c4624d7c0b
commit f35909340b
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
task.go
View File

@ -50,21 +50,23 @@ func (t *taskDef) process(taskName, srcDir, dstDir string, conf *config, flags i
}
}
for _, macro := range t.Macros {
if len(macro) == 0 {
continue
}
if flags&flagNoMacro == 0 {
for _, macro := range t.Macros {
if len(macro) == 0 {
continue
}
macroName := macro[0]
macroParams := macro[1:]
macroName := macro[0]
macroParams := macro[1:]
depMacro, ok := conf.Macros[macroName]
if !ok {
return fmt.Errorf("macro dependency not found %s", macroName)
}
depMacro, ok := conf.Macros[macroName]
if !ok {
return fmt.Errorf("macro dependency not found %s", macroName)
}
if err := depMacro.process(dstDir, macroParams, flags); err != nil {
return err
if err := depMacro.process(dstDir, macroParams, flags); err != nil {
return err
}
}
}