X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FStatus.pm;h=bdac7550efa61a3149a9271624c37142139e3b84;hb=d91858a335a8eba1d303261131ebb72ecc8b331a;hp=382ada06b8ec2135617e262934359f291932cd90;hpb=01011dbea23c925f1c4e4e6731660ea2406870aa;p=debbugs.git

diff --git a/Debbugs/Status.pm b/Debbugs/Status.pm
index 382ada0..bdac755 100644
--- a/Debbugs/Status.pm
+++ b/Debbugs/Status.pm
@@ -40,7 +40,7 @@ use Params::Validate qw(validate_with :types);
 use Debbugs::Common qw(:util :lock :quit :misc);
 use Debbugs::Config qw(:config);
 use Debbugs::MIME qw(decode_rfc1522 encode_rfc1522);
-use Debbugs::Packages qw(makesourceversions make_source_versions getversions get_versions binarytosource);
+use Debbugs::Packages qw(makesourceversions make_source_versions getversions get_versions binary_to_source);
 use Debbugs::Versions;
 use Debbugs::Versions::Dpkg;
 use POSIX qw(ceil);
@@ -143,6 +143,10 @@ path to the summary file instead of the bug number and/or location.
 something modifying it while the bug has been read. You B<must> call
 C<unfilelock();> if something not undef is returned from read_bug.
 
+=item locks -- hashref of already obtained locks; incremented as new
+locks are needed, and decremented as locks are released on particular
+files.
+
 =back
 
 One of C<bug> or C<summary> must be passed. This function will return
@@ -171,6 +175,9 @@ sub read_bug{
 					 lock     => {type => BOOLEAN,
 						      optional => 1,
 						     },
+					 locks    => {type => HASHREF,
+						      optional => 1,
+						     },
 					},
 			     );
     die "One of bug or summary must be passed to read_bug"
@@ -197,13 +204,13 @@ sub read_bug{
 	 ($location) = $status =~ m/(db-h|db|archive)/;
     }
     if ($param{lock}) {
-	filelock("$config{spool_dir}/lock/$param{bug}");
+	filelock("$config{spool_dir}/lock/$param{bug}",exists $param{locks}?$param{locks}:());
     }
     my $status_fh = IO::File->new($status, 'r');
     if (not defined $status_fh) {
 	warn "Unable to open $status for reading: $!";
 	if ($param{lock}) {
-	    unfilelock();
+		unfilelock(exists $param{locks}?$param{locks}:());
 	}
 	return undef;
     }
@@ -223,7 +230,7 @@ sub read_bug{
     if ($version > 3) {
 	 warn "Unsupported status version '$version'";
 	 if ($param{lock}) {
-	     unfilelock();
+	     unfilelock(exists $param{locks}?$param{locks}:());
 	 }
 	 return undef;
     }
@@ -232,7 +239,11 @@ sub read_bug{
     for my $line (@lines) {
         if ($line =~ /(\S+?): (.*)/) {
             my ($name, $value) = (lc $1, $2);
-            $data{$namemap{$name}} = $value if exists $namemap{$name};
+	    # this is a bit of a hack; we should never, ever have \r
+	    # or \n in the fields of status. Kill them off here.
+	    # [Eventually, this should be superfluous.]
+	    $value =~ s/[\r\n]//g;
+	    $data{$namemap{$name}} = $value if exists $namemap{$name};
         }
     }
     for my $field (keys %fields) {
@@ -291,10 +302,14 @@ my %split_fields =
      affects        => \&splitpackages,
      blocks         => $ditch_empty_space,
      blockedby      => $ditch_empty_space,
-     tags           => sub {return &{$ditch_empty}(qr/\s*\,\s*/,@_)},
+     # this isn't strictly correct, but we'll split both of them for
+     # the time being until we ditch all use of keywords everywhere
+     # from the code
+     keywords       => $ditch_empty_space,
+     tags           => $ditch_empty_space,
      found_versions => $ditch_empty_space,
      fixed_versions => $ditch_empty_space,
-     merged_with    => $ditch_empty_space,
+     mergedwith     => $ditch_empty_space,
     );
 
 sub split_status_fields {
@@ -316,12 +331,7 @@ sub split_status_fields {
 		      ) {
 		    @elements = split $split_fields{$field}, $data->{$field};
 		}
-		if (@elements != 1) {
-		    $data->{$field} = \@elements;
-		}
-		else {
-		    $data->{$field} = $elements[0];
-		}
+		$data->{$field} = \@elements;
 	    }
 	}
     }
