mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-23 13:41:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 7091-7092 via svnmerge from

Browse Source 
svn+ssh://svn.code.sf.net/p/scst/svn/trunk

........
  r7091 | vlnb | 2017-01-23 16:29:41 -0800 (Mon, 23 Jan 2017) | 5 lines
  
  Add scstadmin in the dist archive
  
  Reported by David Chen <david.chen@osnexus.com>
........
  r7092 | bvassche | 2017-02-04 22:52:06 -0800 (Sat, 04 Feb 2017) | 6 lines
  
  scstadmin: Revert r7014
  
  The immediateExit() call introduced in r7014 prevents to assign multiple
  values to attributes that support multiple values, e.g. 'allowed_portal'.
  Hence revert r7014.
........


git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.2.x@7093 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2017-02-14 03:27:53 +00:00
parent 3e96590f2d
commit fa495e2139
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;
}