← Back to branch summary

~ubuntu-branches/ubuntu/saucy/dahdi-tools/saucy

« back to all changes in this revision

Viewing changes to debian/patches/xpp_no_extra_at

  • Committer: Bazaar Package Importer
  • Author(s): Jean-Michel Dault, Tzafrir Cohen
  • Date: 2009-08-25 03:55:55 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20090825035555-0m2rh06tcm6pfmzq
Tags: 1:2.2.0-1ubuntu1
http://bugs.debian.org/535865
* Merge from debian pkg-voip (2.2.0 final)
* Change maintainer and standards version
* Since the init script needs /dev/dahdi, require either dahdi-dkms or
  dahdi-source.

* Debian changes

 [ Tzafrir Cohen ]
 * New upstream release.
 * Patch bashism: fixes bashism in waitfor_xpds (Closes: #535865).
 * Patch hardware_rescan: backport Dahdi::Hardware->rescan()
 * Patch no_extra_at: backport of a per/xpp fix. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/xpp_no_extra_at
 
1
dahdi-perl: don't re-append '@' when testing the Astribank connector string
 
2
    
 
3
Source: http://svn.digium.com/svn/dahdi/tools/trunk@7000
 
4
 
 
5
--- a/xpp/perl_modules/Dahdi/Xpp.pm
 
6
+++ b/xpp/perl_modules/Dahdi/Xpp.pm
 
7
@@ -206,10 +206,9 @@ sub add_xpporder(@) {
 
8
        # Overrides from config file
 
9
        foreach my $xbus (@xbuses) {
 
10
                my $label = $xbus->label;
 
11
-               my $connector = '@' . $xbus->connector;
 
12
                my $val;
 
13
                $val = $order{$label};
 
14
-               $val = $order{$connector} unless defined $val;
 
15
+               $val = $order{$xbus->connector} unless defined $val;
 
16
                $xbus->{XPPORDER} = $val if defined $val;
 
17
        }
 
18
 }