Merge pull request #765 from LiliC/lili/adjust-error-msg

lilic · web-flow · commit be39b2da62ef · 2018-11-20T16:28:37.000+01:00
internal/../project_util.go: Adjust error msg
diff --git a/internal/util/projutil/project_util.go b/internal/util/projutil/project_util.go
@@ -49,8 +49,11 @@ func MustInProjectRoot() {
 	// if the current directory has the "./build/dockerfile" file, then it is safe to say
 	// we are at the project root.
 	_, err := os.Stat(buildDockerfile)
-	if err != nil && os.IsNotExist(err) {
-		log.Fatalf("must run command in project root dir: (%v)", err)
+	if err != nil {
+		if os.IsNotExist(err) {
+			log.Fatal("must run command in project root dir: project structure requires ./build/Dockerfile")
+		}
+		log.Fatalf("error: (%v) while checking if current directory is the project root", err)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,11 @@ func MustInProjectRoot() {`
`49`	`49`	`// if the current directory has the "./build/dockerfile" file, then it is safe to say`
`50`	`50`	`// we are at the project root.`
`51`	`51`	`_, err := os.Stat(buildDockerfile)`
`52`		`- if err != nil && os.IsNotExist(err) {`
`53`		`- log.Fatalf("must run command in project root dir: (%v)", err)`
	`52`	`+ if err != nil {`
	`53`	`+ if os.IsNotExist(err) {`
	`54`	`+ log.Fatal("must run command in project root dir: project structure requires ./build/Dockerfile")`
	`55`	`+ }`
	`56`	`+ log.Fatalf("error: (%v) while checking if current directory is the project root", err)`
`54`	`57`	`}`
`55`	`58`	`}`
`56`	`59`