summaryrefslogtreecommitdiff
path: root/summain
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2011-08-08 14:51:34 +0100
committerLars Wirzenius <liw@liw.fi>2011-08-08 14:51:34 +0100
commitd302e6765609392389b48be701998943975843bb (patch)
tree568dfa6610d7b3deb0d2a7143b73afa6fa8cb969 /summain
parent68f67f9b71e1bbc9647d350cb6b62d72ebfbeab9 (diff)
downloadsummain-d302e6765609392389b48be701998943975843bb.tar.gz
Fix relative pathnames.
Diffstat (limited to 'summain')
-rwxr-xr-xsummain6
1 files changed, 3 insertions, 3 deletions
diff --git a/summain b/summain
index 717d398..233eff4 100755
--- a/summain
+++ b/summain
@@ -99,13 +99,13 @@ class Summain(cliapp.Application):
for filename in self.files(root):
o = summainlib.FilesystemObject(filename, nn, pn, exclude)
if relative:
- name = self.relative_path(root)
+ name = self.relative_path(root, o)
else:
name = o['Name']
fmt.write_object(name, o, checksums)
fmt.close()
- def relative_path(self, root):
+ def relative_path(self, root, o):
'''Return a path that is relative to root, if possible.
If pathname does not start with root, then return it
@@ -120,7 +120,7 @@ class Summain(cliapp.Application):
pathname = self['Name']
if pathname.startswith(root2):
return pathname[len(root2):]
- elif pathname == root and self._isdir():
+ elif pathname == root and o.isdir():
return '.'
else:
return pathname