Changeset 973 in ProjectBuilder

Timestamp:

Feb 19, 2010, 3:55:50 AM (14 years ago)

Author:

Bruno Cornec

Message:

Split function pb_env_init and add function pb_env_init_pbrc needed for rpmbootstrap

File:

• devel/pb/lib/ProjectBuilder/Env.pm (modified) (3 diffs)

devel/pb/lib/ProjectBuilder/Env.pm

@@ -31 +31 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_env_init);
+our @EXPORT = qw(pb_env_init pb_env_init_pbrc);
 
 =pod
@@ -47 +47 @@
 =over 4
 
-=item B<pb_env_init>
-
-This function setup the environment for project-builder.
-The first parameter is the project if given on the command line.
-The second parameter is a flag indicating whether we should setup up the pbconf environment or not.
-The third parameter is the action passed to pb.
-It sets up environement variables (PBETC, PBPROJ, PBDEFDIR, PBBUILDDIR, PBROOTDIR, PBDESTDIR, PBCONFDIR, PBPROJVER) 
+=item B<pb_env_init_pbrc>
+
+This function setup/use the configuration file in the HOME directory
+It sets up environment variables (PBETC) 
 
 =cut
 
-sub pb_env_init {
-
-my $proj=shift || undef;
-my $pbinit=shift || undef;
-my $action=shift;
-my $ver;
-my $tag;
+sub pb_env_init_pbrc {
 
 $ENV{'PBETC'} = "$ENV{'HOME'}/.pbrc";
@@ -111 +102 @@
 # We only have one configuration file for now.
 pb_conf_add("$ENV{'PBETC'}");
+}
+
+=item B<pb_env_init>
+
+This function setup the environment for project-builder.
+The first parameter is the project if given on the command line.
+The second parameter is a flag indicating whether we should setup up the pbconf environment or not.
+The third parameter is the action passed to pb.
+It sets up environement variables (PBETC, PBPROJ, PBDEFDIR, PBBUILDDIR, PBROOTDIR, PBDESTDIR, PBCONFDIR, PBPROJVER) 
+
+=cut
+
+sub pb_env_init {
+
+my $proj=shift || undef;
+my $pbinit=shift || undef;
+my $action=shift;
+my $ver;
+my $tag;
+
+pb_env_init_pbrc();
 
 #