Skip to content

Commit

Permalink
Install downstream packages in correct subdir (#4763)
Browse files Browse the repository at this point in the history
  • Loading branch information
kenodegard authored Feb 9, 2023
1 parent 56d65e1 commit 925c227
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion conda_build/render.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import json
import os
from os.path import isdir, isfile, abspath
from pathlib import Path
import random
import re
import shutil
Expand Down Expand Up @@ -217,9 +218,18 @@ def find_pkg_dir_or_file_in_pkgs_dirs(pkg_dist, m, files_only=False):
with tarfile.open(pkg_file, 'w:bz2') as archive:
for entry in os.listdir(pkg_dir):
archive.add(os.path.join(pkg_dir, entry), arcname=entry)
pkg_subdir = os.path.join(m.config.croot, m.config.host_subdir)

# use the package's subdir
try:
info = json.loads(Path(pkg_dir, "info", "index.json").read_text())
subdir = info["subdir"]
except (FileNotFoundError, KeyError):
subdir = m.config.host_subdir

pkg_subdir = os.path.join(m.config.croot, subdir)
pkg_loc = os.path.join(pkg_subdir, os.path.basename(pkg_file))
shutil.move(pkg_file, pkg_loc)
break
return pkg_loc


Expand Down

0 comments on commit 925c227

Please sign in to comment.