[debian-edu-commits] debian-edu/ 164/183: Undo change that seem to have been done by mistake when the japanese translation was updated. It is not mentioned in the changelog.

[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 6796d6b03a0628ae3f9617cf622164f72cdd8cdd
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sat Aug 17 11:48:42 2013 +0000

    Undo change that seem to have been done by mistake when the japanese translation was updated.  It is not mentioned in the changelog.
---
 20desktop-profiles_activateDesktopProfiles | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/20desktop-profiles_activateDesktopProfiles b/20desktop-profiles_activateDesktopProfiles
index f4e952c..70a8879 100644
--- a/20desktop-profiles_activateDesktopProfiles
+++ b/20desktop-profiles_activateDesktopProfiles
@@ -367,21 +367,18 @@ if (test $INSTALLED = true); then
                         /etc/default/desktop-profiles \
                         "$CACHE_FILE" 2> /dev/null | \
 	       head -1) = "$CACHE_FILE"); then
-      # if the cache holds sets any profiles -> 
       # export the variable settings in the cache file after replacing 
       # the placeholders for the current variable values with said values 
       # (the location of placeholders is based on the active personalitytype)
-      if( grep = "$CACHE_FILE" > /dev/null 2>&1 ); then
-        export $(cat "$CACHE_FILE" | sed -e "s|\\\$KDEDIRS|$KDEDIRS|" \
+      export $(cat "$CACHE_FILE" | sed -e "s|\\\$KDEDIRS|$KDEDIRS|" \
                             -e "s|\\\$XDG_CONFIG_DIRS|$XDG_CONFIG_DIRS|" \
                             -e "s|\\\$XDG_DATA_DIRS|$XDG_DATA_DIRS|" \
                             -e "s|\\\$CHOICESPATH|$CHOICESPATH|" \
                             -e "s|\\\$GNUSTEP_PATHLIST|$GNUSTEP_PATHLIST|" \
 			    -e "s|\\\$UDEdir|$UDEdir|" );
     
-        # UDEdir only holds 1 dir, so drop every dir except the first nonempty one
-        export UDEdir=$(echo $UDEdir | sed 's|^:||' | cut --fields 1 --delimiter ":");
-      fi;	
+      # UDEdir only holds 1 dir, so drop every dir except the first nonempty one
+      export UDEdir=$(echo $UDEdir | sed 's|^:||' | cut --fields 1 --delimiter ":");
     # else if we have any profile kinds we're interested in, then go 
     # calculate the profile assignments
     elif (test "$ACTIVE_PROFILE_KINDS"x != "x"); then

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