diff --git a/astakosclient/astakosclient/keypath.py b/astakosclient/astakosclient/keypath.py
index 022bf21a0943e1eb6cf545a694269c6da0746db8..abb6ca9afe5337414898af26ba81358f7d4de132 100644
--- a/astakosclient/astakosclient/keypath.py
+++ b/astakosclient/astakosclient/keypath.py
@@ -31,6 +31,8 @@
# interpreted as representing official policies, either expressed
# or implied, of GRNET S.A.
+import copy
+
def dict_merge(a, b):
"""
diff --git a/snf-branding/setup.py b/snf-branding/setup.py
index 1f88c6c5c0b59c0fb60c845bbc1d36bdb75b7034..732c5cf7e56794398c403732c43e3609e3b9cf97 100644
--- a/snf-branding/setup.py
+++ b/snf-branding/setup.py
@@ -36,6 +36,7 @@ import distribute_setup
distribute_setup.use_setuptools()
import os
+import sys
from setuptools import setup, find_packages
from fnmatch import fnmatchcase
diff --git a/snf-cyclades-app/setup.py b/snf-cyclades-app/setup.py
index ebaf833dfd19cd7f88959640c6540074a7566fe2..d6c716e80b056c22a23c1171575fad8ca4cadfaf 100644
--- a/snf-cyclades-app/setup.py
+++ b/snf-cyclades-app/setup.py
@@ -36,6 +36,7 @@ import distribute_setup
distribute_setup.use_setuptools()
import os
+import sys
from distutils.util import convert_path
from fnmatch import fnmatchcase
diff --git a/snf-cyclades-app/synnefo/api/util.py b/snf-cyclades-app/synnefo/api/util.py
index e1603f614c4b115b20bd826f5baecc2bf4f27783..8bfd8550404ca8f684d5eaac3a81aa54f078cd37 100644
--- a/snf-cyclades-app/synnefo/api/util.py
+++ b/snf-cyclades-app/synnefo/api/util.py
@@ -377,6 +377,7 @@ def render_metadata(request, metadata, use_values=False, status=200):
def render_meta(request, meta, status=200):
if request.serialization == 'xml':
+ key, val = meta.items()[0]
data = render_to_string('meta.xml', dict(key=key, val=val))
else:
data = json.dumps(dict(meta=meta))
diff --git a/snf-cyclades-app/synnefo/logic/management/commands/pool-modify.py b/snf-cyclades-app/synnefo/logic/management/commands/pool-modify.py
index 507ea8566d4bb0d3cb5e092ca7250976d91801e7..28c3c31d7217e8b6336bd038604d9a5d434456ad 100644
--- a/snf-cyclades-app/synnefo/logic/management/commands/pool-modify.py
+++ b/snf-cyclades-app/synnefo/logic/management/commands/pool-modify.py
@@ -63,6 +63,7 @@ class Command(BaseCommand):
base = options['base']
add_reserved = options['add-reserved']
remove_reserved = options['remove-reserved']
+ size = options['size']
if not type_:
raise CommandError("Type of pool is mandatory")
diff --git a/snf-pithos-app/setup.py b/snf-pithos-app/setup.py
index df878e8bb99a64bbe890ea250a2078b5efaa57fb..93db27787c28a2bdc1ac12efe635f4179ac04759 100644
--- a/snf-pithos-app/setup.py
+++ b/snf-pithos-app/setup.py
@@ -36,6 +36,7 @@ import distribute_setup
distribute_setup.use_setuptools()
import os
+import sys
from distutils.util import convert_path
from fnmatch import fnmatchcase
diff --git a/snf-pithos-backend/pithos/backends/lib/sqlite/public.py b/snf-pithos-backend/pithos/backends/lib/sqlite/public.py
index 555bed7fc090a2a28487df9bfc2568fe84f3d4ab..429523a73a4fd7517a935bb87aac1eb2df72dacc 100644
--- a/snf-pithos-backend/pithos/backends/lib/sqlite/public.py
+++ b/snf-pithos-backend/pithos/backends/lib/sqlite/public.py
@@ -75,8 +75,7 @@ class Public(DBWorker):
)
q = "insert into public(path, active, url) values(?, 1, ?)"
self.execute(q, (path, url))
- if sqlite3_changes() != 0:
- logger.info('Public url set for path: %s' % path)
+ logger.info('Public url set for path: %s' % path)
def public_unset(self, path):
q = "delete from public where path = ?"
diff --git a/snf-pithos-backend/setup.py b/snf-pithos-backend/setup.py
index d24050fc507e6adf39f7d75186ef88d6492b5663..eb8b9663d6838d210d58c3f22ae945d1df3b3701 100644
--- a/snf-pithos-backend/setup.py
+++ b/snf-pithos-backend/setup.py
@@ -36,6 +36,7 @@ import distribute_setup
distribute_setup.use_setuptools()
import os
+import sys
from distutils.util import convert_path
from fnmatch import fnmatchcase