Changeset 982 in ProjectBuilder for devel/pb-modules

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/pb-modules/lib/ProjectBuilder

Files:

• Base.pm (modified) (1 diff)
• Distribution.pm (modified) (1 diff)

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