diff options
Diffstat (limited to 'lib/ansible/galaxy')
| -rw-r--r-- | lib/ansible/galaxy/login.py | 8 | ||||
| -rw-r--r-- | lib/ansible/galaxy/role.py | 2 | ||||
| -rw-r--r-- | lib/ansible/galaxy/token.py | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/ansible/galaxy/login.py b/lib/ansible/galaxy/login.py index 29b6c094de..d6bb0a6957 100644 --- a/lib/ansible/galaxy/login.py +++ b/lib/ansible/galaxy/login.py @@ -54,12 +54,12 @@ class GalaxyLogin(object): self.get_credentials() def get_credentials(self): - display.display(u'\n\n' + "We need your " + stringc("Github login",'bright cyan') + + display.display(u'\n\n' + "We need your " + stringc("Github login",'bright cyan') + " to identify you.", screen_only=True) - display.display("This information will " + stringc("not be sent to Galaxy",'bright cyan') + + display.display("This information will " + stringc("not be sent to Galaxy",'bright cyan') + ", only to " + stringc("api.github.com.","yellow"), screen_only=True) display.display("The password will not be displayed." + u'\n\n', screen_only=True) - display.display("Use " + stringc("--github-token",'yellow') + + display.display("Use " + stringc("--github-token",'yellow') + " if you do not want to enter your password." + u'\n\n', screen_only=True) try: @@ -90,7 +90,7 @@ class GalaxyLogin(object): for token in tokens: if token['note'] == 'ansible-galaxy login': display.vvvvv('removing token: %s' % token['token_last_eight']) - try: + try: open_url('https://api.github.com/authorizations/%d' % token['id'], url_username=self.github_username, url_password=self.github_password, method='DELETE', force_basic_auth=True,) except HTTPError as e: diff --git a/lib/ansible/galaxy/role.py b/lib/ansible/galaxy/role.py index 9883abdc8e..539951e2ce 100644 --- a/lib/ansible/galaxy/role.py +++ b/lib/ansible/galaxy/role.py @@ -244,7 +244,7 @@ class GalaxyRole(object): elif role_data.get('github_branch', None): self.version = role_data['github_branch'] else: - self.version = 'master' + self.version = 'master' elif self.version != 'master': if role_versions and str(self.version) not in [a.get('name', None) for a in role_versions]: raise AnsibleError("- the specified version (%s) of %s was not found in the list of available versions (%s)." % (self.version, self.name, role_versions)) diff --git a/lib/ansible/galaxy/token.py b/lib/ansible/galaxy/token.py index 742c7b39f0..06836ee358 100644 --- a/lib/ansible/galaxy/token.py +++ b/lib/ansible/galaxy/token.py @@ -51,10 +51,10 @@ class GalaxyToken(object): f = open(self.file,'w') f.close() os.chmod(self.file,S_IRUSR|S_IWUSR) # owner has +rw - display.vvv('Created %s' % self.file) + display.vvv('Created %s' % self.file) return open(self.file, 'r') - def set(self, token): + def set(self, token): self.config['token'] = token self.save() |