mirror of
https://github.com/rclone/rclone.git
synced 2025-02-14 21:23:01 +02:00
bisync: test fix for saltysyncs
https://forum.rclone.org/t/avoiding-bisync-times-are-equal-conflicts-with-newer/46636/30 This isn't the real fix, but should at least tell us if we've found the bug.
This commit is contained in:
parent
b52aabd8fe
commit
2341934d8e
@ -370,7 +370,7 @@ func (b *bisyncRun) runLocked(octx context.Context) (err error) {
|
||||
fs.Infof(nil, "No changes found")
|
||||
} else {
|
||||
fs.Infof(nil, "Applying changes")
|
||||
changes1, changes2, results2to1, results1to2, queues, err = b.applyDeltas(octx, ds1, ds2)
|
||||
_, _, results2to1, results1to2, queues, err = b.applyDeltas(octx, ds1, ds2)
|
||||
if err != nil {
|
||||
if b.InGracefulShutdown && (err == context.Canceled || err == accounting.ErrorMaxTransferLimitReachedGraceful || strings.Contains(err.Error(), "context canceled")) {
|
||||
fs.Infof(nil, "Ignoring sync error due to Graceful Shutdown: %v", err)
|
||||
@ -397,6 +397,7 @@ func (b *bisyncRun) runLocked(octx context.Context) (err error) {
|
||||
// save new listings
|
||||
// NOTE: "changes" in this case does not mean this run vs. last run, it means start of this run vs. end of this run.
|
||||
// i.e. whether we can use the March lst-new as this side's lst without modifying it.
|
||||
changes1, changes2 = true, true // FIXME test fix for https://forum.rclone.org/t/avoiding-bisync-times-are-equal-conflicts-with-newer/46636/30
|
||||
if noChanges {
|
||||
b.replaceCurrentListings()
|
||||
} else {
|
||||
|
Loading…
x
Reference in New Issue
Block a user