From 69dbc50d3c7dc18d7276a1ba7fdcf670e784f984 Mon Sep 17 00:00:00 2001 From: "docelic@crystallabs.io" Date: Sun, 28 Apr 2019 22:16:14 +0000 Subject: [PATCH] Do not sort flaglist twice With this change, 'inspect'ing an element prints its attributes in a defined order: (requiredness, multivaluedness) Previously, the order was alphabetical and varying. FossilOrigin-Name: bb3518297cc3ffdd6a8a1db79e681431f56f6d395f5300e6f99d0f444fc5fd04 --- shelldap | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/shelldap b/shelldap index e97b0d4..3b8e86f 100755 --- a/shelldap +++ b/shelldap @@ -2327,6 +2327,9 @@ sub run_inspect print "\nAttributes:\n"; foreach my $attr ( sort (@{$must_attr}, @{$may_attr}) ) { my @flaglist; + + push ( @flaglist, $must{$attr} ? 'required' : 'optional' ); + if ( $self->{'schema'}->attribute( $attr )->{'single-value'} ) { push ( @flaglist, 'single-value' ); } @@ -2334,10 +2337,8 @@ sub run_inspect push ( @flaglist, 'multivalue' ); } - push ( @flaglist, $must{$attr} ? 'required' : 'optional' ); - my $flags = ''; - $flags = (' (' . join( ', ', sort @flaglist ) . ')') if scalar @flaglist > 0; + $flags = (' (' . join( ', ', @flaglist ) . ')') if scalar @flaglist > 0; printf( " %s%s\n", $attr, $flags ); }