This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9401

pyoxidizer: make sure defaultrc directory exists before trying to write to it
ClosedPublic

Authored by durin42 on Nov 25 2020, 11:08 AM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG37bcd7f5a543: pyoxidizer: make sure defaultrc directory exists before trying to write to it
Summary

When doing some work involving one-file binaries, this line is failing
for me. It seems reasonable to just make sure the destination
directory exists before splatting the file into it.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Nov 25 2020, 11:08 AM
mharbison72 added a subscriber: mharbison72.Nov 25 2020, 5:14 PM
mharbison72 added inline comments.
contrib/packaging/hgpackaging/pyoxidizer.py
130

Should it use exist_ok=True? Or is this always missing?

durin42 updated this revision to Diff 23679.Nov 25 2020, 5:18 PM
durin42 marked an inline comment as done.Nov 25 2020, 5:19 PM

Good catch!

mharbison72 accepted this revision.Nov 25 2020, 7:09 PM
This revision is now accepted and ready to land.Nov 25 2020, 7:09 PM

Revision Contents
Changeset List

Diff 23683

contrib/packaging/hgpackaging/pyoxidizer.py

check=True, check=True,
) )
if "windows" in target_triple: if "windows" in target_triple:
process_install_rules(STAGING_RULES_WINDOWS, source_dir, out_dir) process_install_rules(STAGING_RULES_WINDOWS, source_dir, out_dir)
# Write out a default editor.rc file to configure notepad as the # Write out a default editor.rc file to configure notepad as the
# default editor. # default editor.
os.makedirs(out_dir / "defaultrc", exist_ok=True)
mharbison72Unsubmitted
Done

Should it use exist_ok=True? Or is this always missing?

mharbison72: Should it use `exist_ok=True`? Or is this always missing?
with (out_dir / "defaultrc" / "editor.rc").open( with (out_dir / "defaultrc" / "editor.rc").open(
"w", encoding="utf-8" "w", encoding="utf-8"
) as fh: ) as fh:
fh.write("[ui]\neditor = notepad\n") fh.write("[ui]\neditor = notepad\n")
for f in STAGING_EXCLUDES_WINDOWS: for f in STAGING_EXCLUDES_WINDOWS:
p = out_dir / f p = out_dir / f
if p.exists(): if p.exists():
print("removing %s" % p) print("removing %s" % p)
p.unlink() p.unlink()
# Add vcruntimeXXX.dll next to executable. # Add vcruntimeXXX.dll next to executable.
vc_runtime_dll = find_vc_runtime_dll(x64="x86_64" in target_triple) vc_runtime_dll = find_vc_runtime_dll(x64="x86_64" in target_triple)
shutil.copy(vc_runtime_dll, out_dir / vc_runtime_dll.name) shutil.copy(vc_runtime_dll, out_dir / vc_runtime_dll.name)