ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/SCRAM/src/BuildSystem/Tool.pm
(Generate patch)

Comparing COMP/SCRAM/src/BuildSystem/Tool.pm (file contents):
Revision 1.1.2.7 by williamc, Thu Apr 27 13:22:03 2000 UTC vs.
Revision 1.1.2.8.2.2 by williamc, Mon Aug 14 14:28:19 2000 UTC

# Line 66 | Line 66 | sub equals {
66          my $tool=shift;
67  
68          my $rv=0;
69 <        if ( ($tool->url() eq $self->url() ) &&
69 >        if (
70 >        # TODO - temp for backwards comp mode($tool->url() eq $self->url() ) &&
71               ($tool->name() eq $self->name() ) &&
72               ($tool->version() eq $self->version()) ) {
73            $rv=1;
# Line 216 | Line 217 | sub restore {
217          $fh->open("<".$location) or die "Unable to open $location for output".
218                                  $!."\n";
219          my ($tool,$type,$variable,$value);
220 +        my @fields;
221          while ( <$fh> ) {
222            chomp;
223            next if /^#/;
224            next if /^\s*$/;
225 <          ($variable, $value, $type)=split /:/;
225 >          @fields=split /:/;
226 >          if ( $_!~/:$/ ) {
227 >            $type=pop @fields;
228 >          }
229 >          else { $type="" };
230 >          $variable=shift @fields;
231 >          $value=join ":",@fields;
232 >          #($variable, $value, $type)=split /:/;
233            next if ( $variable=~/\&/ );
234            $product=~tr[A-Z][a-z];
235            if ( $type eq "_sys" ) {
# Line 230 | Line 239 | sub restore {
239            }
240            else {
241              $self->addfeature($variable,$value);
242 +            if ( $type ne "" ) {
243 +               $self->type($variable,$type);
244 +            }
245            }
246          }
247          undef $fh;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines