Merge lp://qastaging/~mandel/desktopcouch/move_xdg_to_platform into lp://qastaging/desktopcouch
- move_xdg_to_platform
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | dobey |
Approved revision: | 199 |
Merged at revision: | 229 |
Proposed branch: | lp://qastaging/~mandel/desktopcouch/move_xdg_to_platform |
Merge into: | lp://qastaging/desktopcouch |
Prerequisite: | lp://qastaging/~mandel/desktopcouch/add_platform_module |
Diff against target: |
174 lines (+67/-19) 7 files modified
desktopcouch/application/local_files.py (+5/-5) desktopcouch/application/platform/__init__.py (+3/-1) desktopcouch/application/platform/linux/base_dirs.py (+40/-0) desktopcouch/application/platform/linux/keyring.py (+6/-7) desktopcouch/application/service.py (+3/-6) desktopcouch/tasks/__init__.py (+1/-0) desktopcouch/tasks/record.py (+9/-0) |
To merge this branch: | bzr merge lp://qastaging/~mandel/desktopcouch/move_xdg_to_platform |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chad Miller (community) | Approve | ||
Manuel de la Peña (community) | Abstain | ||
Eric Casteleijn (community) | Approve | ||
Vincenzo Di Somma (community) | Approve | ||
Review via email: mp+39782@code.qastaging.launchpad.net |
Commit message
Moved xdg to the platform packages, windows does not have an xdg implementation.
Description of the change
Moved the xdg code to be in the platform package since windows does not have an xdg implementation.
Vincenzo Di Somma (vds) : | # |
Ubuntu One Auto Pilot (otto-pilot) wrote : | # |
Attempt to merge into lp:desktopcouch failed due to conflicts:
text conflict in desktopcouch/
text conflict in desktopcouch/
Ubuntu One Auto Pilot (otto-pilot) wrote : | # |
The attempt to merge lp:~mandel/desktopcouch/move_xdg_to_platform into lp:desktopcouch failed. Below is the output from the failed tests.
running build
running build_py
creating build
creating build/lib.
creating build/lib.
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
creating build/lib.
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
copying desktopcouch/
creating build/lib.
copying desktopcouch/
copying desktopcouch/
Manuel de la Peña (mandel) wrote : | # |
hm, I need to take a closer look
Ubuntu One Auto Pilot (otto-pilot) wrote : | # |
The attempt to merge lp:~mandel/desktopcouch/move_xdg_to_platform into lp:desktopcouch failed. Below is the output from the failed tests.
Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file://
desktopcouch.
TestUpdateDes
test_
desktopcouch.
TestService
test_
test_
test_
desktopcouch.
TestKeyringIn
test_with_auth ... [OK]
test_
TestLocalFiles
test_
test_
test_
test_
desktopcouch.
TestReplication
test_creation ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file://
TestUbuntuone
test_exclusion ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file://
desktopcouch.
TestMigration
test_
test_
TestRegistration
test_
test_
test_
desktopcouch.
TestCouchdbIo
test_
test_
test_mkuri ... [OK]
test_
test_
test_
desktopcouch.
TestUbuntoneP
test_
test_
test_
test_
Ubuntu One Auto Pilot (otto-pilot) wrote : | # |
The attempt to merge lp:~mandel/desktopcouch/move_xdg_to_platform into lp:desktopcouch failed. Below is the output from the failed tests.
Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file://
desktopcouch.
TestUpdateDes
test_
desktopcouch.
TestService
test_
test_
test_
desktopcouch.
TestKeyringIn
test_with_auth ... [OK]
test_
TestLocalFiles
test_
test_
test_
test_
desktopcouch.
TestReplication
test_creation ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file://
TestUbuntuone
test_exclusion ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file://
desktopcouch.
TestMigration
test_
test_
TestRegistration
test_
test_
test_
desktopcouch.
TestCouchdbIo
test_
test_
test_mkuri ... [OK]
test_
test_
test_
desktopcouch.
TestUbuntoneP
test_
test_
test_
test_
Ubuntu One Auto Pilot (otto-pilot) wrote : | # |
The attempt to merge lp:~mandel/desktopcouch/move_xdg_to_platform into lp:desktopcouch failed. Below is the output from the failed tests.
Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file://
desktopcouch.
TestUpdateDes
test_
desktopcouch.
TestService
test_
test_
test_
desktopcouch.
TestKeyringIn
test_with_auth ... [OK]
test_
TestLocalFiles
test_
test_
test_
test_
desktopcouch.
TestReplication
test_creation ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file://
TestUbuntuone
test_exclusion ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file://
desktopcouch.
TestMigration
test_
test_
TestRegistration
test_
test_
test_
desktopcouch.
TestCouchdbIo
test_
test_
test_mkuri ... [OK]
test_
test_
test_
desktopcouch.
TestUbuntoneP
test_
test_
test_
test_
Ubuntu One Auto Pilot (otto-pilot) wrote : | # |
No proposals found for merge of lp:~mandel/desktopcouch/add_platform_module into lp:desktopcouch.
Ubuntu One Auto Pilot (otto-pilot) wrote : | # |
There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.
Manuel de la Peña (mandel) wrote : | # |
Just for tarmac
Ubuntu One Auto Pilot (otto-pilot) wrote : | # |
No proposals found for merge of lp:~mandel/desktopcouch/add_platform_module into lp:desktopcouch.
Manuel de la Peña (mandel) : | # |
Chad Miller (cmiller) : | # |
Ubuntu One Auto Pilot (otto-pilot) wrote : | # |
The attempt to merge lp:~mandel/desktopcouch/move_xdg_to_platform into lp:desktopcouch failed. Below is the output from the failed tests.
Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file://
desktopcouch.
TestUpdateDes
test_
desktopcouch.
TestService
test_
test_
test_
desktopcouch.
TestKeyringIn
test_with_auth ... [OK]
test_
TestLocalFiles
test_
test_
test_
test_
desktopcouch.
TestReplication
test_creation ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file://
TestUbuntuone
test_exclusion ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file://
desktopcouch.
TestMigration
test_
test_
TestRegistration
test_
test_
test_
desktopcouch.
TestCouchdbIo
test_
test_
test_mkuri ... [OK]
test_
test_
test_
desktopcouch.
TestUbuntoneP
test_
test_
test_
test_
Ubuntu One Auto Pilot (otto-pilot) wrote : | # |
The attempt to merge lp:~mandel/desktopcouch/move_xdg_to_platform into lp:desktopcouch failed. Below is the output from the failed tests.
Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file://
desktopcouch.
TestUpdateDes
test_
desktopcouch.
TestService
test_
test_
test_
desktopcouch.
TestKeyringIn
test_with_auth ... [OK]
test_
TestLocalFiles
test_
test_
test_
test_
desktopcouch.
TestReplication
test_creation ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file://
TestUbuntuone
test_exclusion ... Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file://
desktopcouch.
TestMigration
test_
test_
TestRegistration
test_
test_
test_
desktopcouch.
TestCouchdbIo
test_
test_
test_mkuri ... [OK]
test_
test_
test_
desktopcouch.
TestUbuntoneP
test_
test_
test_
test_
- 199. By Manuel de la Peña
-
Removed unused import.
Looking good! Tests pass.