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

Timestamp:

Mar 30, 2009, 2:31:42 AM (15 years ago)

Author:

Bruno Cornec

Message:

• pb_get_arch placed lower in the modules tree and used everywhere uname was used
• Adds the possibility to replace the post-install script for rinse to allow for a perl script replacement which is common between distributions

Location:

devel/pb-modules/lib/ProjectBuilder

Files:

• Base.pm (modified) (2 diffs)
• Distribution.pm (modified) (2 diffs)

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

@@ -37 +37 @@
 
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_mkdir_p pb_system pb_rm_rf pb_get_date pb_log pb_log_init pb_get_uri pb_get_content pb_set_content pb_display_file pb_syntax_init pb_syntax pb_temp_init $pbdebug $pbLOG $pbdisplaytype $pblocale);
+our @EXPORT = qw(pb_mkdir_p pb_system pb_rm_rf pb_get_date pb_log pb_log_init pb_get_uri pb_get_content pb_set_content pb_display_file pb_syntax_init pb_syntax pb_temp_init pb_get_arch $pbdebug $pbLOG $pbdisplaytype $pblocale);
 
 =pod
@@ -371 +371 @@
 }
 
+=item B<pb_get_arch>
+
+This function returns the architecture of our local environment and
+standardize on i386 for those platforms. It also solves issues where a i386 VE on x86_64 returns x86_64 wrongly
+
+=cut
+
+sub pb_get_arch {
+
+my $arch = `uname -m`;
+chomp($arch);
+$arch =~ s/i.86/i386/;
+
+return($arch);
+}
+
 =back 
 

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

@@ -119 +119 @@
 
     # By defaut propose yum
-    my $arch=`uname -m`;
+    my $arch=pb_get_arch();
     my $opt = "";
-    chomp($arch);
     if ($arch eq "x86_64") {
         $opt="--exclude=*.i?86";
@@ -570 +569 @@
 
 }
+
+
 =back