From b1f2de212cfee7083c21c6f7685f39eb3d1bb3c2 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Mon, 1 Jan 2018 17:27:42 -0800 Subject: [PATCH] make.go: remove redundant failure message I forgot to delete Change-Id: Ia81f14ee958d49d53e5ef8961f77518e6a4c6802 --- make.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/make.go b/make.go index 7d7c907c9..37bcf8478 100644 --- a/make.go +++ b/make.go @@ -134,9 +134,6 @@ func main() { if err != nil { log.Fatalf("Failed to get current directory: %v", err) } - if strings.HasSuffix(camRoot, "camlistore.org") { - log.Fatalf("Camlistore was renamed to Perkeep. Your current directory (%s) looks like a camlistore.org directory. We're expecting you to be in a perkeep.org directory now. See https://github.com/camlistore/camlistore/issues/981#issuecomment-354690313 for details. You need to rename your camlistore.org parent directory to perkeep.org") - } latestSrcMod = mirror(sql) if *onlysync { if *website { @@ -1461,10 +1458,7 @@ func homeDir() string { } func failIfCamlistoreOrgDir() { - dir, err := os.Getwd() - if err != nil { - return - } + dir, _ := os.Getwd() if strings.HasSuffix(dir, "camlistore.org") { log.Fatalf(`Camlistore was renamed to Perkeep. Your current directory (%s) looks like a camlistore.org directory.