Skip to content

http_proxy env support for Pkg mirroring #697

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

http_proxy env support for Pkg mirroring #697

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04e622c
http_proxy env support for Pkg mirroring
gronke Apr 3, 2019
0e96cb1
Merge branch 'master' into enhancement/pkg-proxy-support
igalic Apr 23, 2020
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
19 changes: 14 additions & 5 deletions libioc/Pkg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import typing
import math
import os.path
import os
import re

import libzfs
Expand Down Expand Up @@ -142,7 +143,7 @@ def _update_host_repo(self, release_major_version: int) -> None:
"--repository", self._get_repo_name(release_major_version)
],
logger=self.logger,
env=dict(
env=self.__mixin_env(dict(
ABI=self.__get_abi_string(release_major_version),
SIGNATURE_TYPE="fingerprints",
IGNORE_OSVERSION="yes"
Expand All @@ -152,6 +153,14 @@ def _update_host_repo(self, release_major_version: int) -> None:
def __get_abi_string(self, release_major_version: int) -> str:
return f"FreeBSD:{release_major_version}:{self.host.processor}"

@staticmethod
def __mixin_env(env: typing.Dict[str, str]) -> typing.Dict[str, str]:
env_clone_keys = ["http_proxy"]
for key in os.environ:
if key.lower() in env_clone_keys:
env[key.lower()] = os.environ[key]
return env

def _mirror_packages(
self,
packages: typing.List[str],
Expand All @@ -166,10 +175,10 @@ def _mirror_packages(
"--repository", self._get_repo_name(release_major_version)
] + packages,
logger=self.logger,
env=dict(
env=self.__mixin_env(dict(
ABI=self.__get_abi_string(release_major_version),
SIGNATURE_TYPE="fingerprints"
)
))
)

if (stderr is not None) and (len(stderr) > 0):
Expand All @@ -186,11 +195,11 @@ def _build_mirror_index(self, release_major_version: int) -> None:
"repo",
cache_ds.mountpoint
],
env=dict(
env=self.__mixin_env(dict(
ABI=self.__get_abi_string(release_major_version),
SIGNATURE_TYPE="fingerprints",
FINGERPRINTS="/usr/share/keys/pkg"
),
)),
logger=self.logger
)

Expand Down