Ubuntu One Control Panel

Merge lp:~dobey/ubuntuone-control-panel/update-4-0 into lp:ubuntuone-control-panel/stable-4-0

  1. update-4-0
  2. Merge into stable-4-0
Proposed by dobey on 2012-06-25
Status: Merged
Approved by: dobey on 2012-06-26
Approved revision: no longer in the source branch.
Merged at revision: 330
Proposed branch: lp:~dobey/ubuntuone-control-panel/update-4-0
Merge into: lp:ubuntuone-control-panel/stable-4-0
Diff against target: 61 lines (+5/-5)
5 files modified
data/source_ubuntuone-control-panel.py (+1/-1)
ubuntuone/controlpanel/backend.py (+1/-1)
ubuntuone/controlpanel/gui/qt/tests/test_folders.py (+1/-1)
ubuntuone/controlpanel/gui/qt/tests/test_systray.py (+1/-1)
ubuntuone/controlpanel/logger.py (+1/-1)
To merge this branch: bzr merge lp:~dobey/ubuntuone-control-panel/update-4-0
Reviewer Review Type Date Requested Status
Roberto Alsina (community) 2012-06-25 Approve on 2012-06-25
Review via email: mp+111915@code.launchpad.net

Commit Message

Get the log directory from the platform logging module

To post a comment you must log in.
Roberto Alsina (ralsina) :
review: Approve
lp:~dobey/ubuntuone-control-panel/update-4-0 updated on 2012-06-26
330. By dobey on 2012-06-26

Get the log directory from the platform logging module

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/source_ubuntuone-control-panel.py'
2--- data/source_ubuntuone-control-panel.py 2011-09-27 22:17:54 +0000
3+++ data/source_ubuntuone-control-panel.py 2012-06-25 19:19:18 +0000
4@@ -23,7 +23,7 @@
5
6 from apport.hookutils import attach_related_packages, attach_file_if_exists
7
8-from ubuntuone.platform.xdg_base_directory import ubuntuone_log_dir
9+from ubuntuone.platform.logger import ubuntuone_log_dir
10
11
12 def add_info(report):
13
14=== modified file 'ubuntuone/controlpanel/backend.py'
15--- ubuntuone/controlpanel/backend.py 2012-05-11 13:30:34 +0000
16+++ ubuntuone/controlpanel/backend.py 2012-06-25 19:19:18 +0000
17@@ -171,7 +171,7 @@
18 is_synching = bool(status['is_connected'])
19 is_idle = bool(status['is_online']) and status['queues'] == 'IDLE'
20 is_disconnected = status['name'] == 'WAITING' or \
21- (status['name'] == 'READY' and \
22+ (status['name'] == 'READY' and
23 'Not User' in status['connection'])
24 is_starting = status['name'] in ('INIT', 'LOCAL_RESCAN', 'READY')
25 is_stopped = status['name'] == 'SHUTDOWN'
26
27=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_folders.py'
28--- ubuntuone/controlpanel/gui/qt/tests/test_folders.py 2012-06-06 15:15:37 +0000
29+++ ubuntuone/controlpanel/gui/qt/tests/test_folders.py 2012-06-25 19:19:18 +0000
30@@ -998,7 +998,7 @@
31 self.assertEqual(item.volume_id, volume_id)
32 # should be checked if the volume_id is not None
33 subscribed = item.checkState(gui.LOCAL_SUBSCRIPTION_COL) == gui.CHECKED
34- self.assertEqual(subscribed, volume_id != None)
35+ self.assertEqual(subscribed, volume_id is not None)
36
37 self.timer.timeout.emit() # update sizes will be called
38
39
40=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_systray.py'
41--- ubuntuone/controlpanel/gui/qt/tests/test_systray.py 2012-05-14 20:16:02 +0000
42+++ ubuntuone/controlpanel/gui/qt/tests/test_systray.py 2012-06-25 19:19:18 +0000
43@@ -133,4 +133,4 @@
44 self.assertTrue(tray.isVisible())
45 self.assertEqual(tray.window, None)
46 self.assertIsInstance(tray.context_menu, QtGui.QMenu)
47- self.assertFalse(tray.icon() == None)
48+ self.assertNotEqual(tray.icon(), None)
49
50=== modified file 'ubuntuone/controlpanel/logger.py'
51--- ubuntuone/controlpanel/logger.py 2012-03-16 16:40:27 +0000
52+++ ubuntuone/controlpanel/logger.py 2012-06-25 19:19:18 +0000
53@@ -25,7 +25,7 @@
54
55 # pylint: disable=F0401,E0611
56 from ubuntuone.logger import LOGBACKUP, basic_formatter
57-from ubuntuone.platform.xdg_base_directory import ubuntuone_log_dir
58+from ubuntuone.platform.logger import ubuntuone_log_dir
59
60
61 if os.environ.get('U1_DEBUG'):

Subscribers

People subscribed via source and target branches

to all changes: