[maemo-commits] [maemo-commits] r14234 - in projects/connectivity/osso-bluez-compat/trunk: . debian etc

[From: subversion at stage.maemo.org]

Author: jh
Date: 2007-10-01 15:38:30 +0300 (Mon, 01 Oct 2007)
New Revision: 14234

Modified:
   projects/connectivity/osso-bluez-compat/trunk/configure.ac
   projects/connectivity/osso-bluez-compat/trunk/debian/changelog
   projects/connectivity/osso-bluez-compat/trunk/etc/bluez-restore.sh
Log:
Get the backed up mode value correctly

Modified: projects/connectivity/osso-bluez-compat/trunk/configure.ac
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/configure.ac	2007-10-01 12:01:46 UTC (rev 14233)
+++ projects/connectivity/osso-bluez-compat/trunk/configure.ac	2007-10-01 12:38:30 UTC (rev 14234)
@@ -1,4 +1,4 @@
-AC_INIT([osso-bluez-compat],[0.12])
+AC_INIT([osso-bluez-compat],[0.13])
 
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)

Modified: projects/connectivity/osso-bluez-compat/trunk/debian/changelog
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/debian/changelog	2007-10-01 12:01:46 UTC (rev 14233)
+++ projects/connectivity/osso-bluez-compat/trunk/debian/changelog	2007-10-01 12:38:30 UTC (rev 14234)
@@ -1,3 +1,9 @@
+osso-bluez-compat (0.13) unstable; urgency=low
+
+  * Read the backed up mode value correctlye. Fixes: NB#67991 
+
+ -- Johan Hedberg <johan.hedberg at nokia.com>  Mon,  1 Oct 2007 12:38:12 +0000
+
 osso-bluez-compat (0.12) unstable; urgency=low
 
   * Restore previous mode if backup has no info about it. Fixes: NB#67991

Modified: projects/connectivity/osso-bluez-compat/trunk/etc/bluez-restore.sh
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/etc/bluez-restore.sh	2007-10-01 12:01:46 UTC (rev 14233)
+++ projects/connectivity/osso-bluez-compat/trunk/etc/bluez-restore.sh	2007-10-01 12:38:30 UTC (rev 14234)
@@ -26,6 +26,8 @@
 	mv $OLD_DIR $CORRECT_DIR
 fi
 
+BK_MODE=`egrep ^mode $CORRECT_DIR/config|awk '{ print $2 }'`
+
 OLD_MODE=`dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.GetMode|tail -n 1|awk '{ print $2 }'|sed s/\"//g`
 
 dbus-send --system --print-reply --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetMode string:connectable > /dev/null
@@ -46,12 +48,12 @@
 
 MODE=""
 
-if [ -f "$CORRECT_DIR/config" ]; then
-	MODE=`egrep ^mode $CORRECT_DIR/config|awk '{ print $2 }'`
-fi
-
-if [ -z "$MODE" ]; then
+if [ "$BK_MODE" ]; then
+	MODE=$BK_MODE
+elif [ "$OLD_MODE" ]; then
 	MODE=$OLD_MODE
+else
+	MODE="off"
 fi
 
 dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetMode string:$MODE > /dev/null