Skip to content

Commit

Permalink
Alire.Environment: change _PREFIX to _ALIRE_PREFIX (#958)
Browse files Browse the repository at this point in the history
* alire.toml: bump gnatcoll-slim commit to match git submodule

* Alire.Environment: change _PREFIX to _ALIRE_PREFIX

With just _PREFIX there is a high risk of conflicts with legitimate use
of environment variables.
  • Loading branch information
Fabien-Chouteau authored Mar 30, 2022
1 parent 65991b3 commit 303de0e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/alire/alire-environment.adb
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ package body Alire.Environment is
end loop;

-- Set the crate PREFIX location for access to resources
This.Set (AAA.Strings.To_Upper_Case (+Rel.Name) & "_PREFIX",
This.Set (AAA.Strings.To_Upper_Case (+Rel.Name) & "_ALIRE_PREFIX",
Release_Base,
"Crate prefix for resources location");
end Load;
Expand Down
4 changes: 2 additions & 2 deletions testsuite/tests/printenv/basic/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ def make_path(list):
'.*'
'export GPR_PROJECT_PATH="' + expected_gpr_path + '"\n'
'.*'
'export HELLO_PREFIX="' + expected_hello_path + '"\n'
'export HELLO_ALIRE_PREFIX="' + expected_hello_path + '"\n'
'.*'
'export LIBHELLO_PREFIX="' + expected_libhello_path + '"\n'
'export LIBHELLO_ALIRE_PREFIX="' + expected_libhello_path + '"\n'
'.*'
'export TEST_GPR_EXTERNAL="gpr_ext_B"\n'
'.*',
Expand Down

0 comments on commit 303de0e

Please sign in to comment.