-
Committer:
Yu Ning
-
Date:
2015-01-15 05:22:27 UTC
-
mfrom:
(85.2.1 trusty-proposed)
-
Revision ID:
ning.yu@canonical.com-20150115052227-h0idcf3o8lzimbdt
Merge with trusty-updates, 0.2.56.3:
[ Brian Murray ]
* udisks/backend.py: fix some calls to mount_sync that were missed in the
port to the UDisks2 API. Thanks to Marc Culler for the patch.
(LP: #1279987)
[ Yu Ning ]
* usb-creator-helper: use parent object only if there is a parent.
(LP: #1380041)
* usb-creator-helper: re-create the udisks client otherwise it will not
return the newly created device or partition. (LP: #1361474, #1300361)
* usb-creator-helper: use parted instead of udisks2 to create the new
partition table since udisks2 uses wipefs to erase the old partition
table, however partition table erasing is not supported in wipefs yet in
trusty, and that would cause a timed out error.