1. docker
  2. Commit ee508d47c3917b423b6caae0ad2867c4f6ffe696
Browse code

hack/make.ps1: fix Validate-PkgImports

In Go 1.10.1, the Deps for pkg\tarsum\tarsum_test.go are empty ([]) and
the PowerShell script ends up setting its import list to a string value
of False instead of an empty array. This can be remedied by forcing the
result to be an array, by concatenating to an empty array (@() + ...)

Signed-off-by: John Stephens <johnstep@docker.com>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit ec3f9230d70506c536a24e844da0f0b3af9b43f6)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

John Stephens authored on 2018/04/12 10:23:12
Showing 1 changed files
hack/make.ps1
History View file @ ee508d4
... ... 
@@ -251,10 +251,10 @@ Function Validate-PkgImports($headCommit, $upstreamCommit) {
251 251 
         if ($LASTEXITCODE -ne 0) { Throw "Failed go list for dependencies on $file" }
252 252 
         $imports = $imports -Replace "\[" -Replace "\]", "" -Split(" ") | Sort-Object | Get-Unique
253 253 
         # Filter out what we are looking for
254 
-        $imports = $imports -NotMatch "^github.com/docker/docker/pkg/" `
255 
-                            -NotMatch "^github.com/docker/docker/vendor" `
256 
-                            -Match "^github.com/docker/docker" `
257 
-                            -Replace "`n", ""
254 
+        $imports = @() + $imports -NotMatch "^github.com/docker/docker/pkg/" `
255 
+                                  -NotMatch "^github.com/docker/docker/vendor" `
256 
+                                  -Match "^github.com/docker/docker" `
257 
+                                  -Replace "`n", ""
258 258 
         $imports | % { $badFiles+="$file imports $_`n" }
259 259 
     }
260 260 
     if ($badFiles.Length -eq 0) {