Browse Source

fixed default argument sequence

bugfixes
harshadyeola 10 years ago
parent
commit
c341373395
  1. 2
      ee/cli/plugins/stack.py
  2. 2
      ee/core/apt_repo.py

2
ee/cli/plugins/stack.py

@ -60,7 +60,7 @@ class EEStackController(CementBaseController):
if set(EEVariables.ee_mysql).issubset(set(apt_packages)): if set(EEVariables.ee_mysql).issubset(set(apt_packages)):
print("Adding repository for mysql ... ") print("Adding repository for mysql ... ")
EERepo.add(ppa=EEVariables.ee_mysql_repo) EERepo.add(ppa=EEVariables.ee_mysql_repo)
EERepo.add_key('hkp://keys.gnupg.net', '1C4CBDCDCD2EFD2A') EERepo.add_key('1C4CBDCDCD2EFD2A')
chars = ''.join(random.sample(string.ascii_letters, 8)) chars = ''.join(random.sample(string.ascii_letters, 8))
print("Pre-seeding mysql variables ... ") print("Pre-seeding mysql variables ... ")
EEShellExec.cmd_exec("echo \"percona-server-server-5.6 " EEShellExec.cmd_exec("echo \"percona-server-server-5.6 "

2
ee/core/apt_repo.py

@ -40,7 +40,7 @@ class EERepo():
"--remove '{ppa_name}'".format(ppa_name=repo_url)) "--remove '{ppa_name}'".format(ppa_name=repo_url))
pass pass
def add_key(keyserver=None, keyids): def add_key(keyids, keyserver=None):
if keyserver is None: if keyserver is None:
EEShellExec.cmd_exec("gpg --keyserver {serv}" EEShellExec.cmd_exec("gpg --keyserver {serv}"
.format(serv=(keyserver .format(serv=(keyserver

Loading…
Cancel
Save