Skip to content

Commit

Permalink
Merge pull request #1845 from sfoerster/unpack_mv_nonzip_bugfix
Browse files Browse the repository at this point in the history
bugfix: unpack for nonzip archives also needs to compare basename(dir)
  • Loading branch information
inclement committed Jun 8, 2019
2 parents f9e81e0 + 3bf88f7 commit 8ccd0a4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pythonforandroid/recipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ def unpack(self, arch):
sh.tar('xf', extraction_filename)
root_directory = sh.tar('tf', extraction_filename).stdout.decode(
'utf-8').split('\n')[0].split('/')[0]
if root_directory != directory_name:
if root_directory != basename(directory_name):
shprint(sh.mv, root_directory, directory_name)
else:
raise Exception(
Expand Down

0 comments on commit 8ccd0a4

Please sign in to comment.