Mailinglist Archive: opensuse-commit (1426 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package aaa_base
checked in at Thu Mar 15 01:11:18 CET 2007.

--------
--- aaa_base/aaa_base.changes	2007-03-07 22:45:14.000000000 +0100
+++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes	2007-03-13 12:01:18.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Mar 13 12:00:09 CET 2007 - werner@xxxxxxx
+
+- Fix of the fix for bugzilla #244788: be sure that the ~/.bashrc
+  is sourced once, not more not less.
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ aaa_base.spec ++++++
--- /var/tmp/diff_new_pack.I26142/_old	2007-03-15 01:10:50.000000000 +0100
+++ /var/tmp/diff_new_pack.I26142/_new	2007-03-15 01:10:50.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:        15
+Release:        17
 Summary:        SUSE Linux Base Package
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         aaa_base.tar.bz2
@@ -143,6 +143,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Tue Mar 13 2007 - werner@xxxxxxx
+- Fix of the fix for bugzilla #244788: be sure that the ~/.bashrc
+  is sourced once, not more not less.
 * Wed Mar 07 2007 - werner@xxxxxxx
 - Use colored root prompt (bugzilla #144620)
 * Tue Mar 06 2007 - rguenther@xxxxxxx




++++++ 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-03-07 11:07:35.000000000 +0100
+++ new/aaa_base/etc/bash.bashrc	2007-03-13 11:54:40.000000000 +0100
@@ -290,22 +290,6 @@
 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_CONNECTION" -a -z "$PROFILEREAD" ; then
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-26 16:23:54.000000000 +0100
+++ new/aaa_base/etc/profile	2007-03-13 11:44:52.000000000 +0100
@@ -306,32 +306,37 @@
 fi
 
 #
-# System BASH specials, maybe also good for other shells
-# Note that ksh always reads /etc/ksh.kshrc
+# Standard ssh command does not do an login, therefore
+# /etc/profile will be sourced by /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
-fi
-
-#
-# KSH specials
-#
-if test "$is" = "ksh" -a -r /etc/ksh.kshrc ; then
-    if test ! /etc/bash.bashrc -ef /etc/ksh.kshrc ; then
+if test -z "$_SOURCED_FOR_SSH" ; then
+    #
+    # System BASH specials, maybe also good for other shells
+    # Note that ksh always reads /etc/ksh.kshrc
+    #
+    if test "$is" != ksh ; then
 	test -r /etc/bash.bashrc && . /etc/bash.bashrc
     fi
-    if test -n "$ENV" -a "$ENV" != "\$HOME/.kshrc" -a -z "$_HOMEKSHRC" ; then
+    if test "$is" = "bash" -a -z "$_HOMEBASHRC" ; then
 	# loop detection
-	readonly _HOMEKSHRC=true
-	test -r $HOME/.kshrc && . $HOME/.kshrc
+	readonly _HOMEBASHRC=true
+	test -r $HOME/.bashrc && . $HOME/.bashrc
     fi
-fi
 
+    #
+    # KSH specials
+    #
+    if test "$is" = "ksh" -a -r /etc/ksh.kshrc ; then
+	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" -a -z "$_HOMEKSHRC" ; then
+	    # loop detection
+	    readonly _HOMEKSHRC=true
+	    test -r $HOME/.kshrc && . $HOME/.kshrc
+	fi
+    fi
+fi
 #
 # End of /etc/profile
 #




++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx