[Scst-svn] SF.net SVN: scst:[2011] trunk/scstadmin/scstadmin.sysfs/scstadmin

[<mga...@us...>]

Revision: 2011
          http://scst.svn.sourceforge.net/scst/?rev=2011&view=rev
Author:   mgandalf
Date:     2010-08-26 22:05:53 +0000 (Thu, 26 Aug 2010)

Log Message:
-----------
- 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.

Modified Paths:
--------------
    trunk/scstadmin/scstadmin.sysfs/scstadmin

Modified: trunk/scstadmin/scstadmin.sysfs/scstadmin
===================================================================
--- trunk/scstadmin/scstadmin.sysfs/scstadmin	2010-08-26 18:18:10 UTC (rev 2010)
+++ trunk/scstadmin/scstadmin.sysfs/scstadmin	2010-08-26 22:05:53 UTC (rev 2011)
@@ -1575,7 +1575,8 @@
 					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 @@
 						}
 					}
 
-					setDeviceAttributes($device, $attributes, $deletions)
+					setDeviceAttributes($device, $attributes, FALSE)
 					  if (scalar keys %{$attributes});
 					next;
 				}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.