Changeset 2187 in ProjectBuilder for devel/pb/bin

Timestamp:

Mar 3, 2017, 4:07:32 AM (8 years ago)

Author:

Bruno Cornec

Message:

Rename pb_distro_setuprepo_gen as pb_distro_setuprepo_gen_conf and create a
new pb_distro_setuprepo_gen external function called by pb to allow the usage
of external repository for pb installation itself if needed.

File:

• devel/pb/bin/pb (modified) (2 diffs)

devel/pb/bin/pb

@@ -3903 +3903 @@
     }
 
+    my ($addrepo) = pb_conf_read("$ENV{'PBDESTDIR'}/pbrc","addrepo");
+    my $pbrepo = pb_distro_get_param($pbos,$addrepo);
     print SCRIPT << 'EOF';
     
@@ -3912 +3914 @@
 pb_system("yum clean all","Cleaning yum env","mayfail") if ((($pbos->{'name'} eq "fedora") && ($pbos->{'version'} < 22)) || ($pbos->{'name'} eq "asianux") || ($pbos->{'name'} eq "rhel"));
 my ($ospkgdep) = pb_conf_get_if("ospkgdep");
-    
+
 my $pkgdep = pb_distro_get_param($pbos,$ospkgdep);
-pb_distro_installdeps(undef,$pbos,undef,pb_distro_only_deps_needed($pbos,join(' ',split(/,/,$pkgdep))));
+my $forcerepo;
+EOF
+    print SCRIPT "\$forcerepo = pb_distro_setuprepo_gen(\$pbos,\"$pbrepo\");\n" if ((defined $pbrepo) && ($pbrepo ne ""));
+    print SCRIPT << 'EOF';
+pb_distro_installdeps(undef,$pbos,$forcerepo,pb_distro_only_deps_needed($pbos,join(' ',split(/,/,$pkgdep))));
 
 EOF