From 6a844c42f01d29b61ffe93aec88ff195d974de84 Mon Sep 17 00:00:00 2001 From: Hidden Z Date: Wed, 27 Oct 2010 16:16:37 +0000 Subject: [PATCH] py-i2phosts-injector: check for key conflicts when adding Now we can see when key for some host are differs with our key --- py-i2phosts-injector | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/py-i2phosts-injector b/py-i2phosts-injector index 120a24e..f5eb38b 100755 --- a/py-i2phosts-injector +++ b/py-i2phosts-injector @@ -50,15 +50,18 @@ for line in f: else: # Check for already existed hosts in database to avoid unneeded INSERTs # beacuse they will fail anyway. - qs = i2phost.objects.filter(name=hostname) - if qs.exists(): - if not args.supress: - print 'Host %s already exists' % hostname - else: + try: + h = i2phost.objects.get(name=hostname) + except i2phost.DoesNotExist: if not args.quiet: print 'Adding %s' % hostname host = i2phost(name=hostname, b64hash=base64, description=args.description, activated=True, external=True) host.save() + else: + if not args.supress: + print 'Host %s already exists' % hostname + if h.b64hash != base64: + print 'Key conflict for host: %s' % hostname f.close()