Merge lp:~rcart/ubuntu/precise/mpd/fix-947551 into lp:ubuntu/precise/mpd

[Ronny Cardona]

* debian/source_mpd.py
  - Added apport hook to include user configuration file. (LP: #947551)

[Daniel Holbach (dholbach)]

Did you test this? According to https://wiki.archlinux.org/index.php/Music_Player_Daemon the config file format does not contain any use of "=".

Also if you should choose to use GPL3+ (which is totally fine), this needs to be documented in debian/copyright.

Thanks for your work on this!

review: Needs Information

[Ronny Cardona (rcart)]

1. Yes, I tested it using 'ubuntu-bug mpd' and checking the report. The 'MpdUserConf' key was attached with the user configuration file overwriting the password field, if any.

2. Right. As you can see in the file (source_mpd.py) I'm using '"' to find the password value, and then, replace it with '@@APPORTREPACLACED@@':
                if 'password' in line.split('"')[0]:
                    line = "%s \"@@APPORTREPLACED@@\" " % (line.split('"')[0])

3. There's already a copyright file in debian/copyright. What you mean by documented?

Thanks for your time.

[Daniel Holbach (dholbach)]

Ah, regarding 1. and 2. That's fine. Sorry, I misread the code.

Regarding 3.: Do you think you can add something to debian/copyright about your file being under a different license?

[Ronny Cardona (rcart)]

Is the same version (well, mpd is GPL2+ which includes GPL3). Isn't it?

[Daniel Holbach (dholbach)]

Yes, but yours is GPL3+ only, not GPL2+.

[Ronny Cardona (rcart)]

You're right. Hook updated to GPL2+.

BTW, what if I would like to release it in GPL3+? Or just GPL?

[Daniel Holbach (dholbach)]

If you want to have it GPL3+ exclusively, you just need to document it in debian/copyright.

[Ronny Cardona (rcart)]

Oh, great. Thanks for clarify.

[Daniel Holbach (dholbach)]

Good work. Thanks for choosing GPL2+, this will allow us to use the same debian/copyright as the package in Debian.

I took the liberty of adding this line to debian/mpd.install to make sure the hook gets installed:

debian/source_mpd.py usr/share/apport/package-hooks

review: Approve

[Ronny Cardona (rcart)]

Awesome! I didn't know that. Thank you.

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-04 00:11:01 +0000
+++ debian/changelog	2012-03-16 17:20:23 +0000
@@ -1,3 +1,10 @@
+mpd (0.16.5-1ubuntu4) precise; urgency=low
+
+  * debian/source_mpd.py
+    - Added apport hook to include user configuration file. (LP: #947551)
+
+ -- Ronny Cardona <[e-mail]>  Wed, 07 Mar 2012 18:03:12 -0600
+
 mpd (0.16.5-1ubuntu3) precise; urgency=low
 
   * debian/mpd.init.d:
 
=== added file 'debian/source_mpd.py'
--- debian/source_mpd.py	1970-01-01 00:00:00 +0000
+++ debian/source_mpd.py	2012-03-16 17:20:23 +0000
@@ -0,0 +1,31 @@
+'''
+apport package hook for Music Player Deamon
+
+Author: Ronny Cardona <[e-mail]>
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2 of the License, or (at your
+option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
+the full text of the license.
+'''
+
+from apport.hookutils import *
+import os
+
+# Reference for this function: http://pastebin.ubuntu.com/263396/
+def _my_files(report, filename, keyname):
+    if not (os.path.exists(filename)):
+            return
+    key = keyname 
+    report[key] = ""
+    for line in read_file(filename).split('\n'):
+        try:
+            if 'password' in line.split('"')[0]:
+                line = "%s \"@@APPORTREPLACED@@\" " % (line.split('"')[0])
+            report[key] += line + '\n'
+        except IndexError:
+            continue
+
+def add_info(report):
+	_my_files(report, os.path.expanduser('~/.mpdconf'), 'UserMpdConf')