Skip to content

Commit

Permalink
[internal] Refactors output_field to default to something that disa…
Browse files Browse the repository at this point in the history
…mbiguates on parametrized fields (pantsbuild#16232)

# Rust tests and lints will be skipped. Delete if not intended.
[ci skip-rust]

# Building wheels and fs_util will be skipped. Delete if not intended.
[ci skip-build-wheels]
  • Loading branch information
Christopher Neugebauer authored and jyggen committed Jul 27, 2022
1 parent 7fe785b commit 6cd43a3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
5 changes: 1 addition & 4 deletions src/python/pants/build_graph/address.py
Expand Up @@ -514,10 +514,7 @@ def sanitize(s: str) -> str:
else:
target = f"{parent_prefix}{self.target_name}"
if self.parameters:
key_value_strs = ",".join(
f"{sanitize(k)}={sanitize(v)}" for k, v in self.parameters.items()
)
params = f"@@{key_value_strs}"
params = f"@{sanitize(self.parameters_repr)}"
else:
params = ""
generated = f"@{sanitize(self.generated_name)}" if self.generated_name else ""
Expand Down
5 changes: 4 additions & 1 deletion src/python/pants/core/goals/package.py
Expand Up @@ -72,11 +72,14 @@ class OutputPathField(StringField, AsyncFieldMixin):
def value_or_default(self, *, file_ending: str | None) -> str:
if self.value:
return self.value
file_prefix = (
target_name_part = (
self.address.generated_name.replace(".", "_")
if self.address.generated_name
else self.address.target_name
)
params_sanitized = self.address.parameters_repr.replace(".", "_")
file_prefix = f"{target_name_part}{params_sanitized}"

if file_ending is None:
file_name = file_prefix
else:
Expand Down

0 comments on commit 6cd43a3

Please sign in to comment.