Remove references to useragent setting.

Now that httputil is used, there is no reason to keep a setting for
the useragent around, the global settings for rbot apply.

2 files changed, 3 insertions, 51 deletions

diff --git a/bugzilla.rb b/bugzilla.rb
index 754f113..79bb137 100644
--- a/bugzilla.rb
+++ b/bugzilla.rb
@@ -44,7 +44,7 @@ class BugzillaPlugin < Plugin
   VALID_RESO  = ['FIXED', 'INVALID', 'WONTFIX', 'LATER', 'REMIND', 'DUPLICATE', 'WORKSFORME', 'CANTFIX', 'NEEDINFO', 'TEST-REQUEST', 'UPSTREAM']
  
   # Each zilla instance may have these parameters
-  OPTIONS = [ 'baseurl', 'dataurl', 'showbugurl', 'reporturl', 'useragent' ]
+  OPTIONS = [ 'baseurl', 'dataurl', 'showbugurl', 'reporturl' ]
 
   # Exception class to raise when requesting information about an
   # unknown zilla instance.
@@ -168,18 +168,6 @@ class BugzillaPlugin < Plugin
       @reporturl = @registry["zilla.#{name}.reporturl"] = val
     end
 
-    def useragent
-      agent = @registry["zilla.#{name}.baseurl"]
-      return agent if agent
-
-      return "rbot/$version"
-    end
-
-    def useragent=(val)
-      @registry["zilla.#{name}.useragent"] = val
-      delete_client
-    end
-
     def lastseenid
       return @registry["zilla.#{name}.lastseenid"]
     end
@@ -692,7 +680,7 @@ class BugzillaPlugin < Plugin
     "zilla instance"        => "zilla instance #{Bold}add#{Bold}|#{Bold}delete#{Bold}|#{Bold}set#{Bold}|#{Bold}show#{Bold}|#{Bold}list#{Bold} : handle bugzilla instances",
     "zilla instance add"    => "zilla instance add #{Bold}name#{Bold} #{Bold}baseurl#{Bold} : adds a new bugzilla (use \#{bugno} in URLs to replace the bug number)",
     "zilla instance delete" => "zilla instance delete #{Bold}name#{Bold} : delete the named bugzilla",
-    "zilla instance set"    => "zilla instance set #{Bold}name#{Bold} #{Bold}option#{Bold} #{Bold}value{#Bold} : set the option to a given value for the zilla. Valid options are baseurl, dataurl, showbugurl, useragent",
+    "zilla instance set"    => "zilla instance set #{Bold}name#{Bold} #{Bold}option#{Bold} #{Bold}value{#Bold} : set the option to a given value for the zilla. Valid options are baseurl, dataurl, showbugurl",
     "zilla instance list"   => "zilla instance list : shows current querable bugzilla instancess",
     "zilla instance show"   => "zilla instance show #{Bold}name#{Bold} : shows the configuration for the named bugzilla.",
 
@@ -764,7 +752,7 @@ plugin.map 'zilla instance set :zilla :setting :value',
   :action => 'instance_set',
   :requirements => {
     :zilla => /^[^\. ]+$/,
-    :setting => /^(baseurl|dataurl|showbugurl|reporturl|useragent)$/
+    :setting => /^(baseurl|dataurl|showbugurl|reporturl)$/
   },
   :auth_path => 'modify'
 
diff --git a/registry.dump b/registry.dump
index 40d554d..cc7742a 100644
--- a/registry.dump
+++ b/registry.dump
@@ -7,108 +7,72 @@ HEADER=END
  \04\08"Ehttp://bugzilla.abisource.com/show_bug.cgi?ctype=xml;id=#{bugno}
  zilla.abisource.showbugurl
  \04\08";http://bugzilla.abisource.com/show_bug.cgi?id=#{bugno}
- zilla.abisource.useragent
- \04\08"6rBot/0.9.11-git (master branch, revision b23ff88)
  zilla.apache.dataurl
  \04\08":http://issues.apache.org/bugzilla/xml.cgi?id=#{bugno}
  zilla.apache.showbugurl
  \04\08"?http://issues.apache.org/bugzilla/show_bug.cgi?id=#{bugno}
- zilla.apache.useragent
- \04\08"6rBot/0.9.11-git (master branch, revision b23ff88)
  zilla.atheme.dataurl
  \04\08"Ihttp://people.atheme.org/~nenolod/bugs-ng/xml_export.php?id=#{bugno}
  zilla.atheme.showbugurl
  \04\08")http://bugs-meta.atheme.org/#{bugno}
- zilla.atheme.useragent
- \04\08"6rBot/0.9.11-git (master branch, revision b23ff88)
  zilla.eclipse.dataurl
  \04\08"Ehttps://bugs.eclipse.org/bugs/show_bug.cgi?ctype=xml&id=#{bugno}
  zilla.eclipse.showbugurl
  \04\08";https://bugs.eclipse.org/bugs/show_bug.cgi?id=#{bugno}
- zilla.eclipse.useragent
- \04\08"6rBot/0.9.11-git (master branch, revision b23ff88)
  zilla.freedesktop.dataurl
  \04\08"Dhttps://bugs.freedesktop.org/show_bug.cgi?ctype=xml&id=#{bugno}
  zilla.freedesktop.showbugurl
  \04\08":https://bugs.freedesktop.org/show_bug.cgi?id=#{bugno}
