# HG changeset patch
# User Aurelien Campeas <aurelien.campeas@logilab.fr>
# Date 1335946419 -7200
# Node ID a682f5cb73f6cf11beca603a9b5c714b60fdb981
# Parent  76ce456f8f076a0614670b733dbcd843788801bc# Parent  b752df3e8596676d7059c432335ffdbb220c20af
[merge] backport stable fixes

diff -r 76ce456f8f07 -r a682f5cb73f6 bin/clone_deps.py
--- a/bin/clone_deps.py	Fri Apr 27 14:22:38 2012 +0200
+++ b/bin/clone_deps.py	Wed May 02 10:13:39 2012 +0200
@@ -3,6 +3,7 @@
 
 from subprocess import call as sbp_call, Popen, PIPE
 from urllib import urlopen
+import os
 from os import path as osp, pardir, chdir
 
 
diff -r 76ce456f8f07 -r a682f5cb73f6 server/sources/native.py
--- a/server/sources/native.py	Fri Apr 27 14:22:38 2012 +0200
+++ b/server/sources/native.py	Wed May 02 10:13:39 2012 +0200
@@ -1811,8 +1811,10 @@
         versions = set(self._get_versions())
         if file_versions != versions:
             self.logger.critical('Unable to restore : versions do not match')
-            self.logger.critical('Expected:\n%s', '\n'.join(list(sorted(versions))))
-            self.logger.critical('Found:\n%s', '\n'.join(list(sorted(file_versions))))
+            self.logger.critical('Expected:\n%s', '\n'.join('%s : %s' % (cube, ver)
+                                                            for cube, ver in sorted(versions)))
+            self.logger.critical('Found:\n%s', '\n'.join('%s : %s' % (cube, ver)
+                                                         for cube, ver in sorted(file_versions)))
             raise ValueError('Unable to restore : versions do not match')
         table_chunks = {}
         for name in archive.namelist():