From f211c92b82dacd9e7ffea75e4f0c936a69099b93 Mon Sep 17 00:00:00 2001
From: yinle <yinle@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 15 Mar 2013 06:13:29 +0000
Subject: [PATCH] fix the issue that lsslp put in the SLP request messages into
 the "stana" files working with lsslp -z flag

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@15527 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/SLP.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/perl-xCAT/xCAT/SLP.pm b/perl-xCAT/xCAT/SLP.pm
index ef407620c..c47c13c47 100644
--- a/perl-xCAT/xCAT/SLP.pm
+++ b/perl-xCAT/xCAT/SLP.pm
@@ -90,7 +90,7 @@ sub dodiscover {
         }
     }
     my $printinfo = join(",", @printip);  
-    send_message($args{reqcallback}, 0, "Sending SLP request on interfaces: $printinfo ...") if ($args{reqcallback});
+    send_message($args{reqcallback}, 0, "Sending SLP request on interfaces: $printinfo ...") if ($args{reqcallback} and !$args{nomsg} );
 	foreach my $srvtype (@srvtypes) {
 		send_service_request_single(%args,ifacemap=>$interfaces,SrvType=>$srvtype);
 	}
@@ -170,12 +170,12 @@ sub dodiscover {
             $interval = time() -  $startinterval;
             if ($args{Time} and $args{Count}) {
                 if ($rspcount >= $args{Count} or $interval >= $args{Time}) {
-                    send_message($args{reqcallback}, 0, "Received $rspcount1 responses.") if ($args{reqcallback});
+                    send_message($args{reqcallback}, 0, "Received $rspcount1 responses.") if ($args{reqcallback}  and !$args{nomsg});
                     last;
                 }
             }
             if ($sendcount > $retrytime and $rspcount1 == 0) {
-                send_message($args{reqcallback}, 0, "Received $rspcount1 responses.") if ($args{reqcallback});
+                send_message($args{reqcallback}, 0, "Received $rspcount1 responses.") if ($args{reqcallback} and !$args{nomsg});
                 last;
             }
             #########################
@@ -184,8 +184,8 @@ sub dodiscover {
             if ( $interval > $retryinterval){#* (2**$sendcount))) { #double time
                 $sendcount++;
                 $startinterval = time();
-                send_message($args{reqcallback}, 0, "Received $rspcount1 responses.") if ($args{reqcallback});  
-                send_message($args{reqcallback}, 0, "Sending SLP request on interfaces: $printinfo ...") if ($args{reqcallback});
+                send_message($args{reqcallback}, 0, "Received $rspcount1 responses.") if ($args{reqcallback} and !$args{nomsg});  
+                send_message($args{reqcallback}, 0, "Sending SLP request on interfaces: $printinfo ...") if ($args{reqcallback} and !$args{nomsg});
                 foreach my $srvtype (@srvtypes) {
                     send_service_request_single(%args,ifacemap=>$interfaces,SrvType=>$srvtype);
                 }