From cec7c12ac4284c32b5d10e979a78ab364eae959c Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Thu, 26 Nov 2015 13:40:39 +0100
Subject: [PATCH] allow removing old ids

---
 oml/commands.py |  2 +-
 oml/nodes.py    |  1 +
 oml/update.py   | 11 +++++++++--
 oml/user/api.py |  4 ++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/oml/commands.py b/oml/commands.py
index 2d6df73..ea2dc41 100644
--- a/oml/commands.py
+++ b/oml/commands.py
@@ -25,7 +25,7 @@ def version(module):
         version += '-' + get('git', 'describe', '--always').strip()
         os.chdir(root_dir)
     else:
-        if module in settings.release['modules']:
+        if 'modules' in settings.release and module in settings.release['modules']:
             version = settings.release['modules'][module]['version']
         else:
             version = -1
diff --git a/oml/nodes.py b/oml/nodes.py
index 9e5f4eb..489f593 100644
--- a/oml/nodes.py
+++ b/oml/nodes.py
@@ -112,6 +112,7 @@ class Node(Thread):
             u = self.user
             self.user_id = r['id']
             u.migrate_id(self.user_id)
+            self._opener = get_opener(self.user_id)
 
     def get_local(self):
         if self._nodes and self._nodes._local:
diff --git a/oml/update.py b/oml/update.py
index 34edb7b..859c7a0 100644
--- a/oml/update.py
+++ b/oml/update.py
@@ -53,7 +53,8 @@ def get(url, filename=None):
 
 def check():
     if settings.release:
-        release_data = get(settings.server.get('release_url', 'http://downloads.openmedialibrary.com/release.json'))
+        release_data = get(settings.server.get('release_url',
+            'http://downloads.openmedialibrary.com/release.json'))
         release = json.loads(release_data.decode('utf-8'))
         old = current_version('openmedialibrary')
         new = release['modules']['openmedialibrary']['version']
@@ -61,7 +62,13 @@ def check():
     return False
 
 def current_version(module):
-    return settings.release['modules'][module]['version'] if module in settings.release['modules'] else ""
+    if 'modules' in settings.release \
+        and module in settings.release['modules'] \
+        and 'version' in settings.release['modules'][module]:
+        version = settings.release['modules'][module]['version']
+    else:
+        version = ''
+    return version
 
 def download():
     if not os.path.exists(os.path.join(settings.config_path, 'release.json')):
diff --git a/oml/user/api.py b/oml/user/api.py
index 0206e70..752cd35 100644
--- a/oml/user/api.py
+++ b/oml/user/api.py
@@ -341,7 +341,7 @@ def rejectPeering(data):
             message
         }
     '''
-    if len(data.get('id', '')) != 16:
+    if len(data.get('id', '')) not in (16, 43):
         logger.debug('invalid user id')
         return {}
     u = models.User.get_or_create(data['id'])
@@ -360,7 +360,7 @@ def removePeering(data):
             message
         }
     '''
-    if len(data.get('id', '')) != 16:
+    if len(data.get('id', '')) not in (16, 43):
         logger.debug('invalid user id')
         return {}
     u = models.User.get_or_create(data['id'])