Author: tgoettlicher Date: Thu Aug 2 21:31:56 2007 New Revision: 6410 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6410&view=rev Log: backup Modified: trunk/updater-kde/updater/zypp/ZYppUpdater.cpp Modified: trunk/updater-kde/updater/zypp/ZYppUpdater.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp/ZYppUpdater.cpp?rev=6410&r1=6409&r2=6410&view=diff ============================================================================== --- trunk/updater-kde/updater/zypp/ZYppUpdater.cpp (original) +++ trunk/updater-kde/updater/zypp/ZYppUpdater.cpp Thu Aug 2 21:31:56 2007 @@ -70,7 +70,6 @@ _xml_reader.setContentHandler(this); resetXmlStream(); - //_xml_source.setData( "<stream>" ); } UpdaterCapabilities ZYppUpdater::capabilities() @@ -96,10 +95,16 @@ if (p->exitStatus() == 103 ) { + kdDebug() << "restarting now..." << endl; system("( sleep 2; opensuseupdater-kde ) & "); kapp->quit(); } + if (_error) + updateAppletError("Error"); + + +/* if ( !_install_stderr_buffer.isEmpty() || !_install_stdout_buffer.isEmpty() ) { // some errors/warnings occured @@ -120,13 +125,12 @@ updateAppletError( i18n("helper program returned:\n%1").arg(message)); } +*/ _install_stderr_buffer.truncate(0); _install_stdout_buffer.truncate(0); - delete p; + delete _process; _process = 0L; - - } void ZYppUpdater::resetXmlStream() @@ -153,6 +157,12 @@ delete _process; _process = 0L; + if (_error) + { + QMessageBox::critical( NULL, PROGRAM_DISPLAY_NAME, _error_buffer); + updateAppletError("_error_buffer"); + } + // parse the xml if ( ! _last_xml_parse_code ) @@ -225,12 +235,6 @@ else emit(updateApplet(APPLET_NO_UPDATES, 0, 0)); - // TODO - if ( _message ) - { - emit(updateAppletError(_error_buffer)); - _message_buffer.truncate(0); - } if ( _error ) { @@ -314,6 +318,7 @@ } resetXmlStream(); + _error=false; _process = new KProcess; *_process << "/usr/sbin/zypp-checkpatches-wrapper"; @@ -438,6 +443,7 @@ } resetXmlStream(); + _error=false; kdDebug() << "_process" << endl; _process = new KProcess; @@ -532,12 +538,19 @@ { _state = Errors; } - if ( (qName == "message") && (_state == Unknown ) ) + if ( qName == "message") { - _state = Message; - _message = true; - } - if ( (qName == "progress")) + if (atts.value("type") == "error") + { + _error = true; + _error_buffer += atts.value("text"); + } + else + { + QMessageBox::information( NULL, PROGRAM_DISPLAY_NAME, atts.value("text")); + } + } + if (qName == "progress") { _state = Progress; if ( atts.value("type") == "done" ) @@ -625,7 +638,6 @@ } if ( (qName == "message") && (_state == Message ) ) { - _message_buffer += "\n"; _state = Unknown; } if ( ( qName == "progress" )) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org