Merge lp:~hmontoliu/firefox/firefox-3.1.apport_hook into lp:firefox/3.5

[Hilario J. Montoliu (hjmf)]

[Hilario J. Montoliu (hjmf) (hmontoliu)]

* fix LP: #361052 - firefox apport hook fails to retrieve pluginreg.dat file
* update debian/apport/firefox-3.5.py - removed unused code and minor refactoring.

[Alexander Sack (asac)]

Your Name in the Changelog isn't right ;) ... otherwise this looks good. (you dont need to rerequest a new merge, just push --overwrite and then push the "resubmit" button to request a new review round).

review: Needs Fixing

[Alexander Sack (asac)]

i adjusted the changelog a bit more and committed. thanks!

=== modified file 'debian/apport/firefox-3.5.py'
--- debian/apport/firefox-3.5.py	2009-03-18 01:10:51 +0000
+++ debian/apport/firefox-3.5.py	2009-04-14 23:23:38 +0000
@@ -1,6 +1,6 @@
 '''firefox apport hook draft
 
-/usr/share/apport/package-hooks/firefox-3.5.py
+/usr/share/apport/package-hooks/firefox-3.0.py
 
 Appends to apport's firefox default report: the files pluginreg.dat and
 profiles.ini, and also a summary of all the extensions loaded on each firefox
@@ -18,13 +18,13 @@
 
 import os
 import ConfigParser
-import glob
 import cStringIO
 from xml.dom import minidom
 
 def extensions_ini_parser(extensions_ini_file):
     '''parses profile's extensions.ini file and returns a tuple:
-    ((gre extensions, app extensions, local extensions), (gre themes, app themes, local themes))'''
+    ((gre extensions, app extensions, local extensions), (gre themes, app
+    themes, local themes))'''
     parser = ConfigParser.ConfigParser()
     parser.read(extensions_ini_file) 
     ext_ini_d = {}
@@ -73,24 +73,20 @@
 
 def extension_summary_helper(extension_list, section_name, alt_output = 1):
     '''does some output proccessing for extensionSummary'''
-    str = ''
+    summary = ''
     if len(extension_list) > 0:
-        str += '''  %s:\n''' % section_name
+        summary += '''  %s:\n''' % section_name
         for extension in extension_list:
-            str += '''    %s\n''' % install_ini_parser(extension)
+            summary += '''    %s\n''' % install_ini_parser(extension)
     else:
         if alt_output == 1: # if 0, don't output anything
-            str += '''  No %s in this Profile.\n''' % section_name 
-    str += '''\n'''
-    return str
+            summary += '''  No %s in this Profile.\n''' % section_name 
+    summary += '''\n'''
+    return summary
 
 def add_info(report):
-    config_dir = os.path.join(os.environ['HOME'], '.mozilla', 'firefox-3.5')
-    
-    # append pluginreg.dat file:
-    pluginreg_dat = os.path.join(config_dir,'pluginreg.dat')
-    if os.path.exists(pluginreg_dat):
-        report['pluginreg.dat'] = open(pluginreg_dat).read()
+    '''adds hooked infor into the apport report.'''
+    config_dir = os.path.join(os.environ['HOME'], '.mozilla', 'firefox')
     
     # append profiles.ini file & parse it:
     profiles_ini = os.path.join(config_dir,'profiles.ini') 
@@ -109,17 +105,25 @@
                 profiles_d[profile_parser.get(section, 'Name')] = (os.path.join(config_dir, profile_parser.get(section, 'Path')), is_default)
     
     # summarize the extensions loaded on each profile (either global and local):
+    # also append the pluginreg.dat file of the default profile (maybe in a
+    # future append each profile's pluginreg.dat file)
     extensions_dict, themes_dict, extension_summary = {}, {}, ''
     for profile_name in profiles_d.keys():
         profile_path, is_default = profiles_d[profile_name]
         extensions_ini = os.path.join(profile_path, 'extensions.ini')
+        pluginreg_dat = os.path.join(profile_path, 'pluginreg.dat')
+        if os.path.exists(pluginreg_dat):
+            if is_default == '1':
+                report['default_profile_pluginreg.dat'] = open(pluginreg_dat).read()
+            else:
+                report['profile_%s_pluginreg.dat' % profile_name] = open(pluginreg_dat).read()
         if os.path.exists(extensions_ini):
             # attach each profile's extensions.ini too (not enabled).
             #report['extensions.ini (profile: %s)' % profile_name ] = open(extensions_ini).read()
-            (extensions_dict['gre_extensions'], extensions_dict['app_extensions'], extensions_dict['local_extensions']),\
+            (extensions_dict['gre_extensions'], extensions_dict['app_extensions'], extensions_dict['local_extensions']), \
             (themes_dict['gre_theme'], themes_dict['app_theme'], themes_dict['local_theme']) = extensions_ini_parser(extensions_ini)
-    
-            if is_default == '1': is_default_str = ''' (The Default):'''
+            if is_default == '1': 
+                is_default_str = ''' (The Default):'''
             else: is_default_str = ''':'''
             extension_summary += '''Profile "%s"%s\n\n''' % (profile_name, is_default_str)
             extension_summary += extension_summary_helper(extensions_dict['gre_extensions'], 'GRE Extensions')
@@ -128,10 +132,10 @@
             extension_summary += extension_summary_helper(themes_dict['gre_theme'], 'GRE Theme', 0)
             extension_summary += extension_summary_helper(themes_dict['app_theme'], 'Application Theme', 0)
             extension_summary += extension_summary_helper(themes_dict['local_theme'], 'Local Theme', 0)
-        buffer = cStringIO.StringIO() # it's needed for propper apport attachments
-        print >> buffer, extension_summary
-        buffer.seek(0)
-    report['ExtensionSummary'] = buffer.read()
+        wbuffer = cStringIO.StringIO() # it's needed for propper apport attachments
+        print >> wbuffer, extension_summary
+        wbuffer.seek(0)
+    report['ExtensionSummary'] = wbuffer.read()
     # debug (comment on production)
     # return report
 
@@ -139,5 +143,6 @@
 # (uncomment the 'return report' at add_report())
 if __name__ == "__main__":
     D = {}  
-    report = add_info(D)
-    for key in report.keys(): print '''%s:\n''' % key, report[key]
+    REPORT = add_info(D)
+    for KEY in REPORT.keys(): 
+        print '''-------------------%s: ------------------\n''' % KEY, REPORT[KEY]

=== modified file 'debian/changelog'
--- debian/changelog	2009-04-01 17:03:01 +0000
+++ debian/changelog	2009-04-14 23:55:12 +0000
@@ -1,3 +1,10 @@
+firefox-3.5 (3.5~b4~hg20090330r24021+nobinonly-0ubuntu2) UNRELEASED; urgency=low
+
+  * fix LP: #361052 - firefox apport hook fails to retrieve pluginreg.dat file
+  * update debian/apport/firefox-3.5.py - removed unused code and minor refactoring.
+
+ -- hmontoliu <[e-mail]>  Wed, 15 Apr 2009 01:16:04 +0200
+
 firefox-3.5 (3.5~b4~hg20090330r24021+nobinonly-0ubuntu1) jaunty; urgency=low
 
   * New upstream snapshot, needed to initiate the firefox 3.1->3.5 transition (LP: #352995)