[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 931c708fb987fa512f887639df8d054ddb0a5daa..bc4a6fba9a046d964f3b476f2a448ee9e6e84419 100644 (file)
--- 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 59f1d0d1e1fb7edcb6d0efafc191011fd4e25bc6..f6203e1e096bc91ed1c95db98bd8091646132cfd 100644 (file)
--- 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"