Merge lp:~cyphermox/mtp/file-sizes into lp:mtp
Proposed by
Mathieu Trudel-Lapierre
Status: | Needs review |
---|---|
Proposed branch: | lp:~cyphermox/mtp/file-sizes |
Merge into: | lp:mtp |
Diff against target: |
80 lines (+18/-6) 3 files modified
debian/changelog (+10/-0) server/UbuntuMtpDatabase.h (+7/-5) src/MtpServer.cpp (+1/-1) |
To merge this branch: | bzr merge lp:~cyphermox/mtp/file-sizes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Ubuntu Phablet Team | Pending | ||
Review via email: mp+263248@code.launchpad.net |
Commit message
Better handle large files.
To post a comment you must log in.
Unmerged revisions
- 70. By Mathieu Trudel-Lapierre
-
Update changelog for bug 1455464
- 69. By Mathieu Trudel-Lapierre
-
boost::filesystem file_size() returns a uintmax_t; and the MTP_PROPERTY_
OBJECT_ SIZE property should be a UINT64 anyway. - 68. By Mathieu Trudel-Lapierre
-
Properly return MTP_RESPONSE_
OBJECT_ TOO_LARGE in MtpServer before reaching the database only if the reported file size is greater than the reported max file size, and isn't larger than a UINT32.
FAILED: Continuous integration, rev:69 /code.launchpad .net/~mathieu- tl/mtp/ file-sizes/ +merge/ 263248/ +edit-commit- message
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http:// jenkins. qa.ubuntu. com/job/ mtp-ci/ 35/ jenkins. qa.ubuntu. com/job/ mtp-vivid- amd64-ci/ 7 jenkins. qa.ubuntu. com/job/ mtp-vivid- armhf-ci/ 7 jenkins. qa.ubuntu. com/job/ mtp-vivid- armhf-ci/ 7/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mtp-vivid- i386-ci/ 7
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/mtp- ci/35/rebuild
http://