am 6ce8ae76: am ac39bef4: Merge "common.py: Fix the build."

* commit '6ce8ae761b8a238ce215638510230baed277235f':
  common.py: Fix the build.
This commit is contained in:
Tao Bao 2015-10-16 22:50:39 +00:00 committed by Android Git Automerger
commit 88aea00628

View file

@ -1261,8 +1261,11 @@ class BlockDifference(object):
self.path = os.path.join(tmpdir, partition)
b.Compute(self.path)
_, self.device = GetTypeAndDevice("/" + partition,
OPTIONS.source_info_dict)
if src is None:
_, self.device = GetTypeAndDevice("/" + partition, OPTIONS.info_dict)
else:
_, self.device = GetTypeAndDevice("/" + partition,
OPTIONS.source_info_dict)
def WriteScript(self, script, output_zip, progress=None):
if not self.src: