Changeset 1067

Timestamp:

07/12/10 19:59:03 (3 years ago)

Author:

bruno

Message:

r3941@sge91-1-82-234-15-218: bruno | 2010-06-30 17:25:48 +0200
Adds a new optional parameter for pb_distro_get_param (upper family such as linux)

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (1 diff)
• pb/bin/pb (modified) (1 diff)

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

@@ -117 +117 @@
 # Dig into the tuple to find the best answer
 $dfam = pb_distro_get_param($ddir,$dver,$darch,$osfamily);
-$dos = pb_distro_get_param($ddir,$dver,$darch,$os);
-$dtype = $ostype->{$dfam} if (defined $ostype->{$dfam});
-$dupd = pb_distro_get_param($ddir,$dver,$darch,$osupd,$dfam,$dtype);
-$dsuf = pb_distro_get_param($ddir,$dver,$darch,$ossuffix,$dfam,$dtype);
-$dnover = pb_distro_get_param($ddir,$dver,$darch,$osnover,$dfam,$dtype);
-$drmdot = pb_distro_get_param($ddir,$dver,$darch,$osremovedotinver,$dfam,$dtype);
+$dtype = pb_distro_get_param($ddir,$dver,$darch,$ostype,$dfam);
+$dos = pb_distro_get_param($ddir,$dver,$darch,$os,$dfam,$dtype);
+$dupd = pb_distro_get_param($ddir,$dver,$darch,$osupd,$dfam,$dtype,$dos);
+$dsuf = pb_distro_get_param($ddir,$dver,$darch,$ossuffix,$dfam,$dtype,$dos);
+$dnover = pb_distro_get_param($ddir,$dver,$darch,$osnover,$dfam,$dtype,$dos);
+$drmdot = pb_distro_get_param($ddir,$dver,$darch,$osremovedotinver,$dfam,$dtype,$dos);
 
 # Some OS have no interesting version

devel/pb/bin/pb

@@ -2455 +2455 @@
     # First install all required packages
     pb_system("yum clean all","Cleaning yum env") if (($ddir eq "fedora") || ($ddir eq "asianux") || ($ddir eq "rhel"));
-    my $pkgdep = pb_distro_get_param($ddir,$dver,$darch,$ospkgdep,$dfam,$dtype);
+    my $pkgdep = pb_distro_get_param($ddir,$dver,$darch,$ospkgdep,$dfam,$dtype,$dos);
     pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,join(' ',split(/,/,$pkgdep))));
 
     # Then install manually the missing perl modules
-    my $perldep = pb_distro_get_param($ddir,$dver,$darch,$osperldep,$dfam,$dtype);
+    my $perldep = pb_distro_get_param($ddir,$dver,$darch,$osperldep,$dfam,$dtype,$dos);
     foreach my $m (split(/,/,$perldep)) {
         # Skip empty deps