Merge branch 'hotfix-0.14.4'

Changelog

@@ -6,6 +6,19 @@ Unified Changelog file for Synnefo versions >= 0.13
 Since v0.13 most of the Synnefo components have been merged into a single
 repository and have aligned versions.
 
+.. _Changelog-0.14.4:
+
+v0.14.4
+=======
+
+Released: Mon Jul 29 12:24:22 EEST 2013
+
+Pithos
+------
+
+* Fix bug in reconcile resources management command.
+
+
 .. _Changelog-0.14.3:
 
 v0.14.3

NEWS

@@ -5,6 +5,13 @@ Unified NEWS file for Synnefo versions >= 0.13
 
 Since v0.13 all Synnefo components have been merged into a single repository.
 
+.. _NEWS-0.14.4:
+
+v0.14.4
+=======
+
+Released: Mon Jul 29 12:24:22 EEST 2013
+
 .. _NEWS-0.14.3:
 
 v0.14.3

docs/admin-guide.rst

@@ -1809,6 +1809,7 @@ Changelog, NEWS
 ===============
 
 
+* v0.14.4 :ref:`Changelog <Changelog-0.14.4>`, :ref:`NEWS <NEWS-0.14.4>`
 * v0.14.3 :ref:`Changelog <Changelog-0.14.3>`, :ref:`NEWS <NEWS-0.14.3>`
 * v0.14.2 :ref:`Changelog <Changelog-0.14.2>`, :ref:`NEWS <NEWS-0.14.2>`
 * v0.14 :ref:`Changelog <Changelog-0.14>`, :ref:`NEWS <NEWS-0.14>`

snf-pithos-app/pithos/api/management/commands/reconcile-resources-pithos.py

@@ -77,8 +77,10 @@ class Command(NoArgsCommand):
 
             users = set(db_usage.keys())
             if userid and userid not in users:
-                self.stdout.write("User '%s' does not exist in DB!\n" % userid)
-                return
+                if backend._lookup_account(userid) is None:
+                    self.stdout.write("User '%s' does not exist in DB!\n" %
+                                      userid)
+                    return
 
             # Get holding from Quotaholder
             try:
@@ -161,4 +163,4 @@ def create_provision(provision_info):
     return {"holder": user,
             "source": DEFAULT_SOURCE,
             "resource": resource,
-            "quantity": db_value - qh_value}
+            "quantity": int(db_value - qh_value)}

version

 # This is a comment!
-0.14.3
+0.14.4