[svn-commits] tzafrir: branch tools/tzafrir/sysfs r8753 - /tools/team/tzafrir/sysfs/xpp/per...

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Tue Jun  8 10:04:47 2010
New Revision: 8753

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8753
Log:
Use '!port' rather than '(port)'

Use '!port' at the end of span names, rather than '(port)', as per
recent -linux changes.

Modified:
    tools/team/tzafrir/sysfs/xpp/perl_modules/Dahdi/Span.pm

Modified: tools/team/tzafrir/sysfs/xpp/perl_modules/Dahdi/Span.pm
URL: http://svnview.digium.com/svn/dahdi/tools/team/tzafrir/sysfs/xpp/perl_modules/Dahdi/Span.pm?view=diff&rev=8753&r1=8752&r2=8753
==============================================================================
--- tools/team/tzafrir/sysfs/xpp/perl_modules/Dahdi/Span.pm (original)
+++ tools/team/tzafrir/sysfs/xpp/perl_modules/Dahdi/Span.pm Tue Jun  8 10:04:47 2010
@@ -363,11 +363,11 @@
 	# FIXME: the following is a number, rather than a readable value:
 	$self->{ALARMS} = $self->_get_dev_attr('alarms');
 	my $hwname = $self->hardware_id || $self->location;
-	if (defined $self->alias) {
-		my $unique_string = sprintf "span-aliases!%s(%s)", $self->alias, $self->{SPAN_ID};
+	if (defined $self->alias && $self->alias) {
+		my $unique_string = sprintf "span-aliases!%s!%s", $self->alias, $self->{SPAN_ID};
 		$self->{UNIQUE_STRING} = $unique_string;
-	} elsif (defined $hwname && $ENV{DAHDI_DIALBYNAME}) {
-		my $unique_string = sprintf "span-names!%s(%s)", $hwname, $self->{SPAN_ID};
+	} elsif (defined $hwname) {
+		my $unique_string = sprintf "span-names!%s!%s", $hwname, $self->{SPAN_ID};
 		$self->{UNIQUE_STRING} = $unique_string;
 	} else {
 		$self->{UNIQUE_STRING} = $num;