From 43d4add02f4a358c413a4c8a86a7f2504c771f47 Mon Sep 17 00:00:00 2001 From: DanB Date: Mon, 7 May 2018 19:43:44 +0200 Subject: [PATCH] Fix Makefile for debian packaging --- cmd/cgr-loader/cgr-loader.go | 5 +---- packages/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/cmd/cgr-loader/cgr-loader.go b/cmd/cgr-loader/cgr-loader.go index f01a4893a..75e8dd21a 100755 --- a/cmd/cgr-loader/cgr-loader.go +++ b/cmd/cgr-loader/cgr-loader.go @@ -292,10 +292,7 @@ func main() { if err = tpReader.LoadAll(); err != nil { log.Fatal(err) } - /*if *verbose { - tpReader.ShowStatistics() - } - */ + if *dryRun { // We were just asked to parse the data, not saving it return } diff --git a/packages/Makefile b/packages/Makefile index 46e4b24ea..1ac50d3ea 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -12,7 +12,7 @@ ifeq ($(GIT_DATE),) exit 1 endif -JESSIE_VERSION=$(shell dpkg-parsechangelog -S Version -l jessie/changelog 2> /dev/null) +JESSIE_VERSION=$(shell dpkg-parsechangelog -S Version -ljessie/changelog 2> /dev/null) ifeq ($(JESSIE_VERSION),) echo "Error: Failed to extract version from jessie changelog" @@ -21,7 +21,7 @@ endif JESSIE_PKG_VERSION=$(JESSIE_VERSION)+$(GIT_DATE)+$(GIT_COMMIT) -SQUEEZE_VERSION=$(shell dpkg-parsechangelog -S Version -l squeeze/changelog 2> /dev/null) +SQUEEZE_VERSION=$(shell dpkg-parsechangelog -S Version -lsqueeze/changelog 2> /dev/null) ifeq ($(SQUEEZE_VERSION),) echo "Error: Failed to extract version from squeeze changelog"