[project @ 2002-11-08 14:01:33 by ajt]

first pass at storing version info

diff --git a/scripts/errorlib.in b/scripts/errorlib.in
index 26e2fa3e858b4b6e7be9056198f3b505901fdc0c..a59c8a247432090c816e7998dc6c845d734a162c 100755 (executable)
--- 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= <S>);
     chop($s_mergedwith= <S>);
     chop($s_severity= <S>);
+    chop($s_versions= <S>);
+    chop($s_fixed_versions= <S>);
     close(S);
        $s_severity = 'normal' if $s_severity eq '';
     return 1;

diff --git a/scripts/process.in b/scripts/process.in
index 78c78005dd4e5c4075c320e0ebc6c28782571b45..ca4fb68ef2518a13fa74a5f8368a1d824ab601fe 100755 (executable)
--- 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 be6141acc0720b36f4b5ec4d49094acb21d51cce..4c1167384f6f064612ddf81e8b6eab78d497d0e1 100755 (executable)
--- 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 <code>.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");