← Back to team overview

apport-hackers team mailing list archive

[Merge] lp:~brian-murray/apport/check-more-mount-points into lp:apport

 

Brian Murray has proposed merging lp:~brian-murray/apport/check-more-mount-points into lp:apport.

Requested reviews:
  Apport upstream developers (apport-hackers)

For more details, see:
https://code.launchpad.net/~brian-murray/apport/check-more-mount-points/+merge/64225

I've extended the free space checks to include /var and /rofs, which as I understand it is the system partition for live installs while / is an aufs overlay that includes /home and /rofs.
-- 
https://code.launchpad.net/~brian-murray/apport/check-more-mount-points/+merge/64225
Your team Apport upstream developers is requested to review the proposed merge of lp:~brian-murray/apport/check-more-mount-points into lp:apport.
=== modified file 'data/general-hooks/generic.py'
--- data/general-hooks/generic.py	2010-05-04 10:45:13 +0000
+++ data/general-hooks/generic.py	2011-06-10 17:29:48 +0000
@@ -3,7 +3,8 @@
 # Copyright (C) 2009 Canonical Ltd.
 # Authors: Matt Zimmerman <mdz@xxxxxxxxxxxxx>
 #          Martin Pitt <martin.pitt@xxxxxxxxxx>
-# 
+#          Brian Murray <brian@xxxxxxxxxx>
+#
 # 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
@@ -19,7 +20,10 @@
         report['NonfreeKernelModules'] = ' '.join(nm)
 
     # check for low space
-    mounts = { '/': 'system' }
+    mounts = {'/': 'system',
+              '/var': '/var',
+              '/rofs': 'system'}
+
     home = os.getenv('HOME')
     if home:
         mounts[home] = 'home'
@@ -31,8 +35,8 @@
 
         if free_mb < treshold:
             report['UnreportableReason'] = 'Your %s partition has less than \
-%s MB of free space available, which leads to a lot of problems. Please \
-free some space.' % (mounts[mount], free_mb)
+%s MB of free space available, which leads to problems using applications \
+and installing updates. Please free some space.' % (mounts[mount], free_mb)
 
     # important glib errors/assertions (which should not have private data)
     if 'ExecutablePath' in report: