diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/bricolage/files/bric_upgrade.sh | 2 | ||||
| -rw-r--r-- | www/bricolage/files/patch-inst_postgres.pl | 19 |
2 files changed, 1 insertions, 20 deletions
diff --git a/www/bricolage/files/bric_upgrade.sh b/www/bricolage/files/bric_upgrade.sh index e6c9cef3b3ac..0f5963eefb10 100644 --- a/www/bricolage/files/bric_upgrade.sh +++ b/www/bricolage/files/bric_upgrade.sh @@ -12,7 +12,7 @@ fi # Ensure the old version exists at the end of the argument list OLDVERSION=`echo "$*" | sed -e "s/^.* \([^ ]*\)/\1/"` -VTEST=`echo "$OLDVERSION" | sed -e 's/^1\.8\.[01234678]$/OKAY/' -e 's/^1\.10\.[0]$/OKAY/'` +VTEST=`echo "$OLDVERSION" | sed -e 's/^1\.8\.[01234678]$/OKAY/' -e 's/^1\.10\.[01]$/OKAY/'` if [ "${VTEST}" != "OKAY" ] then echo "Version $OLDVERSION unknown." diff --git a/www/bricolage/files/patch-inst_postgres.pl b/www/bricolage/files/patch-inst_postgres.pl deleted file mode 100644 index a8ec60e6801f..000000000000 --- a/www/bricolage/files/patch-inst_postgres.pl +++ /dev/null @@ -1,19 +0,0 @@ -*** inst/postgres.pl.orig Sun Apr 2 10:26:59 2006 ---- inst/postgres.pl Sun Apr 2 10:27:55 2006 -*************** -*** 135,141 **** - - unless ($PG{host_name}) { - $PG{system_user} = $PG{root_user}; -! while(1) { - ask_confirm("Postgres System Username", \$PG{system_user}, $QUIET); - $PG{system_user_uid} = (getpwnam($PG{system_user}))[2]; - last if defined $PG{system_user_uid}; ---- 135,141 ---- - - unless ($PG{host_name}) { - $PG{system_user} = $PG{root_user}; -! while(!$QUIET) { - ask_confirm("Postgres System Username", \$PG{system_user}, $QUIET); - $PG{system_user_uid} = (getpwnam($PG{system_user}))[2]; - last if defined $PG{system_user_uid}; |