c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-11-18 10:21:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove inappropiate error message suggesting to use '-r'

Browse Source 
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 <behlendorf1@llnl.gov>
Reviewed-by: Kjeld Schouten <kjeld@schouten-lebbing.nl>
Signed-off-by: InsanePrawn <insane.prawny@gmail.com>
Closes #9574
This commit is contained in:
InsanePrawn 2019-11-15 18:52:11 +01:00 committed by Tony Hutter
parent 6657800745
commit ef0b539581
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libzfs/libzfs_dataset.c
View File

@ -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 (type == ZFS_TYPE_SNAPSHOT && strchr(path, '@') == NULL) {
if (hdl != NULL) if (hdl != NULL)
zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
"missing '@' delimiter in snapshot name, " "missing '@' delimiter in snapshot name"));
"did you mean to use -r?"));
return (0); 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 (type == ZFS_TYPE_BOOKMARK && strchr(path, '#') == NULL) {
if (hdl != NULL) if (hdl != NULL)
zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
"missing '#' delimiter in bookmark name, " "missing '#' delimiter in bookmark name"));
"did you mean to use -r?"));
return (0); return (0);
} }