Merge pull request #496 from Lex-2008/master

Lex-2008 · web-flow · commit 4c05517be118 · 2018-11-29T11:57:56.000+01:00
Check for presence of $BACKUP_DIR/data, not $BACKUP_DIR, when restoring DB
diff --git a/packaging/common/cfengine-hub/postinstall.sh b/packaging/common/cfengine-hub/postinstall.sh
@@ -572,7 +572,7 @@ migrate_db_using_dump_file() {
   return $result
 }
 
-if is_upgrade && [ -d "$BACKUP_DIR" ]; then
+if is_upgrade && [ -d "$BACKUP_DIR/data" ]; then
   # DEBUG variable controls which of migration methods fail:
   # 0 - do nothing special (usually pg_upgrade, which is first method, succeeds)
   # 1 - fail first method (so we get a chance to run second method, migration via pipe)

Original file line number	Diff line number	Diff line change
`@@ -572,7 +572,7 @@ migrate_db_using_dump_file() {`
`572`	`572`	`return $result`
`573`	`573`	`}`
`574`	`574`
`575`		`-if is_upgrade && [ -d "$BACKUP_DIR" ]; then`
	`575`	`+if is_upgrade && [ -d "$BACKUP_DIR/data" ]; then`
`576`	`576`	`# DEBUG variable controls which of migration methods fail:`
`577`	`577`	`# 0 - do nothing special (usually pg_upgrade, which is first method, succeeds)`
`578`	`578`	`# 1 - fail first method (so we get a chance to run second method, migration via pipe)`