lp://qastaging/~mikemc/ubuntuone-client/find-logging-conf

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/ubuntuone-client at revision 1347

Brian Curtin (community): Approve on 2012-10-18

Michał Karnicki (community): Approve on 2012-10-18

Roberto Alsina (community): Approve on 2012-10-17

Diff: 46 lines (+11/-7)

2 files modified

tests/syncdaemon/test_config.py (+9/-6)
ubuntuone/syncdaemon/config.py (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1067489: syncdaemon get_config_files does not find logging.conf when launched via control-panel, from source

High

Fix Released

Link a bug report

Related blueprints

1346. By Mike McCracken on 2012-10-17

merge with trunk

1345. By Mike McCracken on 2012-10-17

- add full path for logging.conf to get_config_files so it will be found when running outside of the client, for example from the control-panel directory

1344. By Mike McCracken on 2012-10-17

- add test for logging.conf, and move test_load_branch_configuration into a testcase subclass that does not patch get_config_files, because it is testing get_config_files.

1343. By dobey on 2012-10-15

Use GI bindings of GLib instead of static bindings in launch/login scripts.

1342. By Brian Curtin on 2012-10-15

- Use procutils.which to identify the full path of a python executable to be spawned on Windows.

1341. By Diego Sarmentero on 2012-10-15

- Using deflated_size instead of size (LP: #1062729).

1340. By Manuel de la Peña on 2012-10-12

- Ensure that the correct glib method is used when we cannot use the gir (LP: #1065272).

1339. By Diego Sarmentero on 2012-10-11

- Fixed backwards compatibilites.

1338. By Diego Sarmentero on 2012-10-10

- Recceive notifications from aggregator when the status of syncdaemon change (LP: #1053631).

1337. By Roberto Alsina on 2012-10-10

 - Switched to twisted's OrderedDict (Fixes lp:1064673 ).