Changeset 982 in ProjectBuilder for devel

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

Location:

devel

Files:

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

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

@@ -400 +400 @@
 
 my $cmds = shift || "";
-my $opts = shift || "";
+my $options = shift || "";
 
 # cmds is a string of coma separated commands
-foreach my $file (split(/,/,$cmds) {
+foreach my $file (split(/,/,$cmds)) {
     pb_check_req($file,0);
 }
 
 # opts is a string of coma separated commands
-foreach my $file (split(/,/,$opts) {
+foreach my $file (split(/,/,$options)) {
     pb_check_req($file,1);
 }

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

@@ -444 +444 @@
 }
 
-# Allow replacement of variables inside the parameter such as ddir, dver, darch for rpmbootstrap
-eval { $param =~ s/(\$\w+)/$1/eeg };
-
-pb_log(2,"DEBUG: pb_distro_get_param on ",Dumper($opt)," returns $param\n");
+# Allow replacement of variables inside the parameter such as ddir, dver, darch for rpmbootstrap 
+# but not shell variable which ae backslashed
+if ($param =~ /[^\\]\$/) {
+    pb_log(3,"Expanding variable on $param\n");
+    eval { $param =~ s/(\$\w+)/$1/eeg };
+}
+
+pb_log(2,"DEBUG: pb_distro_get_param on $ddir-$dver-$darch returns ==$param==\n");
 return($param);
 

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");

devel/rpmbootstrap/bin/rpmbootstrap

@@ -192 +192 @@
 
 #
-# Check for command requirements
-#
-my ($req,$opt) = pb_conf_get_if("oscmd","oscmdopt");
-pb_check_requirements($req->{$appname},$opt->{$appname});
-
-#
 # Check target dir
 # Create if not existent and use default if none given
@@ -203 +197 @@
 pb_env_init_pbrc(); # to get content of HOME/.pbrc
 my $vepath = shift @ARGV;
+
+#
+# Check for command requirements
+#
+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);
 
 if (not defined $vepath) {