- parse_rpm_build_headers have same behaviour with dontdie and callback

  when using cache or the rpm

1 files changed, 11 insertions, 2 deletions

diff --git a/URPM/Build.pm b/URPM/Build.pm
index 2bd6aca..0282c8b 100644
--- a/URPM/Build.pm
+++ b/URPM/Build.pm
@@ -42,8 +42,16 @@ sub parse_rpms_build_headers {
 
 	    if ($cache{$key} && $cache{$key}{time} > 0 && $cache{$key}{time} >= (stat $_)[9]) {
 		($id, undef) = $urpm->parse_hdlist("$dir/$cache{$key}{file}", !$options{callback});
-		defined $id or die "bad header $dir/$cache{$key}{file}\n";
-		$options{callback} and $options{callback}->($urpm, $id, %options);
+		unless (defined $id) {
+		  if ($options{dontdie}) {
+		    print STDERR "bad header $dir/$cache{$key}{file}\n";
+		    next;
+		  } else {
+		    die "bad header $dir/$cache{$key}{file}\n";
+		  }
+		}
+
+		$options{callback} and $options{callback}->($urpm, $id, %options, (file => $_));
 
 		$filename = $cache{$key}{file};
 	    } else {
@@ -56,6 +64,7 @@ sub parse_rpms_build_headers {
 			die "bad rpm $_\n";
 		    }
 		}
+		
 
 		my $pkg = $urpm->{depslist}[$id];