From d16a0677a994a141c17d9dac887d465060ec8fc3 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 7 Jun 2017 18:00:50 -0500
Subject: [PATCH] FS-10372: [Build-System,fs-utils] Add fix versions to
 filebug.pl #resolve

---
 support-d/utils/filebug.pl |  4 ++--
 support-d/utils/fixbug.pl  | 17 +++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/support-d/utils/filebug.pl b/support-d/utils/filebug.pl
index 50fefa04a9..28d43452d0 100755
--- a/support-d/utils/filebug.pl
+++ b/support-d/utils/filebug.pl
@@ -239,7 +239,7 @@ if ($opts{debug}) {
     print Dumper $input;
 } else {
     $issue = $jira->POST('/issue', undef, $input) or die "Issue was not created:";
-    print "Issue Posted: " . $issue->{key};
+    print "Issue Posted: " . $issue->{key} . "\n";
 
     if ($opts{versions_array}) {
 	$input = {
@@ -253,7 +253,7 @@ if ($opts{debug}) {
 
 	$jira->PUT("/issue/" . $issue->{key}, undef, $input);
 
-	print "Fix versions updated for issue " . $issue->{key};;
+	print "Fix versions updated for issue " . $issue->{key} . "\n";
     }
     
 
diff --git a/support-d/utils/fixbug.pl b/support-d/utils/fixbug.pl
index aeb5b5f1dd..a46e6137c1 100755
--- a/support-d/utils/fixbug.pl
+++ b/support-d/utils/fixbug.pl
@@ -57,6 +57,8 @@ my $cmd;
 my $prog = `which curl` || `which wget`;
 my $auto = 1;
 my $post = " \#resolve";
+my $component;
+my $summary;
 
 chomp $prog;
 
@@ -65,7 +67,7 @@ if ($opts{auth}) {
 	$opts{user} = getfield("User: ");
     }
     
-    if (!$opts{pass} && !$opts{debug}) {
+    if (!$opts{pass}) {
 	$opts{pass} = getpass();
 	print "\n";
     }
@@ -109,11 +111,10 @@ if ($opts{auth}) {
 
     my $xs= new XML::Simple;
     my $r = $xs->XMLin($xml);
+    $summary = $r->{channel}->{item}->{summary};
+    $summary =~ s/\"/\\"/g;
 
-    my $sum = $r->{channel}->{item}->{summary};
-    $sum =~ s/\"/\\"/g;
-
-    my $component = $r->{channel}->{item}->{component};
+    $component = $r->{channel}->{item}->{component};
 
     if(ref($component) eq 'ARRAY') {
 	$component = join(",", @{$component});
@@ -131,7 +132,7 @@ if ($opts{msg} eq "edit") {
   $auto = 0;
   $opts{msg} = undef;
   open T, ">/tmp/$opts{bug}.tmp";
-  print T "$opts{bug}${post} [$sum]\n\n---Cut this line to confirm commit.....";
+  print T "$opts{bug}${post} [$summary]\n\n---Cut this line to confirm commit.....";
   close T;
 }
 
@@ -148,12 +149,12 @@ if ($opts{comment}) {
 
 if ($auto) {
     if ($opts{msg}) {
-	$opts{msg} =~ s/%s/$sum/;
+	$opts{msg} =~ s/%s/$summary/;
 	$opts{msg} =~ s/%b/$opts{bug}/;
 	$opts{msg} =~ s/%c/$component/;
 	$gitcmd = "git commit $args -m \"$opts{msg}$opts{append}\"";
     } else {
-	$gitcmd = "git commit $args -m \"$opts{bug}: [$component] $sum$opts{append}${post}\"";
+	$gitcmd = "git commit $args -m \"$opts{bug}: [$component] ${summary}$opts{append}${post}\"";
     }
 } else {
   $gitcmd = "git commit $args -t /tmp/$opts{bug}.tmp";