From dfe644834c7b82029376a95056526dde3fb205f0 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 30 Jul 2013 10:41:15 +0000 Subject: [PATCH] scstadmin: Save multi-valued attributes sorted git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4927 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scstadmin/scstadmin.sysfs/scstadmin | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scstadmin/scstadmin.sysfs/scstadmin b/scstadmin/scstadmin.sysfs/scstadmin index 7e5e5bf58..defe6cf49 100755 --- a/scstadmin/scstadmin.sysfs/scstadmin +++ b/scstadmin/scstadmin.sysfs/scstadmin @@ -1281,12 +1281,14 @@ sub serializeKeyAttr { && defined($$attr_filter{$attribute}))); if (defined($$attributes{$attribute}->{'keys'})) { - foreach my $key (sort keys %{$$attributes{$attribute}->{'keys'}}) { + my @values; + foreach my $key (keys %{$$attributes{$attribute}->{'keys'}}) { my $value = $$attributes{$attribute}->{'keys'}->{$key}->{'value'}; - if ($value ne '') { - $result .= "$prefix$attribute " . escapeMeta($value) . "\n"; - } + push (@values, $value) if ($value ne ''); + } + foreach my $value (sort @values) { + $result .= "$prefix$attribute " . escapeMeta($value) . "\n"; } } elsif ($attribute eq 'enabled' || $attribute eq 'hw_target') { my $value = $$attributes{$attribute}->{'value'};