diff options
| author | mmusante <none@none> | 2007-05-14 08:39:48 -0700 |
|---|---|---|
| committer | mmusante <none@none> | 2007-05-14 08:39:48 -0700 |
| commit | fce7d82b2f44c64aedba1312d169198f858de333 (patch) | |
| tree | 38a6e1c9cc39d3ed13a05e73ca22df00d0ec55c3 /usr/src | |
| parent | 9077d101f3e868548658d61117f3040bbc081612 (diff) | |
| download | illumos-joyent-fce7d82b2f44c64aedba1312d169198f858de333.tar.gz | |
6540584 zfs list command should not produce "no datasets available" message in script mode
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/zfs/zfs_main.c | 2 | ||||
| -rw-r--r-- | usr/src/cmd/zpool/zpool_main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/cmd/zfs/zfs_main.c b/usr/src/cmd/zfs/zfs_main.c index 73b818abd4..5cc470162b 100644 --- a/usr/src/cmd/zfs/zfs_main.c +++ b/usr/src/cmd/zfs/zfs_main.c @@ -1469,7 +1469,7 @@ zfs_do_list(int argc, char **argv) zfs_free_proplist(cb.cb_proplist); zfs_free_sort_columns(sortcol); - if (ret == 0 && cb.cb_first) + if (ret == 0 && cb.cb_first && !cb.cb_scripted) (void) printf(gettext("no datasets available\n")); return (ret); diff --git a/usr/src/cmd/zpool/zpool_main.c b/usr/src/cmd/zpool/zpool_main.c index fbb4558f92..209e76d64b 100644 --- a/usr/src/cmd/zpool/zpool_main.c +++ b/usr/src/cmd/zpool/zpool_main.c @@ -2082,7 +2082,7 @@ zpool_do_list(int argc, char **argv) ret = for_each_pool(argc, argv, B_TRUE, NULL, list_callback, &cb); - if (argc == 0 && cb.cb_first) { + if (argc == 0 && cb.cb_first && !cb.cb_scripted) { (void) printf(gettext("no pools available\n")); return (0); } |