OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Mar-2003 11:50:45
Branch: HEAD Handle: 2003032110504400
Modified files:
openpkg-src/openpkg-tool
openpkg-build.pl
Log:
more verbose error message printed when index parser fails
Summary:
Revision Changes Path
1.65 +40 -30 openpkg-src/openpkg-tool/openpkg-build.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-build.pl
============================================================================
$ cvs diff -u -r1.64 -r1.65 openpkg-build.pl
--- openpkg-src/openpkg-tool/openpkg-build.pl 21 Mar 2003 09:45:04 -0000 1.64
+++ openpkg-src/openpkg-tool/openpkg-build.pl 21 Mar 2003 10:50:44 -0000 1.65
@@ -848,22 +848,27 @@
$mywith = $with;
}
- $rec = {
- href => (relurl($url, undef, $href))[0],
- name => $name,
- version => $version,
- release => $release,
- depends => depend_list(swith($bags,'bprereq',$mywith)),
- keeps => depend_list(swith($bags,'prereq',$mywith)),
- conflicts => swith($bags,'conflicts',$mywith),
- source => swith($bags,'source',$mywith),
- nosource => swith($bags,'nosource',$mywith),
- desc => $desc,
- platform => $platform,
- prefix => $prefix,
- OPTIONS => $options,
- DEFOPTS => { %$options }
+ eval {
+ $rec = {
+ href => (relurl($url, undef, $href))[0],
+ name => $name,
+ version => $version,
+ release => $release,
+ depends => depend_list(swith($bags,'bprereq',$mywith)),
+ keeps => depend_list(swith($bags,'prereq',$mywith)),
+ conflicts => swith($bags,'conflicts',$mywith),
+ source => swith($bags,'source',$mywith),
+ nosource => swith($bags,'nosource',$mywith),
+ desc => $desc,
+ platform => $platform,
+ prefix => $prefix,
+ OPTIONS => $options,
+ DEFOPTS => { %$options }
+ };
};
+ if ($@) {
+ die "ERROR: when reading entry '$name'\n".$@;
+ }
foreach (@provides) {
push(@{$map->{$_->{name}}->{vs($_)}}, $rec);
@@ -944,22 +949,27 @@
$mywith = $with;
}
- $rec = {
- href => (relurl($url, undef, $href))[0],
- name => $name,
- version => $version,
- release => $release,
- platform => xel($_->{'Platform'}),
- prefix => xel($_->{'Prefixes'}),
- depends => depend_list(xwith($_->{'BuildPreReq'}, $mywith)),
- keeps => depend_list(xwith($_->{'PreReq'}, $mywith)),
- conflicts => xwith($_->{'Conflicts'}, $mywith),
- source => xwith($_->{'Source'}, $mywith),
- nosource => xwith($_->{'NoSource'}, $mywith),
- desc => $desc,
- OPTIONS => $options,
- DEFOPTS => { %$options }
+ eval {
+ $rec = {
+ href => (relurl($url, undef, $href))[0],
+ name => $name,
+ version => $version,
+ release => $release,
+ platform => xel($_->{'Platform'}),
+ prefix => xel($_->{'Prefixes'}),
+ depends => depend_list(xwith($_->{'BuildPreReq'}, $mywith)),
+ keeps => depend_list(xwith($_->{'PreReq'}, $mywith)),
+ conflicts => xwith($_->{'Conflicts'}, $mywith),
+ source => xwith($_->{'Source'}, $mywith),
+ nosource => xwith($_->{'NoSource'}, $mywith),
+ desc => $desc,
+ OPTIONS => $options,
+ DEFOPTS => { %$options }
+ };
};
+ if ($@) {
+ die "ERROR: when reading entry '$name'\n".$@;
+ }
foreach (@provides) {
push(@{$map->{$_->{name}}->{vs($_)}}, $rec);
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
