Skip to content

Commit

Permalink
drop utf-8 encoding to compute file hashes in symlink stage
Browse files Browse the repository at this point in the history
  • Loading branch information
rhaschke committed Jan 31, 2017
1 parent 5c73dd4 commit e8c8a8e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions catkin_tools/jobs/catkin.py
Original file line number Diff line number Diff line change
Expand Up @@ -288,8 +288,8 @@ def link_devel_products(
if os.path.exists(dest_file):
if os.path.realpath(dest_file) != os.path.realpath(source_file):
# Compute hashes for colliding files
source_hash = md5(open(os.path.realpath(source_file)).read().encode('utf-8')).hexdigest()
dest_hash = md5(open(os.path.realpath(dest_file)).read().encode('utf-8')).hexdigest()
source_hash = md5(open(os.path.realpath(source_file)).read()).hexdigest()
dest_hash = md5(open(os.path.realpath(dest_file)).read()).hexdigest()
# If the link links to a different file, report a warning and increment
# the collision counter for this path
if dest_hash != source_hash:
Expand Down

0 comments on commit e8c8a8e

Please sign in to comment.