* merge in changes to support cloned bugs in blockers

diff --git a/html/server-refcard.html.in b/html/server-refcard.html.in
index 838e8ffe9f23f03ddf566670663155a43b01af40..c1f09b85679ba60f01a81c688a9c39d759662ddd 100644 (file)
--- a/html/server-refcard.html.in
+++ b/html/server-refcard.html.in
@@ -90,6 +90,20 @@ you, the person doing the reopen.
 $gHTMLSeverityDesc
 </dl>
 
+<h2>Synopsis of bug submission and followup addresses</h2>
+
+<ul compact>
+  <li><var>nnn</var>[ <code>-submit</code> | ]
+  <li><var>nnn</var><code>-maintonly</code>
+  <li><var>nnn</var><code>-quiet</code>
+  <li><var>nnn</var><code>-forwarded</code>
+  <li><var>nnn</var><code>-request</code>
+  <li><var>nnn</var><code>-submitter</code>
+  <li><var>nnn</var><code>-done</code>
+  <li><var>nnn</var><code>-close</code>
+  <li><var>nnn</var><code>-subscribe</code>
+</ul>  
+
 <hr>
 
 <p>Other pages:

diff --git a/scripts/service.in b/scripts/service.in
index fdf1fa808b07be3b9ec621aa1a75eb6c400eb3ed..50bb4cd1485ecd44f5b8e8cb7e6740502779b3b2 100755 (executable)
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -719,13 +719,19 @@ END
        my $bugnum = $2; my $blockers = $4;
        $addsub = "add";
        $addsub = "sub" if ($1 eq "un");
-       
+       if ($bugnum =~ m/^-\d+$/ && defined $clonebugs{$bugnum}) {
+            $bugnum = $clonebugs{$bugnum};
+       }
+
        my @okayblockers;
        my @badblockers;
        foreach my $b (split /[\s,]+/, $blockers) {
            $b=~s/^\#//;
            if ($b=~/[0-9]+/) {
                $ref=$b;
+               if ($ref =~ m/^-\d+$/ && defined $clonebugs{$ref}) {
+                    $ref = $clonebugs{$ref};
+               }
                if (&getbug) {
                    push @okayblockers, $b;