Subversion Repositories DevTools

Rev

Rev 361 | Rev 383 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 361 Rev 363
Line 280... Line 280...
280 
    #
 280 
    #
281 
    if ( $svn_label->Type )
 281 
    if ( $svn_label->Type )
282 
    {
 282 
    {
283 
        $opt_viewname = $svn_label->Path;
 283 
        $opt_viewname = $svn_label->Path;
284 
        $opt_viewname .= '_' . ($svn_label->Version || 'trunk');
 284 
        $opt_viewname .= '_' . ($svn_label->Version || 'trunk');
- 
 
 285 
 
- 
 
 286 
        #
- 
 
 287 
        #   Tags and Branches 'should' include the package name
- 
 
 288 
        #   This will lead to a duplication of the package name
- 
 
 289 
        #   ie: aaaaa/package/tags/package_version
- 
 
 290 
        #   Attempt to remove these
- 
 
 291 
        #
- 
 
 292 
        if ( $opt_viewname =~ s~[_/]([\-.:0-9a-zA-Z]+)_\1_~_$1_~ )
- 
 
 293 
        {
- 
 
 294 
            Verbose ("Removed duplicate package name: $1 from $opt_viewname");
- 
 
 295 
        }
285 
    }
 296 
    }
286 
    else
 297 
    else
287 
    {
 298 
    {
288 
        $opt_viewname = $svn_label->Path;
 299 
        $opt_viewname = $svn_label->Path;
289 
        $bad_label_name = 1;
 300 
        $bad_label_name = 1;
Line 611... Line 622...
611 
 
 622 
 
612 
}
 623 
}
613 
Error ("Package not transferred")
 624 
Error ("Package not transferred")
614 
    if ( $error );
 625 
    if ( $error );
615 
 
 626 
 
- 
 
 627 
chdir ($user_cwd) or Error( "Cannot chdir to $$user_cwd");
616 
 
 628 
 
617 
#
 629 
#
618 
#   Delete the view
 630 
#   Delete the view
619 
#
 631 
#
620 
if ( ! $opt_reuse && ! $error && ! $opt_keep )
 632 
if ( ! $opt_reuse && ! $error && ! $opt_keep )