mahlon/shelldap
1
0
Fork 0
Code Issues Pull requests Activity

Revert an old LCS edge case fix in favor of a better one.

Browse source 
FossilOrigin-Name: 646a3154f00651907a13fb5823ed00e3e6ca509c7457c8bb3e533fa00a6aa583
This commit is contained in:
Mahlon E. Smith 2019-12-02 23:48:55 +00:00
parent 7a65b31a6c
commit d4c7e5d5f3
1 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
shelldap
View file

@ -1485,6 +1485,7 @@ sub diff {
# #
if ( $cur_valcount == 1 ) { if ( $cur_valcount == 1 ) {
$e->replace( $attr => $val ); $e->replace( $attr => $val );
$seen_attr{ $attr }++;
} }
else { else {
@ -1509,10 +1510,6 @@ sub diff {
# #
foreach ( $diff->Items(1) ) { foreach ( $diff->Items(1) ) {
my ( $attr, $val ) = $parse->( $_ ) or next; 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 }; next if $seen_attr{ $attr };
$self->debug("DELETE: $_"); $self->debug("DELETE: $_");
$e->delete( $attr => [ $val ] ); $e->delete( $attr => [ $val ] );