Skip to content

Commit

Permalink
Remove inappropiate error message suggesting to use '-r'
Browse files Browse the repository at this point in the history
Removes an incorrect error message from libzfs that suggests applying
'-r' when a zfs subcommand is called with a filesystem path while
expecting either a snapshot or bookmark path.

Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Kjeld Schouten <[email protected]>
Signed-off-by: InsanePrawn <[email protected]>
Closes openzfs#9574
  • Loading branch information
InsanePrawn authored and behlendorf committed Nov 15, 2019
1 parent 64c77c4 commit cc1a1e1
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions lib/libzfs/libzfs_dataset.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,7 @@ zfs_validate_name(libzfs_handle_t *hdl, const char *path, int type,
if (type == ZFS_TYPE_SNAPSHOT && strchr(path, '@') == NULL) {
if (hdl != NULL)
zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
"missing '@' delimiter in snapshot name, "
"did you mean to use -r?"));
"missing '@' delimiter in snapshot name"));
return (0);
}

Expand All @@ -134,8 +133,7 @@ zfs_validate_name(libzfs_handle_t *hdl, const char *path, int type,
if (type == ZFS_TYPE_BOOKMARK && strchr(path, '#') == NULL) {
if (hdl != NULL)
zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
"missing '#' delimiter in bookmark name, "
"did you mean to use -r?"));
"missing '#' delimiter in bookmark name"));
return (0);
}

Expand Down

0 comments on commit cc1a1e1

Please sign in to comment.