mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-18 19:21:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2017-02-07 18:28:44 -08:00
parent bddec074a2 2a074789ac
commit 621cd3adf7
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -419,7 +419,7 @@ scst-dist-gzip:
else \
scripts/list-source-files; \
fi | \
grep -E '^doc/|^fcst/|^iscsi-scst/|^Makefile|^qla2x00t(|_git)/|^scst.spec|^scst/|^scst_local/|^srpt/|^usr/'|\
grep -E '^doc/|^fcst/|^iscsi-scst/|^Makefile|^qla2x00t(|_git)/|^scst.spec|^scst/|^scst_local/|^srpt/|^usr/|^scstadmin/'|\
tar -T- -cf- | \
tar -C $${name}-$(VERSION) -xf-; \
} && \

2
scstadmin/scstadmin.sysfs/scstadmin
View File

@@ -5762,8 +5762,6 @@ sub configToAttr {
if (!scalar keys %{$$config{$attr}}) {
$attributes{$attr} = '';
} elsif ((keys %{$$config{$attr}}) > 1) {
immediateExit("Invalid configuration encountered. ".
"Attribute '$attr' has multiple values.");
foreach my $value (keys %{$$config{$attr}}) {
push @{$attributes{$attr}}, $value;
}