X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=cmd%2Fzfs%2Fzfs_main.c;h=b6dc6d49d3b7c47a0fa76f700dae812071e196b8;hb=e0f86c98620bbc085a7edddd8f6dbf82e4783a46;hp=32f85b1e01d3fa49c54e15f89b78a1ff2bfec72e;hpb=d53368f6755ff67342f68e2e536c4157409fd047;p=zfs.git diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c index 32f85b1..b6dc6d4 100644 --- a/cmd/zfs/zfs_main.c +++ b/cmd/zfs/zfs_main.c @@ -238,7 +238,7 @@ get_usage(zfs_help_t idx) case HELP_ROLLBACK: return (gettext("\trollback [-rRf] \n")); case HELP_SEND: - return (gettext("\tsend [-RDp] [-[iI] snapshot] \n")); + return (gettext("\tsend [-vRDp] [-[iI] snapshot] \n")); case HELP_SET: return (gettext("\tset " " ...\n")); @@ -1879,16 +1879,6 @@ zfs_do_userspace(int argc, char **argv) zfs_userquota_prop_t p; int error; - /* - * Try the python version. If the execv fails, we'll continue - * and do a simplistic implementation. - */ - (void) execv(pypath, argv-1); - - (void) printf("internal error: %s not found\n" - "falling back on built-in implementation, " - "some features will not work\n", pypath); - if ((zhp = zfs_open(g_zfs, argv[argc-1], ZFS_TYPE_DATASET)) == NULL) return (1);