Changeset 1925


Ignore:
Timestamp:
Dec 26, 2014, 3:39:16 PM (5 years ago)
Author:
bruno
Message:
  • Fix checkssh errors with this version
File:
1 edited

Legend:

Unmodified
Added
Removed
  • 0.12.7/pb/bin/pb

    r1923 r1925  
    38043804                    $theorlist{"$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/$pbrealpkgrpm-$pbver-$pbtag$pbos->{'suffix'}"} = 0;
    38053805                } elsif ($pbos->{'type'} eq "deb") {
    3806                     $theorlist{"$pbos->{'name'}/$pbos->{'version'}/$pbrealpkgdeb"."_$pbver-$pbtag"."_$pbos->{'arch'}"} = 0;
    3807                     $archlist{"$pbos->{'name'}/$pbos->{'version'}/$pbrealpkgdeb"."_$pbver-$pbtag"} = "$pbos->{'arch'}";
     3806                    my $pb;
     3807                    $pb->{'realpkg'} = $pbrealpkg;
     3808                    $pb->{'ver'} = $pbver;
     3809                    $pb->{'extdir'} = pb_get_extdir();
     3810                    my $archp = pb_get_pkg_arch($pb,$pbos);
     3811                    $theorlist{"$pbos->{'name'}/$pbos->{'version'}/$pbrealpkgdeb"."_$pbver-$pbtag"."_$archp"} = 0;
     3812                    $archlist{"$pbos->{'name'}/$pbos->{'version'}/$pbrealpkgdeb"."_$pbver-$pbtag"} = "$archp";
    38083813                } elsif ($pbos->{'type'} eq "ebuild") {
    38093814                    my $prefix = "-r";
     
    38883893            my $p = $_;
    38893894            $p =~ s/\.(i[3456]86|x86_64|noarch|src)\.rpm$//;
     3895            $p =~ s/_amd64\.deb$/_x86_64.deb/;
    38903896            $p =~ s/\.deb$//;
    3891             #$p =~ s/_(i[3456]86|amd64|all)\.deb$//;
    38923897            $p =~ s/(-0\.[0-9]{8})[0-9]{6}/$1*/ if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i));
    38933898            $p =~ s/(-r|_p[0-9]+)\.ebuild/$1*/ if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i));
     
    43484353}
    43494354
     4355#
     4356# Return the arch of the package considered
     4357#
     4358sub pb_get_pkg_arch {
     4359
     4360my $pb = shift;
     4361my $pbos = shift;
     4362my $archp = undef;
     4363
     4364# Either we have an Architecture: all (deb noarch) in the control file or we have the arch we're building for
     4365# We look after this info in the tar built during previous phases hoping it's still available and valid
     4366# If not, we rebuild it
     4367my $src2="$ENV{'PBDESTDIR'}/$pb->{'realpkg'}-$pb->{'ver'}$pb->{'extdir'}.pbconf.tar.gz";
     4368pb_system("cd $ENV{'PBBUILDDIR'} ; tar xfz $src2","Extracting pbconf","","quiet");
     4369if ($pbos->{'type'} eq "deb") {
     4370    my $ctrlf = "$pb->{'realpkg'}-$pb->{'ver'}$pb->{'extdir'}/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/control";
     4371    open(CTRL, $ctrlf) || die "Unable to read $ctrlf";
     4372    $archp = $pbos->{'arch'};
     4373    while (<CTRL>) {
     4374        $archp = "all" if (/^Architecture:\s*all/);
     4375    }
     4376    close(CTRL);
     4377}
     4378return($archp);
     4379}
     4380
    43504381# Manages VM/RM SSH port communication
    43514382sub pb_get_port {
Note: See TracChangeset for help on using the changeset viewer.