[Iscs-developers] ISCS/SPM/src spmmainform.ui.h,1.32,1.33 spmthreads.cpp,1.22,1.23
Status: Beta
Brought to you by:
jsulliva
Menu
▾
▴
[Iscs-developers] ISCS/SPM/src spmmainform.ui.h,1.32,1.33 spmthreads.cpp,1.22,1.23
|
From: <jsu...@us...> - 2003-08-27 11:53:42
|
Update of /cvsroot/iscs/ISCS/SPM/src
In directory sc8-pr-cvs1:/tmp/cvs-serv25257/SPM/src
Modified Files:
spmmainform.ui.h spmthreads.cpp
Log Message:
Added ssh error messages to SPM error messages
Index: spmmainform.ui.h
===================================================================
RCS file: /cvsroot/iscs/ISCS/SPM/src/spmmainform.ui.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** spmmainform.ui.h 27 Aug 2003 01:45:58 -0000 1.32
--- spmmainform.ui.h 27 Aug 2003 11:53:37 -0000 1.33
***************
*** 614,618 ****
launchProcWUProgBar();
if ( ! ProcStderr->isEmpty() ) { // i.e. we generated errors while trying to read and write to the database directories
! QMessageBox::warning(this, tr("SPM - Commit Changes Error"), tr("Could not copy update files\nto database server - SPM Error Code: U108"));
return false;
}
--- 614,618 ----
launchProcWUProgBar();
if ( ! ProcStderr->isEmpty() ) { // i.e. we generated errors while trying to read and write to the database directories
! QMessageBox::warning(this, tr("SPM - Commit Changes Error"), tr("Could not copy update files\nto database server - SPM Error Code: U108\n%1", "The parameter is the error message from ssh").arg(ProcStderr->join("\n")));
return false;
}
***************
*** 657,661 ****
SBLabel->setText(SBLabelMsg);
if (! ProcStderr->isEmpty() ) {
! QMessageBox::warning(this, tr("SPM - File Problem"), tr("Could not obtain the file\n%1 on %2\nIt is not safe to proceed without this file\nSPM Error Code: L108").arg(Path + so->DIRDELIMDB + "DbChanges").arg(so->DbServer) );
return false;
}
--- 657,661 ----
SBLabel->setText(SBLabelMsg);
if (! ProcStderr->isEmpty() ) {
! QMessageBox::warning(this, tr("SPM - File Problem"), tr("Could not obtain the file\n%1 on %2\nIt is not safe to proceed without this file\nSPM Error Code: L108\n%3", "Parameter #1 is the pathname of the DbChanges file, #2 is the IP address of the DBD and #3 is the error message returned by ssh").arg(Path + so->DIRDELIMDB + "DbChanges").arg(so->DbServer).arg(ProcStderr->join("\n")) );
return false;
}
***************
*** 692,696 ****
SBLabel->setText(SBLabelMsg);
if (! ProcStderr->isEmpty() ) {
! QMessageBox::warning(this, tr("SPM - Previous Database Problem"), tr("The previous database update did not finish properly!\nYou MUST add the line:\n%1\n to the end of the file:\n%2\non %3\nIt is not safe to make any changes until this is done\nSPM Error Code: L109").arg(EndString).arg(Path + so->DIRDELIMDB + "DbChanges").arg(so->DbServer));
return false;
}
--- 692,696 ----
SBLabel->setText(SBLabelMsg);
if (! ProcStderr->isEmpty() ) {
! QMessageBox::warning(this, tr("SPM - Previous Database Problem"), tr("The previous database update did not finish properly!\nYou MUST add the line:\n%1\n to the end of the file:\n%2\non %3\nIt is not safe to make any changes until this is done\nSPM Error Code: L109\n%4", "Parameter #1 is the SQL statement that must be added, #2 is the pathname of the file to which it must be added, #3 is the IP address of the DBD and #4 is the error message returned from ssh").arg(EndString).arg(Path + so->DIRDELIMDB + "DbChanges").arg(so->DbServer).arg(ProcStderr->join("\n")) );
return false;
}
***************
*** 719,723 ****
SBLabel->setText(SBLabelMsg);
if (! ProcStderr->isEmpty()) { // there was an error during the delete
! QMessageBox::warning(this, tr("SPM - Database Warning"), tr("An error occurred while deleting the temporary\ndatabase dump file on the database server %1.\nYou should manually delete thi\n file to recover the disk space.\nThe file name is spmdump.sql and is in\nyour home directory on the database server.\nSPM Error: L106").arg(so->DbServer));
}
prepProc();
--- 719,723 ----
SBLabel->setText(SBLabelMsg);
if (! ProcStderr->isEmpty()) { // there was an error during the delete
! QMessageBox::warning(this, tr("SPM - Database Warning"), tr("An error occurred while deleting the temporary\ndatabase dump file on the database server %1.\nYou should manually delete thi\n file to recover the disk space.\nThe file name is spmdump.sql and is in\nyour home directory on the database server.\nSPM Error: L106\n%2", "Parameter #1 is the IP Address of the DBD and #2 is the error message returned from ssh").arg(so->DbServer).arg(ProcStderr->join("\n")) );
}
prepProc();
***************
*** 1183,1187 ****
SBLabel->setText(SBLabelMsg);
if ( ! ProcStderr->isEmpty() ) {
! QMessageBox::warning(this, tr("SPM - Update Lock Problem"), tr("Failed to obtain an update lock.\nChanges cannot be safely committed. - SPM Error Code: U114"));
prepProc();
QDir::setCurrent(Path);
--- 1183,1187 ----
SBLabel->setText(SBLabelMsg);
if ( ! ProcStderr->isEmpty() ) {
! QMessageBox::warning(this, tr("SPM - Update Lock Problem"), tr("Failed to obtain an update lock.\nChanges cannot be safely committed. - SPM Error Code: U114\n%1", "The parameter is the error message from ssh").arg(ProcStderr->join("\n")) );
prepProc();
QDir::setCurrent(Path);
***************
*** 1416,1420 ****
}
else if (! ProcStderr->isEmpty()) { // i.e., there was some unanticpated error message
! QMessageBox::critical(this, tr("SPM - Database Error"), tr("There was an unidentified error\nwhile creating the edit database\nSPM Error Code: L103"));
return false;
}
--- 1416,1420 ----
}
else if (! ProcStderr->isEmpty()) { // i.e., there was some unanticpated error message
! QMessageBox::critical(this, tr("SPM - Database Error"), tr("There was an unidentified error\nwhile creating the edit database\nSPM Error Code: L103\n%1", "The parameter is the error message from ssh").arg(ProcStderr->join("\n")) );
return false;
}
***************
*** 1529,1533 ****
if ( ! ProcStderr->isEmpty() ) {
success = false;
! while ( QMessageBox::warning(this, tr("SPM - File Rename Problem"), tr("Could not rename the %1\ndirectory to %2 on %3.\nSPM Error Code: U123\nYou MUST manually rename this directory\nor you may have problems updating PEPs in the future", "The third parameter is the IP Address of the DBD").arg(Dir->path() + so->DIRDELIMDB + PreCommit).arg(Dir->path() + so->DIRDELIMDB + QString::number(so->DbVersion)).arg(so->DbServer), QMessageBox::Retry | QMessageBox::Default, QMessageBox::Cancel | QMessageBox::Escape) == QMessageBox::Retry ) {
ProcStderr->clear();
launchProcWUProgBar();
--- 1529,1533 ----
if ( ! ProcStderr->isEmpty() ) {
success = false;
! while ( QMessageBox::warning(this, tr("SPM - File Rename Problem"), tr("Could not rename the %1\ndirectory to %2 on %3.\nSPM Error Code: U123\nYou MUST manually rename this directory\nor you may have problems updating PEPs in the future\n%4", "The third parameter is the IP Address of the DBD and the fourth is the error message returned from ssh").arg(Dir->path() + so->DIRDELIMDB + PreCommit).arg(Dir->path() + so->DIRDELIMDB + QString::number(so->DbVersion)).arg(so->DbServer).arg(ProcStderr->join("\n")), QMessageBox::Retry | QMessageBox::Default, QMessageBox::Cancel | QMessageBox::Escape) == QMessageBox::Retry ) {
ProcStderr->clear();
launchProcWUProgBar();
***************
*** 1550,1554 ****
if ( ! ProcStderr->isEmpty() ) {
success = false;
! while ( QMessageBox::warning(this, tr("SPM - File Rename Problem"), tr("Could not rename the %1\ndirectory to %2 on %3.\nSPM Error Code: U123\nYou MUST manually rename this directory\nor you may have problems updating PEPs in the future", "The third parameter is the IP Address of the DBD").arg(Dir->path() + so->DIRDELIMDB + PreCommit).arg(Dir->path() + so->DIRDELIMDB + QString::number(so->DbVersion)).arg(so->DbServer), QMessageBox::Retry | QMessageBox::Default, QMessageBox::Cancel | QMessageBox::Escape) == QMessageBox::Retry ) {
ProcStderr->clear();
launchProcWUProgBar();
--- 1550,1554 ----
if ( ! ProcStderr->isEmpty() ) {
success = false;
! while ( QMessageBox::warning(this, tr("SPM - File Rename Problem"), tr("Could not rename the %1\ndirectory to %2 on %3.\nSPM Error Code: U123\nYou MUST manually rename this directory\nor you may have problems updating PEPs in the future\n%4", "The third parameter is the IP Address of the DBD and the fourth is the error message from ssh").arg(Dir->path() + so->DIRDELIMDB + PreCommit).arg(Dir->path() + so->DIRDELIMDB + QString::number(so->DbVersion)).arg(so->DbServer).arg(ProcStderr->join("\n")), QMessageBox::Retry | QMessageBox::Default, QMessageBox::Cancel | QMessageBox::Escape) == QMessageBox::Retry ) {
ProcStderr->clear();
launchProcWUProgBar();
***************
*** 1626,1630 ****
if ( ! ProcStderr->isEmpty() ) {
bool success = false;
! while ( QMessageBox::warning(this, tr("SPM - File Transfer Problem"), tr("The update files could not be transfered to\nthe %1 directory on DBD %2.\nSPM Error Code: U121\nThe update cannot continue until they are transferred.").arg(Path).arg(so->DbServer), QMessageBox::Retry | QMessageBox::Default, QMessageBox::Cancel | QMessageBox::Escape) == QMessageBox::Retry ) {
ProcStderr->clear();
launchProcWUProgBar();
--- 1626,1630 ----
if ( ! ProcStderr->isEmpty() ) {
bool success = false;
! while ( QMessageBox::warning(this, tr("SPM - File Transfer Problem"), tr("The update files could not be transfered to\nthe %1 directory on DBD %2.\nSPM Error Code: U121\nThe update cannot continue until they are transferred.\n%3", "The first parameter is the target directory on the DBD, the second is the IP address of the DBD and the third is the error message from ssh").arg(Path).arg(so->DbServer).arg(ProcStderr->join("\n")), QMessageBox::Retry | QMessageBox::Default, QMessageBox::Cancel | QMessageBox::Escape) == QMessageBox::Retry ) {
ProcStderr->clear();
launchProcWUProgBar();
***************
*** 1648,1652 ****
if ( ! ProcStderr->isEmpty() ) {
bool success = false;
! while ( QMessageBox::warning(this, tr("SPM - File Transfer Problem"), tr("The update files could not be transfered to\nthe %1 directory on DBD %2.\nSPM Error Code: U121\nThe update cannot continue until they are transferred.").arg(Path).arg(so->DbServer), QMessageBox::Retry | QMessageBox::Default, QMessageBox::Cancel | QMessageBox::Escape) == QMessageBox::Retry ) {
ProcStderr->clear();
launchProcWUProgBar();
--- 1648,1652 ----
if ( ! ProcStderr->isEmpty() ) {
bool success = false;
! while ( QMessageBox::warning(this, tr("SPM - File Transfer Problem"), tr("The update files could not be transfered to\nthe %1 directory on DBD %2.\nSPM Error Code: U121\nThe update cannot continue until they are transferred.\n%4", "The first parameter is the target directory on the DBD, the second the IP Address of the DBD and the third the error message from ssh").arg(Path).arg(so->DbServer).arg(ProcStderr->join("\n")), QMessageBox::Retry | QMessageBox::Default, QMessageBox::Cancel | QMessageBox::Escape) == QMessageBox::Retry ) {
ProcStderr->clear();
launchProcWUProgBar();
***************
*** 1695,1699 ****
SBLabel->setText(SBLabelMsg);
if ( ! ProcStderr->isEmpty() ) {
! QMessageBox::warning(this, tr("SPM - Update Lock Problem"), tr("Failed to release update lock.\nNo further updates can be applied until this lock is released.\nTo manually release the lock, overwrite the\n file %1 on the database server %2 to contain\nthe single character \"0\". - SPM Error Code: U114").arg(so->SPMDbDataRoot + "dbversions" + so->DIRDELIMDB + File->name()).arg(so->DbServer));
prepProc();
QDir::setCurrent(Path);
--- 1695,1699 ----
SBLabel->setText(SBLabelMsg);
if ( ! ProcStderr->isEmpty() ) {
! QMessageBox::warning(this, tr("SPM - Update Lock Problem"), tr("Failed to release update lock.\nNo further updates can be applied until this lock is released.\nTo manually release the lock, overwrite the\n file %1 on the database server %2 to contain\nthe single character \"0\". - SPM Error Code: U114\n%3", "The first parameter is the pathname to the lock file, the second the IP Address of the DBD and the third the error message from ssh").arg(so->SPMDbDataRoot + "dbversions" + so->DIRDELIMDB + File->name()).arg(so->DbServer).arg(ProcStderr->join("\n")) );
prepProc();
QDir::setCurrent(Path);
Index: spmthreads.cpp
===================================================================
RCS file: /cvsroot/iscs/ISCS/SPM/src/spmthreads.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** spmthreads.cpp 23 Aug 2003 02:49:08 -0000 1.22
--- spmthreads.cpp 27 Aug 2003 11:53:37 -0000 1.23
***************
*** 150,154 ****
delPEPTemp();
if ( ! sh->ProcStderr.isEmpty() ) {
! ErrorCode = sh->tr("Could not clear /etc/PEPTemp directory - U110");
sh->prepProc();
return false;
--- 150,154 ----
delPEPTemp();
if ( ! sh->ProcStderr.isEmpty() ) {
! ErrorCode = sh->tr("Could not clear /etc/PEPTemp directory - U110\n%1", "parameter is the error message from ssh").arg(sh->ProcStderr.join("\n"));
sh->prepProc();
return false;
***************
*** 200,204 ****
}
if ( ! sh->ProcStderr.isEmpty() ) {
! ErrorCode = sh->tr("An unexpected error occurred - %1 - This is probably a failure to communicate with the PEP", "The parameter is the list of errors from Stderr").arg(sh->ProcStderr.join(" "));
sh->prepProc();
return false;
--- 200,204 ----
}
if ( ! sh->ProcStderr.isEmpty() ) {
! ErrorCode = sh->tr("An unexpected error occurred - %1 - This is probably a failure to communicate with the PEP", "The parameter is the list of errors from Stderr").arg(sh->ProcStderr.join("\n"));
sh->prepProc();
return false;
|