mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-02-23 14:41:43 +00:00
Code Issues Releases Wiki Activity

Only style changes - still NOT functional

Browse source
This commit is contained in:
Simon Frei 2017-07-19 13:55:14 +02:00
parent 9f6df7d999
commit 37f75519cf
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/borg/item.pyx
View file

@ -365,9 +365,9 @@ class ManifestItem(PropDict):
# indicated in compare_mode instead. # indicated in compare_mode instead.
if item1.get('deleted'): if item1.get('deleted'):
return 'added link' return 'added link'
elif item2.get('deleted'): if item2.get('deleted'):
return 'removed link' return 'removed link'
elif 'source' in item1 and 'source' in item2 and item1.source != item2.source: if 'source' in item1 and 'source' in item2 and item1.source != item2.source:
return 'changed link' return 'changed link'
def compare_content(path, item1, item2): def compare_content(path, item1, item2):
@ -390,7 +390,7 @@ def compare_content(path, item1, item2):
def compare_directory(item1, item2): def compare_directory(item1, item2):
if item2.get('deleted') and not item1.get('deleted'): if item2.get('deleted') and not item1.get('deleted'):
return 'removed directory' return 'removed directory'
elif item1.get('deleted') and not item2.get('deleted'): if item1.get('deleted') and not item2.get('deleted'):
return 'added directory' return 'added directory'
def compare_owner(item1, item2): def compare_owner(item1, item2):
@ -406,13 +406,11 @@ def compare_content(path, item1, item2):
def contents_changed(item1, item2): def contents_changed(item1, item2):
if can_compare_chunk_ids: if can_compare_chunk_ids:
return item1.chunks != item2.chunks return item1.chunks != item2.chunks
else: if sum_chunk_size(item1) != sum_chunk_size(item2):
if sum_chunk_size(item1) != sum_chunk_size(item2): return True
return True chunk_ids1 = [c.id for c in item1.chunks]
else: chunk_ids2 = [c.id for c in item2.chunks]
chunk_ids1 = [c.id for c in item1.chunks] return not fetch_and_compare_chunks(chunk_ids1, chunk_ids2, archive1, archive2)
chunk_ids2 = [c.id for c in item2.chunks]
return not fetch_and_compare_chunks(chunk_ids1, chunk_ids2, archive1, archive2)
@staticmethod @staticmethod
def compare_chunk_contents(chunks1, chunks2): def compare_chunk_contents(chunks1, chunks2):