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

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

Revision: 1992
          http://scst.svn.sourceforge.net/scst/?rev=1992&view=rev
Author:   mgandalf
Date:     2010-08-25 18:43:49 +0000 (Wed, 25 Aug 2010)

Log Message:
-----------
- Fix resetting a create/assignment attribute to default by
  removing it from the config file.
- Fix closing pass-through devices on clearConfig().

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

Modified: trunk/scstadmin/scstadmin.sysfs/scstadmin
===================================================================
--- trunk/scstadmin/scstadmin.sysfs/scstadmin	2010-08-25 18:36:19 UTC (rev 1991)
+++ trunk/scstadmin/scstadmin.sysfs/scstadmin	2010-08-25 18:43:49 UTC (rev 1992)
@@ -1877,10 +1877,21 @@
 	my $second = shift;
 
 	foreach my $attr (keys %{$first}) {
-		next if (!defined($$second{$attr}->{'keys'}->{'0'}->{'value'}) && ($$first{$attr} == 0));
-		return TRUE if ($$first{$attr} ne $$second{$attr}->{'keys'}->{'0'}->{'value'});
+		if (defined($$second{$attr}->{'keys'})) {
+			next if (!defined($$second{$attr}->{'keys'}->{'0'}->{'value'}) && ($$first{$attr} == 0));
+			return TRUE if ($$first{$attr} ne $$second{$attr}->{'keys'}->{'0'}->{'value'});
+		} else {
+			next if (!defined($$second{$attr}->{'value'}) && ($$first{$attr} == 0));
+			return TRUE if ($$first{$attr} ne $$second{$attr}->{'value'});
+		}
 	}
 
+	foreach my $attr (keys %{$second}) {
+		if (defined($$second{$attr}->{'keys'}) && !defined($$first{$attr})) {
+			return TRUE;
+		}
+	}
+
 	return FALSE;
 }
 
@@ -1913,9 +1924,7 @@
 	foreach my $handler (sort keys %{$handlers}) {
 		foreach my $device (@{$$handlers{$handler}}) {
 			my $attributes = $SCST->deviceAttributes($device);
-			if (!defined($$attributes{'scsi_device'})) {
-				closeDevice($handler, $device, $force);
-			}
+			closeDevice($handler, $device, $force);
 		}
 	}
 


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