| author | Lars Hjemli <hjemli@gmail.com> | 2010-07-18 13:03:08 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2010-07-18 13:03:08 (UTC) |
| commit | 5c5d189635287a3bfaa1a4aef133dc0c582a27c2 (patch) (unidiff) | |
| tree | cf14b0a5578c9d23a560690e7e256260633ce043 /cgit.c | |
| parent | 60fcf600f5010701c20b63867999a802ca0e05c0 (diff) | |
| parent | ba56a37e863d0f90e3e953047486905cfb959925 (diff) | |
| download | cgit-5c5d189635287a3bfaa1a4aef133dc0c582a27c2.zip cgit-5c5d189635287a3bfaa1a4aef133dc0c582a27c2.tar.gz cgit-5c5d189635287a3bfaa1a4aef133dc0c582a27c2.tar.bz2 | |
Merge branch 'lh/macros'
| -rw-r--r-- | cgit.c | 10 |
1 files changed, 5 insertions, 5 deletions
| @@ -154,3 +154,3 @@ void config_cb(const char *name, const char *value) | |||
| 154 | else if (!strcmp(name, "cache-root")) | 154 | else if (!strcmp(name, "cache-root")) |
| 155 | ctx.cfg.cache_root = xstrdup(value); | 155 | ctx.cfg.cache_root = xstrdup(expand_macros(value)); |
| 156 | else if (!strcmp(name, "cache-root-ttl")) | 156 | else if (!strcmp(name, "cache-root-ttl")) |
| @@ -185,5 +185,5 @@ void config_cb(const char *name, const char *value) | |||
| 185 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) | 185 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
| 186 | process_cached_repolist(value); | 186 | process_cached_repolist(expand_macros(value)); |
| 187 | else | 187 | else |
| 188 | scan_tree(value, repo_config); | 188 | scan_tree(expand_macros(value), repo_config); |
| 189 | else if (!strcmp(name, "source-filter")) | 189 | else if (!strcmp(name, "source-filter")) |
| @@ -211,3 +211,3 @@ void config_cb(const char *name, const char *value) | |||
| 211 | else if (!strcmp(name, "include")) | 211 | else if (!strcmp(name, "include")) |
| 212 | parse_configfile(value, config_cb); | 212 | parse_configfile(expand_macros(value), config_cb); |
| 213 | } | 213 | } |
| @@ -707,3 +707,3 @@ int main(int argc, const char **argv) | |||
| 707 | cgit_parse_args(argc, argv); | 707 | cgit_parse_args(argc, argv); |
| 708 | parse_configfile(ctx.env.cgit_config, config_cb); | 708 | parse_configfile(expand_macros(ctx.env.cgit_config), config_cb); |
| 709 | ctx.repo = NULL; | 709 | ctx.repo = NULL; |