Changeset 1067


Ignore:
Timestamp:
Jul 12, 2010, 7:59:03 PM (10 years ago)
Author:
Bruno Cornec
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:
2 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/lib/ProjectBuilder/Distribution.pm

    r1064 r1067  
    117117# Dig into the tuple to find the best answer
    118118$dfam = pb_distro_get_param($ddir,$dver,$darch,$osfamily);
    119 $dos = pb_distro_get_param($ddir,$dver,$darch,$os);
    120 $dtype = $ostype->{$dfam} if (defined $ostype->{$dfam});
    121 $dupd = pb_distro_get_param($ddir,$dver,$darch,$osupd,$dfam,$dtype);
    122 $dsuf = pb_distro_get_param($ddir,$dver,$darch,$ossuffix,$dfam,$dtype);
    123 $dnover = pb_distro_get_param($ddir,$dver,$darch,$osnover,$dfam,$dtype);
    124 $drmdot = pb_distro_get_param($ddir,$dver,$darch,$osremovedotinver,$dfam,$dtype);
     119$dtype = pb_distro_get_param($ddir,$dver,$darch,$ostype,$dfam);
     120$dos = pb_distro_get_param($ddir,$dver,$darch,$os,$dfam,$dtype);
     121$dupd = pb_distro_get_param($ddir,$dver,$darch,$osupd,$dfam,$dtype,$dos);
     122$dsuf = pb_distro_get_param($ddir,$dver,$darch,$ossuffix,$dfam,$dtype,$dos);
     123$dnover = pb_distro_get_param($ddir,$dver,$darch,$osnover,$dfam,$dtype,$dos);
     124$drmdot = pb_distro_get_param($ddir,$dver,$darch,$osremovedotinver,$dfam,$dtype,$dos);
    125125
    126126# Some OS have no interesting version
  • devel/pb/bin/pb

    r1066 r1067  
    24552455    # First install all required packages
    24562456    pb_system("yum clean all","Cleaning yum env") if (($ddir eq "fedora") || ($ddir eq "asianux") || ($ddir eq "rhel"));
    2457     my $pkgdep = pb_distro_get_param($ddir,$dver,$darch,$ospkgdep,$dfam,$dtype);
     2457    my $pkgdep = pb_distro_get_param($ddir,$dver,$darch,$ospkgdep,$dfam,$dtype,$dos);
    24582458    pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,join(' ',split(/,/,$pkgdep))));
    24592459
    24602460    # Then install manually the missing perl modules
    2461     my $perldep = pb_distro_get_param($ddir,$dver,$darch,$osperldep,$dfam,$dtype);
     2461    my $perldep = pb_distro_get_param($ddir,$dver,$darch,$osperldep,$dfam,$dtype,$dos);
    24622462    foreach my $m (split(/,/,$perldep)) {
    24632463        # Skip empty deps
Note: See TracChangeset for help on using the changeset viewer.