From cc1a1e17d944fa4111443c41cdab7320061b38fa Mon Sep 17 00:00:00 2001 From: InsanePrawn Date: Fri, 15 Nov 2019 18:52:11 +0100 Subject: [PATCH] Remove inappropiate error message suggesting to use '-r' 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 Reviewed-by: Kjeld Schouten Signed-off-by: InsanePrawn Closes #9574 --- lib/libzfs/libzfs_dataset.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/libzfs/libzfs_dataset.c b/lib/libzfs/libzfs_dataset.c index 2604c6617..acc9daec7 100644 --- a/lib/libzfs/libzfs_dataset.c +++ b/lib/libzfs/libzfs_dataset.c @@ -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); } @@ -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); }