- else:
- dmd_last_uploaded_uri = metadata.get('last_uploaded_uri', None)
- print ">>>> if %r != %r" % (dmd_last_uploaded_uri, db_entry.last_uploaded_uri)
- if dmd_last_uploaded_uri is not None and dmd_last_uploaded_uri != db_entry.last_uploaded_uri:
- is_conflict = True
- self._count('objects_conflicted')
- else:
- # XXX todo: mark as conflict if file is in pending upload set
- if self._is_upload_pending(relpath_u):
- is_conflict = True
- self._count('objects_conflicted')
+ elif dmd_last_uploaded_uri is not None and dmd_last_uploaded_uri != db_entry.last_uploaded_uri:
+ is_conflict = True
+ self._count('objects_conflicted')
+ elif self._is_upload_pending(relpath_u):
+ is_conflict = True
+ self._count('objects_conflicted')