Changeset 2330


Ignore:
Timestamp:
Oct 17, 2017, 11:46:56 PM (10 months ago)
Author:
bruno
Message:

Fix local install for rpm distros (use osins when oslocalins is empty)

File:
1 edited

Legend:

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

    r2324 r2330  
    165165$pbos->{'family'} = pb_distro_get_param($pbos,pb_conf_get("osfamily"));
    166166$pbos->{'type'} = pb_distro_get_param($pbos,pb_conf_get("ostype"));
    167 ($pbos->{'os'},$pbos->{'install'},$pbos->{'suffix'},$pbos->{'nover'},$pbos->{'rmdot'},$pbos->{'update'},$pbos->{'localinstall'}) = pb_distro_get_param($pbos,pb_conf_get("os","osins","ossuffix","osnover","osremovedotinver","osupd","oslocalins"));
     167($pbos->{'os'},$pbos->{'install'},$pbos->{'suffix'},$pbos->{'nover'},$pbos->{'rmdot'},$pbos->{'update'}) = pb_distro_get_param($pbos,pb_conf_get("os","osins","ossuffix","osnover","osremovedotinver","osupd"));
     168($pbos->{'localinstall'}) = pb_distro_get_param($pbos,pb_conf_get_if("oslocalins"));
    168169#($pbos->{'family'},$pbos->{'type'},$pbos->{'os'},$pbos->{'install'},$pbos->{'suffix'},$pbos->{'nover'},$pbos->{'rmdot'},$pbos->{'update'}) = pb_distro_get_param($pbos,pb_conf_get("osfamily","ostype","os","osins","ossuffix","osnover","osremovedotinver","osupd"));
    169170
     
    370371# This may not be // proof. We should test for availability of repo and sleep if not
    371372my $cmd = "$pbos->{'install'} $deps";
    372 $cmd = "$pbos->{'localinstall'} $deps" if (defined $local);
     373$cmd = "$pbos->{'localinstall'} $deps" if ((defined $local) && (defined $pbos->{'localinstall'}) && ($pbos->{'localinstall'} !~ /[ ]*/));
    373374my $ret = pb_system($cmd, "Installing dependencies ($cmd)","mayfail");
    374375# Try to accomodate deficient proxies
Note: See TracChangeset for help on using the changeset viewer.