android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

RepoHook: do not list options twice during hash based approval

Browse Source 
Instead of

  Do you want to allow this script to run (yes/yes-never-ask-again/NO)? (yes/always/NO)?

ask

  Do you want to allow this script to run (yes/always/NO)?

Change-Id: I5f5a2d0e88086a8d85e54fb8623a62d74a20956a
Signed-off-by: Jonathan Nieder <jrn@google.com>
This commit is contained in:
Jonathan Nieder 2016-08-16 12:05:09 -07:00
parent c4c2b066d1
commit 71e4cea6de
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
project.py
View File

@ -522,13 +522,11 @@ class RepoHook(object):
prompt = ('Repo %s run the script:\n' prompt = ('Repo %s run the script:\n'
' %s\n' ' %s\n'
'\n' '\n'
'Do you want to allow this script to run ' 'Do you want to allow this script to run')
'(yes/yes-never-ask-again/NO)? ') % (self._GetMustVerb(),
self._script_fullpath)
return self._CheckForHookApprovalHelper( return self._CheckForHookApprovalHelper(
'approvedhash', 'approvedhash',
self._GetHash(), self._GetHash(),
prompt, prompt % (self._GetMustVerb(), self._script_fullpath),
'Scripts have changed since %s was allowed.' % (self._hook_type,)) 'Scripts have changed since %s was allowed.' % (self._hook_type,))
def _ExecuteHook(self, **kwargs): def _ExecuteHook(self, **kwargs):