Skip to content

Commit 009ce50

Browse files
author
gau1991
committed
Fixed prompt that asked while installing HHVM and PageSpeed
1 parent 746a2d3 commit 009ce50

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

ee/cli/plugins/debug.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ def debug_php(self):
179179
hhvmconf=True
180180
else:
181181
hhvmconf=False
182-
data = dict(php="9001", debug="9001", hhvm="9001", hhvmconf)
182+
data = dict(php="9001", debug="9001", hhvm="9001",
183+
hhvmconf=hhvmconf)
183184
Log.debug(self, 'Writting the Nginx debug configration to file'
184185
' /etc/nginx/conf.d/upstream.conf ')
185186
ee_nginx = open('/etc/nginx/conf.d/upstream.conf',
@@ -223,7 +224,8 @@ def debug_php(self):
223224
hhvmconf=True
224225
else:
225226
hhvmconf=False
226-
data = dict(php="9001", debug="9001", hhvm="9001", hhvmconf)
227+
data = dict(php="9001", debug="9001", hhvm="9001",
228+
hhvmconf=hhvmcof)
227229

228230
data = dict(php="9000", debug="9001", hhvm="8000")
229231
Log.debug(self, 'Writting the Nginx debug configration to file'

ee/cli/plugins/site.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,9 @@ class Meta:
359359
dict(help="provide password for wordpress user",
360360
dest='wppass')),
361361
(['--proxy'],
362-
dict(help="create proxy for site", nargs='+'))
362+
dict(help="create proxy for site", nargs='+')),
363+
(['--experimental'],
364+
dict(help="Enable Experimenal packages without prompt")),
363365
]
364366

365367
@expose(hide=True)
@@ -470,7 +472,7 @@ def default(self):
470472
# Check prompt
471473
check_prompt = input("Type \"y\" to continue [n]")
472474
if check_prompt != "Y" and check_prompt != "y":
473-
Log.info("Not using HHVM for site.")
475+
Log.info(self, "Not using HHVM for site.")
474476
data['hhvm'] = False
475477
hhvm = 0
476478
else:
@@ -494,7 +496,7 @@ def default(self):
494496
# Check prompt
495497
check_prompt = input("Type \"y\" to continue [n]")
496498
if check_prompt != "Y" and check_prompt != "y":
497-
Log.info("Not using PageSpeed for site.")
499+
Log.info(self, "Not using PageSpeed for site.")
498500
data['pagespeed'] = False
499501
pagespeed = 0
500502
else:
@@ -737,7 +739,9 @@ class Meta:
737739
action='store' or 'store_const',
738740
choices=('on', 'off'), const='on', nargs='?')),
739741
(['--proxy'],
740-
dict(help="update to prxy site", nargs='+')),
742+
dict(help="update to proxy site", nargs='+')),
743+
(['--experimental'],
744+
dict(help="Enable Experimenal packages without prompt")),
741745
(['--all'],
742746
dict(help="update all sites", action='store_true')),
743747
]
@@ -1000,16 +1004,16 @@ def doupdatesite(self, pargs):
10001004

10011005
if pargs.pagespeed or pargs.hhvm:
10021006
if pargs.hhvm:
1003-
if (not self.app.pargs.experimental):
1007+
if (not pargs.experimental):
10041008
Log.info(self, "HHVM is experimental feature and it may not"
1005-
"work with all plugins all your site.\nYou can "
1009+
" work with all plugins all your site.\nYou can "
10061010
"disable it by passing --hhvm=off later.\nDo you wish"
10071011
" to enable HHVM now for {0}?".format(ee_domain))
10081012

10091013
# Check prompt
10101014
check_prompt = input("Type \"y\" to continue [n]")
10111015
if check_prompt != "Y" and check_prompt != "y":
1012-
Log.info("Not using HHVM for site.")
1016+
Log.info(self, "Not using HHVM for site.")
10131017
data['hhvm'] = False
10141018
hhvm = False
10151019
else:
@@ -1020,7 +1024,7 @@ def doupdatesite(self, pargs):
10201024
hhvm = True
10211025

10221026
if pargs.pagespeed:
1023-
if (not self.app.pargs.experimental):
1027+
if (not pargs.experimental):
10241028
Log.info(self, "PageSpeed is experimental feature and it may not"
10251029
"work with all CSS/JS/Cache of your site.\nYou can "
10261030
"disable it by passing --pagespeed=off later.\nDo you wish"

0 commit comments

Comments
 (0)