lukechilds
/
easyengine
mirror of https://github.com/lukechilds/easyengine.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'python' of github.com:rtCamp/easyengine into python

bugfixes
gau1991 10 years ago
parent
d8c9f4a6e7 69d80779f0
commit
1d1be1ca37
3 changed files with 109 additions and 220 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      ee/cli/plugins/stack.py
  2. 322
      ee/core/aptget.py
  3. 3
      ee/core/services.py

4
ee/cli/plugins/stack.py
View File

@ -1180,8 +1180,10 @@ class EEStackController(CementBaseController):
if len(apt_packages): if len(apt_packages):
Log.debug(self, "Removing apt_packages") Log.debug(self, "Removing apt_packages")
EEAptGet.remove(self, apt_packages) EEAptGet.remove(self, apt_packages)
EEAptGet.auto_remove(self)
if len(packages): if len(packages):
EEFileUtils.remove(self, packages) EEFileUtils.remove(self, packages)
EEAptGet.auto_remove(self)
Log.info(self, "Successfully removed packages") Log.info(self, "Successfully removed packages")
@expose(help="Purge packages") @expose(help="Purge packages")
@ -1254,8 +1256,10 @@ class EEStackController(CementBaseController):
if len(apt_packages): if len(apt_packages):
EEAptGet.remove(self, apt_packages, purge=True) EEAptGet.remove(self, apt_packages, purge=True)
EEAptGet.auto_remove(self)
if len(packages): if len(packages):
EEFileUtils.remove(self, packages) EEFileUtils.remove(self, packages)
EEAptGet.auto_remove(self)
Log.info(self, "Successfully purged packages") Log.info(self, "Successfully purged packages")

322
ee/core/aptget.py
View File

