apport-hackers team mailing list archive

[Michael Vogt <michael.vogt@xxxxxxxxxx>]

Michael Vogt has proposed merging lp:~mvo/apport/is-enabled into lp:apport.

Requested reviews:
  Apport upstream developers (apport-hackers)

For more details, see:
https://code.launchpad.net/~mvo/apport/is-enabled/+merge/63821

This is a addition to the lp:~mvo/apport/apport-checkreports-addition branch. It provides a small helper binary that can be used to query if apport is enabled or not.
-- 
https://code.launchpad.net/~mvo/apport/is-enabled/+merge/63821
Your team Apport upstream developers is requested to review the proposed merge of lp:~mvo/apport/is-enabled into lp:apport.

=== modified file 'apport/fileutils.py'
--- apport/fileutils.py	2011-02-03 13:52:02 +0000
+++ apport/fileutils.py	2011-06-08 08:47:10 +0000
@@ -25,6 +25,17 @@
 
 _config_file = '~/.config/apport/settings'
 
+def apport_enabled():
+    '''Return whether Apport should generate crash reports.'''
+    CONFIG = '/etc/default/apport'
+    import re
+    try:
+        conf = open(CONFIG).read()
+        return re.search('^\s*enabled\s*=\s*0\s*$', conf, re.M) is None
+    except IOError:
+        # if the file does not exist, assume it's enabled
+        return True
+
 def find_package_desktopfile(package):
     '''Return a package's .desktop file.
 

=== modified file 'apport_python_hook.py'
--- apport_python_hook.py	2011-02-28 10:58:32 +0000
+++ apport_python_hook.py	2011-06-08 08:47:10 +0000
@@ -13,18 +13,7 @@
 import os
 import sys
 
-CONFIG = '/etc/default/apport'
-
-def enabled():
-    '''Return whether Apport should generate crash reports.'''
-
-    import re
-    try:
-        conf = open(CONFIG).read()
-        return re.search('^\s*enabled\s*=\s*0\s*$', conf, re.M) is None
-    except IOError:
-        # if the file does not exist, assume it's enabled
-        return True
+from apport.fileutils import apport_enabled
 
 def apport_excepthook(exc_type, exc_obj, exc_tb):
     '''Catch an uncaught exception and make a traceback.'''
@@ -45,7 +34,7 @@
             return
 
         # do not do anything if apport was disabled
-        if not enabled():
+        if not apport_enabled():
             return
 
         try:

=== modified file 'data/apport-checkreports'
--- data/apport-checkreports	2009-09-08 10:30:40 +0000
+++ data/apport-checkreports	2011-06-08 08:47:10 +0000
@@ -14,7 +14,7 @@
 
 import sys, os.path, optparse
 
-from apport.fileutils import get_new_reports, get_new_system_reports
+from apport.fileutils import get_new_reports, get_new_system_reports, apport_enabled
 
 # parse command line options
 optparser = optparse.OptionParser('%prog [options]')
@@ -29,8 +29,12 @@
     reports = get_new_reports()
 
 if len(reports) > 0:
-    for r in reports:
-        print r.split('.')[0].split('_')[-1]
-    sys.exit(0)
+    if apport_enabled():
+        for r in reports:
+            print r.split('.')[0].split('_')[-1]
+        sys.exit(0)
+    else:
+        print "new reports but apport disabled"
+        sys.exit(2)
 else:
     sys.exit(1)

=== added file 'data/apport-is-enabled'
--- data/apport-is-enabled	1970-01-01 00:00:00 +0000
+++ data/apport-is-enabled	2011-06-08 08:47:10 +0000
@@ -0,0 +1,9 @@
+#!/usr/bin/python
+
+import sys
+from apport.fileutils import apport_enabled
+
+if apport_enabled():
+   sys.exit(0)
+else:
+   sys.exit(1)
\ No newline at end of file