[Pkg-voip-commits] [dahdi-tools] 219/285: xpp_fxloader: handle empty span-type.conf

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch master
in repository dahdi-tools.

commit 77730a90597091263570944818599bf33f31030e
Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Date:   Tue Mar 31 22:37:10 2015 +0300

    xpp_fxloader: handle empty span-type.conf
    
    If we have /etc/dahdi/span-types.conf but it doesn't have any
    line, we should avoid using the option -S to astribank_hexload.
    Fix the test for this.
    
    Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
---
 xpp/xpp_fxloader | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/xpp/xpp_fxloader b/xpp/xpp_fxloader
index ce5133a..5135ebf 100644
--- a/xpp/xpp_fxloader
+++ b/xpp/xpp_fxloader
@@ -319,8 +319,9 @@ load_fw_device() {
 					if [ "$pri_spec_wildcard" != '' ]; then
 						debug "ECHO($dev_short): Found definitions for wildcard -- $pri_spec_wildcard"
 					fi
-					pri_spec=`echo "$pri_spec_wildcard $pri_spec" | tr -s ' \t\n' ','`
-					if [ "$pri_spec" != '' ]; then
+					pri_spec_params=""
+					if [ "$pri_spec$pri_spec_wildcard" != '' ]; then
+						pri_spec=`echo "$pri_spec_wildcard $pri_spec" | tr -s ' \t\n' ','`
 						pri_spec_params="-S $pri_spec"
 						debug "ECHO($dev_short): pri_spec_params='$pri_spec_params'"
 					fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/dahdi-tools.git