Skip to content
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

Jump to bottom

Prefer config.image over config.image_id #2712

Merged
merged 1 commit into from
May 15, 2024
Merged

Prefer config.image over config.image_id #2712

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
4 changes: 2 additions & 2 deletions mkosi/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ def config_default_compression(namespace: argparse.Namespace) -> Compression:


def config_default_output(namespace: argparse.Namespace) -> str:
output = namespace.image_id or namespace.image or "image"
output = namespace.image or namespace.image_id or "image"

if namespace.image_version:
output += f"_{namespace.image_version}"
Expand Down Expand Up @@ -1523,7 +1523,7 @@ class Config:
image: Optional[str]

def name(self) -> str:
return self.image_id or self.image or "default"
return self.image or self.image_id or "default"

def machine_or_name(self) -> str:
return self.machine or self.name()
Expand Down
Loading