@ -3,243 +3,127 @@ import apt
import apt_pkg import apt_pkg
import sys import sys
from ee.core.logging import Log from ee.core.logging import Log
from sh import apt_get
class EEAptGet(): class EEAptGet():
"""Generic apt-get intialisation""" """Generic apt-get intialisation"""
def update(self): def update(self):
"""Similar to apt-get update""" try:
apt_cache = apt.cache.Cache()
# app.log.debug("Update cache") apt_cache.update()
cache = apt.Cache() success = (apt_cache.commit(
fprogress = apt.progress.text.AcquireProgress() apt.progress.text.AcquireProgress(),
iprogress = apt.progress.base.InstallProgress() apt.progress.base.InstallProgress()))
cache.update() #apt_cache.close()
return success
def upgrade(self, packages): except AttributeError as e:
"""Similar to apt-get update""" Log.error(self, 'AttributeError: ' + str(e))
cache = apt.Cache()
fprogress = apt.progress.text.AcquireProgress() def dist_upgrade():
iprogress = apt.progress.base.InstallProgress() apt_cache = apt.cache.Cache()
my_selected_packages = [] apt_cache.update()
# Cache Initialization apt_cache.open(None)
if not cache: apt_cache.upgrade(True)
cache = apt.Cache() success = (apt_cache.commit(
# Cache Read apt.progress.text.AcquireProgress(),
cache.open() apt.progress.base.InstallProgress()))
for package in packages: #apt_cache.close()
pkg = cache[package] return success
# Check Package Installed
if pkg.is_installed:
# Check Package is Upgradeble
if pkg.is_upgradable:
with cache.actiongroup():
# Mark Package for Upgrade
pkg.mark_upgrade()
my_selected_packages.append(pkg.installed)
else:
print("\'{package_name}-{package_ver.version}\'"
"already the newest version"
.format(package_name=pkg.name,
package_ver=pkg.installed))
# Check if packages available for install.
if len(my_selected_packages) > 0:
print("The following packages will be upgraded:"
"\n {pkg_name}"
.format(pkg_name=my_selected_packages))
print("{pkg_install_count} newly installed."
.format(pkg_upgrade_count=len(my_selected_packages)))
print("Need to get {req_download} bytes of archives"
.format(req_download=cache.required_download))
print("After this operation, {space} bytes of"
"additional disk space will be used."
.format(space=cache.required_space))
try:
# Commit changes in cache (actually install)
cache.commit(fprogress, iprogres)
except Exception as e:
print("package installation failed. [{err}]"
.format(err=str(e)))
return(False)
return(True)
def install(self, packages): def install(self, packages):
"""Installation of packages""" """Installation of packages"""
cache = apt.Cache() def install_package(self, package_name):
fprogress = apt.progress.text.AcquireProgress() apt_pkg.init()
iprogress = apt.progress.base.InstallProgress() # #apt_pkg.PkgSystemLock()
my_selected_packages = [] apt_cache = apt.cache.Cache()
# Cache Initialization pkg = apt_cache[package_name.strip()]
if not cache: if package_name.strip() in apt_cache:
cache = apt.Cache() if pkg.is_installed:
# Cache Read #apt_pkg.PkgSystemUnLock()
cache.open() Log.info(self, 'Trying to install a package that '
'is already installed (' +
for package in packages: package_name.strip() + ')')
try: #apt_cache.close()
pkg = cache[package] return False
except KeyError as e:
continue
# Check Package Installed
if pkg.is_installed or pkg.marked_install:
# Check Package is Upgradeble
if pkg.is_upgradable:
print("latest version of \'{package_name}\' available."
.format(package_name=pkg.installed))
else: else:
# Check if package already marked for install
if not pkg.marked_install:
print("\'{package_name}-{package_ver}\'"
"already the newest version"
.format(package_name=pkg.shortname,
package_ver=pkg.installed))
else:
with cache.actiongroup():
# Mark Package for Installation
pkg.mark_install() pkg.mark_install()
my_selected_packages.append(pkg.name) try:
#apt_pkg.PkgSystemUnLock()
# Check if packages available for install. result = apt_cache.commit()
if cache.install_count > 0: #apt_cache.close()
print("The following NEW packages will be installed:" return result
"\n {pkg_name}" except SystemError as e:
.format(pkg_name=my_selected_packages)) Log.error(self, 'SystemError: ' + str(e))
print("{pkg_install_count} newly installed." #apt_cache.close()
.format(pkg_install_count=cache.install_count)) else:
print("Need to get {req_download} bytes of archives" #apt_cache.close()
.format(req_download=cache.required_download)) Log.error(self, 'Unknown package selected (' +
print("After this operation, {space:.2f} MB of" package_name.strip() + ')')
" additional disk space will be used."
.format(space=cache.required_space/1e6))
try:
# Commit changes in cache (actually install)
cache.commit()
except Exception as e:
print("package installation failed. [{err}]"
.format(err=str(e)))
return(False)
return(True)
def remove(self, packages, auto=False, purge=False):
def __dependencies_loop(cache, deplist, pkg, onelevel=True):
""" Loops through pkg's dependencies.
Returns a list with every package found. """
if onelevel:
onelevellist = []
if not pkg.is_installed:
return
for depf in pkg.installed.dependencies:
for dep in depf:
# if (dep.name in cache and not cache[dep.name]
# in deplist):
# deplist.append(cache[dep.name])
# __dependencies_loop(cache, deplist, cache[dep.name])
# if onelevel:
if dep.name in cache:
if (cache[dep.name].is_installed and
cache[dep.name].is_auto_installed):
onelevellist.append(cache[dep.name])
# if onelevel:
return onelevellist
cache = apt.Cache()
fprogress = apt.progress.text.AcquireProgress()
iprogress = apt.progress.base.InstallProgress()
onelevel = []
my_selected_packages = []
# Cache Initialization
if not cache:
cache = apt.Cache()
# Cache Read
cache.open()
for package in packages: for package in packages:
print("processing", package) if not install_package(self, package):
try:
pkg = cache[package]
except KeyError as e:
Log.debug(self, "{0}".format(e))
continue
if not pkg.is_installed:
Log.info(self, "Package '{package_name}' is not installed,"
" so not removed."
.format(package_name=pkg.name))
continue continue
my_selected_packages.append(pkg.name)
# How logic works:
# 1) We loop trough dependencies's dependencies and add them to
# the list.
# 2) We sequentially remove every package in list
# - via is_auto_installed we check if we can safely remove it
deplist = []
onelevel = onelevel + __dependencies_loop(cache, deplist, pkg,
onelevel=True)
# Mark for deletion the first package, to fire up
# auto_removable Purge?
try: def remove(self, packages, auto=False, purge=False):
if purge: def remove_package(self, package_name, purge=False):
pkg.mark_delete(purge=True) apt_pkg.init()
else: #apt_pkg.PkgSystemLock()
pkg.mark_delete(purge=False) apt_cache = apt.cache.Cache()
except SystemError as e: pkg = apt_cache[package_name.strip()]
Log.debug(self, "{0}".format(e)) if package_name.strip() in apt_cache:
apt.ProblemResolver(cache).remove(pkg) if not pkg.is_installed:
# print(pkg.inst_state) #apt_pkg.PkgSystemUnLock()
# Log.error(self, "Unable to purge packages.") Log.info(self, 'Trying to uninstall a package '
'that is not installed (' +
for dep in onelevel: package_name.strip() + ')')
my_selected_packages.append(dep.name) return False
try:
if purge:
dep.mark_delete(purge=True)
else: else:
dep.mark_delete(purge=False) try:
except SystemError as e: pkg.mark_delete(purge)
Log.debug(self, "{0}".format(e)) except SystemError as e:
Log.error(self, "Unable to purge depedencies.") Log.debug(self, 'SystemError: ' + str(e))
return False
try:
#apt_pkg.PkgSystemUnLock()
result = apt_cache.commit()
#apt_cache.close()
return result
except SystemError as e:
Log.debug(self, 'SystemError: ' + str(e))
return False
#apt_cache.close()
else:
#apt_cache.close()
Log.error(self, 'Unknown package selected (' +
package_name.strip() + ')')
# Check if packages available for remove/update. for package in packages:
if cache.delete_count > 0: if not remove_package(self, package, purge=purge):
# app.log.debug('packages will be REMOVED ') continue
print("The following packages will be REMOVED:"
"\n {pkg_name}"
.format(pkg_name=my_selected_packages))
print("{pkg_remove_count} to remove."
.format(pkg_remove_count=cache.delete_count))
# app.log.debug('bytes disk space will be freed')
print("After this operation, {space:.2f} MB disk space "
"will be freed.".format(space=cache.required_space/1e6))
try:
cache.commit(fprogress, iprogress)
except Exception as e:
# app.log.error('Sorry, package installation failed ')
print("Sorry, package installation failed [{err}]"
.format(err=str(e)))
return(False)
return(True)
def is_installed(self, package): def auto_clean(self):
cache = apt.Cache() try:
fprogress = apt.progress.text.AcquireProgress() apt_get.autoclean("-y")
iprogress = apt.progress.base.InstallProgress() except ErrorReturnCode as e:
Log.debug(self, "{0}".format(e))
Log.error(self, "Unable to apt-get autoclean")
# Cache Initialization def auto_remove(self):
if not cache:
cache = apt.Cache()
# Cache Read
cache.open()
try: try:
pkg = cache[package] Log.debug(self, "Running apt-get autoremove")
# Check Package Installed apt_get.autoremove("-y")
if pkg.is_installed: except ErrorReturnCode as e:
return True
else:
return False
except KeyError as e:
Log.debug(self, "{0}".format(e)) Log.debug(self, "{0}".format(e))
except Exception as e: Log.error(self, "Unable to apt-get autoremove")
return False
def is_installed(self, package_name):
apt_cache = apt.cache.Cache()
apt_cache.open()
if (package_name.strip() in apt_cache and
apt_cache[package_name.strip()].is_installed):
apt_cache.close()
return True
#apt_cache.close()
return False

3
ee/core/services.py
View File

@ -75,7 +75,8 @@ class EEService():
# print(retcode[0]) # print(retcode[0])
# subprocess.getstatusoutput('service {0} reload' # subprocess.getstatusoutput('service {0} reload'
# .format(service_name)) # .format(service_name))
Log.info(self, "[" + Log.ENDC + "OK" + Log.OKBLUE + "]") Log.info(self, "[" + Log.ENDC + "OK" + Log.OKBLUE +
"]")
return True return True
else: else:
Log.debug(self, "{0}".format(retcode[1])) Log.debug(self, "{0}".format(retcode[1]))

Write Preview
Loading…
Cancel
Save