Skip to content

Commit e422637

Browse files
committed
fix: align remaining error messages with original distrobox
- Change "For creating it, run:" to "Ok. For creating it, run this command:" - Use original placeholder format: <name-of-container> --image <remote>/<docker>:<tag> - Split clone error into separate lines matching original - Change "Next time, run:" to "next time, run this command first:" - Improve installation error to specify distrobox-plus and missing component
1 parent ddca9a6 commit e422637

2 files changed

Lines changed: 11 additions & 6 deletions

File tree

src/distrobox_plus/commands/create.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,8 @@ def get_clone_image(manager: ContainerManager, clone_name: str) -> str | None:
397397

398398
if status == "running":
399399
print_error(f"Container {clone_name} is running.")
400-
print_error("Please stop it first. Cannot clone a running container.")
400+
print_error("Please stop it first.")
401+
print_error("Cannot clone a running container.")
401402
return None
402403

403404
# Get container ID
@@ -477,8 +478,11 @@ def _add_distrobox_volumes(
477478
export_path = get_script_path("distrobox-export")
478479
hostexec_path = get_script_path("distrobox-host-exec")
479480

480-
if not entrypoint_path or not export_path:
481-
print_error("[error]Error: distrobox-init or distrobox-export not found[/error]")
481+
if not entrypoint_path:
482+
print_error("[error]Error: distrobox-plus installation incomplete, missing distrobox-init[/error]")
483+
sys.exit(127)
484+
if not export_path:
485+
print_error("[error]Error: distrobox-plus installation incomplete, missing distrobox-export[/error]")
482486
sys.exit(127)
483487

484488
cmd.append("--volume=/tmp:/tmp:rslave")
@@ -900,7 +904,8 @@ def _ensure_image(
900904
print_error(f"Image {opts.image} not found.")
901905
try:
902906
if not prompt_yes_no("Do you want to pull the image now?"):
903-
print_error(f"Next time, run: {manager.name} pull {opts.image}")
907+
print_error("next time, run this command first:")
908+
print_error(f"\t{manager.name} pull {opts.image}")
904909
return False
905910
except InvalidInputError as e:
906911
print_error(f"[error]{e}[/error]")

src/distrobox_plus/commands/enter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,8 +381,8 @@ def run(args: list[str] | None = None) -> int:
381381
if not config.non_interactive:
382382
try:
383383
if not prompt_yes_no(f"Create it now, out of image {DEFAULT_IMAGE}?"):
384-
print_error("For creating it, run:")
385-
print_error("\tdistrobox create <name> --image <image>")
384+
print_error("Ok. For creating it, run this command:")
385+
print_error("\tdistrobox create <name-of-container> --image <remote>/<docker>:<tag>")
386386
return 0
387387
except InvalidInputError as e:
388388
print_error(red(str(e)))

0 commit comments

Comments
 (0)