-
Notifications
You must be signed in to change notification settings - Fork 428
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.
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
Install downstream packages in correct subdir
#4763
Conversation
pkg_loc = os.path.join(pkg_subdir, os.path.basename(pkg_file)) | ||
shutil.move(pkg_file, pkg_loc) | ||
break |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why break?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it was missing from before, there's no need to continue processing once we have a valid pkg_loc
info = json.loads(Path(pkg_dir, "info", "index.json").read_text()) | ||
subdir = info["subdir"] | ||
except (FileNotFoundError, KeyError): | ||
subdir = m.config.host_subdir |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I dislike this fallback, what do we do instead? let the errors propagate up?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
old packages don't have subdir IIRC
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
This had missed news and tests :-/ |
Description
Resolves #4750
Checklist - did you ...
news
directory (using the template) for the next release's release notes?