debian-packaging
/
dahdi-tools
8
0
Fork 0
Code Issues Pull Requests Releases Activity

dahdi_spantypes.patch: remove useless lines 

(Thanks Ilya Demyanov)

Signed-off-by: Tzafrir Cohen <tzafrir@debian.org>
This commit is contained in:
Tzafrir Cohen 2019-03-04 00:05:49 +02:00
parent cd6136cec1
commit 12a607fe15
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
debian/patches/dahdi_spantypes.patch vendored
View File

@ -9,12 +9,12 @@ and new name.
Signed-off-by: Tzafrir Cohen <tzafrir@debian.org> Signed-off-by: Tzafrir Cohen <tzafrir@debian.org>
--- ---
dahdi_span_assignments | 17 ++++++++++++++--- dahdi_span_assignments | 15 ++++++++++++---
dahdi_span_types | 23 ++++++++++++++++++----- dahdi_span_types | 23 ++++++++++++++++++-----
2 files changed, 32 insertions(+), 8 deletions(-) 2 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/dahdi_span_assignments b/dahdi_span_assignments diff --git a/dahdi_span_assignments b/dahdi_span_assignments
index 9b4f305..7fd9fea 100755 index 9b4f305..235d61e 100755
--- a/dahdi_span_assignments --- a/dahdi_span_assignments
+++ b/dahdi_span_assignments +++ b/dahdi_span_assignments
@@ -151,6 +151,15 @@ attr_clean() { @@ -151,6 +151,15 @@ attr_clean() {
@ -42,22 +42,20 @@ index 9b4f305..7fd9fea 100755
do do
span=`grep 2>/dev/null -Hw "$local_spanno" "$device/span-"*"/local_spanno" | \ span=`grep 2>/dev/null -Hw "$local_spanno" "$device/span-"*"/local_spanno" | \
sed -e 's,/local_spanno:.*,,' -e 's,.*/,,'` sed -e 's,/local_spanno:.*,,' -e 's,.*/,,'`
@@ -193,7 +202,8 @@ dump_config() { @@ -193,7 +202,7 @@ dump_config() {
id="$devpath" id="$devpath"
fi fi
echo "# Device: [$hardware_id] @$location $devpath" echo "# Device: [$hardware_id] @$location $devpath"
- for local_spanno in `cut -d: -f1 "$device/spantype"` - for local_spanno in `cut -d: -f1 "$device/spantype"`
+ sp_file="dahdi_spantype"
+ for local_spanno in `get_device_spannos "$device"` + for local_spanno in `get_device_spannos "$device"`
do do
span=`grep 2>/dev/null -Hw "$local_spanno" "$device/span-"*"/local_spanno" | \ span=`grep 2>/dev/null -Hw "$local_spanno" "$device/span-"*"/local_spanno" | \
sed -e 's,/local_spanno:.*,,' -e 's,.*/,,'` sed -e 's,/local_spanno:.*,,' -e 's,.*/,,'`
@@ -358,7 +368,8 @@ list_devices() { @@ -358,7 +367,7 @@ list_devices() {
devpath=`cd "$device" && pwd -P` devpath=`cd "$device" && pwd -P`
location='@'`attr_clean "$device/location"` location='@'`attr_clean "$device/location"`
hardware_id=`attr_clean "$device/hardware_id"` hardware_id=`attr_clean "$device/hardware_id"`
- for local_spanno in `cut -d: -f1 "$device/spantype"` - for local_spanno in `cut -d: -f1 "$device/spantype"`
+ sp_file="dahdi_spantype"
+ for local_spanno in `get_device_spannos "$device"` + for local_spanno in `get_device_spannos "$device"`
do do
found=`dev_match_conf "$devpath" "$location" "$hardware_id" "$local_spanno"` found=`dev_match_conf "$devpath" "$location" "$hardware_id" "$local_spanno"`