Group apparently removed items by working status.

This makes it easier to spot promotions in some cases.

Author: cuavas

makewn.py

@@ -502,20 +502,26 @@ def handle_new_software(shortname, description, is_clone, is_working):
         for shortname in renames:
             if shortname in old_working: del old_working[shortname]
             elif shortname in old_nonworking: del old_nonworking[shortname]
-        removed = list()
-        for shortname, description in old_working.items(): removed.append(description)
-        for shortname, description in old_nonworking.items(): removed.append(description)
-        removed.sort()
-
-        if renames or removed or added_working or added_nonworking or promoted:
+        removed_working = list()
+        removed_nonworking = list()
+        for shortname, description in old_working.items(): removed_working.append(description)
+        for shortname, description in old_nonworking.items(): removed_nonworking.append(description)
+        removed_working.sort()
+        removed_nonworking.sort()
+
+        if renames or removed_working or removed_nonworking or added_working or added_nonworking or promoted:
             self.output.write('%s (%s):\n' % (listname, filename))
             if renames:
                 self.output.write('  Renames\n')
                 for old_name, info in renames.items():
                     self.output.write('    %s -> %s %s\n' % (old_name, info[1], info[0]))
-            if removed:
-                self.output.write('  Removed\n')
-                for description in removed:
+            if removed_working:
+                self.output.write('  Removed (working)\n')
+                for description in removed_working:
+                    self.output.write('    %s\n' % (description, ))
+            if removed_nonworking:
+                self.output.write('  Removed (non-working)\n')
+                for description in removed_nonworking:
                     self.output.write('    %s\n' % (description, ))
             if added_working:
                 self.output.write('  Working\n')

newdrivers.py

@@ -273,27 +273,36 @@ def handleNewMachine(driver, description, is_clone, is_working):
     if (error_handler.errors > 0) or (error_handler.warnings > 0):
         sys.exit(1)
 
-    removed = list()
+    removed_working = list()
     for driver in old_working:
         if (driver not in new_working) and (driver not in new_nonworking) and (driver not in renames):
-            removed.append(old_working[driver])
+            removed_working.append(old_working[driver])
+    removed_working.sort()
+
+    removed_nonworking = list()
     for driver in old_nonworking:
         if (driver not in new_working) and (driver not in new_nonworking) and (driver not in renames):
-            removed.append(old_nonworking[driver])
-    removed.sort()
+            removed_nonworking.append(old_nonworking[driver])
+    removed_nonworking.sort()
 
     output.write('Comparing %s to %s\n\n' % (oldbuild, newbuild))
 
     if renames:
         output.write('Renames\n')
         for old_name, info in renames.items():
-            output.write('%s -> %s %s\n' % (old_name, info[1], info[0]))
+            output.write('  %s -> %s %s\n' % (old_name, info[1], info[0]))
+        output.write('\n')
+
+    if removed_working:
+        output.write('Removed (working)\n')
+        for description in removed_working:
+            output.write('  %s\n' % (description, ))
         output.write('\n')
 
-    if removed:
-        output.write('Removed\n')
-        for description in removed:
-            output.write('%s\n' % (description, ))
+    if removed_nonworking:
+        output.write('Removed (non-working)\n')
+        for description in removed_nonworking:
+            output.write('  %s\n' % (description, ))
         output.write('\n')
 
     printResult('New working systems', new_working_parents)