From: Zygmunt Krynicki <me@zygoon.pl>
Date: Thu, 17 Jan 2019 13:46:00 +0000 (+0200)
Subject: [PATCH 5/9] advisor,errtracker: use upstream bolt package
X-Git-Tag: archive/raspbian/2.37.4-1+rpi1+deb10u1^2~10
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=20ac47a413761f4a731dea73e01c4d0b8282d09d;p=snapd.git

[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 <me@zygoon.pl>

Gbp-Pq: Name 0005-advisor-errtracker-use-upstream-bolt-package.patch
---

diff --git a/advisor/backend.go b/advisor/backend.go
index d74aa14f..42a4ba05 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 d7507a9a..1910b7d7 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"