Changeset 1926 for 0.12.7


Ignore:
Timestamp:
Dec 26, 2014, 11:36:48 PM (5 years ago)
Author:
bruno
Message:

-Improves deb checkssh support again

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 0.12.7/pb/bin/pb

    r1925 r1926  
    43604360my $pb = shift;
    43614361my $pbos = shift;
    4362 my $archp = undef;
    4363 
     4362my $archp = $pbos->{'arch'};
     4363
     4364# Only used for Debian as of now
    43644365# Either we have an Architecture: all (deb noarch) in the control file or we have the arch we're building for
    43654366# We look after this info in the tar built during previous phases hoping it's still available and valid
    43664367# If not, we rebuild it
    4367 my $src2="$ENV{'PBDESTDIR'}/$pb->{'realpkg'}-$pb->{'ver'}$pb->{'extdir'}.pbconf.tar.gz";
    4368 pb_system("cd $ENV{'PBBUILDDIR'} ; tar xfz $src2","Extracting pbconf","","quiet");
    43694368if ($pbos->{'type'} eq "deb") {
    4370     my $ctrlf = "$pb->{'realpkg'}-$pb->{'ver'}$pb->{'extdir'}/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/control";
     4369    my $ctrlf = "$ENV{'PBBUILDDIR'}/$pb->{'realpkg'}-$pb->{'ver'}$pb->{'extdir'}/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/control";
     4370    pb_system("cd $ENV{'PBBUILDDIR'} ; tar xfz $ENV{'PBDESTDIR'}/$pb->{'realpkg'}-$pb->{'ver'}$pb->{'extdir'}.pbconf.tar.gz","Extracting pbconf","","quiet") if (! -f $ctrlf );
    43714371    open(CTRL, $ctrlf) || die "Unable to read $ctrlf";
    4372     $archp = $pbos->{'arch'};
    43734372    while (<CTRL>) {
    43744373        $archp = "all" if (/^Architecture:\s*all/);
Note: See TracChangeset for help on using the changeset viewer.