From 5548b4e03f70958f4f3d2065177b34e5ae1e36d9 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Mon, 3 Jun 2019 11:17:25 +0200 Subject: [PATCH] drop patches applied upstream Signed-off-by: Thomas Lamprecht --- ...x-NoneType-object-has-no-attribute-_.patch | 32 ------------------- debian/patches/series | 1 - 2 files changed, 33 deletions(-) delete mode 100644 debian/patches/extra/0001-addons-bridge-fix-NoneType-object-has-no-attribute-_.patch diff --git a/debian/patches/extra/0001-addons-bridge-fix-NoneType-object-has-no-attribute-_.patch b/debian/patches/extra/0001-addons-bridge-fix-NoneType-object-has-no-attribute-_.patch deleted file mode 100644 index da8ce68..0000000 --- a/debian/patches/extra/0001-addons-bridge-fix-NoneType-object-has-no-attribute-_.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1d35560dc603ac43a87a5584c6776d9872ede4e5 Mon Sep 17 00:00:00 2001 -From: Julien Fortin -Date: Fri, 19 Apr 2019 17:14:21 +0800 -Subject: addons: bridge: fix 'NoneType' object has - no attribute '__getitem__' error - -Fixes #90 - -Signed-off-by: Julien Fortin -Signed-off-by: Alexandre Derumier ---- - ifupdown2/addons/bridge.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ifupdown2/addons/bridge.py b/ifupdown2/addons/bridge.py -index 9c1de18..973ec7e 100644 ---- a/ifupdown2/addons/bridge.py -+++ b/ifupdown2/addons/bridge.py -@@ -2055,8 +2055,8 @@ class bridge(moduleBase): - finally: - if ifaceobj.link_type != ifaceLinkType.LINK_NA: - for p in running_ports: -- if (ifaceobj_getfunc(p)[0].link_privflags & -- ifaceLinkPrivFlags.KEEP_LINK_DOWN): -+ ifaceobj_list = ifaceobj_getfunc(p) -+ if (ifaceobj_list and ifaceobj_list[0].link_privflags & ifaceLinkPrivFlags.KEEP_LINK_DOWN): - netlink.link_set_updown(p, "down") - continue - try: --- -2.11.0 - diff --git a/debian/patches/series b/debian/patches/series index 5975ab1..5fc2cfc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,4 +3,3 @@ pve/0002-don-t-remove-tap-veth-fwpr-interfaces-from-bridge-on.patch pve/0003-add-dummy-mtu-bridgevlanport-modules.patch pve/0004-debian-fixup-networking.service.patch pve/0005-allow-vlan-subinterface-in-a-vlan-aware-bridge.patch -extra/0001-addons-bridge-fix-NoneType-object-has-no-attribute-_.patch -- 2.39.5