Changeset 2437


Ignore:
Timestamp:
Sep 6, 2019, 5:26:40 PM (6 weeks ago)
Author:
bruno
Message:

Fix installation of external repos which was broken in this version

Location:
devel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/lib/ProjectBuilder/Distribution.pm

    r2434 r2437  
    653653    #
    654654    my ($addrepo) = pb_conf_get_in_hash_if($h,"addinstallrepo");
    655     if ((not defined $addrepo) || (not defined $addrepo->{$ENV{'PBPROJ'}})) {
     655    my $repo = pb_distro_get_param($pbos,$addrepo);
     656    if ((not defined $addrepo) || (not defined $repo)) {
    656657        my ($pbrepo) = pb_conf_get_in_hash_if($h,"pbrepo");
    657658        return(undef) if (not defined $pbrepo);
     
    675676        return(pb_distro_setuprepo_gen($pbos,$url));
    676677    } else {
    677         my ($addrepo) = pb_conf_get_in_hash_if($h,"addinstallrepo");
    678         return(pb_distro_setuprepo_gen($pbos,$addrepo->{$ENV{'PBPROJ'}}));
     678        return(pb_distro_setuprepo_gen($pbos,$repo));
    679679    }
    680680} else {
    681681    my ($addrepo) = pb_conf_get_in_hash_if($h,"add".$repotype."repo");
    682     return(pb_distro_setuprepo_gen($pbos,$addrepo->{$ENV{'PBPROJ'}}));
     682    my $repo = pb_distro_get_param($pbos,$addrepo);
     683    return(pb_distro_setuprepo_gen($pbos,$repo));
    683684}
    684685}
  • devel/pb/bin/pb

    r2436 r2437  
    40604060    }
    40614061
    4062     my ($addrepo) = pb_conf_read("$ENV{'PBDESTDIR'}/pbrc.yml","addbuildrepo");
    4063     my $pbrepo = pb_distro_get_param($pbos,$addrepo);
    40644062    print SCRIPT << 'EOF';
    40654063   
Note: See TracChangeset for help on using the changeset viewer.