Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/hgweb/hgwebdir_mod.py @ 45247:d5ccc059fbcd
templater: handle None returned from templatedir()
My recent 91aa9bba3dc9 (templater: make templatepaths() return a
single path, or None, 2020-07-21) didn't account for the fact that
`templatedir()` returns `None` in frozen binaries. That is ironic,
since the reason I'm working on this is to add support for built-in
mapfiles in frozen binaries. This patch updates the callers to handle
the `None` case. It's somewhat ugly, but I will have to revisit this
soon anyway, since my goal is to make all callers handle that case by
trying to read the map file using the resources API instead.
Differential Revision: https://phab.mercurial-scm.org/D8810
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 24 Jul 2020 11:24:59 -0700 |
| parents | 86f9b25d750b |
| children | 9a5c4875a88c |
comparison
equal
deleted
inserted
replaced
| 45246:4ccd5ec565c2 | 45247:d5ccc059fbcd |
|---|---|
| 413 else: | 413 else: |
| 414 fname = req.qsparams[b'static'] | 414 fname = req.qsparams[b'static'] |
| 415 static = self.ui.config(b"web", b"static", untrusted=False) | 415 static = self.ui.config(b"web", b"static", untrusted=False) |
| 416 if not static: | 416 if not static: |
| 417 tp = self.templatepath or templater.templatedir() | 417 tp = self.templatepath or templater.templatedir() |
| 418 static = [os.path.join(tp, b'static')] | 418 if tp is not None: |
| 419 static = [os.path.join(tp, b'static')] | |
| 419 | 420 |
| 420 staticfile(static, fname, res) | 421 staticfile(static, fname, res) |
| 421 return res.sendresponse() | 422 return res.sendresponse() |
| 422 | 423 |
| 423 # top-level index | 424 # top-level index |