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 d74aa14fe9e9446d15c2dd4101958731360a9bfb..42a4ba05190fcbe0b5a2d0a599f879efeacb4ace 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 51721481835d337d9e5103bfab0e84803e3b9a0b..746e55b9893860e796e9bd05791576f8bcdf671a 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"