Revert an old LCS edge case fix in favor of a better one. default tip master
authorMahlon E. Smith <mahlon@martini.nu>
Mon, 02 Dec 2019 15:48:56 -0800
changeset 133 4831c902b269
parent 132 c06315e8f0ac
Revert an old LCS edge case fix in favor of a better one.
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 ] );