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 |
Related bugs: |
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.
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 *** linux-x86_ 64-2.7 linux-x86_ 64-2.7/ contrib linux-x86_ 64-2.7/ contrib/ testing testing/ testcase. py -> build/lib. linux-x86_ 64-2.7/ contrib/ testing testing/ __init_ _.py -> build/lib. linux-x86_ 64-2.7/ contrib/ testing linux-x86_ 64-2.7/ ubuntuone linux-x86_ 64-2.7/ ubuntuone/ platform linux-x86_ 64-2.7/ ubuntuone/ platform/ credentials platform/ credentials/ ipc_service. py -> build/lib. linux-x86_ 64-2.7/ ubuntuone/ platform/ credentials platform/ credentials/ dbus_service. py -> build/lib. linux-x86_ 64-2.7/ ubuntuone/ platform/ credentials platform/ credentials/ __init_ _.py -> build/lib. linux-x86_ 64-2.7/ ubuntuone/ platform/ credentials linux-x86_ 64-2.7/ ubuntuone/ platform/ filesystem_ notifications linux-x86_ 64-2.7/ ubuntuone/ platform/ filesystem_ notifications/ notify_ processor platform/ filesystem_ notifications/ notify_ processor/ linux.py -> build/lib. linux-x86_ 64-2.7/ ubuntuone/ platform/ filesystem_ notifications/ notify_ processor platform/ filesystem_ notifications/ notify_ processor/ common. py -> build/lib. linux-x86_ 64-2.7/ ubuntuone/ platform/ filesystem_ notifications/ notify_ processor platform/ filesystem_ notifications/ notify_ processor/ __init_ _.py -> build/lib. linux-x86_ 64-2.7/ ubuntuone/ platform/ filesystem_ notifications/ notify_ processor linux-x86_ 64-2.7/ ubuntuone/ proxy proxy/common. py -> build/lib. linux-x86_ 64-2.7/ ubuntuone/ proxy proxy/tunnel_ client. py -> build/lib. linux-x86_ 64-2.7/ ubuntuone/ proxy proxy/tunnel_ server. py -> build/lib. linux-x86_ 64-2.7/ ubuntuone/ proxy proxy/logger. py -> build/lib. linux-x86_ 64-2.7/ ubuntuone/ proxy proxy/_ _init__ .py -> build/lib. linux-x86_ 64-2.7/ ubuntuone/ proxy linux-x86_ 64-2.7/ ubuntuone/ status status/ notification. py -> build/lib. linux-x86_ 64-2.7/ ubuntuone/ status status/ logger. py -> build/lib. linux-x86_ 64-2.7/ ubuntuone/ status status/ aggregator. py -> build/lib. linux-x86_ 64-2.7/ ubuntuone/ status status/ __init_ _.py -> build/lib. linux-x86_ 64-2.7/ ubuntuone/ status linux-x86_ 64-2.7/ ubuntuone/ platform/ notification platform/ notification/ linux.py -> build/lib. linux-x86_ 64-2.7/ ubuntuone/ platform/ notification platform/ notification/ windows. py -> build/lib. linux-x86_ 64-2.7/ ubuntuone/ platform/ notification platform/ notification/ __init_ _.py -> build/lib. linux-x86_ 64-2.7/ ubuntuone/ platform/ notification linux-x86_ 64-2.7/ ubuntuone/ platform/ tools platform/ tools/linux. py -> build/lib. linux-x86_ 64-2.7/ ubuntuone/ platform/ tools platform/ tools/_ _init__ .py -...
running build
running build_py
creating build
creating build/lib.
creating build/lib.
creating build/lib.
copying contrib/
copying contrib/
creating build/lib.
creating build/lib.
creating build/lib.
copying ubuntuone/
copying ubuntuone/
copying ubuntuone/
creating build/lib.
creating build/lib.
copying ubuntuone/
copying ubuntuone/
copying ubuntuone/
creating build/lib.
copying ubuntuone/
copying ubuntuone/
copying ubuntuone/
copying ubuntuone/
copying ubuntuone/
creating build/lib.
copying ubuntuone/
copying ubuntuone/
copying ubuntuone/
copying ubuntuone/
creating build/lib.
copying ubuntuone/
copying ubuntuone/
copying ubuntuone/
creating build/lib.
copying ubuntuone/
copying ubuntuone/