From cd363df40742cbcd1a34a8f4446ca4c2d179daeb Mon Sep 17 00:00:00 2001
From: "kiko%async.com.br"
 <kiko%async.com.br@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 16 Jan 2004 22:26:49 +0000
Subject: [PATCH] Fix for bug 229998: bugzilla-submit 'Operating-System' and
 'URL' fields are rejected. Minor fixes to bugzilla-submit's argument parsing.
 Patch by me, inspired by work done by joseph@picsel.com (Joseph Heenan).
 contrib-only. a=myk

git-svn-id: svn://10.0.0.236/trunk@151436 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../webtools/bugzilla/contrib/bugzilla-submit/bugdata.txt  | 2 ++
 .../bugzilla/contrib/bugzilla-submit/bugzilla-submit       | 6 +++---
 .../bugzilla/contrib/bugzilla-submit/bugzilla-submit.xml   | 7 ++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/mozilla/webtools/bugzilla/contrib/bugzilla-submit/bugdata.txt b/mozilla/webtools/bugzilla/contrib/bugzilla-submit/bugdata.txt
index 56f70b9f1b1..fc880165cf3 100644
--- a/mozilla/webtools/bugzilla/contrib/bugzilla-submit/bugdata.txt
+++ b/mozilla/webtools/bugzilla/contrib/bugzilla-submit/bugdata.txt
@@ -6,6 +6,8 @@ Hardware: PC
 OS: Linux
 Severity: critical
 Summary: Impending electron shortage
+Depends-on: 8
+URL: http://www.google.com/
 
 We need an emergency supply of electrons.
 
diff --git a/mozilla/webtools/bugzilla/contrib/bugzilla-submit/bugzilla-submit b/mozilla/webtools/bugzilla/contrib/bugzilla-submit/bugzilla-submit
index 0efa501fa0d..8d40be04b3a 100755
--- a/mozilla/webtools/bugzilla/contrib/bugzilla-submit/bugzilla-submit
+++ b/mozilla/webtools/bugzilla/contrib/bugzilla-submit/bugzilla-submit
@@ -32,10 +32,10 @@ field_aliases = (('hardware', 'rep_platform'),
                  ('os', 'op_sys'),
                  ('summary', 'short_desc'),
                  ('description', 'comment'),
-                 ('depends-on', 'dependson'),
+                 ('depends_on', 'dependson'),
                  ('status', 'bug_status'),
                  ('severity', 'bug_severity'),
-                 ('URL', 'bug_file_loc'),)
+                 ('url', 'bug_file_loc'),)
 
 def header_to_field(hdr):
     hdr = hdr.lower().replace("-", "_")
@@ -71,7 +71,7 @@ def setup_parser():
     parser.add_option('-H', '--hardware', dest='rep_platform',
                       help='Set the Hardware field.')
     parser.add_option('-o', '--os', dest='op_sys',
-                      help='Set the Operating-system field.')
+                      help='Set the Operating System field.')
     parser.add_option('-r', '--priority', dest='priority',
                       help='Set the Priority field.')
     parser.add_option('-x', '--severity', dest='bug_severity',
diff --git a/mozilla/webtools/bugzilla/contrib/bugzilla-submit/bugzilla-submit.xml b/mozilla/webtools/bugzilla/contrib/bugzilla-submit/bugzilla-submit.xml
index 01ad49e6311..2ffa9b60102 100644
--- a/mozilla/webtools/bugzilla/contrib/bugzilla-submit/bugzilla-submit.xml
+++ b/mozilla/webtools/bugzilla/contrib/bugzilla-submit/bugzilla-submit.xml
@@ -102,9 +102,10 @@ identifies this field as <quote>Hardware</quote>.)</para></listitem>
 </varlistentry>
 <varlistentry>
 <term>-o, --os</term>
-<listitem><para>Set the op_sys field, overriding the Operating-System header
-from standard input if necessary. (The stock Bugzilla web presentation
-identifies this field as <quote>OS</quote>.)</para></listitem>
+<listitem><para>Set the op_sys field, overriding the OS (Operating
+System) header from standard input if necessary. (The stock Bugzilla web
+presentation also identifies this field as
+<quote>OS</quote>.)</para></listitem>
 </varlistentry>
 <varlistentry>
 <term>-r, --priority</term>