Changeset 2187 in ProjectBuilder
- Timestamp:
- Mar 3, 2017, 4:07:32 AM (7 years ago)
- Location:
- devel
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/lib/ProjectBuilder/Distribution.pm
r2182 r2187 33 33 34 34 our @ISA = qw(Exporter); 35 our @EXPORT = qw(pb_distro_init pb_distro_conffile pb_distro_sysconffile pb_distro_get pb_distro_getlsb pb_distro_installdeps pb_distro_getdeps pb_distro_only_deps_needed pb_distro_setuprepo pb_distro_setuposrepo pb_distro_ get_param pb_distro_get_context pb_distro_to_keylist pb_distro_conf_print pb_apply_conf_proxy);35 our @EXPORT = qw(pb_distro_init pb_distro_conffile pb_distro_sysconffile pb_distro_get pb_distro_getlsb pb_distro_installdeps pb_distro_getdeps pb_distro_only_deps_needed pb_distro_setuprepo pb_distro_setuposrepo pb_distro_setuprepo_gen pb_distro_get_param pb_distro_get_context pb_distro_to_keylist pb_distro_conf_print pb_apply_conf_proxy); 36 36 ($VERSION,$REVISION) = pb_version_init(); 37 37 … … 528 528 my $pbos = shift; 529 529 530 return(pb_distro_setuprepo_gen ($pbos,pb_distro_conffile(),"osrepo"));530 return(pb_distro_setuprepo_gen_conf($pbos,pb_distro_conffile(),"osrepo")); 531 531 } 532 532 … … 541 541 my $pbos = shift; 542 542 543 return(pb_distro_setuprepo_gen ($pbos,"$ENV{'PBDESTDIR'}/pbrc","addrepo"));543 return(pb_distro_setuprepo_gen_conf($pbos,"$ENV{'PBDESTDIR'}/pbrc","addrepo")); 544 544 } 545 545 … … 566 566 } 567 567 568 =item B<pb_distro_setuprepo_gen >569 570 This function sets up in a generic way potential additional repository 571 572 =cut 573 574 sub pb_distro_setuprepo_gen {568 =item B<pb_distro_setuprepo_gen_conf> 569 570 This function sets up in a generic way potential additional repository using conf files 571 572 =cut 573 574 sub pb_distro_setuprepo_gen_conf { 575 575 576 576 my $pbos = shift; … … 585 585 my $param = pb_distro_get_param($pbos,$addrepo); 586 586 return undef if ($param eq ""); 587 588 return(pb_distro_setuprepo_gen($pbos,$param)); 589 } 590 591 592 =item B<pb_distro_setuprepo_gen> 593 594 This function sets up in a generic way potential additional repository passed as a param 595 596 =cut 597 598 sub pb_distro_setuprepo_gen { 599 600 my $pbos = shift; 601 my $param = shift; 602 603 return if (not defined $param); 587 604 588 605 pb_apply_conf_proxy($pbos); -
devel/pb/bin/pb
r2186 r2187 3903 3903 } 3904 3904 3905 my ($addrepo) = pb_conf_read("$ENV{'PBDESTDIR'}/pbrc","addrepo"); 3906 my $pbrepo = pb_distro_get_param($pbos,$addrepo); 3905 3907 print SCRIPT << 'EOF'; 3906 3908 … … 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")); 3913 3915 my ($ospkgdep) = pb_conf_get_if("ospkgdep"); 3914 3916 3915 3917 my $pkgdep = pb_distro_get_param($pbos,$ospkgdep); 3916 pb_distro_installdeps(undef,$pbos,undef,pb_distro_only_deps_needed($pbos,join(' ',split(/,/,$pkgdep)))); 3918 my $forcerepo; 3919 EOF 3920 print SCRIPT "\$forcerepo = pb_distro_setuprepo_gen(\$pbos,\"$pbrepo\");\n" if ((defined $pbrepo) && ($pbrepo ne "")); 3921 print SCRIPT << 'EOF'; 3922 pb_distro_installdeps(undef,$pbos,$forcerepo,pb_distro_only_deps_needed($pbos,join(' ',split(/,/,$pkgdep)))); 3917 3923 3918 3924 EOF
Note:
See TracChangeset
for help on using the changeset viewer.