- zilla.freedesktop.useragent
- \04\08"6rBot/0.9.11-git (master branch, revision b23ff88)
  zilla.gcc.dataurl
  \04\08"Chttp://gcc.gnu.org/bugzilla/show_bug.cgi?ctype=xml&id=#{bugno}
  zilla.gcc.showbugurl
  \04\08"9http://gcc.gnu.org/bugzilla/show_bug.cgi?id=#{bugno}
- zilla.gcc.useragent
- \04\08"6rBot/0.9.11-git (master branch, revision b23ff88)
  zilla.gentoo.dataurl
  \04\08">http://bugs.gentoo.org/show_bug.cgi?ctype=xml&id=#{bugno}
  zilla.gentoo.showbugurl
  \04\08"$http://bugs.gentoo.org/#{bugno}
- zilla.gentoo.useragent
- \04\08"6rBot/0.9.11-git (master branch, revision b23ff88)
  zilla.gnome.dataurl
  \04\08"2http://bugzilla.gnome.org/xml.cgi?id=#{bugno}
  zilla.gnome.showbugurl
  \04\08"7http://bugzilla.gnome.org/show_bug.cgi?id=#{bugno}
- zilla.gnome.useragent
- \04\08"6rBot/0.9.11-git (master branch, revision b23ff88)
  zilla.icedtea.dataurl
  \04\08"Mhttp://icedtea.classpath.org/bugzilla/show_bug.cgi?ctype=xml;id=#{bugno}
  zilla.icedtea.showbugurl
  \04\08"Chttp://icedtea.classpath.org/bugzilla/show_bug.cgi?id=#{bugno}
- zilla.icedtea.useragent
- \04\08"6rBot/0.9.11-git (master branch, revision b23ff88)
  zilla.kde.dataurl
  \04\08",http://bugs.kde.org/xml.cgi?id=#{bugno}
  zilla.kde.showbugurl
  \04\08"1http://bugs.kde.org/show_bug.cgi?id=#{bugno}
- zilla.kde.useragent
- \04\08"6rBot/0.9.11-git (master branch, revision b23ff88)
  zilla.kernel.dataurl
  \04\08"3http://bugzilla.kernel.org/xml.cgi?id=#{bugno}
  zilla.kernel.showbugurl
  \04\08"8http://bugzilla.kernel.org/show_bug.cgi?id=#{bugno}
- zilla.kernel.useragent
- \04\08"6rBot/0.9.11-git (master branch, revision b23ff88)
  zilla.mozilla.dataurl
  \04\08"4http://bugzilla.mozilla.org/xml.cgi?id=#{bugno}
  zilla.mozilla.showbugurl
  \04\08"9http://bugzilla.mozilla.org/show_bug.cgi?id=#{bugno}
- zilla.mozilla.useragent
- \04\08"6rBot/0.9.11-git (master branch, revision b23ff88)
  zilla.netbeans.dataurl
  \04\08"7http://www.netbeans.org/issues/xml.cgi?id=#{bugno}
  zilla.netbeans.showbugurl
  \04\08"<http://www.netbeans.org/issues/show_bug.cgi?id=#{bugno}
- zilla.netbeans.useragent
- \04\08"6rBot/0.9.11-git (master branch, revision b23ff88)
  zilla.novell.dataurl
  \04\08"Chttps://bugzilla.novell.com/show_bug.cgi?ctype=xml&id=#{bugno}
  zilla.novell.showbugurl
  \04\08"9https://bugzilla.novell.com/show_bug.cgi?id=#{bugno}
- zilla.novell.useragent
- \04\08"6rBot/0.9.11-git (master branch, revision b23ff88)
  zilla.openoffice.dataurl
  \04\08"9http://www.openoffice.org/issues/xml.cgi?id=#{bugno}
  zilla.openoffice.showbugurl
  \04\08"9http://www.openoffice.org/issues/xml.cgi?id=#{bugno}
- zilla.openoffice.useragent
- \04\08"6rBot/0.9.11-git (master branch, revision b23ff88)
  zilla.redhat.dataurl
  \04\08"Khttp://bugzilla.redhat.com/bugzilla/show_bug.cgi?ctype=xml&id=#{bugno}
  zilla.redhat.showbugurl
  \04\08"Ahttp://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=#{bugno}
- zilla.redhat.useragent
- \04\08"6rBot/0.9.11-git (master branch, revision b23ff88)
  zilla.sourcemage.dataurl
  \04\08"3http://bugs.sourcemage.org/xml.cgi?id=#{bugno}
  zilla.sourcemage.showbugurl
  \04\08"8http://bugs.sourcemage.org/show_bug.cgi?id=#{bugno}
- zilla.sourcemage.useragent
- \04\08"6rBot/0.9.11-git (master branch, revision b23ff88)
  zilla.xine.dataurl
  \04\08"Dhttp://bugs.xine-project.org/show_bug.cgi?ctype=xml;id=#{bugno}
  zilla.xine.showbugurl
  \04\08":http://bugs.xine-project.org/show_bug.cgi?id=#{bugno}
- zilla.xine.useragent
- \04\08"6rBot/0.9.11-git (master branch, revision b23ff88)
 DATA=END