From 8f1a36bf7f595aef4aaec81199876a5d38552fed Mon Sep 17 00:00:00 2001 From: Zygmunt Krynicki Date: Thu, 17 Jan 2019 15:46:00 +0200 Subject: [PATCH] [PATCH 5/9] advisor,errtracker: use upstream bolt package Upstream snapd uses a fork of the bolt package that carries additional patches for bugs that were discovered by snapd developers. Bolt itself appears to be an abandoned project and is not accepting any new patches. In various distributions the upstream bolt package may or may not have been patched but the forked version was definitely not packaged. As such, to build snapd in Debian the upstream bolt package name must be used. Signed-off-by: Zygmunt Krynicki Gbp-Pq: Name 0005-advisor-errtracker-use-upstream-bolt-package.patch --- advisor/backend.go | 2 +- errtracker/errtracker.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/advisor/backend.go b/advisor/backend.go index 931c708f..bc4a6fba 100644 --- a/advisor/backend.go +++ b/advisor/backend.go @@ -25,7 +25,7 @@ import ( "path/filepath" "time" - "github.com/snapcore/bolt" + "github.com/boltdb/bolt" "github.com/snapcore/snapd/dirs" "github.com/snapcore/snapd/osutil" diff --git a/errtracker/errtracker.go b/errtracker/errtracker.go index 0af7f3cf..db77ec1e 100644 --- a/errtracker/errtracker.go +++ b/errtracker/errtracker.go @@ -33,7 +33,7 @@ import ( "strings" "time" - "github.com/snapcore/bolt" + "github.com/boltdb/bolt" "gopkg.in/mgo.v2/bson" "github.com/snapcore/snapd/arch" -- 2.30.2