Merge lp:~matttbe/ubuntu/quantal/apache2/lp1013171 into lp:ubuntu/quantal/apache2

[Matthieu Baerts]

Hello,

This is just a patch to update apport hook for python3.
Now, Apport adds informations only if '/etc/apache2/sites-enabled/' exists to avoid errors.

Regards,

Matt

[Martin Pitt (pitti)]

Thanks for this! However, the lower half of the apport hook is relevant even without a sites-enabled directory, so I'll take those out of the "then" branch.

review: Approve

[Matthieu Baerts (matttbe)]

Yes, you're right!
I just hope that 'error.log' file doesn't contain any sensitive information ;)
Thank you for this review!

=== modified file 'debian/apache2.py'
--- debian/apache2.py	2010-11-22 09:43:43 +0000
+++ debian/apache2.py	2012-07-02 17:51:21 +0000
@@ -15,30 +15,33 @@
 from apport.hookutils import *
 import os
 
+SITES_ENABLED_DIR = '/etc/apache2/sites-enabled/'
+
 def add_info(report, ui):
-    response = ui.yesno("The contents of your /etc/apache2/sites-enabled directory "
-                        "may help developers diagnose your bug more "
-                        "quickly.  However, it may contain sensitive "
-                        "information.  Do you want to include it in your "
-                        "bug report?")
-
-    if response == None: # user cancelled
-        raise StopIteration
-
-    elif response == True:
-        # Attache config files in /etc/apache2/sites-enabled and listing of files in /etc/apache2/conf.d 
-        for conf_file in os.listdir('/etc/apache2/sites-enabled'):
-            attach_file_if_exists(report, '/etc/apache2/sites-enabled/' + conf_file, conf_file)
-        try:
-            report['Apache2ConfdDirListing'] = unicode(os.listdir('/etc/apache2/conf.d'))
-        except OSError:
-            report['Apache2ConfdDirListing'] = unicode(False)
-
-        # Attach default config files if changed.
-        attach_conffiles(report, 'apache2.2-common', conffiles=None)
-
-        # Attach the error.log file.
-        attach_file(report, '/var/log/apache2/error.log', key='error.log')
-
-        # Get loaded modules.
-        report['Apache2Modules'] = root_command_output(['/usr/sbin/apachectl', '-D DUMP_MODULES'])
+    if os.path.isdir(SITES_ENABLED_DIR):
+        response = ui.yesno("The contents of your " + SITES_ENABLED_DIR + " directory "
+                            "may help developers diagnose your bug more "
+                            "quickly.  However, it may contain sensitive "
+                            "information.  Do you want to include it in your "
+                            "bug report?")
+
+        if response == None: # user cancelled
+            raise StopIteration
+
+        elif response == True:
+            # Attache config files in /etc/apache2/sites-enabled and listing of files in /etc/apache2/conf.d 
+            for conf_file in os.listdir(SITES_ENABLED_DIR):
+                attach_file_if_exists(report, SITES_ENABLED_DIR + conf_file, conf_file)
+            try:
+                report['Apache2ConfdDirListing'] = str(os.listdir('/etc/apache2/conf.d'))
+            except OSError:
+                report['Apache2ConfdDirListing'] = str(False)
+
+            # Attach default config files if changed.
+            attach_conffiles(report, 'apache2.2-common', conffiles=None)
+
+            # Attach the error.log file.
+            attach_file(report, '/var/log/apache2/error.log', key='error.log')
+
+            # Get loaded modules.
+            report['Apache2Modules'] = root_command_output(['/usr/sbin/apachectl', '-D DUMP_MODULES'])

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-08 11:37:31 +0000
+++ debian/changelog	2012-07-02 17:51:21 +0000
@@ -1,3 +1,11 @@
+apache2 (2.2.22-6ubuntu2) UNRELEASED; urgency=low
+
+  * debian/apache2.py
+   - Update apport hook for python3 ; thanks to Edward Donovan (LP: #1013171)
+   - Check if this directory exists: /etc/apache2/sites-enabled/
+
+ -- Matthieu Baerts (matttbe) <[e-mail]>  Mon, 02 Jul 2012 19:43:59 +0200
+
 apache2 (2.2.22-6ubuntu1) quantal; urgency=low
 
   * Merge from Debian unstable.  Remaining changes: