Skip to content

Commit

Permalink
Merge branch 'master' of github.com:justwatchcom/gopass
Browse files Browse the repository at this point in the history
* 'master' of github.com:justwatchcom/gopass:
  Fix typo (#643)
  • Loading branch information
dominikschulz committed Jan 30, 2018
2 parents 9d26bce + df3c3c3 commit 73946ed
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions store/root/move.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func (r *Store) Move(ctx context.Context, from, to string) error {
func (r *Store) Delete(ctx context.Context, name string) error {
ctx, store, sn := r.getStore(ctx, name)
if sn == "" {
return errors.Errorf("can not delete a mount point. Use `gopass mount remove %s`", store.Alias())
return errors.Errorf("can not delete a mount point. Use `gopass mounts remove %s`", store.Alias())
}
return store.Delete(ctx, sn)
}
Expand All @@ -74,10 +74,10 @@ func (r *Store) Delete(ctx context.Context, name string) error {
func (r *Store) Prune(ctx context.Context, tree string) error {
for mp := range r.mounts {
if strings.HasPrefix(mp, tree) {
return errors.Errorf("can not prune subtree with mounts. Unmount first: `gopass mount remove %s`", mp)
return errors.Errorf("can not prune subtree with mounts. Unmount first: `gopass mounts remove %s`", mp)
}
}

ctx, store, tree := r.getStore(ctx, tree)
return store.Prune(ctx, tree)
}
}

0 comments on commit 73946ed

Please sign in to comment.