Accepting request 1007809 from home:favogt:branches:shells

- Replace tcsh-6.24.01-bash52.dif with upstream fix

OBS-URL: https://build.opensuse.org/request/show/1007809
OBS-URL: https://build.opensuse.org/package/show/shells/tcsh?expand=0&rev=129
This commit is contained in:
Dr. Werner Fink 2022-10-04 07:20:22 +00:00 committed by Git OBS Bridge
parent 630c68254c
commit da2551bedb
2 changed files with 21 additions and 3 deletions

View File

@ -1,11 +1,24 @@
--- tcsh-6.24.01/tests/variables.at From 391b04ec25b0d046d532d46a7468fa7a759d0115 Mon Sep 17 00:00:00 2001
+++ tcsh-6.24.01/tests/variables.at 2022-09-30 08:56:23.296533116 +0000 From: zoulasc <christos@zoulas.com>
Date: Sun, 2 Oct 2022 08:41:50 -0400
Subject: [PATCH] bash 5.2 uses implicit exec for "SHLVL=5 tcsh", which causes
it to decrement SHLVL before executing tcsh. Use env to avoid that.
(Vogtinator at github)
---
tests/variables.at | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/variables.at b/tests/variables.at
index 1e8cc8f4..cdd5e211 100644
--- a/tests/variables.at
+++ b/tests/variables.at
@@ -964,7 +964,7 @@ tcsh -f -c 'tcsh -f -c "printenv SHLVL"' @@ -964,7 +964,7 @@ tcsh -f -c 'tcsh -f -c "printenv SHLVL"'
tcsh -f -c 'exec tcsh -f -c "printenv SHLVL"' tcsh -f -c 'exec tcsh -f -c "printenv SHLVL"'
tcsh -f -c '(exec tcsh -f -c "printenv SHLVL")' tcsh -f -c '(exec tcsh -f -c "printenv SHLVL")'
]]) ]])
-AT_CHECK([SHLVL=5 tcsh -f shlvl.csh], , -AT_CHECK([SHLVL=5 tcsh -f shlvl.csh], ,
+AT_CHECK([SHLVL=5 tcsh -f shlvl.csh;:], , +AT_CHECK([env SHLVL=5 tcsh -f shlvl.csh], ,
[6 [6
8 8
2 2

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Oct 4 06:48:42 UTC 2022 - Fabian Vogt <fvogt@suse.com>
- Replace tcsh-6.24.01-bash52.dif with upstream fix
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 30 08:58:48 UTC 2022 - Dr. Werner Fink <werner@suse.de> Fri Sep 30 08:58:48 UTC 2022 - Dr. Werner Fink <werner@suse.de>