Ubuntu One Client

Merge lp:~rye/ubuntuone-client/add-apport-keys into lp:ubuntuone-client

  1. add-apport-keys
  2. Merge into trunk
Proposed by Roman Yepishev on 2010-03-31
Status: Merged
Approved by: dobey on 2010-03-31
Approved revision: 463
Merged at revision: 464
Proposed branch: lp:~rye/ubuntuone-client/add-apport-keys
Merge into: lp:ubuntuone-client
Diff against target: 44 lines (+16/-7)
1 file modified
data/source_ubuntuone-client.py (+16/-7)
To merge this branch: bzr merge lp:~rye/ubuntuone-client/add-apport-keys
Reviewer Review Type Date Requested Status
dobey (community) 2010-03-31 Approve on 2010-03-31
Rick McBride (community) 2010-03-31 Approve on 2010-03-31
Review via email: mp+22537@code.launchpad.net

Commit Message

Set keys for attached files in the apport hook

Description of the Change

This branch sets keys for all files that are attached by apport making it possible to use bugpatterns with ubuntuone-client.

To post a comment you must log in.
dobey (dobey) wrote :

Can you go ahead and add the u1-prefs.log to this too? Might as well do it with this branch I think. Thanks.

review: Needs Fixing
lp:~rye/ubuntuone-client/add-apport-keys updated on 2010-03-31
462. By Roman Yepishev on 2010-03-31

Removed line continuation characters since they are unused in other places

Roman Yepishev (rye) wrote :

Added u1-prefs.log per dobey's request.

lp:~rye/ubuntuone-client/add-apport-keys updated on 2010-03-31
463. By Roman Yepishev on 2010-03-31

Added u1-prefs.log per dobey's request

Rick McBride (rmcbride) wrote :

Nice!

review: Approve
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/source_ubuntuone-client.py'
2--- data/source_ubuntuone-client.py 2010-03-26 14:07:29 +0000
3+++ data/source_ubuntuone-client.py 2010-03-31 15:38:29 +0000
4@@ -30,6 +30,7 @@
5 u1_invalidnames_log = os.path.join(u1_log_path, "syncdaemon-invalid-names.log")
6 u1_oauth_log = os.path.join(u1_log_path, "oauth-login.log")
7 u1_u1sync_log = os.path.join(u1_log_path, "u1sync.log")
8+u1_prefs_log = os.path.join(u1_log_path, "u1-prefs.log")
9 u1_sd_conf = os.path.join("etc", "xdg", "ubuntuone", "syncdaemon.conf")
10 u1_usersd_conf = os.path.join(u1_user_config_path, "syncdaemon.conf")
11 u1_user_conf = os.path.join(u1_user_config_path, "ubuntuone-client.conf")
12@@ -37,12 +38,20 @@
13
14 def add_info(report):
15 """add report info"""
16- attach_file_if_exists(report, u1_except_log)
17- attach_file_if_exists(report, u1_invalidnames_log)
18- attach_file_if_exists(report, u1_oauth_log)
19- attach_file_if_exists(report, u1_usersd_conf)
20- attach_file_if_exists(report, u1_sd_conf)
21- attach_file_if_exists(report, u1_user_conf)
22+ attach_file_if_exists(report, u1_except_log,
23+ "UbuntuOneSyncdaemonExceptionsLog")
24+ attach_file_if_exists(report, u1_invalidnames_log,
25+ "UbuntuOneSyncdaemonInvalidNamesLog")
26+ attach_file_if_exists(report, u1_oauth_log,
27+ "UbuntuOneOAuthLoginLog")
28+ attach_file_if_exists(report, u1_prefs_log,
29+ "UbuntuOnePreferencesLog")
30+ attach_file_if_exists(report, u1_usersd_conf,
31+ "UbuntuOneSyncdaemonConfig")
32+ attach_file_if_exists(report, u1_sd_conf,
33+ "UbuntuOneUserSyncdaemonConfig")
34+ attach_file_if_exists(report, u1_user_conf,
35+ "UbuntuOneClientConfig")
36
37 if not apport.packaging.is_distro_package(report['Package'].split()[0]):
38 report['ThirdParty'] = 'True'
39@@ -64,4 +73,4 @@
40 if version is None:
41 version = 'N/A'
42 versions += '%s %s\n' % (package, version)
43- report['UbuntuoneClientPackages'] = versions
44+ report['UbuntuOneClientPackages'] = versions

Subscribers

People subscribed via source and target branches