- Fix setting device attributes which have no special create attributes.

- Don't warn on device attributes already set of not done with -set_dev_attr.



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2011 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Mark Buechler
2010-08-26 22:05:53 +00:00
parent 9a1870d7df
commit edf378a1e2

View File

@@ -1575,7 +1575,8 @@ sub applyConfigDevices {
my $create_attrs = configToAttr($$devices{$device}->{'CREATE_ATTRIBUTES'});
my $old_create_attrs = $SCST->deviceAttributes($device);
if (compareToKeyAttribute($create_attrs, $old_create_attrs)) {
if ((scalar keys %{$create_attrs}) &&
compareToKeyAttribute($create_attrs, $old_create_attrs)) {
print "-> Device '$device' is configured differently.\n";
if ($deletions) {
@@ -1589,7 +1590,7 @@ sub applyConfigDevices {
}
}
setDeviceAttributes($device, $attributes, $deletions)
setDeviceAttributes($device, $attributes, FALSE)
if (scalar keys %{$attributes});
next;
}