summaryrefslogtreecommitdiff
path: root/summainlib.py
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2011-06-11 19:56:04 +0100
committerLars Wirzenius <liw@liw.fi>2011-06-11 19:56:04 +0100
commit2eeeab33559b26c842f063bd193e374c10cfa8c9 (patch)
tree3c4ccbc6f7480e655fd9a53fd6d1d1bcc69cdb83 /summainlib.py
parent26a18242563623afaa895efc7130525cfaf9126a (diff)
downloadsummain-2eeeab33559b26c842f063bd193e374c10cfa8c9.tar.gz
Fix things so that --checksum option actually works.
Diffstat (limited to 'summainlib.py')
-rw-r--r--summainlib.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/summainlib.py b/summainlib.py
index ca4acd6..fa0953e 100644
--- a/summainlib.py
+++ b/summainlib.py
@@ -165,6 +165,7 @@ class FilesystemObject(object):
md5=None, open_file=None, readlink=None):
self._filename = filename
self._exclude = set(self._normalize_key(k) for k in exclude)
+ self._checksums = checksums
self._pn = pn
self._nn = nn
self._md5 = md5 or hashlib.md5()
@@ -291,8 +292,9 @@ class FilesystemObject(object):
else:
name = self.relative_path(root)
- keys = ['Mtime', 'Mode', 'Ino', 'Dev', 'Nlink', 'Size',
- 'Uid', 'Username', 'Gid', 'Group', 'SHA1', 'Target']
+ keys = (['Mtime', 'Mode', 'Ino', 'Dev', 'Nlink', 'Size',
+ 'Uid', 'Username', 'Gid', 'Group', 'Target'] +
+ self._checksums)
values = [('Name', name)]
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 != '')