desktopcouch

Merge lp://qastaging/~rmcbride/desktopcouch/fix-apport-hook into lp://qastaging/desktopcouch

  1. fix-apport-hook
  2. Merge into trunk
Proposed by Rick McBride
Status: Merged
Approved by: Eric Casteleijn
Approved revision: not available
Merged at revision: not available
Proposed branch: lp://qastaging/~rmcbride/desktopcouch/fix-apport-hook
Merge into: lp://qastaging/desktopcouch
Diff against target: 30 lines (+4/-3)
2 files modified
MANIFEST.in (+1/-0)
data/source_desktopcouch.py (+3/-3)
To merge this branch: bzr merge lp://qastaging/~rmcbride/desktopcouch/fix-apport-hook
Reviewer Review Type Date Requested Status
Eric Casteleijn (community) Approve
Elliot Murphy (community) Approve
Review via email: mp+18549@code.qastaging.launchpad.net

Commit message

Include apport info in the source Manifest.

Fix a NameError in the apport collection code.

To post a comment you must log in.
Revision history for this message
Rick McBride (rmcbride) wrote :

This fixes an incorrect comment and a bug in the apport hook, and also fixes the MANIFEST.in to include it in the source tarball.

To test the hook,

sudo cp data/source_desktopcouch.py /usr/share/apport/package-hooks/
apport-collect -p desktopcouch 516683

This will attach the collection data to the bug for this fix.

To test MANIFEST.in

in the root of branch, do

./setup.py sdist
go into the dist directory, untar the gzipped tarball, and verify that the hook is included.

lp://qastaging/~rmcbride/desktopcouch/fix-apport-hook updated
124. By Rick McBride

fix the comment properly. it's CouchDB, not Couch

Revision history for this message
Elliot Murphy (statik) wrote :

+1

Nice work.

> +# Apport integration for Desktop Couch

Maybe change this to say Desktop CouchDB?

>  # Copyright 2009 Canonical Ltd.

Maybe change this to 2009-2010

--
Elliot Murphy | https://launchpad.net/~statik/

Revision history for this message
Elliot Murphy (statik) :
review: Approve
Revision history for this message
Rick McBride (rmcbride) wrote :

Elliot Murphy wrote:
> +1
>
> Nice work.
>
>> +# Apport integration for Desktop Couch
>
> Maybe change this to say Desktop CouchDB?
>
 I fixed that subsiquent to the initial push (brain fart)

>> # Copyright 2009 Canonical Ltd.
>
> Maybe change this to 2009-2010

I will do that now.
>
>

lp://qastaging/~rmcbride/desktopcouch/fix-apport-hook updated
125. By Rick McBride

fix copyright date

Revision history for this message
Eric Casteleijn (thisfred) wrote :

Code looks good, all tests pass, and it works. I wonder if we should include the .ini file in what is sent: it's private data, and not all that useful in debugging in most cases. The replication log is, but we want to make sure bug #516683 is fully fixed before landing this branch.

Revision history for this message
Eric Casteleijn (thisfred) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MANIFEST.in'
2--- MANIFEST.in 2009-10-12 13:32:29 +0000
3+++ MANIFEST.in 2010-02-03 19:43:12 +0000
4@@ -13,4 +13,5 @@
5 include org.desktopcouch.CouchDB.service
6 include config/desktop-couch/compulsory-auth.ini
7 recursive-include contrib *.py
8+include data/source_desktopcouch.py
9
10
11=== modified file 'data/source_desktopcouch.py'
12--- data/source_desktopcouch.py 2009-11-05 15:15:51 +0000
13+++ data/source_desktopcouch.py 2010-02-03 19:43:12 +0000
14@@ -1,6 +1,6 @@
15-# Apport integration for Ubuntu One client
16+# Apport integration for Desktop CouchDB
17 #
18-# Copyright 2009 Canonical Ltd.
19+# Copyright 2009-2010 Canonical Ltd.
20 #
21 # This program is free software: you can redistribute it and/or modify it
22 # under the terms of the GNU General Public License version 3, as published
23@@ -25,7 +25,7 @@
24 dc_log_path = os.path.join(xdg_cache_home, "desktop-couch", "log")
25 dc_user_config_path = os.path.join(xdg_config_home, "desktop-couch")
26 # things we may want to collect for the report
27-dc_replication_log = os.path.join(u1_log_path, \
28+dc_replication_log = os.path.join(dc_log_path, \
29 "desktop-couch-replication.log")
30 dc_user_conf = os.path.join(dc_user_config_path, "desktop-couchdb.ini")
31

Subscribers

People subscribed via source and target branches