[maemo-commits] [maemo-commits] r12106 - in projects/haf/trunk/osso-af-startup: debian services

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-06-05 15:22:33 +0300 (Tue, 05 Jun 2007)
New Revision: 12106

Modified:
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/services/real-af-base-apps
   projects/haf/trunk/osso-af-startup/services/real-af-startup
Log:
fix for backup finalisation


Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2007-06-05 12:17:01 UTC (rev 12105)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2007-06-05 12:22:33 UTC (rev 12106)
@@ -3,8 +3,10 @@
   * UNRELEASED
   * Setting the OOM killer protection more intelligently in af-services.
     (Related to NB#52080.)
+  * Moved the restore finalisation script to be run later. (Related to
+    NB#54498.)
 
- -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 28 May 2007 17:29:11 +0300
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue, 05 Jun 2007 15:19:39 +0300
 
 osso-af-startup (1.41-1) unstable; urgency=low
 

Modified: projects/haf/trunk/osso-af-startup/services/real-af-base-apps
===================================================================
--- projects/haf/trunk/osso-af-startup/services/real-af-base-apps	2007-06-05 12:17:01 UTC (rev 12105)
+++ projects/haf/trunk/osso-af-startup/services/real-af-base-apps	2007-06-05 12:22:33 UTC (rev 12106)
@@ -28,6 +28,11 @@
   # boost desktop startup
   sleep 9
 
+  if [ -f /tmp/run-osso-backup-finish-restore ]; then
+    $AF_INIT_DIR/osso-backup-finish-restore.sh
+    rm -f /tmp/run-osso-backup-finish-restore
+  fi
+
   if [ -x $CONNECTIVITY_UI_SCRIPT ]; then
     source $CONNECTIVITY_UI_SCRIPT start
   fi

Modified: projects/haf/trunk/osso-af-startup/services/real-af-startup
===================================================================
--- projects/haf/trunk/osso-af-startup/services/real-af-startup	2007-06-05 12:17:01 UTC (rev 12105)
+++ projects/haf/trunk/osso-af-startup/services/real-af-startup	2007-06-05 12:22:33 UTC (rev 12106)
@@ -174,7 +174,8 @@
     # Give Backup a chance to finish restoring task
     if [ -f $HOME/.osso-backup/last-restore.xml ]; then
       if [ -x $AF_INIT_DIR/osso-backup-finish-restore.sh ]; then
-        $AF_INIT_DIR/osso-backup-finish-restore.sh
+        touch /tmp/run-osso-backup-finish-restore
+        # $AF_INIT_DIR/osso-backup-finish-restore.sh
       fi
     fi
   fi