[debian-edu-commits] debian-edu/ 41/183: Avoid hanging x-startup when trying to activate an unsupported profile kind (might happen due to typo's in the setup of ACTIVE_PROFILE_KINDS in the config file)

[Alexander Alemayhu]

This is an automated email from the git hooks/post-receive script.

ccscanf-guest pushed a commit to branch master
in repository desktop-profiles.

commit 5d62c4ee4b508cc6654306cdc23038ef75110b59
Author: Bart Cornelis <cobaco at linux.be>
Date:   Wed Jan 12 12:24:48 2005 +0000

    Avoid hanging x-startup when trying to activate an unsupported profile kind
    (might happen due to typo's in the setup of ACTIVE_PROFILE_KINDS in the
    config file)
---
 20desktop-profiles_activateDesktopProfiles | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/20desktop-profiles_activateDesktopProfiles b/20desktop-profiles_activateDesktopProfiles
index 421c9a0..bbb8cb7 100644
--- a/20desktop-profiles_activateDesktopProfiles
+++ b/20desktop-profiles_activateDesktopProfiles
@@ -174,6 +174,8 @@ activate_GCONF () {
     PROFILES_LIST=$(sort_profiles) 
 
     for KIND in $ACTIVE_PROFILE_KINDS; do
-      activate_$KIND;
+      # || true is to avoid hanging x-startup when trying a non-existing KIND
+      # which can happen e.g. due to typo's in the config file.
+      activate_$KIND || true;
     done;
   fi;  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/desktop-profiles.git