Skip to content

Commit 199bf20

Browse files
jwierzboajanikow
andauthored
Fix 'make generate' command in ZSH (#1305)
Co-authored-by: Adam Janikowski <12255597+ajanikow@users.noreply.github.com>
1 parent 2dd63ea commit 199bf20

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,7 @@ tools: tools-min
546546
@curl -L ${PROTOC_URL} -o $(GOPATH)/protoc.zip
547547
@echo ">> Unzipping protobuf compiler..."
548548
@unzip -o $(GOPATH)/protoc.zip -d $(GOPATH)/
549+
@chmod +x $(GOPATH)/bin/protoc
549550
@echo ">> Fetching protoc go plugins..."
550551
@GOBIN=$(GOPATH)/bin go install github.com/golang/protobuf/protoc-gen-go@v1.5.2
551552
@GOBIN=$(GOPATH)/bin go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2
@@ -635,9 +636,9 @@ generate: generate-internal generate-proto fmt
635636

636637
generate-internal:
637638
ROOT=$(ROOT) go test --count=1 "$(REPOPATH)/internal/..."
638-
639+
639640
generate-proto:
640-
PATH=$(PATH):$(GOBUILDDIR)/bin $(GOBUILDDIR)/bin/protoc -I.:$(GOBUILDDIR)/include/ \
641+
PATH="$(PATH):$(GOBUILDDIR)/bin" $(GOBUILDDIR)/bin/protoc -I.:$(GOBUILDDIR)/include/ \
641642
--go_out=. --go_opt=paths=source_relative \
642643
--go-grpc_out=. --go-grpc_opt=paths=source_relative \
643644
$(PROTOSOURCES)

pkg/storage/pv_creator.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// DISCLAIMER
33
//
4-
// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
4+
// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
55
//
66
// Licensed under the Apache License, Version 2.0 (the "License");
77
// you may not use this file except in compliance with the License.
@@ -168,7 +168,7 @@ func (ls *LocalStorage) createPV(ctx context.Context, apiObject *api.ArangoLocal
168168
continue
169169
}
170170
if info.Available < volSize {
171-
ls.log.Debug("Not enough available size")
171+
ls.log.Error("Not enough available size")
172172
continue
173173
}
174174
// Ok, prepare a directory

0 commit comments

Comments
 (0)