Changeset 2187 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Distribution.pm

Timestamp:

Mar 3, 2017, 4:07:32 AM (7 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-modules/lib/ProjectBuilder/Distribution.pm (modified) (5 diffs)

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

@@ -33 +33 @@
  
 our @ISA = qw(Exporter);
-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);
+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);
 ($VERSION,$REVISION) = pb_version_init();
 
@@ -528 +528 @@
 my $pbos = shift;
 
-return(pb_distro_setuprepo_gen($pbos,pb_distro_conffile(),"osrepo"));
+return(pb_distro_setuprepo_gen_conf($pbos,pb_distro_conffile(),"osrepo"));
 }
 
@@ -541 +541 @@
 my $pbos = shift;
 
-return(pb_distro_setuprepo_gen($pbos,"$ENV{'PBDESTDIR'}/pbrc","addrepo"));
+return(pb_distro_setuprepo_gen_conf($pbos,"$ENV{'PBDESTDIR'}/pbrc","addrepo"));
 }
 
@@ -566 +566 @@
 }
 
-=item B<pb_distro_setuprepo_gen>
-
-This function sets up in a generic way potential additional repository 
-
-=cut
-
-sub pb_distro_setuprepo_gen {
+=item B<pb_distro_setuprepo_gen_conf>
+
+This function sets up in a generic way potential additional repository using conf files
+
+=cut
+
+sub pb_distro_setuprepo_gen_conf {
 
 my $pbos = shift;
@@ -585 +585 @@
 my $param = pb_distro_get_param($pbos,$addrepo);
 return undef if ($param eq "");
+
+return(pb_distro_setuprepo_gen($pbos,$param));
+}
+
+
+=item B<pb_distro_setuprepo_gen>
+
+This function sets up in a generic way potential additional repository passed as a param
+
+=cut
+
+sub pb_distro_setuprepo_gen {
+
+my $pbos = shift;
+my $param = shift;
+
+return if (not defined $param);
 
 pb_apply_conf_proxy($pbos);