Developers of Sympa

[IKEDA Soji <address@concealed>]

Etienne,

On Wed, 14 Aug 2013 11:20:47 +0200
Etienne MELEARD <address@concealed> wrote:

> Hello Soji,
> 
> Can you tell me which merge are you speaking about ? Because I believed 
> until now that since we merge the 6.2 branch into the cleanup branch the 
> 6.2 branch should not be impacted in any way, am I wrong ?

This typo (unbalanced braces) was introduced during merge
of voot-rewrite branch into sympa-6.2-branch [1].  It had not
been corrected, and merge to sympa-cleanup branch already had
began.

So, it will also affect to sympa-cleanup branch.  To avoid disturbing
current work on sympa-cleanup, I committed correction to sympa-6.2-branch
for now.

--- Soji

[1] 
https://sourcesup.renater.fr/scm/viewvc.php/branches/sympa-6.2-branch/src/lib/List.pm?root=sympa&r1=9545&r2=9544&pathrev=9545


> Etienne
> 
> Le 14/08/13 11:09, address@concealed a écrit :
> > sympa[9793] branches/sympa-6.2-branch/src/lib/List.pm: [dev] Typo due 
> > to merge.
> >
> > Revision
> >     9793
> > Author
> >     sikeda
> > Date
> >     2013-08-14 11:09:55 +0200 (mer. 14 août 2013)
> >
> >
> >       Log Message
> >
> > [dev] Typo due to merge.
> >
> >
> >       Modified Paths
> >
> >   * branches/sympa-6.2-branch/src/lib/List.pm
> >     <#branchessympa62branchsrclibListpm>
> >
> >
> >       Diff
> >
> >
> >         Modified: branches/sympa-6.2-branch/src/lib/List.pm (9792 => 9793)
> >
> >
> > --- branches/sympa-6.2-branch/src/lib/List.pm       2013-08-14 09:06:01 
> > UTC (rev 9792)
> > +++ branches/sympa-6.2-branch/src/lib/List.pm       2013-08-14 09:09:55 
> > UTC (rev 9793)
> > @@ -6791,6 +6791,8 @@
> >                 defined $included
> >                     or push @errors, {type => $type, name => 
> > $incl->{name}};
> >             }
> > +       } # if (my $plugin = ...)
> > +
> >         ## Get the list of users.
> >         ## Verify if we can synchronize sources. If it's allowed OR there 
> > are new sources, we update the list, and can add subscribers.
> >             ## Else if we can't synchronize sources. We make an array 
> > with excluded sources.
> 


-- 
株式会社 コンバージョン  セキュリティ&OSSソリューション部   池田荘児
〒231-0004　神奈川県横浜市中区元浜町3-21-2 ヘリオス関内ビル7F
e-mail address@concealed  TEL 045-640-3550
http://www.conversion.co.jp/