Hello community, here is the log from the commit of package kde4-kupdateapplet checked in at Mon Nov 17 17:07:31 CET 2008. -------- --- KDE/kde4-kupdateapplet/kde4-kupdateapplet.changes 2008-11-07 13:50:24.000000000 +0100 +++ /mounts/work_src_done/STABLE/kde4-kupdateapplet/kde4-kupdateapplet.changes 2008-11-17 11:07:25.000000000 +0100 @@ -1,0 +2,12 @@ +Thu Nov 13 16:42:53 CET 2008 - tgoettlicher@suse.de + +- Fixed bnc 444127: kupdateapplet shows error when license is requested +- V 0.8.23 + +------------------------------------------------------------------- +Mon Nov 10 16:55:54 CET 2008 - tgoettlicher@suse.de + +- Fixed bnc #421348: multiple Repository Signature Required messages +- V 0.8.22 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kde4-kupdateapplet-0.8.21.tar.bz2 New: ---- kde4-kupdateapplet-0.8.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde4-kupdateapplet.spec ++++++ --- /var/tmp/diff_new_pack.A20641/_old 2008-11-17 17:06:54.000000000 +0100 +++ /var/tmp/diff_new_pack.A20641/_new 2008-11-17 17:06:54.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kde4-kupdateapplet (Version 0.8.21) +# spec file for package kde4-kupdateapplet (Version 0.8.23) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,12 +24,12 @@ License: GPL v2 only Group: System/YaST Summary: openSUSE System Updater Applet (KDE4) -Version: 0.8.21 +Version: 0.8.23 Release: 1 Url: http://en.opensuse.org/KDE_Updater_Applet BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 -Requires: kde4-kupdateapplet-plugin = 0.8.21 +Requires: kde4-kupdateapplet-plugin = 0.8.23 Requires: oxygen-icon-theme Recommends: smolt # last used in 11.0 @@ -96,7 +96,7 @@ Summary: packagekit plugin for KDE updater applet Requires: PackageKit >= 0.3 Requires: PolicyKit -Provides: kde4-kupdateapplet-plugin = 0.8.21 +Provides: kde4-kupdateapplet-plugin = 0.8.23 %description -n kde4-kupdateapplet-packagekit PackageKit plugin for KDE updater applet for OpenSUSE @@ -115,7 +115,7 @@ Group: System/Packages Summary: zypp plugin for KDE updater applet Requires: zypper >= 0.12.11 -Provides: kde4-kupdateapplet-plugin = 0.8.21 +Provides: kde4-kupdateapplet-plugin = 0.8.23 %description -n kde4-kupdateapplet-zypp zypp plugin for KDE updater applet for OpenSUSE @@ -129,6 +129,12 @@ ############################ %changelog +* Thu Nov 13 2008 tgoettlicher@suse.de +- Fixed bnc 444127: kupdateapplet shows error when license is requested +- V 0.8.23 +* Mon Nov 10 2008 tgoettlicher@suse.de +- Fixed bnc #421348: multiple Repository Signature Required messages +- V 0.8.22 * Fri Nov 07 2008 tgoettlicher@suse.de - Updated translations - V 0.8.21 ++++++ kde4-kupdateapplet-0.8.21.tar.bz2 -> kde4-kupdateapplet-0.8.23.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kde4-kupdateapplet-0.8.21/package/kde4-kupdateapplet.changes new/kde4-kupdateapplet-0.8.23/package/kde4-kupdateapplet.changes --- old/kde4-kupdateapplet-0.8.21/package/kde4-kupdateapplet.changes 2008-11-07 13:50:22.000000000 +0100 +++ new/kde4-kupdateapplet-0.8.23/package/kde4-kupdateapplet.changes 2008-11-17 11:07:23.000000000 +0100 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Thu Nov 13 16:42:53 CET 2008 - tgoettlicher@suse.de + +- Fixed bnc 444127: kupdateapplet shows error when license is requested +- V 0.8.23 + +------------------------------------------------------------------- +Mon Nov 10 16:55:54 CET 2008 - tgoettlicher@suse.de + +- Fixed bnc #421348: multiple Repository Signature Required messages +- V 0.8.22 + +------------------------------------------------------------------- Fri Nov 7 09:56:46 CET 2008 - tgoettlicher@suse.de - Updated translations diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kde4-kupdateapplet-0.8.21/src/logics.cpp new/kde4-kupdateapplet-0.8.23/src/logics.cpp --- old/kde4-kupdateapplet-0.8.21/src/logics.cpp 2008-11-07 13:50:22.000000000 +0100 +++ new/kde4-kupdateapplet-0.8.23/src/logics.cpp 2008-11-17 11:07:23.000000000 +0100 @@ -797,6 +797,7 @@ , _progressTotal (100) , _progressDescription ("") , _skipAutoCheck( false ) + , _systemProfilePopupShownThisSession ( false ) { kDebug() << ": loading logics"; @@ -1172,8 +1173,6 @@ helperprocess->start("/usr/bin/smoltGui"); } - - void Logics::slotDistroUpgrade( const QString &type, const QString &name, const QString &details ) { kDebug() << ". distro upgrade available"; @@ -1208,7 +1207,11 @@ return; } - + if ( _systemProfilePopupShownThisSession ) + { + kDebug() << ". don't show system profile popup because it was shown already"; + return; + } // if the system installes updates try again later // else show popup @@ -1216,6 +1219,7 @@ if ( _state != APPLET_INSTALLING ) { kDebug() << ". emit systemProfile signal"; + _systemProfilePopupShownThisSession = true; emit systemProfile(); } else diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kde4-kupdateapplet-0.8.21/src/logics.h new/kde4-kupdateapplet-0.8.23/src/logics.h --- old/kde4-kupdateapplet-0.8.21/src/logics.h 2008-11-07 13:50:22.000000000 +0100 +++ new/kde4-kupdateapplet-0.8.23/src/logics.h 2008-11-17 11:07:23.000000000 +0100 @@ -143,6 +143,7 @@ bool _skipAutoCheck; QListSolid::Device _lastHardware; QStringList _messages; + bool _systemProfilePopupShownThisSession; signals: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kde4-kupdateapplet-0.8.21/src/notification.cpp new/kde4-kupdateapplet-0.8.23/src/notification.cpp --- old/kde4-kupdateapplet-0.8.21/src/notification.cpp 2008-11-07 13:50:22.000000000 +0100 +++ new/kde4-kupdateapplet-0.8.23/src/notification.cpp 2008-11-17 11:07:23.000000000 +0100 @@ -47,7 +47,7 @@ void Notification::slotMessage(const QString &message) { - KNotification *notification= new KNotification ( "appletmessage", _widget ); + KNotification *notification= new KNotification ( "appletmessage", _widget, KNotification::Persistent ); notification->setText( message ); notification->sendEvent(); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kde4-kupdateapplet-0.8.21/src/packagekit/enums.cpp new/kde4-kupdateapplet-0.8.23/src/packagekit/enums.cpp --- old/kde4-kupdateapplet-0.8.21/src/packagekit/enums.cpp 2008-11-07 13:50:22.000000000 +0100 +++ new/kde4-kupdateapplet-0.8.23/src/packagekit/enums.cpp 2008-11-17 11:07:23.000000000 +0100 @@ -115,3 +115,46 @@ return (FilterEnum)stringValues.key(s); } + +typedef enum { + PK_ERROR_ENUM_OOM, + PK_ERROR_ENUM_NO_NETWORK, + PK_ERROR_ENUM_NOT_SUPPORTED, + PK_ERROR_ENUM_INTERNAL_ERROR, + PK_ERROR_ENUM_GPG_FAILURE, + PK_ERROR_ENUM_PACKAGE_ID_INVALID, + PK_ERROR_ENUM_PACKAGE_NOT_INSTALLED, + PK_ERROR_ENUM_PACKAGE_NOT_FOUND, + PK_ERROR_ENUM_PACKAGE_ALREADY_INSTALLED, + PK_ERROR_ENUM_PACKAGE_DOWNLOAD_FAILED, + PK_ERROR_ENUM_GROUP_NOT_FOUND, + PK_ERROR_ENUM_GROUP_LIST_INVALID, + PK_ERROR_ENUM_DEP_RESOLUTION_FAILED, + PK_ERROR_ENUM_FILTER_INVALID, + PK_ERROR_ENUM_CREATE_THREAD_FAILED, + PK_ERROR_ENUM_TRANSACTION_ERROR, + PK_ERROR_ENUM_TRANSACTION_CANCELLED, + PK_ERROR_ENUM_NO_CACHE, + PK_ERROR_ENUM_REPO_NOT_FOUND, + PK_ERROR_ENUM_CANNOT_REMOVE_SYSTEM_PACKAGE, + PK_ERROR_ENUM_PROCESS_KILL, + PK_ERROR_ENUM_FAILED_INITIALIZATION, + PK_ERROR_ENUM_FAILED_FINALISE, + PK_ERROR_ENUM_FAILED_CONFIG_PARSING, + PK_ERROR_ENUM_CANNOT_CANCEL, + PK_ERROR_ENUM_CANNOT_GET_LOCK, + PK_ERROR_ENUM_NO_PACKAGES_TO_UPDATE, + PK_ERROR_ENUM_CANNOT_WRITE_REPO_CONFIG, + PK_ERROR_ENUM_LOCAL_INSTALL_FAILED, + PK_ERROR_ENUM_BAD_GPG_SIGNATURE, + PK_ERROR_ENUM_MISSING_GPG_SIGNATURE, + PK_ERROR_ENUM_CANNOT_INSTALL_SOURCE_PACKAGE, + PK_ERROR_ENUM_REPO_CONFIGURATION_ERROR, + PK_ERROR_ENUM_NO_LICENSE_AGREEMENT, + PK_ERROR_ENUM_FILE_CONFLICTS, + PK_ERROR_ENUM_REPO_NOT_AVAILABLE, + PK_ERROR_ENUM_INVALID_PACKAGE_FILE, + PK_ERROR_ENUM_PACKAGE_INSTALL_BLOCKED, + PK_ERROR_ENUM_PACKAGE_CORRUPT, + PK_ERROR_ENUM_UNKNOWN +} PkErrorCodeEnum; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kde4-kupdateapplet-0.8.21/src/packagekit/packagekit_updater.cpp new/kde4-kupdateapplet-0.8.23/src/packagekit/packagekit_updater.cpp --- old/kde4-kupdateapplet-0.8.21/src/packagekit/packagekit_updater.cpp 2008-11-07 13:50:22.000000000 +0100 +++ new/kde4-kupdateapplet-0.8.23/src/packagekit/packagekit_updater.cpp 2008-11-17 11:07:23.000000000 +0100 @@ -87,9 +87,16 @@ // getUpdates transaction finished connect(pkConnector, - SIGNAL(UpdatesFinished()), + SIGNAL(GetUpdatesFinished()), this, - SLOT(slotUpdatesFinished()) + SLOT(slotGetUpdatesFinished()) + ); + + // getUpdates transaction finished + connect(pkConnector, + SIGNAL(InstallFinished()), + this, + SLOT(slotInstallFinished()) ); // transaction without progress information @@ -173,6 +180,13 @@ SLOT(slotDistroUpgrade( const QString &, const QString &, const QString &)) ); + connect(pkConnector, + SIGNAL(RepoListFinished()), + this, + SLOT(slotUpdaterRepoSearchFinished()) + ); + + } void PackageKitUpdater::slotStatusChanged( const QString &status ) @@ -284,7 +298,7 @@ pkConnector->getUpdateDetail(QStringList(package_id)); } -void PackageKitUpdater::slotUpdatesFinished() +void PackageKitUpdater::slotGetUpdatesFinished() { ASSERT_LISTS_VALID; @@ -295,23 +309,42 @@ if (_errors) { kDebug() << "there were errors"; - return; + return; + } + + kDebug() << "emiting check finished"; + emit checkFinished(); +} + +void PackageKitUpdater::slotInstallFinished() +{ + if (_errors) + { + kDebug() << "there were errors"; + return; + } + else + { + doCheckForUpdates(); } +} + +void PackageKitUpdater::slotUpdaterRepoSearchFinished() +{ + kDebug() << "finished search for update repositories"; if (!_updateRepoAvailable) { kDebug() << "no update repositories defined"; emit pluginNeedsConfiguration( PLUGIN_CONFIG_NO_UPDATE_REPOS ); - } + } else - { - kDebug() << "emiting check finished"; - - emit checkFinished(); + { + doCheckForUpdates(); } - } + void PackageKitUpdater::slotDriverSearchFinished() { ASSERT_LISTS_VALID; @@ -424,12 +457,19 @@ { } + +void PackageKitUpdater::doCheckForUpdateRepos() +{ + kDebug() << "try to get repolist"; + _updateRepoAvailable=false; + pkConnector->getRepoList(); +} + + void PackageKitUpdater::doCheckForUpdates() { _get_packages_mutex->lock(); _driverSearch = false; - _updateRepoAvailable=false; - pkConnector->getRepoList(); // NOT NEEDED ANYMORE // // first of all: check whether registration ran @@ -450,8 +490,9 @@ _securityAvailable=false; _errors=false; - if (! pkConnector->refreshCache(false) ) - return; +// NOT NEEDED ANYMORE +// if (! pkConnector->refreshCache(false) ) +// return; pkConnector->getUpdates(); _errors = false; @@ -509,7 +550,10 @@ kDebug() << "got populate UI request..."; - doCheckForUpdates(); + doCheckForUpdateRepos(); + + // check whether update repos exist. + // CheckForUpdates() is called if update repos are available } void PackageKitUpdater::slotResolvableSelected(QTreeWidgetItem *item, int resolvableType) @@ -586,8 +630,6 @@ pkConnector->updatePackages(packageIds); - if (!_errors) - doCheckForUpdates(); } void PackageKitUpdater::slotRepoSignatureRequired(const QString &package_id, const QString &repository_name, @@ -677,6 +719,8 @@ void PackageKitUpdater::slotRequireRestart(const QString& type, const QString& details) { + kDebug() << "RequireRestart" << type << ": " << details; + if (type == "system") emit message(i18n("Reboot your system as soon as possible.\n%1").arg(details)); else if (type == "session") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kde4-kupdateapplet-0.8.21/src/packagekit/packagekit_updater.h new/kde4-kupdateapplet-0.8.23/src/packagekit/packagekit_updater.h --- old/kde4-kupdateapplet-0.8.21/src/packagekit/packagekit_updater.h 2008-11-07 13:50:22.000000000 +0100 +++ new/kde4-kupdateapplet-0.8.23/src/packagekit/packagekit_updater.h 2008-11-17 11:07:23.000000000 +0100 @@ -75,7 +75,8 @@ * this slot is connected to the transaction finished * slot from the connector which emits a signal if the * transaction was updates */ - void slotUpdatesFinished(); + void slotGetUpdatesFinished(); + void slotInstallFinished(); void slotDriverSearchFinished(); void slotShowEula(const QString& eula_id, const QString& package_id, const QString& vendor_name, @@ -93,6 +94,7 @@ void slotCheckDistroUpgrade(); void slotDistroUpgrade( const QString &type, const QString &name, const QString &details ); + void slotUpdaterRepoSearchFinished(); protected slots: @@ -104,6 +106,7 @@ void doCheckForUpdates(); void doCheckForDrivers(); void doCheckForFirmware(); + void doCheckForUpdateRepos(); QPackageKitConnector* pkConnector ; QTreeWidget *_patchList; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kde4-kupdateapplet-0.8.21/src/packagekit/qpackagekitconnector.cpp new/kde4-kupdateapplet-0.8.23/src/packagekit/qpackagekitconnector.cpp --- old/kde4-kupdateapplet-0.8.21/src/packagekit/qpackagekitconnector.cpp 2008-11-07 13:50:22.000000000 +0100 +++ new/kde4-kupdateapplet-0.8.23/src/packagekit/qpackagekitconnector.cpp 2008-11-17 11:07:23.000000000 +0100 @@ -125,7 +125,19 @@ void QPackageKitConnector::slotError(const QString& code, const QString& message) { - emit ErrorMessage("PackageKit Error " + code + ": " + message); + // ignore errors which can be handled by showing a + // popup and restart transaction afterwards + + if (code == "no-license-agreement" || + code == "bad-gpg-signature" || + code == "gpg-failure" || + code == "missing-gpg-signature" ) + { + kWarning() << "ignoring packagekit error: " << code << endl; + + return; + } + emit ErrorMessage("PackageKit Error " + code + ": " + message); } QPackageKitTransactionInterface* QPackageKitConnector::connectToInterface() @@ -673,23 +685,31 @@ } else { - kDebug() << "role replay valid: " << param << " " << reply.value(); - - if ( reply.value() == "get-updates" ) - emit UpdatesFinished(); + kDebug() << "role replay valid: " << param << " " << reply.value(); - if ( reply.value() == "what-provides" ) - emit UpdatesFinished(); + if ( reply.value() == "get-updates" || + reply.value() == "what-provides" || + reply.value() == "search-file" ) + emit GetUpdatesFinished(); + + if ( reply.value() == "get-repo-list" ) + emit RepoListFinished(); + + if ( reply.value() == "update-system" || + reply.value() == "install-package" || + reply.value() == "install-packages" || + reply.value() == "install-file" || + reply.value() == "install-files" || + reply.value() == "update-package" || + reply.value() == "update-packages" ) + emit InstallFinished(); - if ( reply.value() == "search-file" ) - emit UpdatesFinished(); - - kDebug() << reply.value() ; + kDebug() << reply.value() ; - } - disconnectFromInterface(transactioninterface); - emit Finished(Exit::fromString(status), runtime); + disconnectFromInterface(transactioninterface); + emit Finished(Exit::fromString(status), runtime); + } } else { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kde4-kupdateapplet-0.8.21/src/packagekit/qpackagekitconnector.h new/kde4-kupdateapplet-0.8.23/src/packagekit/qpackagekitconnector.h --- old/kde4-kupdateapplet-0.8.21/src/packagekit/qpackagekitconnector.h 2008-11-07 13:50:22.000000000 +0100 +++ new/kde4-kupdateapplet-0.8.23/src/packagekit/qpackagekitconnector.h 2008-11-17 11:07:23.000000000 +0100 @@ -190,7 +190,14 @@ void Finished(QPackageKitConnector::Exit::ExitEnum exitCode, uint runtime); //! Emitted when getUpdates transaction is finished - void UpdatesFinished(); + void GetUpdatesFinished(); + + //! Emitted when updates or package installation transaction is finished + void InstallFinished(); + + + //! Emitted when getRepoList transaction is finished + void RepoListFinished(); //! Emitted when the current transaction's progress changes void ProgressChanged(uint percentage, uint subpercentage, uint elapsed, uint remaining); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kde4-kupdateapplet-0.8.21/src/updaterapplication.cpp new/kde4-kupdateapplet-0.8.23/src/updaterapplication.cpp --- old/kde4-kupdateapplet-0.8.21/src/updaterapplication.cpp 2008-11-07 13:50:22.000000000 +0100 +++ new/kde4-kupdateapplet-0.8.23/src/updaterapplication.cpp 2008-11-17 11:07:23.000000000 +0100 @@ -203,7 +203,7 @@ { QMessageBox::critical( NULL, PROGRAM_DISPLAY_NAME, QString( i18n( "Unable to find any backend plugin. " - "Please install one and restart %1", QString( PROGRAM_DISPLAY_NAME ) ) ) ); + "Please install one and restart %1", QString( PROGRAM_DISPLAY_NAME ) ) ) ); return KService::Ptr(); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kde4-kupdateapplet-0.8.21/VERSION.cmake new/kde4-kupdateapplet-0.8.23/VERSION.cmake --- old/kde4-kupdateapplet-0.8.21/VERSION.cmake 2008-11-07 13:50:22.000000000 +0100 +++ new/kde4-kupdateapplet-0.8.23/VERSION.cmake 2008-11-17 11:07:22.000000000 +0100 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "0") SET(VERSION_MINOR "8") -SET(VERSION_PATCH "21") +SET(VERSION_PATCH "23") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org