Merge lp://staging/~dobey/ubuntuone-client/update-13-10 into lp://staging/ubuntuone-client/stable-13-10

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 1396
Merged at revision: 1396
Proposed branch: lp://staging/~dobey/ubuntuone-client/update-13-10
Merge into: lp://staging/ubuntuone-client/stable-13-10
Diff against target: 9736 lines (+312/-9038)
61 files modified
.bzrignore (+2/-73)
Makefile.am (+0/-154)
VERSION (+0/-1)
autogen.sh (+0/-21)
configure.ac (+0/-186)
contrib/check-reactor-import (+3/-0)
contrib/draw-fsm (+2/-1)
data/Makefile.am (+0/-48)
docs/Makefile.am (+0/-7)
docs/reference/Makefile.am (+0/-62)
docs/reference/libsyncdaemon-docs.sgml (+0/-48)
libsyncdaemon/Makefile.am (+0/-114)
libsyncdaemon/libsyncdaemon-1.0.pc.in (+0/-11)
libsyncdaemon/libsyncdaemon.h (+0/-50)
libsyncdaemon/syncdaemon-authentication.c (+0/-298)
libsyncdaemon/syncdaemon-authentication.h (+0/-75)
libsyncdaemon/syncdaemon-config-interface.c (+0/-276)
libsyncdaemon/syncdaemon-config-interface.h (+0/-83)
libsyncdaemon/syncdaemon-credentials.c (+0/-215)
libsyncdaemon/syncdaemon-credentials.h (+0/-75)
libsyncdaemon/syncdaemon-daemon.c (+0/-1477)
libsyncdaemon/syncdaemon-daemon.h (+0/-172)
libsyncdaemon/syncdaemon-events-interface.c (+0/-130)
libsyncdaemon/syncdaemon-events-interface.h (+0/-71)
libsyncdaemon/syncdaemon-file-info.c (+0/-236)
libsyncdaemon/syncdaemon-file-info.h (+0/-78)
libsyncdaemon/syncdaemon-filesystem-interface.c (+0/-190)
libsyncdaemon/syncdaemon-filesystem-interface.h (+0/-84)
libsyncdaemon/syncdaemon-folder-info.c (+0/-176)
libsyncdaemon/syncdaemon-folder-info.h (+0/-73)
libsyncdaemon/syncdaemon-folders-interface.c (+0/-494)
libsyncdaemon/syncdaemon-folders-interface.h (+0/-76)
libsyncdaemon/syncdaemon-interface.c (+0/-274)
libsyncdaemon/syncdaemon-interface.h (+0/-70)
libsyncdaemon/syncdaemon-marshal.list (+0/-5)
libsyncdaemon/syncdaemon-metadata.c (+0/-284)
libsyncdaemon/syncdaemon-metadata.h (+0/-79)
libsyncdaemon/syncdaemon-publicfiles-interface.c (+0/-259)
libsyncdaemon/syncdaemon-publicfiles-interface.h (+0/-73)
libsyncdaemon/syncdaemon-share-info.c (+0/-357)
libsyncdaemon/syncdaemon-share-info.h (+0/-91)
libsyncdaemon/syncdaemon-shares-interface.c (+0/-497)
libsyncdaemon/syncdaemon-shares-interface.h (+0/-79)
libsyncdaemon/syncdaemon-status-info.c (+0/-259)
libsyncdaemon/syncdaemon-status-info.h (+0/-80)
libsyncdaemon/syncdaemon-status-interface.c (+0/-448)
libsyncdaemon/syncdaemon-status-interface.h (+0/-71)
libsyncdaemon/syncdaemon-transfer-info.c (+0/-247)
libsyncdaemon/syncdaemon-transfer-info.h (+0/-78)
libsyncdaemon/test-libsyncdaemon.c (+0/-536)
libsyncdaemon/utils.c (+0/-60)
libsyncdaemon/utils.h (+0/-48)
po/POTFILES.in (+0/-1)
run-tests (+34/-9)
run-tests.bat (+9/-4)
setup.cfg (+2/-0)
setup.py (+259/-0)
ubuntuone-client.pth (+1/-0)
ubuntuone/clientdefs.py.in (+0/-8)
windows/clientdefs.py (+0/-53)
windows/logging.conf (+0/-13)
To merge this branch: bzr merge lp://staging/~dobey/ubuntuone-client/update-13-10
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Review via email: mp+174032@code.staging.launchpad.net

