Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mkexp
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Package registry
Operate
Terraform modules
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
esmenv
mkexp
Commits
ecdeb969
Commit
ecdeb969
authored
3 years ago
by
Karl-Hermann Wieners
Browse files
Options
Downloads
Patches
Plain Diff
Global: fixes related to perl-5.26 compatibility (for ... qw syntax)
parent
5a34616d
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGES.txt
+1
-1
1 addition, 1 deletion
CHANGES.txt
files2config
+1
-1
1 addition, 1 deletion
files2config
namelist2config
+2
-2
2 additions, 2 deletions
namelist2config
with
4 additions
and
4 deletions
CHANGES.txt
+
1
−
1
View file @
ecdeb969
...
...
@@ -18,7 +18,7 @@ Global
use global variables in directories
* namelist2config: re-enable here-doc detection to remove spurious data,
use global variables in namelists and output
* Fixes related to python3 compatibility
(make clean)
* Fixes related to python3
and perl-5.26
compatibility
* Added tools to find differences/similarities between config files
(compconfig.py, diffconfig.py)
...
...
This diff is collapsed.
Click to expand it.
files2config
+
1
−
1
View file @
ecdeb969
...
...
@@ -82,7 +82,7 @@ sub subst_value($) {
$value
=~
s/$opts{o}_$opts{O}(\w)/\${$subst_map{o}}_\${$subst_map{O}}$1/
;
$value
=~
s/$opts{o}_$opts{O}/\${$subst_map{o}}_\$$subst_map{O}/
;
}
for
my
$var
qw(a A o O)
{
for
my
$var
(
qw(a A o O)
)
{
if
(
$opts
{
$var
})
{
$value
=~
s:([-_/])$opts{$var}(\w):$1\${$subst_map{$var}}$2:
;
$value
=~
s:([-_/])$opts{$var}:$1\$$subst_map{$var}:
;
...
...
This diff is collapsed.
Click to expand it.
namelist2config
+
2
−
2
View file @
ecdeb969
...
...
@@ -74,14 +74,14 @@ sub subst_value($) {
$value
=~
s/$opts{o}_$opts{O}(\w)/\${$subst_map{o}}_\${$subst_map{O}}$1/
;
$value
=~
s/$opts{o}_$opts{O}/\${$subst_map{o}}_\$$subst_map{O}/
;
}
for
my
$var
qw(a A o O)
{
for
my
$var
(
qw(a A o O)
)
{
if
(
$opts
{
$var
})
{
$value
=~
s:([-_/])$opts{$var}(\w):$1\${$subst_map{$var}}$2:
;
$value
=~
s:([-_/])$opts{$var}:$1\$$subst_map{$var}:
;
}
}
### for my $var (keys %subst_map) {
for
my
$var
qw(I F)
{
for
my
$var
(
qw(I F)
)
{
if
(
$opts
{
$var
})
{
$value
=~
s/$opts{$var}(\w)/\${$subst_map{$var}}$1/
;
$value
=~
s/$opts{$var}/\$$subst_map{$var}/
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment