summaryrefslogtreecommitdiff
path: root/summainlib.py
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2011-05-16 14:37:38 +0100
committerLars Wirzenius <liw@liw.fi>2011-05-16 14:37:38 +0100
commite91d60c67616d539bbb11916a4f9c451b1bf275d (patch)
treee62d821d6f8f56f6d057ac152de3030e2d3d52c9 /summainlib.py
parent669b55720168cc8f07e88a92001ecc0b2ab7e636 (diff)
downloadsummain-e91d60c67616d539bbb11916a4f9c451b1bf275d.tar.gz
Fix format() to check exclusion correctly.
Normalize exclusion list.
Diffstat (limited to 'summainlib.py')
-rw-r--r--summainlib.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/summainlib.py b/summainlib.py
index 58610ff..1a386e7 100644
--- a/summainlib.py
+++ b/summainlib.py
@@ -162,7 +162,7 @@ class FilesystemObject(object):
def __init__(self, filename, nn, pn, exclude, stat_result=None, sha1=None,
open_file=None, readlink=None):
self._filename = filename
- self._exclude = set(exclude)
+ self._exclude = set(self._normalize_key(k) for k in exclude)
self._pn = pn
self._nn = nn
self._sha1 = sha1 or hashlib.sha1()
@@ -284,6 +284,6 @@ class FilesystemObject(object):
keys = ['Mtime', 'Mode', 'Ino', 'Dev', 'Nlink', 'Size',
'Uid', 'Username', 'Gid', 'Group', 'Sha-1', 'Target']
values = [('Name', name)]
- values += [(k, self[k]) for k in keys if k not in self._exclude]
+ values += [(k, self[k]) for k in keys if self[k] != '']
return ''.join('%s: %s\n' % (k, v) for k, v in values if v != '')