Changeset 1434 in ProjectBuilder

Timestamp:

Mar 18, 2012, 5:07:43 PM (12 years ago)

Author:

Bruno Cornec

Message:

r4577@localhost: bruno | 2012-03-18 16:37:37 +0100

• Fix a syntex bug in pbmkbm

Location:

devel

Files:

• pb/lib/ProjectBuilder/Filter.pm (modified) (2 diffs)
• pbmkbm/bin/pbmkbm (modified) (1 diff)

devel/pb/lib/ProjectBuilder/Filter.pm

@@ -176 +176 @@
             # Order is important as we need to handle hashes refs before simple vars
             # (?: introduce a Non-capturing groupings cf man perlretut
+            # We need to avoid handling other VARs (Makefile e.g) so restrict here to $pb type of vars.
             eval { $tmp =~ s/(\$\w+(?:-\>\{\'\w+\'\})*)/$1/eeg };
             if (($s =~ /^PBDESC$/) && ($line =~ /^ PBDESC/)) {
@@ -183 +184 @@
                 pb_log(3,"*** tmp:$tmp ***\n");
             }
+            # Support $/ vars
             eval { $tmp =~ s/(\$\/)/$1/eeg };
         } elsif (($s =~ /^PBLOG$/) && ($line =~ /^PBLOG$/)) {

devel/pbmkbm/bin/pbmkbm

@@ -494 +494 @@
 die "Unable to read the keyfile $keyfile" if ((not defined $keyfile) || (! -r $keyfile));
 my $keymapdir = pb_distro_get_param($pbos,pb_conf_get("ospathcmd-keymapdir"));
-die "Unable to read the keymapdir $keymapdir" if (not defined $keymapdir) || (! -d $keymapdir));
+die "Unable to read the keymapdir $keymapdir" if ((not defined $keymapdir) || (! -d $keymapdir));
 my $keymapre = pb_distro_get_param($pbos,pb_conf_get("ospathcmd-keymapre"));
 die "Unable to read the keymapre $keymapre" if (not defined $keymapre);