X-Git-Url: https://git.donarmstrong.com/?p=debbugs.git;a=blobdiff_plain;f=Debbugs%2FStatus.pm;h=e880783ca87493680b3c751e32cd06df7cf54526;hp=b518a8ecbd61e115fe1055b00f9c609ecfb26397;hb=7794f8e5eeb42a5b99caa0c50126eac150b3750e;hpb=02c3bfcf18adb3599788f37d2d314cac5f51535a

diff --git a/Debbugs/Status.pm b/Debbugs/Status.pm
index b518a8e..e880783 100644
--- a/Debbugs/Status.pm
+++ b/Debbugs/Status.pm
@@ -37,13 +37,15 @@ use vars qw($VERSION $DEBUG %EXPORT_TAGS @EXPORT_OK @EXPORT);
 use base qw(Exporter);
 
 use Params::Validate qw(validate_with :types);
-use Debbugs::Common qw(:util :lock :quit :misc);
+use Debbugs::Common qw(:util :lock :quit :misc :utf8);
 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);
+use File::Copy qw(copy);
+use Encode qw(decode encode is_utf8);
 
 use Storable qw(dclone);
 use List::Util qw(min max);
@@ -62,6 +64,7 @@ BEGIN{
 				qw(lock_read_all_merged_bugs),
 			       ],
 		     write  => [qw(writebug makestatus unlockwritebug)],
+		     new => [qw(new_bug)],
 		     versions => [qw(addfoundversions addfixedversions),
 				  qw(removefoundversions removefixedversions)
 				 ],
@@ -69,7 +72,7 @@ BEGIN{
 		     fields   => [qw(%fields)],
 		    );
      @EXPORT_OK = ();
-     Exporter::export_ok_tags(qw(status read write versions hook fields));
+     Exporter::export_ok_tags(keys %EXPORT_TAGS);
      $EXPORT_TAGS{all} = [@EXPORT_OK];
 }
 
@@ -143,6 +146,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 +178,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 +207,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,22 +233,45 @@ sub read_bug{
     if ($version > 3) {
 	 warn "Unsupported status version '$version'";
 	 if ($param{lock}) {
-	     unfilelock();
+	     unfilelock(exists $param{locks}?$param{locks}:());
 	 }
 	 return undef;
     }
 
     my %namemap = reverse %fields;
+    for my $field (keys %fields) {
+        $data{$field} = '' unless exists $data{$field};
+    }
+    if ($version < 3) {
+	for my $field (@rfc1522_fields) {
+	    $data{$field} = decode_rfc1522($data{$field});
+	}
+    }
     for my $line (@lines) {
+	my @encodings_to_try = qw(utf8 iso8859-1);
+	if ($version >= 3) {
+	    @encodings_to_try = qw(utf8);
+	}
+	for (@encodings_to_try) {
+	    last if is_utf8($line);
+	    my $temp;
+	    eval {
+		$temp = decode("$_",$line,Encode::FB_CROAK);
+	    };
+	    if (not $@) { # only update the line if there are no errors.
+		$line = $temp;
+		last;
+	    }
+	}
         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) {
-        $data{$field} = '' unless exists $data{$field};
-    }
-
     $data{severity} = $config{default_severity} if $data{severity} eq '';
     for my $field (qw(found_versions fixed_versions found_date fixed_date)) {
 	 $data{$field} = [split ' ', $data{$field}];
@@ -251,11 +284,6 @@ sub read_bug{
 	       @{$data{"${field}_date"}});
     }
 
-    if ($version < 3) {
-	for my $field (@rfc1522_fields) {
-	    $data{$field} = decode_rfc1522($data{$field});
-	}
-    }
     my $status_modified = (stat($status))[9];
     # Add log last modified time
     $data{log_modified} = (stat($log))[9];
@@ -291,6 +319,10 @@ my %split_fields =
      affects        => \&splitpackages,
      blocks         => $ditch_empty_space,
      blockedby      => $ditch_empty_space,
+     # 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,
@@ -427,9 +459,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,());
     }
@@ -437,46 +484,107 @@ 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);
 }
 
