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

[From: subversion at stage.maemo.org]

Author: jh
Date: 2007-09-07 13:02:53 +0300 (Fri, 07 Sep 2007)
New Revision: 13664

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:
Restore previous mode if backup has no info about it

Modified: projects/connectivity/osso-bluez-compat/trunk/configure.ac
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/configure.ac	2007-09-07 08:57:41 UTC (rev 13663)
+++ projects/connectivity/osso-bluez-compat/trunk/configure.ac	2007-09-07 10:02:53 UTC (rev 13664)
@@ -1,4 +1,4 @@
-AC_INIT([osso-bluez-compat],[0.11])
+AC_INIT([osso-bluez-compat],[0.12])
 
 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-09-07 08:57:41 UTC (rev 13663)
+++ projects/connectivity/osso-bluez-compat/trunk/debian/changelog	2007-09-07 10:02:53 UTC (rev 13664)
@@ -1,3 +1,9 @@
+osso-bluez-compat (0.12) unstable; urgency=low
+
+  * Restore previous mode if backup has no info about it. Fixes: NB#67991
+
+ -- Johan Hedberg <johan.hedberg at nokia.com>  Fri,  7 Sep 2007 10:00:06 +0000
+
 osso-bluez-compat (0.11) unstable; urgency=low
 
   * Make sure bluetooth is enabled when calling CUD script. Fixes: NB#66106 

Modified: projects/connectivity/osso-bluez-compat/trunk/etc/bluez-restore.sh
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/etc/bluez-restore.sh	2007-09-07 08:57:41 UTC (rev 13663)
+++ projects/connectivity/osso-bluez-compat/trunk/etc/bluez-restore.sh	2007-09-07 10:02:53 UTC (rev 13664)
@@ -26,6 +26,8 @@
 	mv $OLD_DIR $CORRECT_DIR
 fi
 
+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
 
 NAME=""
@@ -48,7 +50,9 @@
 	MODE=`egrep ^mode $CORRECT_DIR/config|awk '{ print $2 }'`
 fi
 
-if [ "$MODE" ]; then
-	dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetMode string:$MODE > /dev/null
+if [ -z "$MODE" ]; then
+	MODE=$OLD_MODE
 fi
 
+dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetMode string:$MODE > /dev/null
+