diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-08-08 05:09:23 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-08-08 05:09:23 +0530 |
| commit | 484233efddc323d214bd3c34f0cd94005a28aa6f (patch) | |
| tree | a617eb6cc95d7a1810aadcceba21c4609049108e | |
| parent | a017e1e5e4fca6d41507c029fbf62bbd72ea2f48 (diff) | |
gettext-tools.recipe: shutil.which does not exist on Python 2
Which is why we have shell.which.
| -rw-r--r-- | recipes/build-tools/gettext-tools.recipe | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/recipes/build-tools/gettext-tools.recipe b/recipes/build-tools/gettext-tools.recipe index 73c6b6be..010c5f1f 100644 --- a/recipes/build-tools/gettext-tools.recipe +++ b/recipes/build-tools/gettext-tools.recipe @@ -1,5 +1,6 @@ # -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python import shutil +from cerbero.utils import shell class Recipe(recipe.Recipe): name = 'gettext-tools' @@ -28,7 +29,7 @@ class Recipe(recipe.Recipe): # during configure, so replace it with the msgmerge from MSYS-MinGW # which works fine. build_tools_bin = os.path.join(self.config.build_tools_prefix, 'bin') - msys_mingw_bindir = os.path.dirname(shutil.which('mingw-get')) + msys_mingw_bindir = os.path.dirname(shell.which('mingw-get')) msys_msgmerge = os.path.join(msys_mingw_bindir, 'msgmerge.exe') if os.path.isfile(msys_msgmerge): built_msgmerge = os.path.join(build_tools_bin, 'msgmerge.exe') |