Changeset 1128

Timestamp:

12/21/10 03:01:44 (2 years ago)

Author:

bruno

Message:

• pb_check_requirements now takes direct result from pb_conf_get_if and does more internal work, which ease caller.

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Base.pm (modified) (2 diffs)
• pb/bin/pb (modified) (1 diff)
• rpmbootstrap/bin/rpmbootstrap (modified) (1 diff)

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

@@ -409 +409 @@
 sub pb_check_requirements {
 
-my $cmds = shift || "";
-my $options = shift || "";
+my $req = shift || undef;
+my $opt = shift || undef;
+my $appname = shift || undef;
+
+my ($req2,$opt2) = (undef,undef);
+$req2 = $req->{$appname} if (defined $req and defined $appname);
+$opt2 = $opt->{$appname} if (defined $opt and defined $appname);
 
 # cmds is a string of coma separated commands
-foreach my $file (split(/,/,$cmds)) {
-    pb_check_req($file,0);
+if (defined $req2) {
+    foreach my $file (split(/,/,$req2)) {
+        pb_check_req($file,0);
+    }
 }
 
 # opts is a string of coma separated commands
-foreach my $file (split(/,/,$options)) {
-    pb_check_req($file,1);
+if (defined $opt2) {
+    foreach my $file (split(/,/,$opt2)) {
+        pb_check_req($file,1);
+    }
 }
 }
@@ -455 +464 @@
 } else {
     pb_log(2,"OK\n");
-    return($found");
+    return($found);
 }
 }

devel/pb/bin/pb

@@ -499 +499 @@
 #
 my ($req,$opt,$pbpara) = pb_conf_get_if("oscmd","oscmdopt","pbparallel");
-my ($req2,$opt2) = (undef,undef);
-$req2 = $req->{$appname} if (defined $req);
-$opt2 = $opt->{$appname} if (defined $opt);
-pb_check_requirements($req2,$opt2);
+pb_check_requirements($req,$opt,$appname);
 
 #

devel/rpmbootstrap/bin/rpmbootstrap

@@ -229 +229 @@
 #
 my ($req,$opt) = pb_conf_get_if("oscmd","oscmdopt");
-my ($req2,$opt2) = (undef,undef);
-$req2 = $req->{$appname} if (defined $req);
-$opt2 = $opt->{$appname} if (defined $opt);
-pb_check_requirements($req2,$opt2);
+pb_check_requirements($req,$opt,$appname);
 
 if (not defined $vepath) {