Merge lp:~roadmr/checkbox/fix-memory-compare into lp:checkbox

[Daniel Manrique]

An easy fix for an accumulator expression causing memory_compare to give strange negative-difference results.

An easy fix for an accumulator expression causing memory_compare to give strange negative-difference results.

[Zygmunt Krynicki (zyga)]

+1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-07 17:00:38 +0000
+++ debian/changelog	2012-12-11 18:17:21 +0000
@@ -4,6 +4,8 @@
   * New version 0.15 for Raring Ringtail development.
   * Added environ key to poweroff and reboot jobs so they create logs in the
     expected location (LP: #1085833)
+  * scripts/memory_compare: Fixed accumulator expression to give good results
+    (LP: #1089046)
 
   [ Brendan Donegan ] 
   * Change forward-slashes to asterisks in the filename of a connection, since

=== modified file 'scripts/memory_compare'
--- scripts/memory_compare	2012-07-11 14:43:14 +0000
+++ scripts/memory_compare	2012-12-11 18:17:21 +0000
@@ -17,7 +17,7 @@
 
         if form and "IMM" in form:
             try:
-                self.total_size = int(getattr(device, "size", 0))
+                self.total_size += int(getattr(device, "size", 0))
             except ValueError:
                 pass