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

Perl doesn't allow last in a do loop

Browse Source
This commit is contained in:
Jamie Cameron
2008-12-29 18:54:08 +00:00
parent 141b000a88
commit c46888b76f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
postgresql/postgresql-lib.pl
View File

@ -398,7 +398,7 @@ else {
(!&supports_pgpass() ? " -u" : " -U $postgres_login").
" -c ".&quote_path($sql)." $host $_[0]";
if ($postgres_sameunix && defined(getpwnam($postgres_login))) {
$cmd = "su $postgres_login -c ".quotemeta($cmd);
$cmd = &command_as_user($postgres_login, 0, $cmd);
}
$cmd = &command_with_login($cmd);
@ -419,9 +419,9 @@ else {
local ($line, $rv, @data);
do {
$line = <OUT>;
last if (!defined($line));
} while($line =~ /^(username|password|user name):/i ||
$line =~ /(warning|notice):/i || $line !~ /\S/);
$line =~ /(warning|notice):/i ||
$line !~ /\S/ && defined($line));
unlink($temp);
if ($line =~ /^ERROR:\s+(.*)/ || $line =~ /FATAL.*:\s+(.*)/) {
&error(&text('esql', "<tt>$sql</tt>", "<tt>$1</tt>"));