From 54f1aecdfc3a2f09f036bc7b049d15afb84a8086 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Mon, 22 Oct 2018 14:55:50 -0400 Subject: [PATCH] Fix typo in matching which breaks rename. (LP: #1770082) --- debian/changelog | 6 ++++++ netplan/cli/commands/apply.py | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4a5226672..825d02f5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +netplan.io (0.40.1~18.04.2) UNRELEASED; urgency=medium + + * Fix typo breaking rename on 'netplan apply'. (LP: #1770082) + + -- Mathieu Trudel-Lapierre Mon, 22 Oct 2018 14:57:35 -0400 + netplan.io (0.40.1~18.04.1) bionic; urgency=medium * Backport netplan 0.40.1 to 18.04. (LP: #1793309) diff --git a/netplan/cli/commands/apply.py b/netplan/cli/commands/apply.py index 603851480..b702fdac5 100644 --- a/netplan/cli/commands/apply.py +++ b/netplan/cli/commands/apply.py @@ -140,9 +140,9 @@ def process_link_changes(interfaces, config_manager): # pragma: nocover (covere driver = match.get('driver') mac = match.get('macaddress') if driver: - matches['by-driver'][driver] = phy + matches['by-driver'][driver] = newname if mac: - matches['by-mac'][mac] = phy + matches['by-mac'][mac] = newname # /sys/class/net/ens3/device -> ../../../virtio0 # /sys/class/net/ens3/device/driver -> ../../../../bus/virtio/drivers/virtio_net