[Assorted-commits] SF.net SVN: assorted:[1844] shell-tools/trunk/src/bash-commons/bashrc.bash

[<yan...@us...>]

Revision: 1844
          http://assorted.svn.sourceforge.net/assorted/?rev=1844&view=rev
Author:   yangzhang
Date:     2013-03-12 23:22:33 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
Work around keychain bug

Modified Paths:
--------------
    shell-tools/trunk/src/bash-commons/bashrc.bash

Modified: shell-tools/trunk/src/bash-commons/bashrc.bash
===================================================================
--- shell-tools/trunk/src/bash-commons/bashrc.bash	2012-10-19 10:49:16 UTC (rev 1843)
+++ shell-tools/trunk/src/bash-commons/bashrc.bash	2013-03-12 23:22:33 UTC (rev 1844)
@@ -884,7 +884,12 @@
 then keyfile=id_dsa
 else keyfile=
 fi
-if have keychain && [[ $keyfile ]]
+# Inherit to reuse gdm or agent-forwarding.
+# Unfortunately, broken in 2.7.1: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=502468
+#if have keychain && [[ $keyfile ]]
+#then eval `keychain --inherit any --eval --nogui $keychain_flags $keyfile 2> /dev/null`
+#fi
+if have keychain && [[ $keyfile ]] && [[ ! "$SSH_AUTH_SOCK" ]]
 then eval `keychain --eval --nogui $keychain_flags $keyfile 2> /dev/null`
 fi
 
@@ -915,3 +920,7 @@
 if type virtualenvwrapper.sh &> /dev/null
 then . virtualenvwrapper.sh
 fi
+
+if [[ -f /etc/bash_completion.d/virtualenvwrapper ]]
+then . /etc/bash_completion.d/virtualenvwrapper
+fi

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.