diff options
| author | Michael Elkins <melkins@tislabs.com> | 2012-11-12 23:43:43 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2012-11-12 23:43:43 +0000 |
| commit | d77f7e5696aa3727cc4c9c4ab18e78d575e12b92 (patch) | |
| tree | 34cb48997d7d686073de3430c09a9027878edd2e /rpkid/rpki/gui/app/views.py | |
| parent | d3751618a5cd43cabe43ebdab8be9a809fce6b15 (diff) | |
merge with /trunk
svn path=/branches/tk274/; revision=4858
Diffstat (limited to 'rpkid/rpki/gui/app/views.py')
| -rw-r--r-- | rpkid/rpki/gui/app/views.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rpkid/rpki/gui/app/views.py b/rpkid/rpki/gui/app/views.py index 6de313e3..02f145b3 100644 --- a/rpkid/rpki/gui/app/views.py +++ b/rpkid/rpki/gui/app/views.py @@ -374,12 +374,12 @@ def child_add_asn(request, pk): def add_address_callback(child, form): address_range = form.cleaned_data.get('address_range') - try: - r = resource_range_ipv4.parse_str(address_range) - version = 'IPv4' - except BadIPResource: + if ':' in address_range: r = resource_range_ipv6.parse_str(address_range) version = 'IPv6' + else: + r = resource_range_ipv4.parse_str(address_range) + version = 'IPv4' child.address_ranges.create(start_ip=str(r.min), end_ip=str(r.max), version=version) |