From eb6dfcf58cd0330ffae1934a8bed0f2d89493973 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 17 May 2015 20:51:32 +0200 Subject: [PATCH] Remove Repository.Test() --- archiver.go | 2 +- cache.go | 2 +- cmd/restic/cmd_fsck.go | 2 +- repository/repository.go | 6 +----- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/archiver.go b/archiver.go index 286cd0d8f..00d299f4d 100644 --- a/archiver.go +++ b/archiver.go @@ -254,7 +254,7 @@ func (arch *Archiver) fileWorker(wg *sync.WaitGroup, p *Progress, done <-chan st // check if all content is still available in the repository contentMissing := false for _, blob := range oldNode.blobs { - if ok, err := arch.repo.Test(backend.Data, blob.Storage.String()); !ok || err != nil { + if ok, err := arch.repo.Backend().Test(backend.Data, blob.Storage.String()); !ok || err != nil { debug.Log("Archiver.fileWorker", " %v not using old data, %v (%v) is missing", e.Path(), blob.ID.Str(), blob.Storage.Str()) contentMissing = true break diff --git a/cache.go b/cache.go index 5e419bf2f..089c3f257 100644 --- a/cache.go +++ b/cache.go @@ -115,7 +115,7 @@ func (c *Cache) Clear(repo *repository.Repository) error { for _, entry := range list { debug.Log("Cache.Clear", "found entry %v", entry) - if ok, err := repo.Test(backend.Snapshot, entry.ID.String()); !ok || err != nil { + if ok, err := repo.Backend().Test(backend.Snapshot, entry.ID.String()); !ok || err != nil { debug.Log("Cache.Clear", "snapshot %v doesn't exist any more, removing %v", entry.ID, entry) err = c.purge(backend.Snapshot, entry.Subtype, entry.ID) diff --git a/cmd/restic/cmd_fsck.go b/cmd/restic/cmd_fsck.go index a9015a797..f79fb8e56 100644 --- a/cmd/restic/cmd_fsck.go +++ b/cmd/restic/cmd_fsck.go @@ -58,7 +58,7 @@ func fsckFile(opts CmdFsck, repo *repository.Repository, IDs []backend.ID) (uint } } else { // test if data blob is there - ok, err := repo.Test(backend.Data, packID.String()) + ok, err := repo.Backend().Test(backend.Data, packID.String()) if err != nil { return 0, err } diff --git a/repository/repository.go b/repository/repository.go index 5dc273e6c..c2adf0d66 100644 --- a/repository/repository.go +++ b/repository/repository.go @@ -580,7 +580,7 @@ func (s *Repository) SearchKey(password string) error { // Init creates a new master key with the supplied password and initializes the // repository config. func (s *Repository) Init(password string) error { - has, err := s.Test(backend.Config, "") + has, err := s.be.Test(backend.Config, "") if err != nil { return err } @@ -676,10 +676,6 @@ func (s *Repository) List(t backend.Type, done <-chan struct{}) <-chan backend.I return outCh } -func (s *Repository) Test(t backend.Type, name string) (bool, error) { - return s.be.Test(t, name) -} - func (s *Repository) Remove(t backend.Type, name string) error { return s.be.Remove(t, name) }