Mercurial > piecrust2
comparison piecrust/processing/util.py @ 1005:2e5c5d33d62c
Merge changes.
author | Ludovic Chabant <ludovic@chabant.com> |
---|---|
date | Tue, 21 Nov 2017 22:07:12 -0800 |
parents | 46025a1b5434 |
children | 5762a0b821ac |
comparison
equal
deleted
inserted
replaced
1004:4f2e0136123d | 1005:2e5c5d33d62c |
---|---|
72 path_mode = config.get('path_mode', 'relative') | 72 path_mode = config.get('path_mode', 'relative') |
73 if path_mode == 'relative': | 73 if path_mode == 'relative': |
74 dirname, _ = os.path.split(path) | 74 dirname, _ = os.path.split(path) |
75 info.files = [os.path.join(dirname, f) for f in info.files] | 75 info.files = [os.path.join(dirname, f) for f in info.files] |
76 elif path_mode == 'absolute': | 76 elif path_mode == 'absolute': |
77 info.files = [os.path.join(self.app.root_dir, f) | 77 info.files = [self.app.resolvePath(f) for f in info.files] |
78 for f in info.files] | |
79 else: | 78 else: |
80 raise Exception("Unknown path mode: %s" % path_mode) | 79 raise Exception("Unknown path mode: %s" % path_mode) |
81 | 80 |
82 return info | 81 return info |
83 | 82 |