Skip to content

Commit

Permalink
Adjust jhbuild and jhbuildrc for MSYS2 dropping python2.
Browse files Browse the repository at this point in the history
jhbuild has to force /usr/bin/python because the mingw32/64 one
requires MSDOS style paths and that breaks jhbuild modules.
  • Loading branch information
jralls committed Nov 23, 2020
1 parent b4bd328 commit 303f125
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion jhbuild.in
@@ -1,4 +1,4 @@
#!/usr/bin/env python2
#!/usr/bin/env python
# -*- coding: utf-8 -*-

import sys
Expand Down
4 changes: 2 additions & 2 deletions jhbuildrc.in
Expand Up @@ -8,7 +8,7 @@ def _popen(cmd_arg):
cmd.stdout.close()
devnull.close()
if err:
raise RuntimeError, "Failed to close %s stream" % cmd_arg
raise RuntimeError("Failed to close %s stream" % cmd_arg)
return retval

def environ_append(key, value, separator=' '):
Expand All @@ -33,7 +33,7 @@ def add_to_path_var(var, path):
_basedir = "@-BASE_DIR-@"
_download_dir = "@-DOWNLOAD_DIR-@"
_arch = "@-ARCH-@"
if os.environ.has_key('TARGET'):
if 'TARGET' in os.environ:
(_project, _branch) = os.environ['TARGET'].split('-')
else:
_project = 'gnucash'
Expand Down

0 comments on commit 303f125

Please sign in to comment.