Skip to content

get_bin_path2 and get_bin_dir use get_pg_config2 directly #384

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
dmitry-lipetsk merged 1 commit into from
Jul 8, 2026
Merged

get_bin_path2 and get_bin_dir use get_pg_config2 directly #384

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
8 changes: 4 additions & 4 deletions src/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ def get_bin_path2(os_ops: OsOperations, filename):
pg_config = os.environ.get("PG_CONFIG")

if pg_config:
bindir = get_pg_config(pg_config, os_ops)["BINDIR"]
bindir = get_pg_config2(os_ops, pg_config)["BINDIR"]
return os_ops.build_path(bindir, filename)

# try PG_BIN
Expand All @@ -166,7 +166,7 @@ def get_bin_path2(os_ops: OsOperations, filename):

pg_config_path = os_ops.find_executable('pg_config')
if pg_config_path:
bindir = get_pg_config(pg_config_path, os_ops)["BINDIR"]
bindir = get_pg_config2(os_ops, pg_config_path)["BINDIR"]
return os_ops.build_path(bindir, filename)

return filename
Expand All @@ -183,7 +183,7 @@ def get_bin_dir(os_ops: OsOperations) -> str:
pg_config = os.environ.get("PG_CONFIG")

if pg_config:
return get_pg_config(pg_config, os_ops)["BINDIR"]
return get_pg_config2(os_ops, pg_config)["BINDIR"]

# try PG_BIN
pg_bin = os_ops.environ("PG_BIN")
Expand All @@ -192,7 +192,7 @@ def get_bin_dir(os_ops: OsOperations) -> str:

pg_config_path = os_ops.find_executable('pg_config')
if pg_config_path:
return get_pg_config(pg_config_path, os_ops)["BINDIR"]
return get_pg_config2(os_ops, pg_config_path)["BINDIR"]

postgres = os_ops.find_executable('postgres')
if postgres:
Expand Down