other_action message fixups

diff --git a/code/main.py b/code/main.py
index 5e37889..6f226a6 100755 (executable)
--- a/code/main.py
+++ b/code/main.py
@@ -509,9 +509,9 @@ def getNicInfo(data_dict, machine):
                 other += " (cold boot or renew DHCP lease to swap)"
             elif other_action == 'renumber_dhcp':
                 other += " (renew DHCP lease to swap)"
                 other += " (cold boot or renew DHCP lease to swap)"
             elif other_action == 'renumber_dhcp':
                 other += " (renew DHCP lease to swap)"

+            elif other_action == 'remove':
+                other += " (will be removed at next cold boot or DHCP lease renewal)"

             else:
             else:

-                # No message for renumber_dhcp since we don't know if
-                # they're using DHCP.

                 other += " (pending assignment)"
             data_dict['nic%s_other' % i] = other
     if len(machine.nics) == 1:
                 other += " (pending assignment)"
             data_dict['nic%s_other' % i] = other
     if len(machine.nics) == 1:

diff --git a/debian/changelog b/debian/changelog
index 4c8de06..15dbd56 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 invirt-web (0.1.49) unstable; urgency=low
 
   * Tweak wording.
 invirt-web (0.1.49) unstable; urgency=low
 
   * Tweak wording.

+  * Fix missing substitution.

 
  -- Quentin Smith <quentin@mit.edu>  Sun, 20 May 2018 19:28:28 -0400
 
 
  -- Quentin Smith <quentin@mit.edu>  Sun, 20 May 2018 19:28:28 -0400