Skip to content

Commit e8851c9

Browse files
Hervé CauwelierJ. David Ibañez
Hervé Cauwelier
authored and
J. David Ibañez
committed
use Python 2 to build and upload locally
where system "python" could be Python 3. Remote virtual hosts don't all have "python2".
1 parent da7c250 commit e8851c9

5 files changed

+2
-7
lines changed

config.py

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#!/usr/bin/env python
21
# -*- coding: UTF-8 -*-
32
# Copyright (C) 2009-2010 Juan David Ibáñez Palomar <[email protected]>
43
#

hosts.py

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#!/usr/bin/env python
21
# -*- coding: UTF-8 -*-
32
# Copyright (C) 2009-2010 Juan David Ibáñez Palomar <[email protected]>
43
#

modules.py

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#!/usr/bin/env python
21
# -*- coding: UTF-8 -*-
32
# Copyright (C) 2009-2010 Juan David Ibáñez Palomar <[email protected]>
43
#

modules_instance.py

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#!/usr/bin/env python
21
# -*- coding: UTF-8 -*-
32
# Copyright (C) 2009-2010 Juan David Ibáñez Palomar <[email protected]>
43
#

modules_source.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#!/usr/bin/env python
21
# -*- coding: UTF-8 -*-
32
# Copyright (C) 2009-2010 Juan David Ibáñez Palomar <[email protected]>
43
#
@@ -53,7 +52,7 @@ def get_action(self, name):
5352
def get_pkgname(self):
5453
cwd = self.get_path()
5554
local.chdir(cwd)
56-
version = local.run(['%s/python' % bin, 'setup.py', '--version'])
55+
version = local.run(['%s/python2' % bin, 'setup.py', '--version'])
5756
version = version.splitlines()[-1].strip()
5857
return '%s-%s' % (self.name.split('/')[0], version)
5958

@@ -106,7 +105,7 @@ def action_build(self):
106105
# itools package: build
107106
if lfs.exists('%s/setup.conf' % cwd):
108107
local.run(['%s/ipkg-build.py' % bin])
109-
local.run(['%s/python' % bin, 'setup.py', '--quiet', 'sdist'])
108+
local.run(['%s/python2' % bin, 'setup.py', '--quiet', 'sdist'])
110109

111110

112111
dist_title = u'All of the above'

0 commit comments

Comments
 (0)