Merge lp:~mandel/ubuntuone-windows-installer/manual_sync_does_nothing into lp:ubuntuone-windows-installer/beta
Proposed by
Manuel de la Peña
Status: | Merged |
---|---|
Approved by: | John Lenton |
Approved revision: | 175 |
Merged at revision: | 130 |
Proposed branch: | lp:~mandel/ubuntuone-windows-installer/manual_sync_does_nothing |
Merge into: | lp:ubuntuone-windows-installer/beta |
Prerequisite: | lp:~mandel/ubuntuone-windows-installer/add_beta_tab |
Diff against target: |
80 lines (+4/-19) 4 files modified
src/UbuntuOneClient/App.config (+2/-2) src/UbuntuOneClient/Config/log4net.config (+1/-1) src/sync/u1sync/main.py (+1/-8) src/sync/u1sync/ubuntuone_optparse.py (+0/-8) |
To merge this branch: | bzr merge lp:~mandel/ubuntuone-windows-installer/manual_sync_does_nothing |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
John Lenton (community) | Approve | ||
Review via email:
|
Description of the change
Fixed python code that prevented manual sync from working.
Changed the config of the logging so that it uses the appdata of the current user.
To post a comment you must log in.