[maemo-commits] [maemo-commits] r15758 - projects/haf/trunk/maemo-launcher/debian

[From: subversion at stage.maemo.org]

Author: guillem
Date: 2008-07-10 19:58:02 +0300 (Thu, 10 Jul 2008)
New Revision: 15758

Modified:
   projects/haf/trunk/maemo-launcher/debian/changelog
   projects/haf/trunk/maemo-launcher/debian/init.d
Log:
Sources af-defines.sh at the beginning

To avoid it unconditionally overriding the USER variable (among
others). (Fixes: NB#86855)

Modified: projects/haf/trunk/maemo-launcher/debian/changelog
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/changelog	2008-07-10 15:33:07 UTC (rev 15757)
+++ projects/haf/trunk/maemo-launcher/debian/changelog	2008-07-10 16:58:02 UTC (rev 15758)
@@ -1,3 +1,10 @@
+maemo-launcher (0.31-2) UNRELEASED; urgency=low
+
+  * Sources af-defines.sh at the beginning to avoid it unconditionally
+    overriding the USER variable (among others). (Fixes: NB#86855)
+
+ -- Guillem Jover <guillem.jover at nokia.com>  Thu, 10 Jul 2008 19:23:39 +0300
+
 maemo-launcher (0.31-1) unstable; urgency=low
 
   * Export USER, LOGNAME, SHELL and HOME to maemo-launcher. (Fixes: MM#1131)

Modified: projects/haf/trunk/maemo-launcher/debian/init.d
===================================================================
--- projects/haf/trunk/maemo-launcher/debian/init.d	2008-07-10 15:33:07 UTC (rev 15757)
+++ projects/haf/trunk/maemo-launcher/debian/init.d	2008-07-10 16:58:02 UTC (rev 15758)
@@ -11,6 +11,21 @@
 DAEMON_BASE_OPTS="--daemon --booster gtk"
 PIDFILE=/tmp/$NAME.pid
 
+# Those files set needed environment variables for the Maemo applications
+# FIXME: but this should not be needed either, and should be inherited from
+#        the session instead.
+
+# OSSO AF Init definitions
+DEFSDIR=/etc/osso-af-init/
+
+if [ -e $DEFSDIR/af-defines.sh ]
+then
+  . $DEFSDIR/af-defines.sh
+else
+  echo "$DEFSDIR/af-defines.sh not found!"
+  exit 1
+fi
+
 # When inside scratchbox we are not really root nor do we have 'user' user
 if [ -f /targets/links/scratchbox.config ]; then
   DAEMON_OPTS="$DAEMON_BASE_OPTS"
@@ -35,21 +50,6 @@
 
 set -e
 
-# Those files set needed environment variables for the Maemo applications
-# FIXME: but this should not be needed either, and should be inherited from
-#        the session instead.
-
-# OSSO AF Init definitions
-DEFSDIR=/etc/osso-af-init/
-
-if [ -e $DEFSDIR/af-defines.sh ]
-then
-  . $DEFSDIR/af-defines.sh
-else
-  echo "$DEFSDIR/af-defines.sh not found!"
-  exit 1
-fi
-
 case "$1" in
   start)
     echo -n "Starting $DESC: $NAME"