- Warn only in issueLip() when -issue_lip is an argument.

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3951 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Mark Buechler
2011-12-05 19:39:59 +00:00
parent 5cc78efff5
commit 1bbf50a530
+6 -4
View File
@@ -1134,7 +1134,7 @@ sub main {
};
defined($issueLip) && do {
print "\n-> Making requested changes.\n";
$rc = issueLip($driver, $issueLip);
$rc = issueLip($driver, $issueLip, TRUE);
print "\t-> Done.\n";
last SWITCH;
};
@@ -4966,9 +4966,10 @@ sub disableDriver {
sub issueLip {
my $driver = shift;
my $target = shift;
my $warn = shift;
if (defined($driver) && defined($target)) {
return _issueLip($driver, $target);
return _issueLip($driver, $target, $warn);
} else {
my $drivers = $SCST->drivers();
@@ -4976,7 +4977,7 @@ sub issueLip {
my $targets = $SCST->targets($driver);
foreach my $target (@{$targets}) {
my $rc = _issueLip($driver, $target);
my $rc = _issueLip($driver, $target, $warn);
return $rc if ($rc);
}
@@ -4989,11 +4990,12 @@ sub issueLip {
sub _issueLip {
my $driver = shift;
my $target = shift;
my $warn = shift;
my $rc = FALSE;
my $attributes = $SCST->targetAttributes($driver, $target);
if (!defined($$attributes{'host'})) {
if (!defined($$attributes{'host'}) && $warn) {
print "\t-> Driver/target '$driver/$target' has no 'host' attribute, ignoring.\n";
return FALSE;
}