diff options
| author | Tianjie <xunchang@google.com> | 2020-06-19 00:22:59 -0700 |
|---|---|---|
| committer | Tianjie <xunchang@google.com> | 2020-07-06 11:24:36 -0700 |
| commit | 55abd3cbae6bd150b3534728a63befd1cadd6c5e (patch) | |
| tree | 0077b57b1ef96c194380908311ce2a993fb1a89c /scripts/blockdiff.py | |
| parent | 99d570d67bd5dab11de321068c4002ab76ae774a (diff) | |
| parent | 694eeb0dece40f88e11ece3a776d995d855be79b (diff) | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
It's a merge from chrome OS with some reverts.
1. the fd watcher change, because the libbrillo version isn't
compatible in aosp.
commit 6955bcc4ffe4cc9d62a88186b9a7e75d095a7897
commit 493fecb3f48c8478fd3ef244d631d857730dd14d
2. two libcurl unittest. Because the RunOnce() of the fake message
loop seems to have different behavior in aosp.
commit d3d84218cafbc1a95e7d6bbb775b495d1bebf4d2
Put preprocessor guards to use the old code in aosp. And we can
switch to the new code in the other path after adopting the new
libbrillo & libchrome.
Test: unit tests pass, apply an OTA
Change-Id: Id613599834b0f44f92841dbeae6303601db5490d
Diffstat (limited to 'scripts/blockdiff.py')
| -rwxr-xr-x | scripts/blockdiff.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/blockdiff.py b/scripts/blockdiff.py index 5793def7..95893cf4 100755 --- a/scripts/blockdiff.py +++ b/scripts/blockdiff.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/env python # # Copyright (C) 2013 The Android Open Source Project # @@ -17,6 +17,7 @@ """Block diff utility.""" +from __future__ import absolute_import from __future__ import print_function # pylint: disable=import-error @@ -46,7 +47,7 @@ def BlockDiff(block_size, file1, file2, name1, name2, max_length=-1): """ if max_length < 0: - max_length = sys.maxint + max_length = sys.maxsize diff_list = [] num_blocks = extent_start = extent_length = 0 while max_length or extent_length: |