Merge lp:~seb128/ubuntu-system-settings/storage-tweak-computation into lp:ubuntu-system-settings

[Sebastien Bacher]

[storage] tweaks to the disk informations, limit the free space to the
user available one (excluding the system partitions), don't list the
external mounts, that's described in the design and is going to require
work on the categories computation to give correct values

[storage] tweaks to the disk informations, limit the free space to the
user available one (excluding the system partitions), don't list the
external mounts, that's described in the design and is going to require
work on the categories computation to give correct values

[Sebastien Bacher (seb128)]

see https://bugs.launchpad.net/bugs/1374134 for some details

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1080
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1562/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5216
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3800
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/754
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4951
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6468
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6468/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13795
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3186
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4111
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4111/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1562/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good!

Looks accurate on my krillin, thanks!

review: Approve

=== modified file 'plugins/about/Storage.qml'
--- plugins/about/Storage.qml	2014-09-24 15:26:20 +0000
+++ plugins/about/Storage.qml	2014-09-26 08:43:08 +0000
@@ -41,9 +41,10 @@
             var drive = systemDrives[i]
             var type = storageInfo.driveType(drive)
             var path = backendInfo.getDevicePath(drive)
-            if ((type === StorageInfo.InternalDrive ||
-                type === StorageInfo.RemovableDrive ||
-                type === StorageInfo.UnknownDrive) &&
+            /* only deal with the device's storage for now, external mounts
+               handling would require being smarter on the categories
+               computation as well and is not in the current design */
+            if ((type === StorageInfo.InternalDrive) &&
                 paths.indexOf(path) == -1 && // Haven't seen this device before
                 path.charAt(0) === "/") { // Has a real mount point
                 drives.push(drive)
@@ -59,12 +60,9 @@
         }
         return space
     }
+    /* Limit the free space to the user available one (see bug #1374134) */
     property real freediskSpace: {
-        var space = 0
-        for (var i = 0; i < allDrives.length; i++) {
-            space += storageInfo.availableDiskSpace(allDrives[i])
-        }
-        return space
+        return storageInfo.availableDiskSpace("/home")
     }
     property real usedByUbuntu: diskSpace -
                                 freediskSpace -