diff options
| author | Petter Rasmussen | 2016-02-02 23:07:35 +0100 |
|---|---|---|
| committer | Petter Rasmussen | 2016-02-02 23:07:35 +0100 |
| commit | 1a83dbc57e1bd7481f6c716e7705a9712a726008 (patch) | |
| tree | 83a4fe96a957e5e2034cd245022a8406c267b3ff /drive/sync.go | |
| parent | 926a805a153bd99e113543b0a6d43807eb3e49f3 (diff) | |
| download | gdrive-1a83dbc57e1bd7481f6c716e7705a9712a726008.tar.bz2 | |
Remove 'aborting' suffix
Diffstat (limited to 'drive/sync.go')
| -rw-r--r-- | drive/sync.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drive/sync.go b/drive/sync.go index a2c0747..7e809dc 100644 --- a/drive/sync.go +++ b/drive/sync.go @@ -100,7 +100,7 @@ func (self *Drive) prepareRemoteFiles(rootDir *drive.File) ([]*remoteFile, error for _, f := range fileList.Files { relPath, ok := relPaths[f.Id] if !ok { - return nil, fmt.Errorf("File %s does not have a valid parent, aborting...", f.Id) + return nil, fmt.Errorf("File %s does not have a valid parent", f.Id) } remoteFiles = append(remoteFiles, &remoteFile{ relPath: relPath, @@ -153,13 +153,13 @@ func checkFiles(files []*drive.File) error { for _, f := range files { // Ensure all files have exactly one parent if len(f.Parents) != 1 { - return fmt.Errorf("File %s does not have exacly one parent, aborting...", f.Id) + return fmt.Errorf("File %s does not have exacly one parent", f.Id) } // Ensure that there are no duplicate files uniqKey := f.Name + f.Parents[0] if dupeId, isDupe := uniq[uniqKey]; isDupe { - return fmt.Errorf("Found name collision between %s and %s, aborting", f.Id, dupeId) + return fmt.Errorf("Found name collision between %s and %s", f.Id, dupeId) } uniq[uniqKey] = f.Id } |
