projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wip
[spider.git]
/
cmd
/
merge.pl
diff --git
a/cmd/merge.pl
b/cmd/merge.pl
index 3f8cbcd14a291c594d12a9a6743f83a5c949cd34..3342d1e948b7b1c76004bc8554f41a8222c4fc59 100644
(file)
--- a/
cmd/merge.pl
+++ b/
cmd/merge.pl
@@
-14,7
+14,11
@@
return (1, $self->msg('e5')) if $self->priv < 5;
return (1, $self->msg('e12')) if !$f[0];
my $call = uc $f[0];
return (1, $self->msg('e12')) if !$f[0];
my $call = uc $f[0];
-return (1, $self->msg('e11')) if $call eq $main::mycall;
+return (1, $self->msg('e11', $call)) if $call eq $main::mycall;
+ if ($call eq $main::mycall) {
+ push @out, $self->msg('e11', $call);
+ next;
+ }
my $ref = Route::Node::get($call);
my $dxchan = $ref->dxchan if $ref;
my $ref = Route::Node::get($call);
my $dxchan = $ref->dxchan if $ref;