Merge lp:~philip-peitsch/quickly/apport-src-package-support into lp:quickly

[Philip Peitsch]

This patch creates a bin folder that is placed on the path as part of the template's run command. Inside this bin folder is an ubuntu-bug facade (fake) that simply pops up a dialog informing the user that apport integration is successful.

After looking at apport, it became quite clear that apport depends heavily a package being installed. I couldn't see any easy patches to add the functionality, and hit upon the idea of wrapping ubuntu-bug directly instead.

This is dependent on changes made to the lpi-src-package-support in order to preserve the python path modifications, and allow overriding of the subprocess's environment.

[Didier Roche-Tolomelli (didrocks)]

Hum, no so fan of that, but I guess we have no other choice :/
1- I would prefer having it in internal/bin of the template and not in bin/ as this dir doesn't exist*and we want it to be "internal" (as it's only available when you run quickly run, right?).
2- Sucessful -> Successful :)
3- I think sys.path.append will be better than new_env['PATH'] or sys.putenv(). IIRC, there is one which doesn't work with subprocess. You can have a look and quickly/commands.py (the launch() function IIRC)

Or, the more long-term support will be to track/add in launchpad integration some callback return to know if reporting the bug has been successfull or not (maybe not for this release, but for next one

Hope that will help!

I didn't know about this Prerequisite function of merge review! Sweet!

[Philip Peitsch (philip-peitsch)]

Definitely not my preferred way of integrating either... but it is better than a crash on the terminal :).

1. Sounds good... I have moved it
2. :S... whups! Fixed too
3. The difficulty is that I am essentially creating a new environment to pass to the subprocess call. sys.path and sys.putenv affect this current python process, but what I needed to do was change the env on the new one we're spawning. I had a quick poke and sys.path doesn't seem to have any affect on either env. Basically I believe this change is the only way of doing it... though if you have any other ideas I'm happy to try :)

4. I agree with regards to that. I'm thinking of improving the dialog so it simply displays a link to the +filebug url of the specified project that can be clicked on to test the functionality. Shouldn't be too much hassle... didn't want to put too many eggs into it however until you'd decided this approach was ok :). The next step is to figure out how to test apport integration hooks and things if possible...

[lp:~philip-peitsch/quickly/apport-src-package-support]

449. By Philip Peitsch on 2010-03-15

Moving ubuntu-bug from bin to internal/bin to better hide it from the outside

450. By Philip Peitsch on 2010-03-15

Fixing mis-spelling in pop-up dialog

[Didier Roche-Tolomelli (didrocks)]

Hey Philip, did you get some news from the launchpad API side?

review: Needs Information

[Philip Peitsch (philip-peitsch)]

This is currently blocked on bug #534968. I was never able to get the patch reviewed unfortunately.

[Didier Roche-Tolomelli (didrocks)]

I think this MR doesn't apply anymore, cleaning the list :)

Unmerged revisions

450. By Philip Peitsch on 2010-03-15

Fixing mis-spelling in pop-up dialog

449. By Philip Peitsch on 2010-03-15

Moving ubuntu-bug from bin to internal/bin to better hide it from the outside

448. By Philip Peitsch on 2010-03-13

Splitting bin directory out of template root

447. By Philip Peitsch on 2010-03-13

Fixing path addition to add template directory to path

446. By Philip Peitsch on 2010-03-13

Rebasing from lpi-src changes

445. By Philip Peitsch on 2010-03-10

Adding override to quickly run command to set the LPI_PACKAGE_FILE env variable so launchpad-integration will work even if the package isn't installed

444. By Philip Peitsch on 2010-03-10

Merging trunk

443. By Philip Peitsch on 2010-03-10

Making quickly respect PYTHOPATH overrides internally

=== added directory 'data/templates/ubuntu-application/internal/bin'
=== added file 'data/templates/ubuntu-application/internal/bin/ubuntu-bug'
--- data/templates/ubuntu-application/internal/bin/ubuntu-bug	1970-01-01 00:00:00 +0000
+++ data/templates/ubuntu-application/internal/bin/ubuntu-bug	2010-03-15 21:07:23 +0000
@@ -0,0 +1,27 @@
+#!/usr/bin/python
+
+import sys
+import gtk
+
+import gettext
+from gettext import gettext as _
+# set domain text
+gettext.textdomain('quickly')
+
+argv = sys.argv
+
+project_name = None
+if len(argv) > 1:
+    project_name = argv[1]
+
+msg = gtk.MessageDialog(buttons=gtk.BUTTONS_OK, message_format=_("Successful Apport integration"))
+msg.set_title("Apport integration")
+if project_name:
+    msg.format_secondary_text(_("""Apport integration for '%s' is active.
+Users will be able to report bugs once this package is installed."""%project_name))
+else:
+    msg.format_secondary_text(_("""Apport integration for this project is active.
+Users will be able to report bugs once this package is installed."""))
+msg.run()
+msg.destroy()
+

=== modified file 'data/templates/ubuntu-application/run.py'
--- data/templates/ubuntu-application/run.py	2010-03-15 21:07:22 +0000
+++ data/templates/ubuntu-application/run.py	2010-03-15 21:07:23 +0000
@@ -52,11 +52,14 @@
     print _("Can't access to X server, so can't run gtk application")
     sys.exit(1)
 
-new_env = None
+new_env = dict(os.environ)
+template_bin_file = os.path.join(templatetools.get_template_path_from_project(), 'internal','bin')
+if os.path.isdir(template_bin_file) and os.path.isfile(os.path.join(template_bin_file, 'ubuntu-bug')):
+    new_env['PATH'] = ":".join(filter(lambda l:l, [template_bin_file, new_env.get('PATH',None)]))
+
 if os.path.isdir('debian'):
     control_file = os.path.join(os.path.abspath('debian'),'control')
     if os.path.isfile(control_file):
-        new_env = dict(os.environ)
         new_env['LPI_PACKAGE_FILE'] = control_file
 
 project_bin = 'bin/' + configurationhandler.project_config['project']