Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b079b50e authored by Tao Bao's avatar Tao Bao
Browse files

releasetools: Change the base_fs assertion into warnings. 

commit f54216f2 packed the base_fs files
into target_files.zip and added assertion to ensure the existence of the
files. We don't want to fail the OTA generation for the target_files.zip
without the base_fs files. Change the assertion into warnings instead.

Bug: 28547368
Change-Id: I6fd758a0a4fdfff02d1640fa46cf43d971627e26
parent 878775fd

tools/releasetools/common.py

+12 −6
Original line number Diff line number Diff line
@@ -186,16 +186,22 @@ def LoadInfoDict(input_file, input_dir=None): 
    if "system_base_fs_file" in d:

      basename = os.path.basename(d["system_base_fs_file"])

      system_base_fs_file = os.path.join(input_dir, "META", basename)

      assert os.path.exists(system_base_fs_file), \

          "failed to find system base fs file: %s" % (system_base_fs_file,)

      if os.path.exists(system_base_fs_file):

        d["system_base_fs_file"] = system_base_fs_file

      else:

        print "Warning: failed to find system base fs file: %s" % (

            system_base_fs_file,)

        del d["system_base_fs_file"]



    if "vendor_base_fs_file" in d:

      basename = os.path.basename(d["vendor_base_fs_file"])

      vendor_base_fs_file = os.path.join(input_dir, "META", basename)

      assert os.path.exists(vendor_base_fs_file), \

          "failed to find vendor base fs file: %s" % (vendor_base_fs_file,)

      if os.path.exists(vendor_base_fs_file):

        d["vendor_base_fs_file"] = vendor_base_fs_file

      else:

        print "Warning: failed to find vendor base fs file: %s" % (

            vendor_base_fs_file,)

        del d["vendor_base_fs_file"]



  try:

    data = read_helper("META/imagesizes.txt")