build: Fix shadowing bug in staleness calculation. (#635)

dmitshur · web-flow · commit 9659c814f1d5 · 2017-04-27T17:54:11.000-04:00
The parent scope pkg variable was inadvertently shadowed in #411. As a result, the value of impModeTime was wrong, and the if statement could never be true, and pkg.SrcModTime was never updated to a later time. Fixes #559 (possibly other similar issues, but they'll need to be verified).
diff --git a/build/build.go b/build/build.go
@@ -532,11 +532,11 @@ func (s *Session) BuildPackage(pkg *PackageData) (*compiler.Archive, error) {
 			if importedPkgPath == "unsafe" || ignored {
 				continue
 			}
-			pkg, _, err := s.buildImportPathWithSrcDir(importedPkgPath, pkg.Dir)
+			importedPkg, _, err := s.buildImportPathWithSrcDir(importedPkgPath, pkg.Dir)
 			if err != nil {
 				return nil, err
 			}
-			impModeTime := pkg.SrcModTime
+			impModeTime := importedPkg.SrcModTime
 			if impModeTime.After(pkg.SrcModTime) {
 				pkg.SrcModTime = impModeTime
 			}

Original file line number	Diff line number	Diff line change
`@@ -532,11 +532,11 @@ func (s Session) BuildPackage(pkg PackageData) (*compiler.Archive, error) {`
`532`	`532`	`if importedPkgPath == "unsafe" \|\| ignored {`
`533`	`533`	`continue`
`534`	`534`	`}`
`535`		`- pkg, _, err := s.buildImportPathWithSrcDir(importedPkgPath, pkg.Dir)`
	`535`	`+ importedPkg, _, err := s.buildImportPathWithSrcDir(importedPkgPath, pkg.Dir)`
`536`	`536`	`if err != nil {`
`537`	`537`	`return nil, err`
`538`	`538`	`}`
`539`		`- impModeTime := pkg.SrcModTime`
	`539`	`+ impModeTime := importedPkg.SrcModTime`
`540`	`540`	`if impModeTime.After(pkg.SrcModTime) {`
`541`	`541`	`pkg.SrcModTime = impModeTime`
`542`	`542`	`}`