Subversion Repositories prayer-err

Compare Revisions

Ignore whitespace Rev 36 → Rev 37

/trunk/debian/patches/repair_ssl_session_db_on_version_mismatch.patch
1,11 → 1,15
--- a/lib/mydb_db3.c
+++ b/lib/mydb_db3.c
@@ -208,7 +208,7 @@ static int init(const char *dbdir, int m
@@ -208,7 +208,11 @@ static int init(const char *dbdir, int m
if (!(r = myinit(dbdir, myflags)))
return(0);
- if (r != ENOENT) {
+ if (r != ENOENT && r != DB_VERSION_MISMATCH) {
+ if (r != ENOENT
+#ifdef DB_VERSION_MISMATCH
+ && r != DB_VERSION_MISMATCH
+#endif
+ ) {
log_panic("DBERROR: dbenv->open '%s' failed: %s", dbdir, db_strerror(r));
return MYDB_IOERROR;
}
/trunk/debian/patches/templates_fallback_to_compiled.patch
0,0 → 1,45
--- a/lib/template_expand.c
+++ b/lib/template_expand.c
@@ -496,11 +496,11 @@ template_expand_call(struct template_cal
char *s, *t;
char *err = NIL;
- if (tvals->use_compiled)
+ if (tvals->use_compiled ||
+ !(template = template_parse(tvals->dir, tvals->set,
+ item->name, tvals->pool)))
template = template_find(tvals->set, item->name, tvals->pool);
- else
- template = template_parse(tvals->dir, tvals->set,
- item->name, tvals->pool);
+
if (!template) {
str_printf(state->error,
"Template \"%s\" not found (CALL from template \"%s\")\n",
@@ -579,11 +579,11 @@ template_expand(char *name, struct templ
struct str *error = tvals->error;
char *err;
- if (tvals->use_compiled) {
+ if (tvals->use_compiled ||
+ !(template = template_parse(tvals->dir, tvals->set,
+ item->name, tvals->pool)))
template = template_find(tvals->set, name, tvals->pool);
- } else {
- template = template_parse(tvals->dir, tvals->set, name, tvals->pool);
- }
+
if (!template) {
str_printf(tvals->error,
"Template %s not found (top level template_expand())",
--- a/files/etc/prayer.cf.SRC
+++ b/files/etc/prayer.cf.SRC
@@ -452,7 +452,7 @@ pid_dir = "$var_prefix"
######################################################################
# Template stuff
-template_path = "__PREFIX__/templates"
+template_path = "/etc/prayer/templates"
template_set = "xhtml_strict"
template_use_compiled = TRUE
/trunk/debian/patches/series
1,3 → 1,4
repair_ssl_session_db_on_version_mismatch.patch
makefile_install_config.patch
repair_ssl_session_db_on_version_mismatch.patch
accountd_makefile_typo.patch
welcome_is_template.patch
templates_fallback_to_compiled.patch