Changeset 1923 for 0.12.7


Ignore:
Timestamp:
Dec 26, 2014, 2:24:19 PM (5 years ago)
Author:
bruno
Message:
  • Intermediate 0.12.7 version to fix an issue with checkssh where Ubuntu/Debian? distro are not checked per arch but globally
Location:
0.12.7
Files:
1 edited
1 copied

Legend:

Unmodified
Added
Removed
  • 0.12.7/pb/bin/pb

    r1878 r1923  
    37133713    my $pbos = pb_distro_get_context();
    37143714    my $distrolist = pb_get_distros($pbos,undef);
     3715    # List of distriubtions
    37153716    my %dl;
    37163717    my %theorlist;
     
    38033804                    $theorlist{"$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/$pbrealpkgrpm-$pbver-$pbtag$pbos->{'suffix'}"} = 0;
    38043805                } elsif ($pbos->{'type'} eq "deb") {
    3805                     $theorlist{"$pbos->{'name'}/$pbos->{'version'}/$pbrealpkgdeb"."_$pbver-$pbtag"} = 0;
    3806                     # TODO are we always using the last arch ?
     3806                    $theorlist{"$pbos->{'name'}/$pbos->{'version'}/$pbrealpkgdeb"."_$pbver-$pbtag"."_$pbos->{'arch'}"} = 0;
    38073807                    $archlist{"$pbos->{'name'}/$pbos->{'version'}/$pbrealpkgdeb"."_$pbver-$pbtag"} = "$pbos->{'arch'}";
    38083808                } elsif ($pbos->{'type'} eq "ebuild") {
     
    38883888            my $p = $_;
    38893889            $p =~ s/\.(i[3456]86|x86_64|noarch|src)\.rpm$//;
    3890             $p =~ s/_(i[3456]86|amd64|all)\.deb$//;
     3890            $p =~ s/\.deb$//;
     3891            #$p =~ s/_(i[3456]86|amd64|all)\.deb$//;
    38913892            $p =~ s/(-0\.[0-9]{8})[0-9]{6}/$1*/ if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i));
    38923893            $p =~ s/(-r|_p[0-9]+)\.ebuild/$1*/ if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i));
Note: See TracChangeset for help on using the changeset viewer.