TrueCloudLab/rclone
16
0
Fork 4
Code Issues 1 Pull requests Projects Releases 4 Packages Wiki Activity Actions

Remove github.com/pkg/errors and replace with std library version

Browse source 
This is possible now that we no longer support go1.12 and brings
rclone into line with standard practices in the Go world.

This also removes errors.New and errors.Errorf from lib/errors and
prefers the stdlib errors package over lib/errors.
This commit is contained in:
Nick Craig-Wood 2021-11-04 10:12:57 +00:00
parent 97328e5755
commit e43b5ce5e5
233 changed files with 1673 additions and 1695 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cmd/mountlib/check_linux.go
View file

@ -4,12 +4,13 @@
package mountlib
import (
"errors"
"fmt"
"path/filepath"
"strings"
"time"
"github.com/artyom/mtab"
"github.com/pkg/errors"
)
const (
@ -25,16 +26,16 @@ func CheckMountEmpty(mountpoint string) error {
mountpointAbs, err := filepath.Abs(mountpoint)
if err != nil {
return errors.Wrapf(err, "cannot get absolute path: %s", mountpoint)
return fmt.Errorf("cannot get absolute path: %s: %w", mountpoint, err)
}
entries, err := mtab.Entries(mtabPath)
if err != nil {
return errors.Wrapf(err, "cannot read %s", mtabPath)
return fmt.Errorf("cannot read %s: %w", mtabPath, err)
}
for _, entry := range entries {
if entry.Dir == mountpointAbs && entry.Type != "autofs" {
return errors.Errorf(msg, mountpointAbs)
return fmt.Errorf(msg, mountpointAbs)
}
}
return nil
@ -45,11 +46,11 @@ func CheckMountEmpty(mountpoint string) error {
func CheckMountReady(mountpoint string) error {
mountpointAbs, err := filepath.Abs(mountpoint)
if err != nil {
return errors.Wrapf(err, "cannot get absolute path: %s", mountpoint)
return fmt.Errorf("cannot get absolute path: %s: %w", mountpoint, err)
}
entries, err := mtab.Entries(mtabPath)
if err != nil {
return errors.Wrapf(err, "cannot read %s", mtabPath)
return fmt.Errorf("cannot read %s: %w", mtabPath, err)
}
for _, entry := range entries {
if entry.Dir == mountpointAbs && strings.Contains(entry.Type, "rclone") {