Hello community, here is the log from the commit of package aaa_base checked in at Mon Feb 26 18:59:55 CET 2007. -------- --- aaa_base/aaa_base.changes 2007-02-15 14:29:01.000000000 +0100 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2007-02-26 16:13:17.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Feb 26 16:06:05 CET 2007 - werner@suse.de + +- Do not source bashrc twice if sourcing profile for ssh (#244788) +- Expand local ./files for manual pages within bash (#248865) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.d11541/_old 2007-02-26 18:59:34.000000000 +0100 +++ /var/tmp/diff_new_pack.d11541/_new 2007-02-26 18:59:34.000000000 +0100 @@ -19,7 +19,7 @@ PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv net-tools Autoreqprov: on Version: 10.3 -Release: 11 +Release: 12 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -144,7 +144,10 @@ %files -f aaa_base.files %defattr(-,root,root) -%changelog -n aaa_base +%changelog +* Mon Feb 26 2007 - werner@suse.de +- Do not source bashrc twice if sourcing profile for ssh (#244788) +- Expand local ./files for manual pages within bash (#248865) * Thu Feb 15 2007 - werner@suse.de - Use plain bourne shell syntax for bug #231716 (bug #245740) * Wed Feb 14 2007 - werner@suse.de ++++++ aaa_base.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/bash.bashrc new/aaa_base/etc/bash.bashrc --- old/aaa_base/etc/bash.bashrc 2007-02-15 14:24:27.000000000 +0100 +++ new/aaa_base/etc/bash.bashrc 2007-02-26 15:41:56.000000000 +0100 @@ -283,10 +283,28 @@ esac # +# The bash sources ~/.bashrc if exists, remember this here +# +if test "$is" = "bash" -a -z "$_HOMEBASHRC" ; then + readonly _HOMEBASHRC=true +fi + +# +# The ksh sources ~/.kshrc if exists, remember this here +# +if test "$is" = "ksh" -a -z "$_HOMEKSHRC" ; then + if test -n "$ENV" -a "$ENV" != "\$HOME/.kshrc" ; then + readonly _HOMEKSHRC=true + fi +fi + +# # Just in case the user excutes a command with ssh # -if test -n "$SSH_CLIENT" -a -z "$PROFILEREAD" ; then +if test -n "$SSH_CONNECTION" -a -z "$PROFILEREAD" ; then + _SOURCED_FOR_SSH=true . /etc/profile > /dev/null 2>&1 + unset _SOURCED_FOR_SSH fi if test "$is" != "ash" ; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/csh.cshrc new/aaa_base/etc/csh.cshrc --- old/aaa_base/etc/csh.cshrc 2006-04-27 17:15:56.000000000 +0200 +++ new/aaa_base/etc/csh.cshrc 2007-02-26 15:51:01.000000000 +0100 @@ -200,8 +200,10 @@ # # Just in case the user excutes a command with ssh # -if ( ${?SSH_CLIENT} && ! ${?CSHRCREAD} ) then +if ( ${?SSH_CONNECTION} && ! ${?CSHRCREAD} ) then + set _SOURCED_FOR_SSH=true source /etc/csh.login >& /dev/null + unset _SOURCED_FOR_SSH endif # diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/profile new/aaa_base/etc/profile --- old/aaa_base/etc/profile 2007-02-14 10:40:58.000000000 +0100 +++ new/aaa_base/etc/profile 2007-02-26 16:23:54.000000000 +0100 @@ -309,13 +309,13 @@ # System BASH specials, maybe also good for other shells # Note that ksh always reads /etc/ksh.kshrc # -if test "$is" != ksh -a -r /etc/bash.bashrc ; then - . /etc/bash.bashrc +if test "$is" != ksh -a -z "$_SOURCED_FOR_SSH" ; then + test -r /etc/bash.bashrc && . /etc/bash.bashrc fi if test "$is" = "bash" -a -z "$_HOMEBASHRC" ; then # loop detection readonly _HOMEBASHRC=true - test -r $HOME/.bashrc && . $HOME/.bashrc + test -r $HOME/.bashrc && . $HOME/.bashrc fi # @@ -325,10 +325,10 @@ if test ! /etc/bash.bashrc -ef /etc/ksh.kshrc ; then test -r /etc/bash.bashrc && . /etc/bash.bashrc fi - if test -n "$ENV" -a "$ENV" != "\$HOME/.kshrc" ; then + if test -n "$ENV" -a "$ENV" != "\$HOME/.kshrc" -a -z "$_HOMEKSHRC" ; then # loop detection readonly _HOMEKSHRC=true - test -r $HOME/.kshrc && . $HOME/.kshrc + test -r $HOME/.kshrc && . $HOME/.kshrc fi fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/profile.d/complete.bash new/aaa_base/etc/profile.d/complete.bash --- old/aaa_base/etc/profile.d/complete.bash 2007-02-14 12:03:23.000000000 +0100 +++ new/aaa_base/etc/profile.d/complete.bash 2007-02-26 16:05:33.000000000 +0100 @@ -282,6 +282,8 @@ -) COMPREPLY=($os) ;; --) COMPREPLY=($ol) ;; -?) COMPREPLY=($c) ;; + \./*) + COMPREPLY=($(compgen -f -d -X '\./.*' -- $c)) ;; [0-9n]|[0-9n]p) COMPREPLY=($c) ;; *) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org