diff options
| -rw-r--r-- | drive/sync.go | 6 | ||||
| -rw-r--r-- | drive/upload_sync.go | 4 |
2 files changed, 5 insertions, 5 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 } diff --git a/drive/upload_sync.go b/drive/upload_sync.go index 66e1456..d1c155d 100644 --- a/drive/upload_sync.go +++ b/drive/upload_sync.go @@ -129,7 +129,7 @@ func (self *Drive) createMissingRemoteDirs(files *syncFiles, args UploadSyncArgs parentPath := parentFilePath(lf.relPath) parent, ok := files.findRemoteByPath(parentPath) if !ok { - return nil, fmt.Errorf("Could not find remote directory with path '%s', aborting...", parentPath) + return nil, fmt.Errorf("Could not find remote directory with path '%s'", parentPath) } dstFile := &drive.File{ @@ -167,7 +167,7 @@ func (self *Drive) uploadMissingFiles(files *syncFiles, args UploadSyncArgs) err parentPath := parentFilePath(lf.relPath) parent, ok := files.findRemoteByPath(parentPath) if !ok { - return fmt.Errorf("Could not find remote directory with path '%s', aborting...", parentPath) + return fmt.Errorf("Could not find remote directory with path '%s'", parentPath) } fmt.Fprintf(args.Out, "[%04d/%04d] Uploading %s -> %s\n", i + 1, missingCount, lf.absPath, filepath.Join(files.root.file.Name, lf.relPath)) |