Changeset 982 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

Feb 19, 2010, 5:30:20 AM (14 years ago)

Author:

Bruno Cornec

Message:

• Fix variable substitution which was too aggressive in pb_distro_get_param

File:

• devel/pb/bin/pb (modified) (1 diff)

devel/pb/bin/pb

@@ -419 +419 @@
 die pb_syntax(-1,1) if (not defined $action);
 
+my ($filteredfiles, $supfiles, $defpkgdir, $extpkgdir);
+my $pbinit = undef;
+$pbinit = 1 if ($action =~ /^newproj$/);
+
+# Handles project name if any
+# And get global params
+($filteredfiles, $supfiles, $defpkgdir, $extpkgdir) = pb_env_init($opts{'p'},$pbinit,$action);
+
 #
 # Check for command requirements
 #
 my ($req,$opt) = pb_conf_get_if("oscmd","oscmdopt");
-pb_check_requirements($req->{$appname},$opt->{$appname});
-
-my ($filteredfiles, $supfiles, $defpkgdir, $extpkgdir);
-my $pbinit = undef;
-$pbinit = 1 if ($action =~ /^newproj$/);
-
-# Handles project name if any
-# And get global params
-($filteredfiles, $supfiles, $defpkgdir, $extpkgdir) = pb_env_init($opts{'p'},$pbinit,$action);
+my ($req2,$opt2) = (undef,undef);
+$req2 = $req->{$appname} if (defined $req);
+$opt2 = $opt->{$appname} if (defined $opt);
+pb_check_requirements($req2,$opt2);
 
 pb_log(0,"Project: $ENV{'PBPROJ'}\n");