freeze break request enable koji-gc on fedora 23 and 24 keys and install git-email on batcave
by Dennis Gilmore
I wanted to run git send-email to send the koji-gc patch for review and found
it was not installed so here is two patches
Dennnis
From 4297c458ff7a3ea673f2835cf73d2da78d61feca Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <ausil(a)fedoraproject.org>
Date: Thu, 22 Oct 2015 01:54:21 +0000
Subject: [PATCH 1/2] koji-gc: enable kojigc on fedora 23 and 24 keys
Signed-off-by: Dennis Gilmore <ausil(a)fedoraproject.org>
---
roles/koji_hub/files/koji-gc.conf | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/roles/koji_hub/files/koji-gc.conf b/roles/koji_hub/files/koji-
gc.conf
index 7680be9..525c9b7 100644
--- a/roles/koji_hub/files/koji-gc.conf
+++ b/roles/koji_hub/files/koji-gc.conf
@@ -23,6 +23,8 @@ key_aliases =
246110C1 fedora-20
95A43F54 fedora-21
8E1431D5 fedora-22
+ 34EC9CBA fedora-23
+ 81B46521 fedora-24
217521F6 fedora-epel
0608B895 fedora-epel-6
352C64E5 fedora-epel-7
@@ -36,6 +38,8 @@ unprotected_keys =
fedora-20
fedora-21
fedora-22
+ fedora-23
+ fedora-24
fedora-extras
redhat-beta
fedora-epel
@@ -68,6 +72,8 @@ policy =
sig fedora-20 && age < 12 weeks :: keep
sig fedora-21 && age < 12 weeks :: keep
sig fedora-22 && age < 12 weeks :: keep
+ sig fedora-23 && age < 12 weeks :: keep
+ sig fedora-24 && age < 12 weeks :: keep
sig fedora-epel && age < 12 weeks :: keep
sig fedora-epel-6 && age < 12 weeks :: keep
sig fedora-epel-7 && age < 12 weeks :: keep
--
1.8.3.1
From 1945487a35859176d360e7ce937cd14d21f2260e Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <ausil(a)fedoraproject.org>
Date: Thu, 22 Oct 2015 01:58:09 +0000
Subject: [PATCH 2/2] add git-email on batcave in order to send out patches for
review
Signed-off-by: Dennis Gilmore <ausil(a)fedoraproject.org>
---
roles/batcave/tasks/main.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/roles/batcave/tasks/main.yml b/roles/batcave/tasks/main.yml
index f83ebd7..0dccad8 100644
--- a/roles/batcave/tasks/main.yml
+++ b/roles/batcave/tasks/main.yml
@@ -33,6 +33,7 @@
- unzip # general useful util
- fpaste # general useful util
- lftp # needed to easily pull in builds from koji for
internal repos
+ - git-email # needed to send patches for review to the
mailing list
tags:
- batcave
- config
--
1.8.3.1
8 years, 6 months
Plan for tomorrow's Fedora Infrastructure meeting - 2015-10-22
by Stephen John Smoogen
he infrastructure team will be having it's weekly meeting tomorrow,
2015-10-22 at 18:00 UTC in #fedora-meeting on the freenode network.
We have a gobby document
(see: https://fedoraproject.org/wiki/Gobby )
NOTE: Gobby has changed, we are now using gobby05 and infinote. :)
fedora-infrastructure-meeting-next is the document.
Please try and review and edit that document before the meeting and we
will use it to have our agenda of things to discuss. A copy as of today
is included in this email.
If you have something to discuss, add the topic to the discussion area
with your name. If you would like to teach other folks about some
application or setup in our infrastructure, please add that topic and
your name to the learn about section.
smooge
--
= Introduction =
This shared document is for the next fedora infrastructure meeting.
We will use it over the week before the meeting to gather status and
info and discussion items and so forth, then use it in the irc meeting
to transfer
information to the meetbot logs.
= Meeting start stuff =
#startmeeting Infrastructure (2015-10-15)
#meetingname infrastructure
#topic aloha
#chair smooge relrod nirik abadger1999 lmacken dgilmore mdomsch
threebean pingou puiterwijk pbrobinson
#topic New folks introductions / Apprentice feedback
= Status / information / Trivia / Announcements =
(We put things here we want others on the team to know, but don't need
to discuss)
(Please use #info <the thing> - your name)
#topic announcements and information
#info Still in f23 final freeze - everyone
#info buildvm-01.stg is now fedora 23, please test - kevin
#info
= Things we should discuss =
We use this section to bring up discussion topics. Things we want to
talk about as a group and come up with some consensus or decision or
just brainstorm a problem or issue. If there are none of these we skip
this section.
(Use #topic your discussion topic - your username)
#topic
= Learn about some application or setup in infrastructure =
(This section, each week we get 1 person to talk about an application
or setup that we have. Just going over what it is, how to contribute,
ideas for improvement, etc. Whoever would like to do this, just add
the info in this section. In the event we don't find someone to teach
about something, we skip this section and just move on to open floor.)
#topic Learn about:
= Meeting end stuff =
#topic Open Floor
#endmeeting
--
Stephen J Smoogen.
8 years, 6 months
Freeze Break Request: Disable OpenVPN persist-tun so it doesn't fall
over on network hiccups
by Patrick Uiterwijk
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Hi all,
Can I please get +1's for the below configuration patch?
Reasoning is in the commit message.
This should solve the issues we have where RHEL7 machines don't come
back onto the VPN automatically in some specific non-rare cases.
commit b1db3bafd8bfde6fac9cc8c7fc3a5bedd39a1483
Author: Patrick Uiterwijk <puiterwijk(a)redhat.com>
Date: Wed Oct 21 18:26:32 2015 +0000
Disable persist-tun for openvpn
This should solve the issue where RHEL7 machines that get a network
hiccup need an OpenVPN restart to restore their routes.
The code is broken in the current upstream OpenVPN release, such that
it does tear down some of the routes during a ping-restart (when the
connection is dropped due to network hiccups), but the reconnection
code does not restore the routes.
I am working on an upstream patch to fix this, but in the meantime
disabling persist-tun will make sure that OpenVPN does the entire
initialization upon reconnection, which makes sure that all routes
are created.
Signed-off-by: Patrick Uiterwijk <puiterwijk(a)redhat.com>
diff --git a/files/openvpn/client.conf b/files/openvpn/client.conf
index d274e72..abb5d03 100644
- --- a/files/openvpn/client.conf
+++ b/files/openvpn/client.conf
@@ -13,7 +13,6 @@ resolv-retry infinite
nobind
persist-key
- -persist-tun
ca ca.crt
cert client.crt
diff --git a/roles/openvpn/client/files/client.conf b/roles/openvpn/client/files/client.conf
index d274e72..abb5d03 100644
- --- a/roles/openvpn/client/files/client.conf
+++ b/roles/openvpn/client/files/client.conf
@@ -13,7 +13,6 @@ resolv-retry infinite
nobind
persist-key
- -persist-tun
ca ca.crt
cert client.crt
diff --git a/roles/openvpn/server/files/server.conf b/roles/openvpn/server/files/server.conf
index c824b12..3ba8fab 100644
- --- a/roles/openvpn/server/files/server.conf
+++ b/roles/openvpn/server/files/server.conf
@@ -6,7 +6,6 @@ comp-lzo
ping-timer-rem
- -persist-tun
persist-key
ca ca.crt
- --
With kind regards,
Patrick Uiterwijk
Fedora Infra
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBCgAGBQJWJ9nbAAoJEIZXmA2atR5QMR0QAJ4JcXqY7sifgIpgiqwjJljJ
W8weXDdPU8BMS3xBKXYNn20VjcDM1Rwb515Xrjn4nxvHOjKbOoMLW7ccSwYLRcJ5
momInfqviHZLYKAyz8qsXGAY2Zve56BpGCgVNBdNWs05qVq8JTkLeTrymWaAhDdy
ju+KrkVZ/6TvrI8+IDJOzccTLmGU8MjtFFWlEYiz5AEScPN2CAJG8gGUOrHHoNcN
QMGpckixo3Vupo3kp/OGB4fnbvDtHi6NvHK7QfcySlK9CXcVIdVm8VoGVV4E0dP9
hAqndD7wzVbMSWBu5wmVUICzXSXlvM9SzAMXiHC8G6BEbYdAcAYZWBsJeyJzedh+
1x+PUFaLuxrFC7YvxEsHZiQdwP4xXRb8L2FBeO96i2k2dYnrfJk3pTgppRHriCZY
vKnGf1dSovV0phV3KOrsGsyPA+R5eK2WKQ0EIQE2h0iEfk/uLM4j5Npt4OHZlnlX
mcCqNg32KCS+tTzGnJt4LoPzc/pcH5DpStYEkc/iCHL+6Wzx9Ce73m+7tVjVf0Uh
R2vaXPcubdvZDOJ5QMwpCZvHJAp5DI011wC/D+dZ62sblt5oeP6BeMnUUMuWdWx5
ITjllgObDm7NVxhzR2rKWzfX7ZvJYffQkSbMgYjyFJ0b3b/+uFWNwPWUYsk7Gpf6
sAFRW2+ANdPoCB31ofd+
=e7Ij
-----END PGP SIGNATURE-----
8 years, 6 months
Fedora wiki not working properly on proxy04?
by Zamir Sun
Hi team,
This has been here for at least one hour just now. I tried to access the
wiki page and it sometimes (almost 70%) shows a 503 error. I've switched
my browser, switched to my laptop and it still occurs. So I dived into
the http header and it seems that this issue is caused by the backend
proxy04. As I see, whenever I get a 503, the AppServer is proxy04. So I
hope someone can check this.
Thanks.
Here is the IP information [2610:28:3090:3001:dead:beef:cafe:fed3]:80
Here is the header when it do not work(Received by Firefox)
Age: 0
AppServer: proxy04.fedoraproject.org
AppTime: D=1324
Cache-Control: no-cache
Connection: close
Content-Encoding: gzip
Content-Length: 1262
Content-Type: text/html; charset=UTF-8
Date: Wed, 21 Oct 2015 06:42:24 GMT
Pragma: no-cache
Server: Apache/2.4.6 (Red Hat Enterprise Linux)
Vary: Accept-Encoding,User-Agent
X-Varnish: 24591641
via: 1.1 varnish-v4
--
Zamir SUN
zsun(a)fedoraproject.org
zsun in #fedora-zh #openshift on freenode.net
8 years, 6 months
Apprentice Workday 18 November - Planning
by Zach Villers
Infra -
We discussed in the infra meeting last week (15 Oct) planning a workday
for apprentices (such as myself). Apprentices can work together in teams
via screenshare or separately with guidance from masters on various
apprentice tasks, with the goal being to sharpen our apprentice skills
and knock out some tickets as well.
Participation is open to anyone active in the fi-apprentice group (or
any other FIG for that matter.) If you have been hesitant or unsure
where to get started, this will be a great opportunity to roll your
sleeves up and get going.
We did not discuss a particular agenda for the day, so I am listing some
ideas to get started with below. Please feel free to send your own
suggestions, questions, etc.
Apprentice Things to do before Apprentice workday;
- Check your ssh access if you haven't logged in lately (i.e. after the
lockbox -> batcave transition)
- https://infrastructure.fedoraproject.org/infra/docs/sshaccess.rst
- Log in to the Nagios page https://admin.fedoraproject.org/nagios-external
- Review (or read) the Community Services Infrastructure Security Policy
-
https://docs.fedoraproject.org/en-US/Community_Services_Infrastructure/1/...
- Pull down a local copy of the ansible and infra-docs cgit
- https://infrastructure.fedoraproject.org/cgit/
- Read the ansible docs at http://docs.ansible.com/ then set up ansible
on your local machine or server of your choice
- If it's been awhile, drop in to #fedora-admin or #fedora-noc
Apprentice Things to do on Apprentice workday;
- Update group variables in ansible for CSI standards for machines that
don't have any listed. Look at the ansible repo under
inventory/group_vars/ for groups without CSI information.
- Propose patches to update doc templates
- Work on an Easy Fix Ticket
Master Things to do before Apprentice workday;
- Triage some tickets to make them easier/easyfix
- Think of other resources for apprentices to review
- Consider a topic for a lightning chat (or other format) to give on
Apprentice workday;
Master Things to do on Apprentice workday;
- Generally be available in irc
- Give a brief education chat in irc
Questions for the group;
- Should we set up screen shares?
- Maybe https://github.com/yudai/gotty as an idea
- Should apprentices/masters rsvp so we know who is coming/hours?
- Any other announcements we should send out?
Thanks,
Zach
#aikidouke
8 years, 6 months
[release] fedora-packages: 2.0.20
by Ralph Bean
Here it is! As mentioned on the devel list.
There are a lot of small bugfixes and enhancements here. I'm saving the bigger
structural changes for the coming weeks.
Note, packages03 and packages04 are not frozen.
2.0.20
------
Pull Requests
- (@lmacken) #94, Gracefully handle requests for invalid tabs
https://github.com/fedora-infra/fedora-packages/pull/94
- (@relrod) #115, darken footer text slightly, fix #114
https://github.com/fedora-infra/fedora-packages/pull/115
- (@ralphbean) #121, Force stuff down to ascii in the overview widget.
https://github.com/fedora-infra/fedora-packages/pull/121
- (@ralphbean) #123, Get epel7 releases working.
https://github.com/fedora-infra/fedora-packages/pull/123
- (@Fale) #120, Fix broken urls
https://github.com/fedora-infra/fedora-packages/pull/120
- (@jasontibbitts) #137, Wrap "LATEST BUILD" field.
https://github.com/fedora-infra/fedora-packages/pull/137
- (@ralphbean) #148, Add fedmenu.
https://github.com/fedora-infra/fedora-packages/pull/148
- (@ralphbean) #149, Fix bugzilla + tw2.
https://github.com/fedora-infra/fedora-packages/pull/149
- (@genodeftest) #165, Use HTTPS where possible
https://github.com/fedora-infra/fedora-packages/pull/165
- (@pypingou) #166, Use the same approach as elsewhere to include the bodhi image
https://github.com/fedora-infra/fedora-packages/pull/166
- (@ralphbean) #179, Get fedora-packages working with bodhi2.
https://github.com/fedora-infra/fedora-packages/pull/179
- (@ralphbean) #180, Remove broken link from the builds tab.
https://github.com/fedora-infra/fedora-packages/pull/180
- (@ralphbean) #182, Fix koji search links.
https://github.com/fedora-infra/fedora-packages/pull/182
- (@ralphbean) #181, Fix the spec widget.
https://github.com/fedora-infra/fedora-packages/pull/181
- (@ralphbean) #183, Move datagrepper query to the client side.
https://github.com/fedora-infra/fedora-packages/pull/183
- (@ralphbean) #184, Lots of quoting/escapery fixes.
https://github.com/fedora-infra/fedora-packages/pull/184
- (@ralphbean) #185, Handle more bodhi2 cases.
https://github.com/fedora-infra/fedora-packages/pull/185
- (@ralphbean) #186, Tell python-bugzilla that we don't want to cache cookies or tokens.
https://github.com/fedora-infra/fedora-packages/pull/186
- (@ralphbean) #187, Add a search field to the bugs table.
https://github.com/fedora-infra/fedora-packages/pull/187
Commits
- af09bf509 Gracefully handle requests for invalid tabs
https://github.com/fedora-infra/fedora-packages/commit/af09bf509
- 9067ca35e darken footer test slightly, fix #114
https://github.com/fedora-infra/fedora-packages/commit/9067ca35e
- 2635e08d0 Fix broken urls
https://github.com/fedora-infra/fedora-packages/commit/2635e08d0
- 7e03df8c1 Force stuff down to ascii in the overview widget.
https://github.com/fedora-infra/fedora-packages/commit/7e03df8c1
- 8c0ba0b98 Get epel7 releases working.
https://github.com/fedora-infra/fedora-packages/commit/8c0ba0b98
- 564ee475f Wrap "LATEST BUILD" field.
https://github.com/fedora-infra/fedora-packages/commit/564ee475f
- db0cb2852 Add fedmenu.
https://github.com/fedora-infra/fedora-packages/commit/db0cb2852
- ef9e6743f Fix bugzilla + tw2.
https://github.com/fedora-infra/fedora-packages/commit/ef9e6743f
- e3a95d63f Remove libravatar.
https://github.com/fedora-infra/fedora-packages/commit/e3a95d63f
- ddb935e4c Use HTTPS where possible
https://github.com/fedora-infra/fedora-packages/commit/ddb935e4c
- 8ae822bc2 Use the same approach as elsewhere to include the bodhi image
https://github.com/fedora-infra/fedora-packages/commit/8ae822bc2
- 1cf29d4c3 Fix busted change from #166.
https://github.com/fedora-infra/fedora-packages/commit/1cf29d4c3
- aa237e8ce Get fedora-packages working with bodhi2.
https://github.com/fedora-infra/fedora-packages/commit/aa237e8ce
- bcc145b07 Remove broken link from the builds tab.
https://github.com/fedora-infra/fedora-packages/commit/bcc145b07
- 9981a9880 Remove ascii encoding bit now that tw2.core uses render_unicode.
https://github.com/fedora-infra/fedora-packages/commit/9981a9880
- 4a962f34f Fix the spec widget.
https://github.com/fedora-infra/fedora-packages/commit/4a962f34f
- b9b69dc5c Fix koji search links.
https://github.com/fedora-infra/fedora-packages/commit/b9b69dc5c
- 0d13f4b6a Move datagrepper query to the client side.
https://github.com/fedora-infra/fedora-packages/commit/0d13f4b6a
- d6e157fb4 Add a space.
https://github.com/fedora-infra/fedora-packages/commit/d6e157fb4
- 4d1d15e74 Imports.
https://github.com/fedora-infra/fedora-packages/commit/4d1d15e74
- 84ba8633b Move unquoting out of the search filter util and into the search connector.
https://github.com/fedora-infra/fedora-packages/commit/84ba8633b
- fcf3ecd9f Move this to the right place, but escape before applying regexes.
https://github.com/fedora-infra/fedora-packages/commit/fcf3ecd9f
- 9c8b77189 Don't unquote so aggressively in the connector middleware.
https://github.com/fedora-infra/fedora-packages/commit/9c8b77189
- ccb306cea Handle more bodhi2 cases.
https://github.com/fedora-infra/fedora-packages/commit/ccb306cea
- 218e5b4bd Tell python-bugzilla that we don't want to cache cookies or tokens.
https://github.com/fedora-infra/fedora-packages/commit/218e5b4bd
- ba3c82e10 Add a search field to the bugs table.
https://github.com/fedora-infra/fedora-packages/commit/ba3c82e10
- 7fe64a9c9 Remove changelog header.
https://github.com/fedora-infra/fedora-packages/commit/7fe64a9c9
8 years, 6 months
Freeze Break Request: (yet another) mirrorlist: improve tree_lookup
to not modify global database
by Patrick Uiterwijk
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Hi all,
Since my patch of last night with deep copying the in-memory netblock database was a
disaster due to performance issues, I have been working on an improved patch which
avoids changing the in-memory database entirely.
The following patch uses a function that was added in py-radix 0.8 to do exactly that,
and after deploying an updated py-radix and this patch in staging it's been working
just fine.
Could I get +1's to both update py-radix and apply the below patch?
I will make sure to first update one and only if that works deploy it further.
Patch:
- From 5bfdeebd42f9d52a1fa2326bcd9b0eb71e4d8e32 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk(a)redhat.com>
Date: Tue, 20 Oct 2015 05:58:57 +0200
Subject: [PATCH] Use search_covering in radix to avoid having to modify the
tree
Signed-off-by: Patrick Uiterwijk <puiterwijk(a)redhat.com>
- ---
mirrorlist/mirrorlist_server.py | 8 ++------
requirements_mirrorlist.txt | 2 +-
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/mirrorlist/mirrorlist_server.py b/mirrorlist/mirrorlist_server.py
index a8adcf0..3344e4e 100755
- --- a/mirrorlist/mirrorlist_server.py
+++ b/mirrorlist/mirrorlist_server.py
@@ -206,8 +206,7 @@ def tree_lookup(tree, ip, field, maxResults=None):
len_data = 0
if ip is None:
return result
- - node = tree.search_best(ip.strNormal())
- - while node is not None:
+ for node in tree.search_covering(ip.strNormal()):
prefix = node.prefix
if type(node.data[field]) == list:
len_data += len(node.data[field])
@@ -215,10 +214,7 @@ def tree_lookup(tree, ip, field, maxResults=None):
len_data += 1
t = (prefix, node.data[field],)
result.append(t)
- - if maxResults is None or len_data < maxResults:
- - tree.delete(prefix)
- - node = tree.search_best(ip.strNormal())
- - else:
+ if maxResults is not None and len_data >= maxResults:
break
return result
- --
With kind regards,
Patrick Uiterwijk
Fedora Infra
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBCgAGBQJWJliuAAoJEIZXmA2atR5QDroQAI7LFHrb42xZRVtKgm8jh4dU
ZwB/qKMxPY3LnByI1FVw1hgP/CY+y/9pzpoN3nYrLOJAYtAKFVaB31PrF5BJdEFj
1Dn//NTxU8QiIVcm2h95QNLcXeesBagO4cmVgeAFLXvYtRVL+9bQsQF2o/B63Y+q
ToTRpufQnZmQSgvEvM8fgflYt28fiCWNzUHdDSU3Aq/GeTN5JZinluBLVNKDjqYJ
T7fek9Q0mavfkl9BUnw/Ny1p0eA3IAyVudaFDm8FrBKgTTOhdmqQSOUOsgs5qMoK
YDYOCzzPavkO09dOt5i4Sg8EScPClmnF/PA/aA70bPP7ERCEWDW9KDNOr8DM4PD4
swz81Op7kr1jd7wkpAz8ONzuvm01m3C1YVMRokq2GMTX2wXEu8t3ePuNnT1L0YoW
XFNukNGuN2WYd3bC9+5LNxVVICarm0I+K/P1mhNuGybzcI6azyU8X43GkCQUsYj/
FMdRgo98SieRP3hoKwdUgf5e522t9Hr5nhoNYo+zw0SL9x9KhN9hp8ECsYlvjeAB
Y+uu6s1DnZxzrgQO8Ex4w9RnaGPTMJkALrK2ToRpdwe3ivUDAQ5LbHglSh6dOy2Q
u/IG30wK5fE9VavNRgeivBsnecP5QjjTOU4vzF/rVOXdVe6LvrpKg2ftkXA23nmH
B9ggq4pBr/TlFycZzkC9
=ydKL
-----END PGP SIGNATURE-----
8 years, 6 months
Freeze break request: Fix host netblocks lookup in threaded
mirrorlist
by Patrick Uiterwijk
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Hi all,
After some discussion with Matt on my pull request to make mirrorlist use
threads instead of forks, I found one issue with the current code that breaks
the ASN-based lookup: it changes the in-memory version of the ASN lookup tree.
Could I get +1s to apply the underneath patch, which will fix this issue by
making a thread-local copy of the tree before searching and modifying?
commit 8a9d389bc77fe49086458df7ca03f9192a711e79
Author: Patrick Uiterwijk <puiterwijk(a)redhat.com>
Date: Tue Oct 20 01:39:58 2015 +0200
mirrorlist: Use a thread-local copy of the tree to prevent changing the global one
Signed-off-by: Patrick Uiterwijk <puiterwijk(a)redhat.com>
diff --git a/files/hotfix/mirrorlist/mirrorlist_server.py b/files/hotfix/mirrorlist/mirrorlist_server.py
index 39dfc7a..b884229 100755
- --- a/files/hotfix/mirrorlist/mirrorlist_server.py
+++ b/files/hotfix/mirrorlist/mirrorlist_server.py
@@ -6,6 +6,7 @@
# standard library modules in alphabetical order
from collections import defaultdict
+import copy
import datetime
import getopt
import logging
@@ -234,11 +235,12 @@ def tree_lookup(tree, ip, field, maxResults=None):
# and we'll get a new copy of the tree from our parent the next time it
# fork()s.
# returns a list of tuples (prefix, data)
+ ltree = copy.deepcopy(tree)
result = []
len_data = 0
if ip is None:
return result
- - node = tree.search_best(ip.strNormal())
+ node = ltree.search_best(ip.strNormal())
while node is not None:
prefix = node.prefix
if type(node.data[field]) == list:
@@ -248,8 +250,8 @@ def tree_lookup(tree, ip, field, maxResults=None):
t = (prefix, node.data[field],)
result.append(t)
if maxResults is None or len_data < maxResults:
- - tree.delete(prefix)
- - node = tree.search_best(ip.strNormal())
+ ltree.delete(prefix)
+ node = ltree.search_best(ip.strNormal())
else:
break
return result
- --
With kind regards,
Patrick Uiterwijk
Fedora Infra
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBCgAGBQJWJX+bAAoJEIZXmA2atR5Q/yEP/2A9Vy9H2e4u1aoKNZnwaKNB
AQagkPfQ7CgaVvutu7OHWpyP5G+UFWtTQEQlY8rRVSAU4NKYBEABw4Rk+dKt+iF5
WO9VGeqVcvPqV1cPGBqW+qIYJ/ZzdEhg+jEA3v6LInUwukUybCxnnb5szyWgARQm
91mXovdzanTovqCUhlHpDu6fxD/mkLl9QOsElHvZZjJNNt5mTy0+utnCM9Db7O2i
CmIzfAZp5WG6YtottNZ5KoGPCgr/RmtKtNRyfYvQ9yC6T0S8D33sNUShmPZtQ4CH
O8c0T11xd0JEkQSMQ5pGQzTMTYbbOkahdpx20jlpQDVij3PZbUw31cMG/0SF8mQf
Hf1nbruMl1VpMV77dioyycTskR88A7voc0dxyP7lw5Io/ou/o1+qx8u9LYz4OelK
Sik5Jy5Vc8NjxvjLGyskGThAmJnfck9xnl6odJZhQpaGjHwhKFrN7L70upQ4rvsH
MwGIy7ycRmXZrv4gl8ubYY/FKmHhftOcWMyAI32jU2ES43Q2DIo1T0Fs2bRZZsIf
iGnfKTDh61xU++9R9D+BvUk6vJvBle14TqisVOv9T0T/Uu8tneEkvcmEiaCW8fi2
f9teDc8Qwe3t6Dr1K858HMBosriCy8E2OBe08555XBIH+pF8rAVrx049b4Wpxfzf
zY9cqa5tvAKAkRIvM5Ks
=m5h0
-----END PGP SIGNATURE-----
8 years, 6 months