From 5b3c5b37dc1f2b402719e2e5bb208fab6844252c Mon Sep 17 00:00:00 2001 From: Cybjit Date: Tue, 18 Nov 2014 16:26:12 -0600 Subject: [PATCH] showfields: complain about sets --- smem | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/smem b/smem index de221df..c692f73 100755 --- a/smem +++ b/smem @@ -463,7 +463,9 @@ def showsystem(): showtable(range(len(l)), fields, columns.split(), options.sort or 'order') def showfields(fields, f): - if f != list: + if type(f) in (list, set): + print "unknown fields:", " ".join(f) + else: print "unknown field", f print "known fields:" for l in sorted(fields.keys()): @@ -486,11 +488,12 @@ def showtable(rows, fields, columns, sort): mt = totalmem() st = memory()['swaptotal'] - for n in columns: - if n not in fields: - showfields(fields, n) - sys.exit(-1) + missing = set(columns) - set(fields) + if len(missing) > 0: + showfields(fields, missing) + sys.exit(-1) + for n in columns: f = fields[n][2] if 'a' in f: if n == 'swap':