merge changes from don source

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index 580dbf29989569bb36dc3d5c439a727d8e05f096..82382e8ff76aa31af9800f03e0279df749aaada1 100755 (executable)
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -360,6 +360,18 @@ my $title = $gBugs.' '.join(' and ', map {/ or /?"($_)":$_} @title);
                 usertags => \%ut,
                );
 
+# shove in bugs which affect this package if there is a package or a
+# source given (by default), but no affects options given
+if (not exists $param{affects} and not exists $param{noaffects} and
+    (exists $param{source} or
+     exists $param{package})) {
+    push @bugs, get_bugs((map {exists $param{$_}?($_ =~ /^(?:package|source)$/?'affects':$_,$param{$_}):()}
+                         grep {$_ ne 'newest'}
+                         keys %package_search_keys, 'archive'),
+                        usertags => \%ut,
+                       );
+}
+
 if (defined $param{version}) {
      $title .= " at version $param{version}";
 }

diff --git a/scripts/service b/scripts/service
index 3c3e472af03516c13a6a2da7381b8ee5302fc43b..44563b6d652416bb0000571187fda2a6f893e9bf 100755 (executable)
--- a/scripts/service
+++ b/scripts/service
@@ -790,7 +790,6 @@ END
        # option to pass to set_tag (we use a hashref here to make it
        # more obvious what is happening)
        my @tag_operations;
-       my $alter_type = '=';
        my @badtags;
        for my $tag (@tags) {
            if ($tag =~ /^[=+-]$/) {
@@ -808,7 +807,7 @@ END
                elsif ($tag eq '+') {
                    push @tag_operations,
                        {tags => [],
-                        option => [add => 1]
+                        option => [add => 1],
                        };
                }
                next;
@@ -819,7 +818,7 @@ END
            }
            if (not @tag_operations) {
                @tag_operations = {tags => [],
-                                  option => []
+                                  option => [add => 1],
                                  };
            }
            push @{$tag_operations[-1]{tags}},$tag;