Changeset 1434


Ignore:
Timestamp:
Mar 18, 2012, 5:07:43 PM (7 years ago)
Author:
bruno
Message:

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

  • Fix a syntex bug in pbmkbm
Location:
devel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/lib/ProjectBuilder/Filter.pm

    r1367 r1434  
    176176            # Order is important as we need to handle hashes refs before simple vars
    177177            # (?: introduce a Non-capturing groupings cf man perlretut
     178            # We need to avoid handling other VARs (Makefile e.g) so restrict here to $pb type of vars.
    178179            eval { $tmp =~ s/(\$\w+(?:-\>\{\'\w+\'\})*)/$1/eeg };
    179180            if (($s =~ /^PBDESC$/) && ($line =~ /^ PBDESC/)) {
     
    183184                pb_log(3,"*** tmp:$tmp ***\n");
    184185            }
     186            # Support $/ vars
    185187            eval { $tmp =~ s/(\$\/)/$1/eeg };
    186188        } elsif (($s =~ /^PBLOG$/) && ($line =~ /^PBLOG$/)) {
  • devel/pbmkbm/bin/pbmkbm

    r1414 r1434  
    494494die "Unable to read the keyfile $keyfile" if ((not defined $keyfile) || (! -r $keyfile));
    495495my $keymapdir = pb_distro_get_param($pbos,pb_conf_get("ospathcmd-keymapdir"));
    496 die "Unable to read the keymapdir $keymapdir" if (not defined $keymapdir) || (! -d $keymapdir));
     496die "Unable to read the keymapdir $keymapdir" if ((not defined $keymapdir) || (! -d $keymapdir));
    497497my $keymapre = pb_distro_get_param($pbos,pb_conf_get("ospathcmd-keymapre"));
    498498die "Unable to read the keymapre $keymapre" if (not defined $keymapre);
Note: See TracChangeset for help on using the changeset viewer.