VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-08-01 15:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't perform text substitutions where not needed

Browse Source
This commit is contained in:
Jamie Cameron
2010-12-05 22:48:54 -08:00
parent b16b46308b
commit 20a3936f43
129 changed files with 180 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
postgresql/postgresql-lib.pl
View File

@ -1116,18 +1116,20 @@ if ($? || $out =~ /could not|error|failed/i) {
return undef;
}
# restore_database(database, source-path, only-data, clear-db)
# restore_database(database, source-path, only-data, clear-db, [&only-tables])
# Restores the contents of a PostgreSQL backup into the specified database.
# Returns undef on success, or an error message on failure.
sub restore_database
{
local ($db, $path, $only, $clean) = @_;
local ($db, $path, $only, $clean, $tables) = @_;
local $tablesarg = join(" ", map { " -t ".quotemeta($_) } @$tables);
local $cmd = &quote_path($config{'rstr_cmd'}).
(!$postgres_login ? "" :
&supports_pgpass() ? " -U $postgres_login" : " -u").
($config{'host'} ? " -h $config{'host'}" : "").
($only ? " -a" : "").
($clean ? " -c" : "").
$tablesarg.
" -d $db ".&quote_path($path);
if ($postgres_sameunix && defined(getpwnam($postgres_login))) {
$cmd = &command_as_user($postgres_login, 0, $cmd);