Changeset 1064 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Distribution.pm
- Timestamp:
- Jun 27, 2010, 8:23:38 AM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/lib/ProjectBuilder/Distribution.pm
r1050 r1064 42 42 # Return information on the running distro 43 43 # 44 my ($ddir, $dver, $dfam, $dtype, $pbsuf, $ pbupd, $arch) = pb_distro_init();44 my ($ddir, $dver, $dfam, $dtype, $pbsuf, $dos, $pbupd, $arch) = pb_distro_init(); 45 45 print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch)."\n"; 46 46 # 47 47 # Return information on the requested distro 48 48 # 49 my ($ddir, $dver, $dfam, $dtype, $ pbsuf, $pbupd, $arch) = pb_distro_init("ubuntu","7.10","x86_64");49 my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init("ubuntu","7.10","x86_64"); 50 50 print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch)."\n"; 51 51 # … … 53 53 # 54 54 my ($ddir,$dver) = pb_distro_get(); 55 my ($ddir, $dver, $dfam, $dtype, $ pbsuf, $pbupd, $arch) = pb_distro_init($ddir,$dver);55 my ($ddir, $dver, $dfam, $dtype, $dos, $pbsuf, $pbupd, $arch) = pb_distro_init($ddir,$dver); 56 56 print "distro tuple: ".Dumper($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch)."\n"; 57 57 … … 95 95 my $dfam = "unknown"; 96 96 my $dtype = "unknown"; 97 my $dos = "unknown"; 97 98 my $dsuf = "unknown"; 98 99 my $dupd = "unknown"; … … 112 113 $darch=pb_get_arch() if (not defined $darch); 113 114 114 my ($osfamily,$ostype,$osupd,$ossuffix,$osnover,$osremovedotinver ) = pb_conf_get("osfamily","ostype","osupd","ossuffix","osnover","osremovedotinver");115 my ($osfamily,$ostype,$osupd,$ossuffix,$osnover,$osremovedotinver,$os) = pb_conf_get("osfamily","ostype","osupd","ossuffix","osnover","osremovedotinver","os"); 115 116 116 117 # Dig into the tuple to find the best answer 117 118 $dfam = pb_distro_get_param($ddir,$dver,$darch,$osfamily); 119 $dos = pb_distro_get_param($ddir,$dver,$darch,$os); 118 120 $dtype = $ostype->{$dfam} if (defined $ostype->{$dfam}); 119 121 $dupd = pb_distro_get_param($ddir,$dver,$darch,$osupd,$dfam,$dtype); … … 141 143 pb_log(2,"DEBUG: pb_distro_init: $ddir, $dver, $dfam, $dtype, $dsuf, $dupd, $darch\n"); 142 144 143 return($ddir, $dver, $dfam, $dtype, $d suf, $dupd, $darch);145 return($ddir, $dver, $dfam, $dtype, $dos, $dsuf, $dupd, $darch); 144 146 } 145 147 … … 431 433 my $dfam = shift || "unknown"; 432 434 my $dtype = shift || "unknown"; 435 my $dos = shift || "unknown"; 433 436 434 437 if (defined $opt->{"$ddir-$dver-$darch"}) { … … 442 445 } elsif (defined $opt->{$dtype}) { 443 446 $param = $opt->{$dtype}; 447 } elsif (defined $opt->{$dos}) { 448 $param = $opt->{$dos}; 444 449 } elsif (defined $opt->{"default"}) { 445 450 $param = $opt->{"default"};
Note:
See TracChangeset
for help on using the changeset viewer.