@@ -347,22 +357,22 @@ sub join_status_fields {
 	 affects        => ', ',
 	 blocks         => ' ',
 	 blockedby      => ' ',
-	 tags           => ', ',
+	 tags           => ' ',
 	 found_versions => ' ',
 	 fixed_versions => ' ',
 	 found_date     => ' ',
 	 fixed_date     => ' ',
-	 merged_with    => ' ',
+	 mergedwith     => ' ',
 	);
-    my @data = dclone(\@_);
+    my @data = @{dclone(\@_)};
     for my $data (@data) {
 	next if not defined $data;
-	croak "Passed an element which is not a hashref to split_status_field" if
-	    not (defined ref($data) and ref($data) eq 'HASH');
+	croak "Passed an element which is not a hashref to split_status_field: ".
+	    ref($data)
+		if ref($data) ne 'HASH';
 	for my $field (keys %{$data}) {
 	    next unless defined $data->{$field};
-	    next unless defined(ref($data->{$field}))
-		and ref($data->{$field}) eq 'ARRAY';
+	    next unless ref($data->{$field}) eq 'ARRAY';
 	    next unless exists $join_fields{$field};
 	    $data->{$field} = join($join_fields{$field},@{$data->{$field}});
 	}
@@ -432,9 +442,24 @@ even if all of the others were read properly.
 =cut
 
 sub lock_read_all_merged_bugs {
-    my ($bug_num,$location) = @_;
+    my %param = validate_with(params => \@_,
+			      spec   => {bug => {type => SCALAR,
+						 regex => qr/^\d+$/,
+						},
+					 location => {type => SCALAR,
+						      optional => 1,
+						     },
+					 locks    => {type => HASHREF,
+						      optional => 1,
+						     },
+					},
+			     );
     my $locks = 0;
-    my @data = (lockreadbug(@_));
+    my @data = read_bug(bug => $param{bug},
+			lock => 1,
+			exists $param{location} ? (location => $param{location}):(),
+			exists $param{locks} ? (locks => $param{locks}):(),
+		       );
     if (not @data or not defined $data[0]) {
 	return ($locks,());
     }
@@ -442,41 +467,51 @@ sub lock_read_all_merged_bugs {
     if (not length $data[0]->{mergedwith}) {
 	return ($locks,@data);
     }
-    unfilelock();
+    unfilelock(exists $param{locks}?$param{locks}:());
     $locks--;
-    filelock("$config{spool_dir}/lock/merge");
+    filelock("$config{spool_dir}/lock/merge",exists $param{locks}?$param{locks}:());
     $locks++;
-    @data = (lockreadbug(@_));
+    @data = read_bug(bug => $param{bug},
+		     lock => 1,
+		     exists $param{location} ? (location => $param{location}):(),
+		     exists $param{locks} ? (locks => $param{locks}):(),
+		    );
     if (not @data or not defined $data[0]) {
-	unfilelock(); #for merge lock above
+	unfilelock(exists $param{locks}?$param{locks}:()); #for merge lock above
 	$locks--;
 	return ($locks,());
     }
     $locks++;
     my @bugs = split / /, $data[0]->{mergedwith};
+    push @bugs, $param{bug};
     for my $bug (@bugs) {
 	my $newdata = undef;
-	if ($bug ne $bug_num) {
-	    $newdata = lockreadbug($bug,$location);
+	if ($bug != $param{bug}) {
+	    $newdata =
+		read_bug(bug => $bug,
+			 lock => 1,
+			 exists $param{location} ? (location => $param{location}):(),
+			 exists $param{locks} ? (locks => $param{locks}):(),
+			);
 	    if (not defined $newdata) {
 		for (1..$locks) {
-		    unfilelock();
+		    unfilelock(exists $param{locks}?$param{locks}:());
 		}
 		$locks = 0;
-		warn "Unable to read bug: $bug while handling merged bug: $bug_num";
+		warn "Unable to read bug: $bug while handling merged bug: $param{bug}";
 		return ($locks,());
 	    }
 	    $locks++;
 	    push @data,$newdata;
-	}
-	# perform a sanity check to make sure that the merged bugs are
-	# all merged with eachother
-	my $expectmerge= join(' ',grep {$_ != $bug } sort { $a <=> $b } (@bugs,$bug_num));
-	if ($newdata->{mergedwith} ne $expectmerge) {
-	    for (1..$locks) {
-		unfilelock();
+	    # perform a sanity check to make sure that the merged bugs
+	    # are all merged with eachother
+	    my $expectmerge= join(' ',grep {$_ != $bug } sort { $a <=> $b } @bugs);
+	    if ($newdata->{mergedwith} ne $expectmerge) {
+		for (1..$locks) {
+		    unfilelock(exists $param{locks}?$param{locks}:());
+		}
+		die "Bug $param{bug} differs from bug $bug: ($newdata->{bug_num}: '$newdata->{mergedwith}') vs. ('$expectmerge') (".join(' ',@bugs).")";
 	    }
-	    die "Bug $bug_num differs from bug $bug: ($newdata->{bug_num}: $newdata->{mergedwith}) vs. ($expectmerge) (".join(' ',@bugs).")";
 	}
     }
     return ($locks,@data);
@@ -516,9 +551,6 @@ sub makestatus {
 	 }
     }
     %newdata = %{join_status_fields(\%newdata)};
-    for my $field (qw(found_versions fixed_versions found_date fixed_date)) {
-	 $newdata{$field} = join ' ', @{$newdata{$field}||[]};
-    }
 
     if ($version < 3) {
         for my $field (@rfc1522_fields) {
@@ -526,6 +558,13 @@ sub makestatus {
         }
     }
 
+    # this is a bit of a hack; we should never, ever have \r or \n in
+    # the fields of status. Kill them off here. [Eventually, this
+    # should be superfluous.]
+    for my $field (keys %newdata) {
+	$newdata{$field} =~ s/[\r\n]//g if defined $newdata{$field};
+    }
+
     if ($version == 1) {
         for my $field (@v1fieldorder) {
             if (exists $newdata{$field} and defined $newdata{$field}) {
@@ -601,7 +640,7 @@ options mean.
 
 sub unlockwritebug {
     writebug(@_);
-    &unfilelock;
+    unfilelock();
 }
 
 =head1 VERSIONS
@@ -612,7 +651,7 @@ The following functions are exported with the :versions tag
 
      addfoundversions($status,$package,$version,$isbinary);
 
-
+All use of this should be phased out in favor of Debbugs::Control::fixed/found
 
 =cut
 
@@ -625,9 +664,14 @@ sub addfoundversions {
     return unless defined $version;
     undef $package if $package =~ m[(?:\s|/)];
     my $source = $package;
+    if ($package =~ s/^src://) {
+	$isbinary = 0;
+	$source = $package;
+    }
 
     if (defined $package and $isbinary) {
-        my @srcinfo = binarytosource($package, $version, undef);
+        my @srcinfo = binary_to_source(binary => $package,
+				       version => $version);
         if (@srcinfo) {
             # We know the source package(s). Use a fully-qualified version.
             addfoundversions($data, $_->[0], $_->[1], '') foreach @srcinfo;
@@ -701,7 +745,8 @@ sub addfixedversions {
     my $source = $package;
 
     if (defined $package and $isbinary) {
-        my @srcinfo = binarytosource($package, $version, undef);
+        my @srcinfo = binary_to_source(binary => $package,
+				       version => $version);
         if (@srcinfo) {
             # We know the source package(s). Use a fully-qualified version.
             addfixedversions($data, $_->[0], $_->[1], '') foreach @srcinfo;
@@ -832,7 +877,7 @@ sub bug_archiveable{
      }
      # Check to make sure that the bug has none of the unremovable tags set
      if (@{$config{removal_unremovable_tags}}) {
-	  for my $tag (split ' ', ($status->{tags}||'')) {
+	  for my $tag (split ' ', ($status->{keywords}||'')) {
 	       if (grep {$tag eq $_} @{$config{removal_unremovable_tags}}) {
 		    print STDERR "Cannot archive $param{bug} because it has an unremovable tag '$tag'\n" if $DEBUG;
 		    return $cannot_archive;
@@ -877,7 +922,7 @@ sub bug_archiveable{
 	  @dist_tags{@{$config{removal_distribution_tags}}} =
 	       (1) x @{$config{removal_distribution_tags}};
 	  my %dists;
-	  for my $tag (split ' ', ($status->{tags}||'')) {
+	  for my $tag (split ' ', ($status->{keywords}||'')) {
 	       next unless exists $config{distribution_aliases}{$tag};
 	       next unless $dist_tags{$config{distribution_aliases}{$tag}};
 	       $dists{$config{distribution_aliases}{$tag}} = 1;
@@ -1063,25 +1108,10 @@ sub get_bug_status {
 
      $status{package} = '' if not defined $status{package};
      $status{"package"} =~ s/\s*$//;
-     # if we aren't supposed to indicate the source, we'll return
-     # unknown here.
-     $status{source} = 'unknown';
-     if ($param{indicatesource}) {
-	 my @packages = split /\s*,\s*/, $status{package};
-	 my @source;
-	 for my $package (@packages) {
-	     next if $package eq '';
-	     if ($package =~ /^src\:$/) {
-		 push @source,$1;
-	     }
-	     else {
-		 push @source, binarytosource($package);
-	     }
-	 }
-	 if (@source) {
-	     $status{source} = join(', ',@source);
-	 }
-     }
+
+     $status{source} = binary_to_source(binary=>[split /\s*,\s*/, $status{package}],
+					source_only => 1,
+				       );
 
      $status{"package"} = 'unknown' if ($status{"package"} eq '');
      $status{"severity"} = 'normal' if (not defined $status{severity} or $status{"severity"} eq '');
@@ -1200,7 +1230,7 @@ sub bug_presence {
 		    (1) x @{$config{affects_distribution_tags}};
 	       my $some_distributions_disallowed = 0;
 	       my %allowed_distributions;
-	       for my $tag (split ' ', ($status{tags}||'')) {
+	       for my $tag (split ' ', ($status{keywords}||'')) {
 		   if (exists $config{distribution_aliases}{$tag} and
 			exists $affects_distribution_tags{$config{distribution_aliases}{$tag}}) {
 		       $some_distributions_disallowed = 1;
@@ -1211,8 +1241,10 @@ sub bug_presence {
 		       $allowed_distributions{$tag} = 1;
 		   }
 	       }
-	       foreach my $arch (make_list(exists $param{arch}?$param{arch}:undef)) {
-		    for my $package (split /\s*,\s*/, $status{package}) {
+	       my @archs = make_list(exists $param{arch}?$param{arch}:());
+	   GET_SOURCE_VERSIONS:
+	       foreach my $arch (@archs) {
+		   for my $package (split /\s*,\s*/, $status{package}) {
 			 my @versions = ();
 			 my $source = 0;
 			 if ($package =~ /^src:(.+)$/) {
@@ -1243,6 +1275,15 @@ sub bug_presence {
 			 @sourceversions{@temp} = (1) x @temp;
 		    }
 	       }
+	       # this should really be split out into a subroutine,
+	       # but it'd touch so many things currently, that we fake
+	       # it; it's needed to properly handle bugs which are
+	       # erroneously assigned to the binary package, and we'll
+	       # probably have it go away eventually.
+ 	       if (not keys %sourceversions and (not @archs or defined $archs[0])) {
+ 		   @archs = (undef);
+ 		   goto GET_SOURCE_VERSIONS;
+ 	       }
 	  }
 
 	  # TODO: This should probably be handled further out for efficiency and
@@ -1497,23 +1538,23 @@ sub update_realtime {
 
 sub bughook_archive {
 	my @refs = @_;
-	&filelock("$config{spool_dir}/debbugs.trace.lock");
-	&appendfile("debbugs.trace","archive ".join(',',@refs)."\n");
+	filelock("$config{spool_dir}/debbugs.trace.lock");
+	appendfile("$config{spool_dir}/debbugs.trace","archive ".join(',',@refs)."\n");
 	my %bugs = update_realtime("$config{spool_dir}/index.db.realtime",
 				   map{($_,'REMOVE')} @refs);
 	update_realtime("$config{spool_dir}/index.archive.realtime",
 			%bugs);
-	&unfilelock;
+	unfilelock();
 }
 
 sub bughook {
 	my ( $type, %bugs_temp ) = @_;
-	&filelock("$config{spool_dir}/debbugs.trace.lock");
+	filelock("$config{spool_dir}/debbugs.trace.lock");
 
 	my %bugs;
 	for my $bug (keys %bugs_temp) {
 	     my $data = $bugs_temp{$bug};
-	     &appendfile("debbugs.trace","$type $bug\n",makestatus($data, 1));
+	     appendfile("$config{spool_dir}/debbugs.trace","$type $bug\n",makestatus($data, 1));
 
 	     my $whendone = "open";
 	     my $severity = $config{default_severity};
@@ -1531,7 +1572,7 @@ sub bughook {
 	}
 	update_realtime("$config{spool_dir}/index.db.realtime", %bugs);
 
-	&unfilelock;
+	unfilelock();
 }