Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CFE-4450: Allow passing environment variables to package managers #2963

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

CFE-4450: Allow passing environment variables to package managers #2963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion modules/packages/vendored/apt_get.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,17 @@ def package_arguments_builder(is_apt_install):
elif line.startswith("options="):
global apt_get_options
option = line.split("=", 1)[1].rstrip()

if option:
apt_get_options.append(option)
if option.startswith("env:"):
env_option = option.split(":", 1)[1]
env_var = env_option.split("=", 1)
if len(env_var) == 2:
env_name = env_var[0]
env_value = env_var[1]
os.environ[env_name] = env_value
else:
apt_get_options.append(option)

if name:
args.extend(one_package_argument(name, arch, version, is_apt_install))
Expand Down
14 changes: 14 additions & 0 deletions modules/packages/vendored/yum.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,13 @@ def list_updates(online):
yum_options.append(option)
elif option.startswith("enablerepo=") or option.startswith("disablerepo="):
yum_options.append("--" + option)
elif option.startswith("env:"):
env_option = option.split(":", 1)[1]
env_var = env_option.split("=", 1)
if len(env_var) == 2:
env_name = env_var[0]
env_value = env_var[1]
os.environ[env_name] = env_value

online_flag = []
if not online:
Expand Down Expand Up @@ -229,6 +236,13 @@ def package_arguments_builder(is_yum_install):
yum_options.append(option)
elif option.startswith("enablerepo=") or option.startswith("disablerepo="):
yum_options.append("--" + option)
elif option.startswith("env:"):
env_option = option.split(":", 1)[1]
env_var = env_option.split("=", 1)
if len(env_var) == 2:
env_name = env_var[0]
env_value = env_var[1]
os.environ[env_name] = env_value
if line.startswith("Name="):
if name:
# Each new "Name=" triggers a new entry.
Expand Down
27 changes: 27 additions & 0 deletions modules/packages/vendored/zypper.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,21 @@ def package_arguments_builder(is_zypper_install):
elif line.startswith("Architecture="):
arch = line.split("=", 1)[1].rstrip()

elif line.startswith("options="):
global zypper_options
option = line.split("=", 1)[1].rstrip()

if option:
if option.startswith("env:"):
env_option = option.split(":", 1)[1]
env_var = env_option.split("=", 1)
if len(env_var) == 2:
env_name = env_var[0]
env_value = env_var[1]
os.environ[env_name] = env_value
else:
zypper_options.append(option)

if name:
single_list, multi_list = one_package_argument(name, arch, version, is_zypper_install)
single_cmd_args += single_list
Expand Down Expand Up @@ -405,6 +420,18 @@ def file_install():
found = True
cmd_line.append(line.split("=", 1)[1].rstrip())

elif line.startswith("options="):
global zypper_options
option = line.split("=", 1)[1].rstrip()
if option:
if option.startswith("env:"):
env_option = option.split(":", 1)[1]
env_var = env_option.split("=", 1)
if len(env_var) == 2:
env_name = env_var[0]
env_value = env_var[1]
os.environ[env_name] = env_value

if not found:
return 0

Expand Down