lp:~xavi-garcia-mena/keeper/sf-errors-dbus-interface

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:keeper/devel at revision 127

unity-api-1-bot: Needs Fixing (continuous-integration) on 2016-12-22

Xavi Garcia: Pending requested 2016-12-21

Diff: 2685 lines (+930/-444)

40 files modified

include/client/client.h (+5/-4)
include/client/keeper-errors.h (+18/-11)
include/client/keeper-items.h (+78/-0)
include/helper/helper.h (+1/-1)
src/cli/command-line-client-view.cpp (+34/-16)
src/cli/command-line-client-view.h (+3/-3)
src/cli/command-line-client.cpp (+69/-82)
src/cli/command-line-client.h (+5/-3)
src/client/CMakeLists.txt (+3/-0)
src/client/client.cpp (+65/-46)
src/client/keeper-errors.cpp (+9/-9)
src/client/keeper-items.cpp (+212/-0)
src/helper/backup-helper.cpp (+6/-6)
src/helper/helper.cpp (+1/-1)
src/helper/restore-helper.cpp (+5/-5)
src/qdbus-stubs/CMakeLists.txt (+5/-4)
src/qdbus-stubs/com.canonical.keeper.User.xml (+3/-3)
src/qdbus-stubs/dbus-types.h (+5/-2)
src/service/backup-choices.cpp (+1/-1)
src/service/keeper-task-backup.cpp (+11/-5)
src/service/keeper-task-restore.cpp (+9/-3)
src/service/keeper-task.cpp (+6/-6)
src/service/keeper-task.h (+3/-2)
src/service/keeper-user.cpp (+3/-3)
src/service/keeper-user.h (+4/-4)
src/service/keeper.cpp (+103/-58)
src/service/keeper.h (+3/-3)
src/service/metadata-provider.h (+2/-1)
src/service/private/keeper-task_p.h (+2/-2)
src/service/restore-choices.cpp (+3/-3)
src/service/task-manager.cpp (+34/-6)
src/service/task-manager.h (+3/-2)
src/storage-framework/storage_framework_client.cpp (+57/-1)
src/storage-framework/storage_framework_client.h (+5/-0)
tests/dbusmock/keeper-template-test.cpp (+111/-102)
tests/integration/helpers/helpers-test-failure.cpp (+10/-10)
tests/integration/helpers/helpers-test.cc (+5/-5)
tests/integration/helpers/restore-test.cpp (+1/-1)
tests/integration/helpers/test-helpers-base.cpp (+22/-25)
tests/integration/helpers/test-helpers-base.h (+5/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

130. By Xavi Garcia on 2016-12-22

Fixed CMakeLists.txt

129. By Xavi Garcia on 2016-12-22

KeeperError as Error and error codes changed

128. By Xavi Garcia on 2016-12-22

Removed metadata_error signal, signature of dbus is internally again QVariantDictMap, returning error as additional dbus argument

127. By Xavi Garcia on 2016-12-21

conflicts resolved

126. By Xavi Garcia on 2016-12-21

This branch removes some log statements that were not giving too much information and some that are printed too often and flood the logs.

Approved by Charles Kerr, unity-api-1-bot.

125. By Xavi Garcia on 2016-12-21

This branch adds error notification in each keeper task.

Approved by unity-api-1-bot, Charles Kerr.

124. By Xavi Garcia on 2016-12-19

Changes to command line client and some bugs fixed.

Approved by unity-api-1-bot, Charles Kerr.

123. By Charles Kerr on 2016-12-19

Add untar.

Approved by Xavi Garcia, unity-api-1-bot.

122. By Charles Kerr on 2016-11-29

Fix TarCreator::step() to block less.

Approved by Xavi Garcia, unity-api-1-bot.

121. By Xavi Garcia on 2016-11-29

First version of restore.

Approved by unity-api-1-bot, Charles Kerr.