+=head2 new_bug
+
+	my $new_bug_num = new_bug(copy => $data->{bug_num});
+
+Creates a new bug and returns the new bug number upon success.
+
+Dies upon failures.
+
+=cut
+
+sub new_bug {
+    my %param =
+	validate_with(params => \@_,
+		      spec => {copy => {type => SCALAR,
+				        regex => qr/^\d+/,
+				        optional => 1,
+				       },
+			      },
+		     );
+    filelock("nextnumber.lock");
+    my $nn_fh = IO::File->new("nextnumber",'r') or
+	die "Unable to open nextnuber for reading: $!";
+    local $\;
+    my $nn = <$nn_fh>;
+    ($nn) = $nn =~ m/^(\d+)\n$/ or die "Bad format of nextnumber; is not exactly ".'^\d+\n$';
+    close $nn_fh;
+    overwritefile("nextnumber",
+		  ($nn+1)."\n");
+    unfilelock();
+    my $nn_hash = get_hashname($nn);
+    if ($param{copy}) {
+	my $c_hash = get_hashname($param{copy});
+	for my $file (qw(log status summary report)) {
+	    copy("db-h/$c_hash/$param{copy}.$file",
+		 "db-h/$nn_hash/${nn}.$file")
+	}
+    }
+    else {
+	for my $file (qw(log status summary report)) {
+	    overwritefile("db-h/$nn_hash/${nn}.$file",
+			   "");
+	}
+    }
+
+    # this probably needs to be munged to do something more elegant
+#    &bughook('new', $clone, $data);
+
+    return($nn);
+}
+
+
 
 my @v1fieldorder = qw(originator date subject msgid package
                       keywords done forwarded mergedwith severity);
@@ -499,7 +607,7 @@ version.
 
 sub makestatus {
     my ($data,$version) = @_;
-    $version = 2 unless defined $version;
+    $version = 3 unless defined $version;
 
     my $contents = '';
 
@@ -512,12 +620,21 @@ sub makestatus {
     }
     %newdata = %{join_status_fields(\%newdata)};
 
+    %newdata = encode_utf8_structure(%newdata);
+
     if ($version < 3) {
         for my $field (@rfc1522_fields) {
             $newdata{$field} = encode_rfc1522($newdata{$field});
         }
     }
 
+    # 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}) {
@@ -536,11 +653,11 @@ sub makestatus {
                 # Output field names in proper case, e.g. 'Merged-With'.
                 my $properfield = $fields{$field};
                 $properfield =~ s/(?:^|(?<=-))([a-z])/\u$1/g;
-                $contents .= "$properfield: $newdata{$field}\n";
+		my $data = $newdata{$field};
+                $contents .= "$properfield: $data\n";
             }
         }
     }
-
     return $contents;
 }
 
@@ -560,15 +677,23 @@ sub writebug {
     my ($ref, $data, $location, $minversion, $disablebughook) = @_;
     my $change;
 
-    my %outputs = (1 => 'status', 2 => 'summary');
+    my %outputs = (1 => 'status', 3 => 'summary');
     for my $version (keys %outputs) {
         next if defined $minversion and $version < $minversion;
         my $status = getbugcomponent($ref, $outputs{$version}, $location);
         die "can't find location for $ref" unless defined $status;
-        open(S,"> $status.new") || die "opening $status.new: $!";
-        print(S makestatus($data, $version)) ||
+	my $sfh;
+	if ($version >= 3) {
+	    open $sfh,">","$status.new"  or
+		die "opening $status.new: $!";
+	}
+	else {
+	    open $sfh,">","$status.new"  or
+		die "opening $status.new: $!";
+	}
+        print {$sfh} makestatus($data, $version) or
             die "writing $status.new: $!";
-        close(S) || die "closing $status.new: $!";
+        close($sfh) or die "closing $status.new: $!";
         if (-e $status) {
             $change = 'change';
         } else {
@@ -593,7 +718,7 @@ options mean.
 
 sub unlockwritebug {
     writebug(@_);
-    &unfilelock;
+    unfilelock();
 }
 
 =head1 VERSIONS
@@ -604,7 +729,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
 
@@ -617,9 +742,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;
@@ -693,7 +823,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;
@@ -824,7 +955,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;
@@ -869,7 +1000,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;
@@ -1055,25 +1186,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 '');
@@ -1192,7 +1308,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;
@@ -1242,8 +1358,8 @@ sub bug_presence {
 	       # 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) {
- 		   push @archs, undef;
+ 	       if (not keys %sourceversions and (not @archs or defined $archs[0])) {
+ 		   @archs = (undef);
  		   goto GET_SOURCE_VERSIONS;
  	       }
 	  }
@@ -1500,23 +1616,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};
@@ -1534,7 +1650,7 @@ sub bughook {
 	}
 	update_realtime("$config{spool_dir}/index.db.realtime", %bugs);
 
-	&unfilelock;
+	unfilelock();
 }