Hello community,
here is the log from the commit of package kdepimlibs4 for openSUSE:Factory
checked in at Thu Jun 3 14:43:33 CEST 2010.
--------
--- KDE/kdepimlibs4/kdepimlibs4.changes 2010-05-17 15:12:34.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdepimlibs4/kdepimlibs4.changes 2010-05-31 22:42:30.000000000 +0200
@@ -1,0 +2,6 @@
+Mon May 31 20:34:20 UTC 2010 - wstephenson@novell.com
+
+- Don't attempt to migrate KResources to Akonadi on every login of
+ a new user (bnc#591483)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
kres-migrate-only-when-resources-present.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepimlibs4.spec ++++++
--- /var/tmp/diff_new_pack.4MzatZ/_old 2010-06-03 14:43:26.000000000 +0200
+++ /var/tmp/diff_new_pack.4MzatZ/_new 2010-06-03 14:43:26.000000000 +0200
@@ -24,9 +24,10 @@
Summary: KDE PIM Libraries
Url: http://www.kde.org
Version: 4.4.3
-Release: 2
+Release: 3
Source0: kdepimlibs-%version.tar.bz2
Patch0: 4_4_BRANCH.diff
+Patch1: kres-migrate-only-when-resources-present.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: libkdepimlibs4 = %version
Requires: kdelibs4 >= %( echo `rpm -q --queryformat '%{VERSION}' libkde4-devel`)
@@ -45,6 +46,7 @@
%prep
%setup -q -n kdepimlibs-%version
%patch0
+%patch1
%build
%cmake_kde4 -d build -- -DKDE4_ENABLE_FINAL=1
++++++ kres-migrate-only-when-resources-present.diff ++++++
Index: kresources/factory.cpp
===================================================================
--- kresources/factory.cpp (revision 1132835)
+++ kresources/factory.cpp (working copy)
@@ -46,6 +46,7 @@
#include
#include "resource.h"
+#include "managerimpl.h"
using namespace KRES;
@@ -79,38 +80,42 @@
// Akonadi migration
KConfig config( "kres-migratorrc" );
- KConfigGroup migrationCfg( &config, "Migration" );
- const bool enabled = migrationCfg.readEntry( "Enabled", false );
- const bool setupClientBrige = migrationCfg.readEntry( "SetupClientBridge", true );
- const int currentVersion = migrationCfg.readEntry( "Version-" + resourceFamily, 0 );
- const int targetVersion = migrationCfg.readEntry( "TargetVersion", 0 );
- if ( enabled && currentVersion < targetVersion ) {
- kDebug() << "Performing Akonadi migration. Good luck!";
- KProcess proc;
- QStringList args = QStringList() << "--interactive-on-change" << "--type" << resourceFamily;
- if ( !setupClientBrige ) {
- args << "--omit-client-bridge";
+ // check that resource
+ if ( QFile( KRES::ManagerImpl::defaultConfigFile( resourceFamily ) ).exists() ) {
+ KConfigGroup migrationCfg( &config, "Migration" );
+ const bool enabled = migrationCfg.readEntry( "Enabled", false );
+ const bool setupClientBrige = migrationCfg.readEntry( "SetupClientBridge", true );
+ const int currentVersion = migrationCfg.readEntry( "Version-" + resourceFamily, 0 );
+ const int targetVersion = migrationCfg.readEntry( "TargetVersion", 0 );
+ if ( enabled && currentVersion < targetVersion ) {
+ kDebug() << "Performing Akonadi migration. Good luck!";
+ KProcess proc;
+ QStringList args = QStringList() << "--interactive-on-change" << "--type" << resourceFamily;
+ if ( !setupClientBrige ) {
+ args << "--omit-client-bridge";
+ }
+ proc.setProgram( "kres-migrator", args );
+ proc.start();
+ bool result = proc.waitForStarted();
+ if ( result ) {
+ result = proc.waitForFinished();
+ }
+ if ( result && proc.exitCode() == 0 ) {
+ kDebug() << "Akonadi migration has been successful";
+ migrationCfg.writeEntry( "Version-" + resourceFamily, targetVersion );
+ migrationCfg.sync();
+ } else if ( !result || proc.exitCode() != 1 ) {
+ // exit code 1 means it is already running, so we are probably called by a migrator instance
+ kError() << "Akonadi migration failed!";
+ kError() << "command was: " << proc.program();
+ kError() << "exit code: " << proc.exitCode();
+ kError() << "stdout: " << proc.readAllStandardOutput();
+ kError() << "stderr: " << proc.readAllStandardError();
+ }
}
- proc.setProgram( "kres-migrator", args );
- proc.start();
- bool result = proc.waitForStarted();
- if ( result ) {
- result = proc.waitForFinished();
- }
- if ( result && proc.exitCode() == 0 ) {
- kDebug() << "Akonadi migration has been successful";
- migrationCfg.writeEntry( "Version-" + resourceFamily, targetVersion );
- migrationCfg.sync();
- } else if ( !result || proc.exitCode() != 1 ) {
- // exit code 1 means it is already running, so we are probably called by a migrator instance
- kError() << "Akonadi migration failed!";
- kError() << "command was: " << proc.program();
- kError() << "exit code: " << proc.exitCode();
- kError() << "stdout: " << proc.readAllStandardOutput();
- kError() << "stderr: " << proc.readAllStandardError();
- }
+ } else {
+ kDebug() << "Resource" << resourceFamily << "does not exist, skipping!";
}
-
}
return factory;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org