commit 59978ab6e3d4ea8e5e69d2ee275d0ea7aba3c4ca
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 01 17:58:11 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 01 17:58:12 2017 +0000
tree 08b533329a36e88a107ad940947aba41b9ee72da
parent d579b8eb1f52d2ab26803104ed70baba7d7b8732
parent 9beea2a4a3af907653bca906cda63f2d010e6ab4

Merge "releasetools: Merge two identical conditional branches."

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 5a24d5e..956f000 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -1449,14 +1449,7 @@
         return
 
       ranges_str = ranges.to_string_raw()
-      if self.version >= 4:
-        script.AppendExtra(('if (range_sha1("%s", "%s") == "%s" || '
-                            'block_image_verify("%s", '
-                            'package_extract_file("%s.transfer.list"), '
-                            '"%s.new.dat", "%s.patch.dat")) then') % (
-                            self.device, ranges_str, expected_sha1,
-                            self.device, partition, partition, partition))
-      elif self.version == 3:
+      if self.version >= 3:
         script.AppendExtra(('if (range_sha1("%s", "%s") == "%s" || '
                             'block_image_verify("%s", '
                             'package_extract_file("%s.transfer.list"), '