Changeset 2330 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder

Timestamp:

Oct 17, 2017, 11:46:56 PM (7 years ago)

Author:

Bruno Cornec

Message:

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

File:

• devel/pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)

devel/pb-modules/lib/ProjectBuilder/Distribution.pm

@@ -165 +165 @@
 $pbos->{'family'} = pb_distro_get_param($pbos,pb_conf_get("osfamily"));
 $pbos->{'type'} = pb_distro_get_param($pbos,pb_conf_get("ostype"));
-($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"));
+($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"));
+($pbos->{'localinstall'}) = pb_distro_get_param($pbos,pb_conf_get_if("oslocalins"));
 #($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"));
 
@@ -370 +371 @@
 # This may not be // proof. We should test for availability of repo and sleep if not
 my $cmd = "$pbos->{'install'} $deps";
-$cmd = "$pbos->{'localinstall'} $deps" if (defined $local);
+$cmd = "$pbos->{'localinstall'} $deps" if ((defined $local) && (defined $pbos->{'localinstall'}) && ($pbos->{'localinstall'} !~ /[ ]*/));
 my $ret = pb_system($cmd, "Installing dependencies ($cmd)","mayfail");
 # Try to accomodate deficient proxies