Subversion Repositories DevTools

Rev

Rev 7307 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 7307 Rev 7311
Line 204... Line 204...
204 
            $data->{version} = $2;
 204 
            $data->{version} = $2;
205 
            $data->{prj} = $3;
 205 
            $data->{prj} = $3;
206 
            $data->{arch} = $4;
 206 
            $data->{arch} = $4;
207 
            $data->{type} = $5;
 207 
            $data->{type} = $5;
208 
        }
 208 
        }
- 
 
 209 
        elsif ( $file =~ m~^(.*)-(.*)\.([a-z]+)-(.*)\.(.*)\.(rpm)$~i)
- 
 
 210 
        {
- 
 
 211 
            $data->{name} = $1;
- 
 
 212 
            $data->{version} = $2;
- 
 
 213 
            $data->{prj} = $3;
- 
 
 214 
            $data->{release} = $4;
- 
 
 215 
            $data->{arch} = $5;
- 
 
 216 
            $data->{type} = $6;
- 
 
 217 
            $data->{release} =~ s~[PD]$~~;
- 
 
 218 
            $alias = join('.', $data->{name}, $data->{prj}, $data->{release}, $data->{arch}, $data->{type} );
- 
 
 219 
        }
209 
        elsif ( $file =~ m~^(.*)_(.*)\.([^_]+)_(.*)\.(deb|tgz|rpm)$~i)
 220 
        elsif ( $file =~ m~^(.*)_(.*)\.([^_]+)_(.*)\.(deb|tgz|rpm)$~i)
210 
        {
 221 
        {
211 
            $data->{name} = $1;
 222 
            $data->{name} = $1;
212 
            $data->{version} = $2;
 223 
            $data->{version} = $2;
213 
            $data->{prj} = $3;
 224 
            $data->{prj} = $3;
Line 479... Line 490...
479 
# Returns         :
490 
# Returns         :
480 
#
 491 
#
481 
sub RemoveDuplicates
 492 
sub RemoveDuplicates
482 
{
 493 
{
483 
    my %baseNames;
 494 
    my %baseNames;
- 
 
 495 
    my ($base, $type, $suf, $debugName);
484 
    foreach my $file ( keys %bomList)
 496 
    foreach my $file ( keys %bomList)
485 
    {
 497 
    {
- 
 
 498 
        undef $base;
- 
 
 499 
 
486 
        #
 500 
        #
487 
        #   Only process files that are of the expected form
 501 
        #   Only process files that are of the expected form
488 
        #       ie: erg-udcrypt_1.0.3043.vss_UBUNTU16_P.deb
 - 
 
489 
        #
 502 
        #
490 
        if( $file =~ m~(.*)_([PD])(\.(deb|rpm|tgz))$~ )
 503 
        if( $file =~ m~(.*)_([PD])(\.(deb|rpm|tgz))$~ )
491 
        {
 504 
        {
- 
 
 505 
            # ie: erg-udcrypt_1.0.3043.vss_UBUNTU16_P.deb
492 
            my $base=$1;
 506 
            $base=$1;
493 
            my $type=$2;
 507 
            $type=$2;
494 
            my $suf=$3;
 508 
            $suf=$3;
- 
 
 509 
            $debugName = $base . '_D' . $suf;
495 
 
 510 
 
- 
 
 511 
        }
- 
 
 512 
        elsif ( $file =~ m~^(.*-.*\.[a-z]+-.*)([PD])(\..*\.rpm)$~i)
- 
 
 513 
        {
- 
 
 514 
            # ie: ERGtds-25.0.7011.mas-el7D.x86_64.rpm
- 
 
 515 
            $base=$1;
- 
 
 516 
            $type=$2;
- 
 
 517 
            $suf=$3;
- 
 
 518 
            $debugName = $base . 'D' . $suf;
- 
 
 519 
        }
- 
 
 520 
 
- 
 
 521 
        if (defined $base)
- 
 
 522 
        {
496 
            if (exists $baseNames{$base} )
 523 
            if (exists $baseNames{$base} )
497 
            {
 524 
            {
498 
                my $debugName = $base . '_D' . $suf;
- 
 
499 
                Verbose("Remove debug installer: $file. Kill: $debugName");
 525 
                Verbose("Remove debug installer: $file. Kill: $debugName");
500 
                delete $bomList{$debugName};
 526 
                delete $bomList{$debugName};
501 
            }
 527 
            }
502 
 
 528 
 
503 
            $baseNames{$base} = $type;
 529 
            $baseNames{$base} = $type;