dahdi-perl fixes, mostly xpp-specific.

* Fix pattern for PCI BRI cards
* Fix recognizing xpp devices by @connector in xpp_order
* Print more helpful comments in xpp_order
* Remove most (if not all) need of /proc/bus/usb
* Handle other similar "is_twinstar" errors.

Merged revisions 6975,7000,7223,7401,7462 via svnmerge from 
http://svn.digium.com/svn/dahdi/tools/trunk

........
  r6975 | tzafrir | 2009-08-12 22:02:00 +0300 (Wed, 12 Aug 2009) | 2 lines
  
  dahdi-perl: Remove a pointless whitespace in BRI strings list
........
  r7000 | tzafrir | 2009-08-14 00:40:01 +0300 (Fri, 14 Aug 2009) | 4 lines
  
  dahdi-perl: don't re-append '@' when testing the Astribank connector string
  
  xpp rev: 7291
........
  r7223 | tzafrir | 2009-09-27 16:38:50 +0200 (Sun, 27 Sep 2009) | 7 lines
  
  dahdi_genconf: xpp_order generator: Extra '#' after connector comment
  
  Add an extra '#' right after the connector string to make it simpler
  to use the connector string from the generated xpp_order.
  
  xpp rev: 7292
........
  r7401 | tzafrir | 2009-10-13 20:21:17 +0200 (Tue, 13 Oct 2009) | 12 lines
  
  xpp: make /proc/bus/usb/devices optional
  
  Get the information we read from /proc/bus/usb/devices from
  /sys/bus/usb/devices . Tested on my Debian Unstable with 2.6.30 kernel.
  
  The default is still /proc/bus/usb and sysfs is only used if the procfs
  file is not found.
  
  Also fixes a case of using the sysfs attribute busnum, that does not
  exist in kernel 2.6.9 . Devise the bus number from the name of the node.
........
  r7462 | tzafrir | 2009-11-04 13:48:43 +0200 (Wed, 04 Nov 2009) | 6 lines
  
  dahdi-perl: Avoid '"is_twinstar" on unblessed reference'
  
  Dpn't panic if a device is not found in the list of hardware. This
  is not only indication of a bug, but can also happen if a device
  appeared after the script was started.
........


git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/branches/2.2@7473 a0bf4364-ded3-4de4-8d8a-66a801d63aff

1 files changed, 1 insertions, 2 deletions

diff --git a/xpp/perl_modules/Dahdi/Xpp.pm b/xpp/perl_modules/Dahdi/Xpp.pm
index f9e62a5..7ac574b 100644
--- a/xpp/perl_modules/Dahdi/Xpp.pm
+++ b/xpp/perl_modules/Dahdi/Xpp.pm
@@ -206,10 +206,9 @@ sub add_xpporder(@) {
 	# Overrides from config file
 	foreach my $xbus (@xbuses) {
 		my $label = $xbus->label;
-		my $connector = '@' . $xbus->connector;
 		my $val;
 		$val = $order{$label};
-		$val = $order{$connector} unless defined $val;
+		$val = $order{$xbus->connector} unless defined $val;
 		$xbus->{XPPORDER} = $val if defined $val;
 	}
 }