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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-10-22 14:40:19 +0300 (Mon, 22 Oct 2007)
New Revision: 14564

Modified:
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/osso-af-startup.sudoers
   projects/haf/trunk/osso-af-startup/services/af-defines.sh
Log:
osso-product-info code in af-defines.sh can now handle simultaneous callers


Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2007-10-22 11:22:34 UTC (rev 14563)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2007-10-22 11:40:19 UTC (rev 14564)
@@ -1,3 +1,10 @@
+osso-af-startup (1.49-1~unreleased) unstable; urgency=low
+
+  * Fixed the osso-product-info code to handle multiple simultaneous users.
+    Fixes: NB#69969
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 22 Oct 2007 14:30:17 +0300
+
 osso-af-startup (1.48-1) unstable; urgency=low
 
   * Added at-spi startup and shutdown.

Modified: projects/haf/trunk/osso-af-startup/osso-af-startup.sudoers
===================================================================
--- projects/haf/trunk/osso-af-startup/osso-af-startup.sudoers	2007-10-22 11:22:34 UTC (rev 14563)
+++ projects/haf/trunk/osso-af-startup/osso-af-startup.sudoers	2007-10-22 11:40:19 UTC (rev 14564)
@@ -5,5 +5,5 @@
 user ALL = NOPASSWD: /etc/init.d/osso-hss start
 user ALL = NOPASSWD: /etc/init.d/osso-hss stop
 user ALL = NOPASSWD: /usr/bin/osso-product-info
-user ALL = NOPASSWD: /bin/rm -f /tmp/.opi.tmp
+user ALL = NOPASSWD: mv -f /tmp/.opi.tmp.tmp /tmp/.opi.tmp
 

Modified: projects/haf/trunk/osso-af-startup/services/af-defines.sh
===================================================================
--- projects/haf/trunk/osso-af-startup/services/af-defines.sh	2007-10-22 11:22:34 UTC (rev 14563)
+++ projects/haf/trunk/osso-af-startup/services/af-defines.sh	2007-10-22 11:40:19 UTC (rev 14564)
@@ -118,22 +118,22 @@
   source_if_is keyboard.defs
   source_if_is sdl.defs
 
-  if [ -x /usr/bin/osso-product-info ]; then
+  if [ ! -e /tmp/.opi.tmp -a -x /usr/bin/osso-product-info ]; then
     if [ "x$USER" = "xroot" ]; then
       _SUDO=''
     else
       _SUDO='sudo'
     fi
-    $_SUDO /usr/bin/osso-product-info 1> /tmp/.opi.tmp 2> /dev/null
-    if [ -r /tmp/.opi.tmp ]; then
-      VNAMES=`awk -F '=' '{print $1}' < /tmp/.opi.tmp`
-      source /tmp/.opi.tmp
-      export $VNAMES
-      unset VNAMES
-    fi
-    $_SUDO rm -f /tmp/.opi.tmp
+    $_SUDO /usr/bin/osso-product-info 1> /tmp/.opi.tmp.tmp 2> /dev/null
+    $_SUDO mv -f /tmp/.opi.tmp.tmp /tmp/.opi.tmp
     unset _SUDO
   fi
+  if [ -r /tmp/.opi.tmp ]; then
+    VNAMES=`awk -F '=' '{print $1}' < /tmp/.opi.tmp`
+    source /tmp/.opi.tmp
+    export $VNAMES
+    unset VNAMES
+  fi
 
   export AF_DEFINES_SOURCED=1