Browse Source

Fixed Phpredisadmin download

release/v3.3.0
gau1991 10 years ago
parent
commit
6371775d97
  1. 8
      ee/cli/plugins/stack.py
  2. 2
      ee/core/extract.py

8
ee/cli/plugins/stack.py

@ -1403,7 +1403,7 @@ class EEStackController(CementBaseController):
EEExtract.extract(self, '/tmp/pra.tar.gz', '/tmp/') EEExtract.extract(self, '/tmp/pra.tar.gz', '/tmp/')
if not os.path.exists('{0}22222/htdocs/cache/redis' if not os.path.exists('{0}22222/htdocs/cache/redis'
.format(EEVariables.ee_webroot)): .format(EEVariables.ee_webroot)):
Log.debug(self, "Creating new directory " Log.debug(self, "Creating new directory "
"{0}22222/htdocs/cache/redis" "{0}22222/htdocs/cache/redis"
.format(EEVariables.ee_webroot)) .format(EEVariables.ee_webroot))
os.makedirs('{0}22222/htdocs/cache/redis' os.makedirs('{0}22222/htdocs/cache/redis'
@ -1583,8 +1583,8 @@ class EEStackController(CementBaseController):
if self.app.pargs.phpredisadmin: if self.app.pargs.phpredisadmin:
Log.debug(self, "Setting packages varible for phpRedisAdmin") Log.debug(self, "Setting packages varible for phpRedisAdmin")
packages = packages + [["https://github.com/ErikDubbelboer/" packages = packages + [["https://github.com/ErikDubbelboer/"
"phpRedisAdmin/archive/master.zip", "phpRedisAdmin/archive/master.tar.gz",
"/tmp/pra.tar.gz" "phpRedisAdmin"], "/tmp/pra.tar.gz","phpRedisAdmin"],
["https://github.com/nrk/predis/" ["https://github.com/nrk/predis/"
"archive/v1.0.1.tar.gz", "archive/v1.0.1.tar.gz",
"/tmp/predis.tar.gz", "Predis"]] "/tmp/predis.tar.gz", "Predis"]]
@ -1696,7 +1696,7 @@ class EEStackController(CementBaseController):
(not self.app.pargs.adminer) and (not self.app.pargs.utils) and (not self.app.pargs.adminer) and (not self.app.pargs.utils) and
(not self.app.pargs.mailscanner) and (not self.app.pargs.all) and (not self.app.pargs.mailscanner) and (not self.app.pargs.all) and
(not self.app.pargs.pagespeed) and (not self.app.pargs.redis) and (not self.app.pargs.pagespeed) and (not self.app.pargs.redis) and
(not self.app.pargs.phpredisadmin): (not self.app.pargs.phpredisadmin)):
self.app.pargs.web = True self.app.pargs.web = True
self.app.pargs.admin = True self.app.pargs.admin = True

2
ee/core/extract.py

@ -16,6 +16,6 @@ class EEExtract():
os.remove(file) os.remove(file)
return True return True
except tarfile.TarError as e: except tarfile.TarError as e:
Log.debug(self, "{0}{1}".format(e.errno, e.strerror)) Log.debug(self, "{0}".format(e))
Log.error(self, 'Unable to extract file \{0}'.format(file)) Log.error(self, 'Unable to extract file \{0}'.format(file))
return False return False

Loading…
Cancel
Save