Commit message

[Rodney Dawes]

    Drop libsyncdaemon from tree and convert to pure Python project.

To post a comment you must log in.
Revision history for this message
Roberto Alsina (ralsina) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (3.6 MiB)

The attempt to merge lp:~dobey/ubuntuone-client/update-13-10 into lp:ubuntuone-client/stable-13-10 failed. Below is the output from the failed tests.

*** Running test suite for tests ***
running build
running build_py
creating build
creating build/lib.linux-x86_64-2.7
creating build/lib.linux-x86_64-2.7/contrib
creating build/lib.linux-x86_64-2.7/contrib/testing
copying contrib/testing/testcase.py -> build/lib.linux-x86_64-2.7/contrib/testing
copying contrib/testing/__init__.py -> build/lib.linux-x86_64-2.7/contrib/testing
creating build/lib.linux-x86_64-2.7/ubuntuone
creating build/lib.linux-x86_64-2.7/ubuntuone/platform
creating build/lib.linux-x86_64-2.7/ubuntuone/platform/credentials
copying ubuntuone/platform/credentials/ipc_service.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/credentials
copying ubuntuone/platform/credentials/dbus_service.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/credentials
copying ubuntuone/platform/credentials/__init__.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/credentials
creating build/lib.linux-x86_64-2.7/ubuntuone/platform/filesystem_notifications
creating build/lib.linux-x86_64-2.7/ubuntuone/platform/filesystem_notifications/notify_processor
copying ubuntuone/platform/filesystem_notifications/notify_processor/linux.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/filesystem_notifications/notify_processor
copying ubuntuone/platform/filesystem_notifications/notify_processor/common.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/filesystem_notifications/notify_processor
copying ubuntuone/platform/filesystem_notifications/notify_processor/__init__.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/filesystem_notifications/notify_processor
creating build/lib.linux-x86_64-2.7/ubuntuone/proxy
copying ubuntuone/proxy/common.py -> build/lib.linux-x86_64-2.7/ubuntuone/proxy
copying ubuntuone/proxy/tunnel_client.py -> build/lib.linux-x86_64-2.7/ubuntuone/proxy
copying ubuntuone/proxy/tunnel_server.py -> build/lib.linux-x86_64-2.7/ubuntuone/proxy
copying ubuntuone/proxy/logger.py -> build/lib.linux-x86_64-2.7/ubuntuone/proxy
copying ubuntuone/proxy/__init__.py -> build/lib.linux-x86_64-2.7/ubuntuone/proxy
creating build/lib.linux-x86_64-2.7/ubuntuone/status
copying ubuntuone/status/notification.py -> build/lib.linux-x86_64-2.7/ubuntuone/status
copying ubuntuone/status/logger.py -> build/lib.linux-x86_64-2.7/ubuntuone/status
copying ubuntuone/status/aggregator.py -> build/lib.linux-x86_64-2.7/ubuntuone/status
copying ubuntuone/status/__init__.py -> build/lib.linux-x86_64-2.7/ubuntuone/status
creating build/lib.linux-x86_64-2.7/ubuntuone/platform/notification
copying ubuntuone/platform/notification/linux.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/notification
copying ubuntuone/platform/notification/windows.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/notification
copying ubuntuone/platform/notification/__init__.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/notification
creating build/lib.linux-x86_64-2.7/ubuntuone/platform/tools
copying ubuntuone/platform/tools/linux.py -> build/lib.linux-x86_64-2.7/ubuntuone/platform/tools
copying ubuntuone/platform/tools/__init__.py -...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: