diff -Nru nfs-utils-1.3.4/debian/changelog nfs-utils-1.3.4/debian/changelog --- nfs-utils-1.3.4/debian/changelog 2018-10-17 01:06:43.000000000 +1300 +++ nfs-utils-1.3.4/debian/changelog 2019-03-29 13:40:52.000000000 +1300 @@ -1,3 +1,10 @@ +nfs-utils (1:1.3.4-2.2ubuntu3.1) cosmic; urgency=medium + + * nfsiostat-replace-list-reserved-word.patch: fix nfsiostat crash due to + using 'list' as a variable name. (LP: #1821261) + + -- Matthew Ruffell Fri, 29 Mar 2019 13:40:52 +1300 + nfs-utils (1:1.3.4-2.2ubuntu3) cosmic; urgency=medium * truncate_gid*.patch: Backports from upstream to prevent truncating diff -Nru nfs-utils-1.3.4/debian/patches/nfsiostat-replace-list-reserved-word.patch nfs-utils-1.3.4/debian/patches/nfsiostat-replace-list-reserved-word.patch --- nfs-utils-1.3.4/debian/patches/nfsiostat-replace-list-reserved-word.patch 1970-01-01 12:00:00.000000000 +1200 +++ nfs-utils-1.3.4/debian/patches/nfsiostat-replace-list-reserved-word.patch 2019-03-29 13:40:44.000000000 +1300 @@ -0,0 +1,45 @@ +From c4c14011b70375050d7bba7c57e2eaf4c715dc7c Mon Sep 17 00:00:00 2001 +From: Matthew Ruffell +Date: Thu, 28 Mar 2019 15:43:21 -0400 +Subject: [PATCH] nfsiostat: replace 'list' reserved word + +list is a reserved word in python and should not be used as a variable +name. Changing list to devicelist for list_nfs_mounts() + +Fixes: https://bugs.launchpad.net/ubuntu/+source/nfs-utils/+bug/1821261 + +Signed-off-by: Matthew Ruffell +Signed-off-by: Steve Dickson +--- + tools/nfs-iostat/nfs-iostat.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +Index: nfs-utils-1.3.4/tools/nfs-iostat/nfs-iostat.py +=================================================================== +--- nfs-utils-1.3.4.orig/tools/nfs-iostat/nfs-iostat.py ++++ nfs-utils-1.3.4/tools/nfs-iostat/nfs-iostat.py +@@ -484,20 +484,20 @@ def list_nfs_mounts(givenlist, mountstat + return a full list if the given list is empty - + may return an empty list if none found + """ +- list = [] ++ devicelist = [] + if len(givenlist) > 0: + for device in givenlist: + stats = DeviceData() + stats.parse_stats(mountstats[device]) + if stats.is_nfs_mountpoint(): +- list += [device] ++ devicelist += [device] + else: + for device, descr in list(mountstats.items()): + stats = DeviceData() + stats.parse_stats(descr) + if stats.is_nfs_mountpoint(): +- list += [device] +- return list ++ devicelist += [device] ++ return devicelist + + def iostat_command(name): + """iostat-like command for NFS mount points diff -Nru nfs-utils-1.3.4/debian/patches/series nfs-utils-1.3.4/debian/patches/series --- nfs-utils-1.3.4/debian/patches/series 2018-10-17 01:06:40.000000000 +1300 +++ nfs-utils-1.3.4/debian/patches/series 2019-03-29 13:40:32.000000000 +1300 @@ -19,3 +19,4 @@ glibc-2.28-compat.patch truncate_uid.patch truncate_uid_2.patch +nfsiostat-replace-list-reserved-word.patch