Changeset 1128 in ProjectBuilder
- Timestamp:
- Dec 21, 2010, 3:01:44 AM (13 years ago)
- Location:
- devel
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/lib/ProjectBuilder/Base.pm
r1127 r1128 409 409 sub pb_check_requirements { 410 410 411 my $cmds = shift || ""; 412 my $options = shift || ""; 411 my $req = shift || undef; 412 my $opt = shift || undef; 413 my $appname = shift || undef; 414 415 my ($req2,$opt2) = (undef,undef); 416 $req2 = $req->{$appname} if (defined $req and defined $appname); 417 $opt2 = $opt->{$appname} if (defined $opt and defined $appname); 413 418 414 419 # cmds is a string of coma separated commands 415 foreach my $file (split(/,/,$cmds)) { 416 pb_check_req($file,0); 420 if (defined $req2) { 421 foreach my $file (split(/,/,$req2)) { 422 pb_check_req($file,0); 423 } 417 424 } 418 425 419 426 # opts is a string of coma separated commands 420 foreach my $file (split(/,/,$options)) { 421 pb_check_req($file,1); 427 if (defined $opt2) { 428 foreach my $file (split(/,/,$opt2)) { 429 pb_check_req($file,1); 430 } 422 431 } 423 432 } … … 455 464 } else { 456 465 pb_log(2,"OK\n"); 457 return($found ");466 return($found); 458 467 } 459 468 } -
devel/pb/bin/pb
r1127 r1128 499 499 # 500 500 my ($req,$opt,$pbpara) = pb_conf_get_if("oscmd","oscmdopt","pbparallel"); 501 my ($req2,$opt2) = (undef,undef); 502 $req2 = $req->{$appname} if (defined $req); 503 $opt2 = $opt->{$appname} if (defined $opt); 504 pb_check_requirements($req2,$opt2); 501 pb_check_requirements($req,$opt,$appname); 505 502 506 503 # -
devel/rpmbootstrap/bin/rpmbootstrap
r1127 r1128 229 229 # 230 230 my ($req,$opt) = pb_conf_get_if("oscmd","oscmdopt"); 231 my ($req2,$opt2) = (undef,undef); 232 $req2 = $req->{$appname} if (defined $req); 233 $opt2 = $opt->{$appname} if (defined $opt); 234 pb_check_requirements($req2,$opt2); 231 pb_check_requirements($req,$opt,$appname); 235 232 236 233 if (not defined $vepath) {
Note:
See TracChangeset
for help on using the changeset viewer.