lp:~verterok/ubuntuone-client/fix-597870-stable

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntuone-client/stable-1-2 at revision 518

Facundo Batista (community): Approve on 2010-07-05

John O'Brien (community): Approve on 2010-06-24

Diff: 162 lines (+108/-5)

2 files modified

tests/syncdaemon/test_fsm.py (+90/-2)
ubuntuone/syncdaemon/filesystem_manager.py (+18/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #597870: syncdaemon creates unnecessary conflicts

High

Fix Released

Link a bug report

Related blueprints

518. By Guillermo Gonzalez on 2010-06-24

Fix fileystem manager _deletr_dir_tree method to support read-only shares.

517. By dobey on 2010-06-09

[release] ubuntuone-client 1.2.2

516. By dobey on 2010-06-07

Avoid opening the error dialog when getting devices list

515. By dobey on 2010-06-07

Fix typo in music_check_toggled call (removed preceding __)
Convert the DBusBool '0' to int then Python bool for storing
Update the internal config object with the new value after calling DBus

514. By Guillermo Gonzalez on 2010-06-07

Fix dbus_interface error handling in Folders.delete (and Shares.delete_share) when the volume_id is invalid.

513. By dobey on 2010-06-01

As path can be NULL, guard against calling hash_remove with it

512. By Facundo Batista on 2010-05-27

Queue an upload again on SV_HASH_NEW if being LOCAL with hashes ok.

511. By Guillermo Gonzalez on 2010-05-25

Check volume root metadata state in local rescan, fix it if it's in SERVER and log a warning of it's != NONE and != SERVER.

510. By Natalia Bidart on 2010-05-25

Improving logging when performing delete actions.

509. By Guillermo Gonzalez on 2010-05-25

Fix Bug #557160 so UDFs with non-ASCII names (valid UTF-8) can be created using the DBus Interface.