Skip to content

Commit e915700

Browse files
committed
Fix receive -x according to comment
Signed-off-by: Richard Kojedzinszky <richard@kojedz.in>
1 parent e78fa48 commit e915700

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

lib/libzfs/libzfs_sendrecv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4337,7 +4337,7 @@ zfs_setup_cmdline_props(libzfs_handle_t *hdl, zfs_type_t type,
43374337
newname);
43384338
if (nvlist_lookup_string(attrs,
43394339
ZPROP_SOURCE, &source) == 0 &&
4340-
strcmp(source, ZPROP_SOURCE_VAL_RECVD) != 0)
4340+
strcmp(source, fsname) == 0)
43414341
continue;
43424342
}
43434343
/*

tests/runfiles/common.run

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ tests = ['zfs_receive_001_pos', 'zfs_receive_002_pos', 'zfs_receive_003_pos',
296296
'zfs_receive_010_pos', 'zfs_receive_011_pos', 'zfs_receive_012_pos',
297297
'zfs_receive_013_pos', 'zfs_receive_014_pos', 'zfs_receive_015_pos',
298298
'zfs_receive_016_pos', 'receive-o-x_props_override',
299-
'receive-o-x_props_aliases',
299+
'receive-o-x_props_aliases', 'receive-x_props_alternation',
300300
'zfs_receive_from_encrypted', 'zfs_receive_to_encrypted',
301301
'zfs_receive_raw', 'zfs_receive_raw_incremental', 'zfs_receive_-e',
302302
'zfs_receive_raw_-d', 'zfs_receive_from_zstd', 'zfs_receive_new_props',

tests/runfiles/sanity.run

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ tests = ['zfs_receive_001_pos', 'zfs_receive_002_pos', 'zfs_receive_003_pos',
178178
'zfs_receive_013_pos', 'zfs_receive_014_pos', 'zfs_receive_015_pos',
179179
'zfs_receive_016_pos', 'zfs_receive_from_encrypted',
180180
'zfs_receive_to_encrypted', 'zfs_receive_raw',
181-
'zfs_receive_raw_incremental', 'zfs_receive_-e',
181+
'zfs_receive_raw_incremental', 'receive-x_props_alternation', 'zfs_receive_-e',
182182
'zfs_receive_raw_-d', 'zfs_receive_from_zstd', 'zfs_receive_new_props']
183183
tags = ['functional', 'cli_root', 'zfs_receive']
184184

0 commit comments

Comments
 (0)