diff options
Diffstat (limited to 'rpki/pubdb')
| -rw-r--r-- | rpki/pubdb/__init__.py | 21 | ||||
| -rw-r--r-- | rpki/pubdb/models.py | 2 |
2 files changed, 1 insertions, 22 deletions
diff --git a/rpki/pubdb/__init__.py b/rpki/pubdb/__init__.py index 2c83051f..e69de29b 100644 --- a/rpki/pubdb/__init__.py +++ b/rpki/pubdb/__init__.py @@ -1,21 +0,0 @@ -# $Id$ -# -# Copyright (C) 2014 Dragon Research Labs ("DRL") -# -# Permission to use, copy, modify, and/or distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND DRL DISCLAIMS ALL WARRANTIES WITH -# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -# AND FITNESS. IN NO EVENT SHALL DRL BE LIABLE FOR ANY SPECIAL, DIRECT, -# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -# PERFORMANCE OF THIS SOFTWARE. - -""" -Package for Django ORM models relating to pubd. -""" - -from rpki.pubdb.models import * diff --git a/rpki/pubdb/models.py b/rpki/pubdb/models.py index ce42c688..c6196eab 100644 --- a/rpki/pubdb/models.py +++ b/rpki/pubdb/models.py @@ -249,7 +249,7 @@ class Delta(models.Model): raise rpki.exceptions.ExistingObjectAtURI("Object already published at %s" % uri) else: raise rpki.exceptions.DifferentObjectAtURI("Found different object at %s (old %s, new %s)" % (uri, obj.hash, hash)) - except rpki.pubdb.PublishedObject.DoesNotExist: + except rpki.pubdb.models.PublishedObject.DoesNotExist: pass logger.debug("Publishing %s", uri) PublishedObject.objects.create(session = self.session, client = client, der = der, uri = uri, |