[Merge] lp:~ken-vandine/content-hub/lp1429687 into lp:content-hub

[Ken VanDine]

Ken VanDine has proposed merging lp:~ken-vandine/content-hub/lp1429687 into lp:content-hub.

Commit message:
Abort transfers when a file already exists matching the requested name and ContentStore.


Requested reviews:
  Ubuntu Phablet Team (phablet-team)
Related bugs:
  Bug #1429687 in content-hub: "Cannot import two files with the same name to ContentStore.App"
  https://bugs.launchpad.net/content-hub/+bug/1429687

For more details, see:
https://code.launchpad.net/~ken-vandine/content-hub/lp1429687/+merge/253087

=== WIP, still needs test fixes ===

Abort transfers when a file already exists matching the requested name and ContentStore.

-- 
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~ken-vandine/content-hub/lp1429687 into lp:content-hub.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 1603 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20150316/b7457e5a/attachment.diff>