From: Don Armstrong <don@donarmstrong.com>
Date: Wed, 23 May 2007 02:39:33 +0000 (-0700)
Subject:   - Indicate the selected user (closes: #422934)
X-Git-Tag: release/2.6.0~564^2~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e9d17bd3026f9a7bbbbba763198157be34d5dfcf;p=debbugs.git

  - Indicate the selected user (closes: #422934)
---

diff --git a/debian/changelog b/debian/changelog
index 36bd5cdd..177e707a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -172,6 +172,7 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - Fix package link code and link both packages (closes: #419553)
     - Save leading space when we unmime (closes: #416321)
     - Make the version regex correct (closes: #425614)
+    - Indicate the selected user (closes: #422934)
 
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100
diff --git a/scripts/service.in b/scripts/service.in
index 28b8cdba..f4b7c2f9 100755
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -140,6 +140,7 @@ $user =~ s/^.*<(.*)>.*$/$1/;
 $user =~ s/[(].*[)]//;
 $user =~ s/^\s*(\S+)\s+.*$/$1/;
 $user = "" unless (Debbugs::User::is_valid_user($user));
+my $indicated_user = 0;
 
 my $quickabort = 0;
 
@@ -259,10 +260,12 @@ END
 	    my $olduser = ($user ne "" ? " (was $user)" : "");
             &transcript("Setting user to $newuser$olduser.\n");
 	    $user = $newuser;
+	    $indicated_user = 1;
 	} else {
 	    &transcript("Selected user id ($newuser) invalid, sorry\n");
 	    $errors++;
 	    $user = "";
+	    $indicated_user = 1;
 	}
     } elsif (m/^usercategory\s+(\S+)(\s+\[hidden\])?\s*$/i) {
         $ok++;
@@ -273,7 +276,16 @@ END
         my @cats;
         my $bad = 0;
 	my $catsec = 0;
-        while (++$procline <= $#bodylines) {
+	if ($user eq "") {
+	    &transcript("No valid user selected\n");
+	    $errors++;
+	    next;
+        }
+	if (not $indicated_user and defined $user) {
+	     &transcript("User is $user");
+	     $indicated_user = 1;
+	}
+	while (++$procline <= $#bodylines) {
             unless ($bodylines[$procline] =~ m/^\s*([*+])\s*(\S.*)$/) {
                 $procline--;
                 last;
@@ -354,7 +366,12 @@ END
 	if ($user eq "") {
 	    &transcript("No valid user selected\n");
 	    $errors++;
+	    $indicated_user = 1;
         } elsif (&setbug) {
+	    if (not $indicated_user and defined $user) {
+		 &transcript("User is $user");
+		 $indicated_user = 1;
+	    }
 	    &nochangebug;
 	    my %ut;
 	    Debbugs::User::read_usertags(\%ut, $user);