Merge "common.py: Fix the build."

2015-10-16 22:41:45 +00:00
parent 543b28d42f aac4ad56b6
commit ac39bef43f
1 changed files with 5 additions and 2 deletions
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -1259,8 +1259,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: