Revision e492238f

b/snf-pithos-backend/pithos/backends/modular.py
1230 1230
                     permissions=None, src_version=None, is_move=False,
1231 1231
                     delimiter=None):
1232 1232

  
1233
        report_size_change = not is_move
1234 1233
        dest_meta = dest_meta or {}
1235 1234
        dest_version_ids = []
1236 1235
        self._can_read_object(user, src_account, src_container, src_name)
......
1239 1238
        dest_container_path = '/'.join((dest_account, dest_container))
1240 1239
        # Lock container paths in alphabetical order
1241 1240
        if src_container_path < dest_container_path:
1242
            self._lookup_container(src_account, src_container)
1243
            self._lookup_container(dest_account, dest_container)
1241
            src_container_node = self._lookup_container(src_account,
1242
							src_container)[-1]
1243
            dest_container_node = self._lookup_container(dest_account,
1244
							 dest_container)[-1]
1244 1245
        else:
1245
            self._lookup_container(dest_account, dest_container)
1246
            self._lookup_container(src_account, src_container)
1246
            dest_container_node = self._lookup_container(dest_account,
1247
							 dest_container)[-1]
1248
            src_container_node = self._lookup_container(src_account,
1249
							src_container)[-1]
1250

  
1251
        cross_account = src_account != dest_account
1252
        cross_container = src_container != dest_container
1253
        if not cross_account and cross_container:
1254
            src_project = self._get_project(src_container_node)
1255
            dest_project = self._get_project(dest_container_node)
1256
            cross_project = src_project != dest_project
1257
        else:
1258
            cross_project = False
1259
        report_size_change = not is_move or cross_account or cross_project
1247 1260

  
1248 1261
        path, node = self._lookup_object(src_account, src_container, src_name)
1249 1262
        # TODO: Will do another fetch of the properties in duplicate version...

Also available in: Unified diff