Update from upstream #11

Closed
soksanichenko wants to merge 158 commits from a8_updated into a8
Showing only changes of commit 960c85efde - Show all commits

View File

@ -387,11 +387,18 @@ def read_packages(graft_points):
which can change checksum despite data being the same. which can change checksum despite data being the same.
""" """
with open(graft_points) as f: with open(graft_points) as f:
return set(line.split("=", 1)[0] for line in f if line.startswith("Packages/")) return set(
line.split("=", 1)[0]
for line in f
if line.startswith("Packages/") or "/Packages/" in line
)
def compare_packages(old_graft_points, new_graft_points): def compare_packages(old_graft_points, new_graft_points):
"""Read packages from the two files and compare them.""" """Read packages from the two files and compare them.
:returns bool: True if there are differences, False otherwise
"""
old_files = read_packages(old_graft_points) old_files = read_packages(old_graft_points)
new_files = read_packages(new_graft_points) new_files = read_packages(new_graft_points)
return old_files != new_files return old_files != new_files