# HG changeset patch # User Mahlon E. Smith # Date 1575330536 28800 # Node ID 4831c902b2699a4ec0a63f71a9bd727693f0899e # Parent c06315e8f0aced2bc196b416db34fb2c4b841eda Revert an old LCS edge case fix in favor of a better one. diff -r c06315e8f0ac -r 4831c902b269 shelldap --- a/shelldap Sun Oct 13 10:52:25 2019 -0700 +++ b/shelldap Mon Dec 02 15:48:56 2019 -0800 @@ -1485,6 +1485,7 @@ # if ( $cur_valcount == 1 ) { $e->replace( $attr => $val ); + $seen_attr{ $attr }++; } else { @@ -1509,10 +1510,6 @@ # foreach ( $diff->Items(1) ) { my ( $attr, $val ) = $parse->( $_ ) or next; - my $cur_vals = $e->get_value( $attr, asref => 1 ) || []; - my $cur_valcount = scalar @$cur_vals; - - next if $cur_valcount == 1; next if $seen_attr{ $attr }; $self->debug("DELETE: $_"); $e->delete( $attr => [ $val ] );