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

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

target_files_diff: Fix the issue with file type change. 

When a file is switched from a regular file to a symlink, we should skip
the comparasion.

Bug: 28373409
Change-Id: I8fef00ab9f2d6f811fde1cadf595e8bd46af2dfd
parent b5658074

tools/releasetools/target_files_diff.py

+8 −9
Original line number Diff line number Diff line
@@ -172,16 +172,15 @@ def recursiveDiff(prefix, dir1, dir2, out_file): 
      continue



    if entry in list2:

      if os.path.islink(name1):

        if os.path.islink(name2):

      if os.path.islink(name1) and os.path.islink(name2):

        link1 = os.readlink(name1)

        link2 = os.readlink(name2)

        if link1 != link2:

          print("%s: Symlinks differ: %s vs %s" % (name, link1, link2),

                file=out_file)

        else:

          print("%s: File types differ, skipping compare" % name,

                file=out_file)

        continue

      elif os.path.islink(name1) or os.path.islink(name2):

        print("%s: File types differ, skipping compare" % name, file=out_file)

        continue



      stat1 = os.stat(name1)