diff options
| author | Rob Austein <sra@hactrn.net> | 2016-04-12 20:28:02 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2016-04-12 20:28:02 +0000 |
| commit | c8d26417c6f66ce3bf5389f046cc8dd3aa5bf64e (patch) | |
| tree | 951510c3f368a02a0978148d0784a733d767ca5c /rpki | |
| parent | d753ca696172c297245410830e7b63326a85ec29 (diff) | |
Pull rpkic <group> fix from trunk.
I think Subversion's merge tracking data is turning into cream cheese.
svn path=/branches/tk705/; revision=6360
Diffstat (limited to 'rpki')
| -rw-r--r-- | rpki/irdb/zookeeper.py | 4 |
1 files changed, 2 insertions, 2 deletions
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) |