From c8d26417c6f66ce3bf5389f046cc8dd3aa5bf64e Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Tue, 12 Apr 2016 20:28:02 +0000
Subject: Pull rpkic <group> fix from trunk.

I think Subversion's merge tracking data is turning into cream cheese.

svn path=/branches/tk705/; revision=6360
---
 rpki/irdb/zookeeper.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'rpki')

diff --git a/rpki/irdb/zookeeper.py b/rpki/irdb/zookeeper.py
index 0ce91800..e4a04869 100644
--- a/rpki/irdb/zookeeper.py
+++ b/rpki/irdb/zookeeper.py
@@ -1046,8 +1046,8 @@ class Zookeeper(object):
         grouped = {}
 
         # format:  p/n-m asn group
-        for pnm, asn, group in csv_reader(csv_file, columns = 3):
-            key = (asn, group)
+        for pnm, asn, group in csv_reader(filename, columns = 3, min_columns = 2):
+            key = (asn, group or pnm)
             if key not in grouped:
                 grouped[key] = []
             grouped[key].append(pnm)
-- 
cgit v1.2.3