OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Michael van Elst
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-re                       Date:   22-Nov-2002 08:23:24
  Branch: HEAD                             Handle: 2002112207232400

  Modified files:
    openpkg-re              openpkg-build

  Log:
    work around nasty XML::Parser behaviour

  Summary:
    Revision    Changes     Path
    1.48        +13 -6      openpkg-re/openpkg-build
  ____________________________________________________________________________

  Index: openpkg-re/openpkg-build
  ============================================================
  $ cvs diff -u -r1.47 -r1.48 openpkg-build
  --- openpkg-re/openpkg-build  21 Nov 2002 16:14:04 -0000      1.47
  +++ openpkg-re/openpkg-build  22 Nov 2002 07:23:24 -0000      1.48
  @@ -385,6 +385,13 @@
   
       return ($suburl, $subfn);
   }
  +
  +sub xel($) {
  +    my($a) = @_;
  +    my($l) = $a->[0];
  +    return '' if ref $l;
  +    return $l;
  +}
       
   sub get_index ($$$) {
       my($url,$fn,$with) = @_;
  @@ -570,9 +577,9 @@
           foreach (@$desc) {
   
               $href    = $_->{'href'};
  -            $name    = $_->{'Name'}->[0];
  -            $version = $_->{'Version'}->[0];
  -            $release = $_->{'Release'}->[0];
  +            $name    = xel($_->{'Name'});
  +            $version = xel($_->{'Version'});
  +            $release = xel($_->{'Release'});
   
               next unless defined $href &&
                           defined $name &&
  @@ -603,15 +610,15 @@
                   name     => $name,
                   version  => $version,
                   release  => $release,
  -                platform => $_->{'Platform'}->[0],
  -                prefix   => $_->{'Prefixes'}->[0],
  +                platform => xel($_->{'Platform'}),
  +                prefix   => xel($_->{'Prefixes'}),
                   depends  =>
                       ( $_->{'BuildPreReq'}->[0]->{'rdf:bag'}->[0]->{'rdf:li'}
                       || [] ),
                   keeps    =>
                       ( $_->{'PreReq'}->[0]->{'rdf:bag'}->[0]->{'rdf:li'}
                       || [] ),
  -                desc     => $_->{'Description'}->[0]
  +                desc     => xel($_->{'Description'})
               };
               $rec->{OPTIONS} = parse_options($rec->{desc});
   
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to