Merge pull request #12781 from mgedmin/py3k

Python 3: print function in a shell oneliner in Makefile
This commit is contained in:
Toshio Kuratomi 2015-10-16 07:46:33 -07:00
commit 4b4168bc92

View file

@ -3,7 +3,7 @@ VARS_FILE ?= integration_config.yml
# Create a semi-random string for use when testing cloud-based resources # Create a semi-random string for use when testing cloud-based resources
ifndef CLOUD_RESOURCE_PREFIX ifndef CLOUD_RESOURCE_PREFIX
CLOUD_RESOURCE_PREFIX := $(shell python -c "import string,random; print 'ansible-testing-' + ''.join(random.choice(string.ascii_letters + string.digits) for _ in xrange(8));") CLOUD_RESOURCE_PREFIX := $(shell python -c "import string,random; print('ansible-testing-' + ''.join(random.choice(string.ascii_letters + string.digits) for _ in range(8)));")
endif endif
CREDENTIALS_FILE = credentials.yml CREDENTIALS_FILE = credentials.yml