Compare commits

...

1 Commits

Author SHA1 Message Date
Laurent Destailleur
847616ae82 Fix error management 2021-12-02 14:00:47 +01:00

View File

@@ -189,15 +189,16 @@ if ($what == 'mysql')
$ok=0; $ok=0;
dol_syslog("Run command ".$fullcommandcrypted); dol_syslog("Run command ".$fullcommandcrypted);
$handlein = popen($fullcommandclear, 'r'); $handlein = popen($fullcommandclear, 'r');
while (!feof($handlein)) if ($handlein) {
{ while (!feof($handlein))
$read = fgets($handlein); {
fwrite($handle,$read); $read = fgets($handlein);
if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1; fwrite($handle,$read);
elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1; if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;
}
pclose($handlein);
} }
pclose($handlein);
if ($compression == 'none') fclose($handle); if ($compression == 'none') fclose($handle);
if ($compression == 'gz') gzclose($handle); if ($compression == 'gz') gzclose($handle);
if ($compression == 'bz') bzclose($handle); if ($compression == 'bz') bzclose($handle);