From 61c84810264e972821a64eaa4a7ad773ac38930d Mon Sep 17 00:00:00 2001 From: ajt <> Date: Fri, 8 Nov 2002 14:01:33 -0800 Subject: [PATCH] [project @ 2002-11-08 14:01:33 by ajt] first pass at storing version info --- scripts/errorlib.in | 4 +++- scripts/process.in | 22 +++++++++++++++++++--- scripts/service.in | 10 +++++++--- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/scripts/errorlib.in b/scripts/errorlib.in index 26e2fa3e..a59c8a24 100755 --- a/scripts/errorlib.in +++ b/scripts/errorlib.in @@ -1,5 +1,5 @@ # -*- perl -*- -# $Id: errorlib.in,v 1.14 2002/11/07 11:42:35 ajt Exp $ +# $Id: errorlib.in,v 1.15 2002/11/08 14:01:33 ajt Exp $ sub F_SETLK { 6; } sub F_WRLCK{ 1; } $flockstruct= 'sslll'; # And there ought to be something for this too. @@ -40,6 +40,8 @@ sub lockreadbug { chop($s_forwarded= ); chop($s_mergedwith= ); chop($s_severity= ); + chop($s_versions= ); + chop($s_fixed_versions= ); close(S); $s_severity = 'normal' if $s_severity eq ''; return 1; diff --git a/scripts/process.in b/scripts/process.in index 78c78005..ca4fb68e 100755 --- a/scripts/process.in +++ b/scripts/process.in @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $Id: process.in,v 1.54 2002/10/27 14:54:02 ajt Exp $ +# $Id: process.in,v 1.55 2002/11/08 14:01:33 ajt Exp $ # # Usage: process nn # Temps: incoming/Pnn @@ -500,6 +500,20 @@ END } else { $s_package= $pheader{'package'}; } + + $s_versions= ''; + if (defined($pheader{'version'})) { + $s_versions = $pheader{'version'}; + $s_versions ~= s/\s+/ /; + # BUG: need to bounce unknown versions back to submitter here + } + + $s_fixed_versions= ''; + if (defined($pheader{'fixed-in-version'})) { + $s_fixed_versions = $pheader{'fixed-in-version'}; + $s_fixed_versions ~= s/\s+/ /; + } + $s_keywords= ''; if (defined($pheader{'keywords'})) { $s_keywords= $pheader{'keywords'}; @@ -543,10 +557,12 @@ END &overwrite("db-h/$hash/$ref.log",''); &overwrite("db-h/$hash/$ref.status", "$replyto\n$intdate\n$subject\n$header{'message-id'}\n". - "$s_package\n$s_keywords\n\n\n\n$s_severity\n"); + "$s_package\n$s_keywords\n\n\n\n$s_severity\n$s_versions\n". + "$s_fixed_versions\n"); &bughook('new',$ref, "$replyto\n$intdate\n$subject\n$header{'message-id'}\n". - "$s_package\n$s_keywords\n\n\n\n$s_severity\n"); + "$s_package\n$s_keywords\n\n\n\n$s_severity\n$s_versions\n". + "$s_fixed_versions\n"); &overwrite("db-h/$hash/$ref.report", join("\n",@msg)."\n"); } diff --git a/scripts/service.in b/scripts/service.in index be6141ac..4c116738 100755 --- a/scripts/service.in +++ b/scripts/service.in @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $Id: service.in,v 1.60 2002/11/02 09:21:43 ajt Exp $ +# $Id: service.in,v 1.61 2002/11/08 14:01:33 ajt Exp $ # ^ more or less ^ # # Usage: service .nn @@ -850,7 +850,9 @@ sub savebug { "$s_done\n". "$s_forwarded\n". "$s_mergedwith\n". - "$s_severity\n") || &quit("writing db-h/$hash/$ref.status.new: $!"); + "$s_severity\n". + "$s_versions\n". + "$s_fixed_versions\n") || &quit("writing db-h/$hash/$ref.status.new: $!"); close(S) || &quit("closing db-h/$hash/$ref.status.new: $!"); rename("db-h/$hash/$ref.status.new","db-h/$hash/$ref.status") || &quit("installing new db-h/$hash/$ref.status: $!"); @@ -864,7 +866,9 @@ sub savebug { "$s_done\n". "$s_forwarded\n". "$s_mergedwith\n". - "$s_severity\n"); + "$s_severity\n". + "$s_versions\n". + "$s_fixed_versions\n"); &unfilelock; $lowstate= "idle"; &dlex("savebug"); -- 2.39.5