[gentoo-commits] proj/rbot-gentoo:master commit in: gentoo-scripts/, /

[gentoo-commits] proj/rbot-gentoo:master commit in: gentoo-scripts/, /

[Robin H. Johnson]

commit:     32f2b0c4907279d6ddebd15f6f0fea832a80c8d9
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 19 20:34:49 2015 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 19 20:34:49 2015 +0000
URL:        https://gitweb.gentoo.org/proj/rbot-gentoo.git/commit/?id=32f2b0c4

Fix URL to herds.xml.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 gentoo-data.rb          | 3 ++-
 gentoo-scripts/herds.sh | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gentoo-data.rb b/gentoo-data.rb
index 8749910..bcd245a 100644
--- a/gentoo-data.rb
+++ b/gentoo-data.rb
@@ -31,6 +31,7 @@
 #GLSA_SRC = "http://www.gentoo.org/security/en/glsa/glsa-@GLSA_ID@.xml?passthru=1"
 VALID_PACKAGE_SRC = "/dev/shm/qsearch.txt"
 GLSA_SRC = "#{ENV['PORTDIR']}/metadata/glsa/glsa-@GLSA_ID@.xml"
+HERDS_SRC = 'https://api.gentoo.org/packages/herds.xml'
 
 class GentooPlugin < Plugin
   Config.register Config::StringValue.new('gentoo.scriptdir',
@@ -126,7 +127,7 @@ class GentooPlugin < Plugin
     now = Time.now.tv_sec
     unless @@cached['herds'] and @@cached['herds'][0] > now-600
       #m.reply "Fetch #{@@cached['herds'][0]} > #{now-600}"
-      res = @bot.httputil.get("http://www.gentoo.org/proj/en/metastructure/herds/herds.xml?passthru=1")
+      res = @bot.httputil.get(HERDS_SRC)
       herds = REXML::Document.new(res)
       @@cached['herds'] = [now, herds]
     else

diff --git a/gentoo-scripts/herds.sh b/gentoo-scripts/herds.sh
index 510f233..3cba717 100644
--- a/gentoo-scripts/herds.sh
+++ b/gentoo-scripts/herds.sh
@@ -1,4 +1,5 @@
-wget -O herds.xml -q 'http://www.gentoo.org/proj/en/metastructure/herds/herds.xml?passthru=1'
+HERDS_SRC='https://api.gentoo.org/packages/herds.xml'
+wget -O herds.xml -q "${HERDS_SRC}"
 if [ ! -s herds.xml ]; then
 	cp /usr/portage/metadata/herds.xml .
 fi