Skip to content

utils: fix_env: dont delete LD_LIBRARY_PATH from env #2541

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

Merged
merged 4 commits into from
Sep 30, 2019
Merged

utils: fix_env: dont delete LD_LIBRARY_PATH from env #2541

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60d88b9
utils: fix_env: dont delete LD_LIBRARY_PATH from env
pared Sep 27, 2019
c1982c0
utils: add related issue to comment on why there is empty LD_LIBRARY_…
pared Sep 30, 2019
1aba16f
Update dvc/utils/__init__.py
pared Sep 30, 2019
387dc02
scm: git: move LD_LIBRARY_PATH fix to Git.clone method
pared Sep 30, 2019
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: 16 additions & 3 deletions dvc/scm/git/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
from funcy import cached_property

from dvc.exceptions import GitHookAlreadyExistsError
from dvc.utils.compat import str, open
from dvc.utils import fix_env, relpath
from dvc.utils.compat import str, open, cast_bytes_py2
from dvc.utils import fix_env, relpath, is_binary
from dvc.scm.base import (
Base,
SCMError,
Expand Down Expand Up @@ -64,11 +64,24 @@ def __init__(self, root_dir=os.curdir):
def clone(url, to_path, rev=None):
import git

ld_key = "LD_LIBRARY_PATH"

env = fix_env(None)
if is_binary() and ld_key not in env.keys():
# In fix_env, we delete LD_LIBRARY_PATH key if it was empty before
# PyInstaller modified it. GitPython, in git.Repo.clone_from, uses
# env to update its own internal state. When there is no key in
# env, this value is not updated and GitPython re-uses
# LD_LIBRARY_PATH that has been set by PyInstaller.
# See [1] for more info.
# [1] https://github.com/gitpython-developers/GitPython/issues/924
env[cast_bytes_py2(ld_key)] = ""

try:
tmp_repo = git.Repo.clone_from(
url,
to_path,
env=fix_env(None), # needed before we can fix it in __init__
env=env, # needed before we can fix it in __init__
no_single_branch=True,
)
tmp_repo.close()
Expand Down