[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/kjots
From:       Stephen Kelly <steveire () gmail ! com>
Date:       2010-06-21 10:27:56
Message-ID: 20100621102756.8E9B3AC8DA () svn ! kde ! org
[Download RAW message or body]

SVN commit 1140696 by skelly:

Update the config that the migration succeeded, even if it didn't.

Workaround for inexplicable bug.

 M  +3 -3      kjotswidget.cpp  


--- trunk/KDE/kdepim/kjots/kjotswidget.cpp #1140695:1140696
@@ -568,9 +568,6 @@
     }
     if ( result && proc.exitCode() == 0 ) {
       kDebug() << "Akonadi migration has been successful";
-      migrationCfg.writeEntry( "Version", targetVersion );
-      migrationCfg.writeEntry( "Completed", true );
-      migrationCfg.sync();
     } else {
       // exit code 1 means it is already running, so we are probably called by a migrator instance
       kError() << "Akonadi migration failed!";
@@ -579,6 +576,9 @@
       kError() << "stdout: " << proc.readAllStandardOutput();
       kError() << "stderr: " << proc.readAllStandardError();
     }
+    migrationCfg.writeEntry( "Version", targetVersion );
+    migrationCfg.writeEntry( "Completed", true );
+    migrationCfg.sync();
   }
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]