sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[entropy.client] rename Client.clientLog into Client.logger

Browse Source
This commit is contained in:
Fabio Erculiani
2010-10-09 23:23:28 +02:00
parent 8781d9d928
commit 4300322176
7 changed files with 61 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/text_rescue.py
+2 -2
View File
@@ -553,7 +553,7 @@ def _database_spmsync(entropy_client):
mydata = Spm.extract_package_metadata(temp_pkg_path)
except Exception as err:
entropy.tools.print_traceback()
entropy_client.clientLog.log(
entropy_client.logger.log(
"[spm sync]",
etpConst['logging']['normal_loglevel_id'],
"Database spmsync: Exception caught: %s" % (
@@ -681,7 +681,7 @@ def _database_generate(entropy_client):
mydata = Spm.extract_package_metadata(temp_pkg_path)
except Exception as err:
entropy.tools.print_traceback()
entropy_client.clientLog.log(
entropy_client.logger.log(
"[spm sync]",
etpConst['logging']['normal_loglevel_id'],
"Database generation: Exception caught: %s" % (str(err),)
libraries/entropy/client/interfaces/client.py
+4 -4
View File
@@ -636,9 +636,9 @@ class Client(Singleton, TextInterface, LoadersMixin, CacheMixin, CalculatorsMixi
# class init
LoadersMixin.__init__(self)
self.clientLog = LogFile(
self.logger = LogFile(
level = self._settings['system']['log_level'],
filename = etpConst['equologfile'], header = "[client]")
filename = etpConst['entropylogfile'], header = "[client]")
self.MultipleUrlFetcher = multiple_url_fetcher
self.urlFetcher = url_fetcher
@@ -724,8 +724,8 @@ class Client(Singleton, TextInterface, LoadersMixin, CacheMixin, CalculatorsMixi
if hasattr(self, '_installed_repository'):
if self._installed_repository != None:
self._installed_repository.close()
if hasattr(self, 'clientLog'):
self.clientLog.close()
if hasattr(self, 'logger'):
self.logger.close()
if hasattr(self, '_settings') and \
hasattr(self, 'sys_settings_client_plugin_id') and \
hasattr(self._settings, 'remove_plugin'):
libraries/entropy/client/interfaces/methods.py
+3 -3
View File
@@ -645,7 +645,7 @@ class RepositoryMixin:
db_path = etpConst['etpdatabaseclientfilepath']
if (not self.noclientdb) and (not os.path.isfile(db_path)):
conn = load_db_from_ram()
entropy.tools.print_traceback(f = self.clientLog)
entropy.tools.print_traceback(f = self.logger)
else:
try:
repo_class = self.get_repository(etpConst['clientdbid'])
@@ -658,7 +658,7 @@ class RepositoryMixin:
etpConst['clientdbid'])
# TODO: remove this in future, drop useless data from clientdb
except (DatabaseError,):
entropy.tools.print_traceback(f = self.clientLog)
entropy.tools.print_traceback(f = self.logger)
conn = load_db_from_ram()
else:
# validate database
@@ -670,7 +670,7 @@ class RepositoryMixin:
conn.close()
except (RepositoryPluginError, OSError, IOError):
pass
entropy.tools.print_traceback(f = self.clientLog)
entropy.tools.print_traceback(f = self.logger)
conn = load_db_from_ram()
self._installed_repository = conn
libraries/entropy/client/interfaces/package.py
+31 -31
View File
@@ -1015,13 +1015,13 @@ class Package:
def __unpack_package(self):
if not self.pkgmeta['merge_from']:
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['normal_loglevel_id'],
"Unpacking package: %s" % (self.pkgmeta['atom'],)
)
else:
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['normal_loglevel_id'],
"Merging package: %s" % (self.pkgmeta['atom'],)
@@ -1073,7 +1073,7 @@ class Package:
catch_empty = True
)
except EOFError:
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]", etpConst['logging']['normal_loglevel_id'],
"EOFError on " + self.pkgmeta['pkgpath']
)
@@ -1081,7 +1081,7 @@ class Package:
except:
# this will make devs to actually catch the
# right exception and prepare a fix
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['normal_loglevel_id'],
"Raising Unicode/Pickling Error for " + \
@@ -1123,7 +1123,7 @@ class Package:
try:
Spm = self._entropy.Spm()
except Exception as err:
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['normal_loglevel_id'],
"Source Package Manager not available: %s | %s" % (
@@ -1144,7 +1144,7 @@ class Package:
self._entropy.clear_cache()
self._entropy.clientLog.log("[Package]",
self._entropy.logger.log("[Package]",
etpConst['logging']['normal_loglevel_id'],
"Removing package: %s" % (self.pkgmeta['removeatom'],))
@@ -1273,7 +1273,7 @@ class Package:
# Is file or directory a protected item?
if protected:
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['verbose_loglevel_id'],
"[remove] Protecting config file: %s" % (sys_root_item,)
@@ -1332,7 +1332,7 @@ class Package:
try:
os.remove(sys_root_item)
except OSError as err:
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['normal_loglevel_id'],
"[remove] Unable to remove %s, error: %s" % (
@@ -1366,7 +1366,7 @@ class Package:
level = "warning",
header = red(" ## ")
)
self._entropy.clientLog.log("[Package]", etpConst['logging']['normal_loglevel_id'],
self._entropy.logger.log("[Package]", etpConst['logging']['normal_loglevel_id'],
"Collision found during removal of %s - cannot overwrite" % (
path,)
)
@@ -1428,7 +1428,7 @@ class Package:
# clear on-disk cache
self._entropy.clear_cache()
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['normal_loglevel_id'],
"Installing package: %s" % (self.pkgmeta['atom'],)
@@ -1474,7 +1474,7 @@ class Package:
try:
Spm = self._entropy.Spm()
except Exception as err:
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['normal_loglevel_id'],
"Source Package Manager not available: %s | %s" % (
@@ -1483,7 +1483,7 @@ class Package:
)
return -1
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['normal_loglevel_id'],
"Installing new SPM entry: %s" % (self.pkgmeta['atom'],)
@@ -1516,7 +1516,7 @@ class Package:
try:
Spm = self._entropy.Spm()
except Exception as err:
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['normal_loglevel_id'],
"Source Package Manager not available: %s | %s" % (
@@ -1530,7 +1530,7 @@ class Package:
spm_uid = Spm.assign_uid_to_installed_package(spm_package)
except (SPMError, KeyError,):
# installed package not available, we must ignore it
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['normal_loglevel_id'],
"Spm uid not available for Spm package: %s (pkg not avail?)" % (
@@ -1557,7 +1557,7 @@ class Package:
try:
Spm = self._entropy.Spm()
except Exception as err:
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['normal_loglevel_id'],
"Source Package Manager not available: %s | %s" % (
@@ -1566,7 +1566,7 @@ class Package:
)
return -1
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['normal_loglevel_id'],
"Removing from SPM: %s" % (self.pkgmeta['removeatom'],)
@@ -1847,7 +1847,7 @@ class Package:
# if our directory is a file on the live system
elif os.path.isfile(rootdir): # really weird...!
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['normal_loglevel_id'],
"WARNING!!! %s is a file when it should be " \
@@ -1870,7 +1870,7 @@ class Package:
# if our live system features a directory instead of
# a symlink, we should consider removing the directory
if not os.path.islink(rootdir) and os.path.isdir(rootdir):
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['normal_loglevel_id'],
"WARNING!!! %s is a directory when it should be " \
@@ -1896,7 +1896,7 @@ class Package:
try:
shutil.rmtree(rootdir, True)
except (shutil.Error, OSError,) as err:
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['normal_loglevel_id'],
"WARNING!!! Failed to rm %s " \
@@ -1981,7 +1981,7 @@ class Package:
self.pkgmeta['configprotect_data'].append(
(prot_old_tofile, prot_md5,))
except (IOError,) as err:
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['normal_loglevel_id'],
"WARNING!!! Failed to get md5 of %s " \
@@ -2033,7 +2033,7 @@ class Package:
except RuntimeError:
# circular symlink, fuck!
# really weird...!
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['normal_loglevel_id'],
"WARNING!!! %s is a circular symlink !!!" % (fromfile,)
@@ -2055,7 +2055,7 @@ class Package:
except RuntimeError:
# circular symlink, fuck!
# really weird...!
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['normal_loglevel_id'],
"WARNING!!! %s is a circular symlink !!!" % (tofile,)
@@ -2080,7 +2080,7 @@ class Package:
# try to cope...
os.remove(tofile)
except (OSError, IOError,) as err:
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['normal_loglevel_id'],
"WARNING!!! Failed to cope to oddity of %s " \
@@ -2093,7 +2093,7 @@ class Package:
if os.path.isdir(tofile) and not os.path.islink(tofile):
# really weird...!
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['normal_loglevel_id'],
"WARNING!!! %s is a directory when it should " \
@@ -2116,7 +2116,7 @@ class Package:
try:
shutil.rmtree(tofile, True)
except (shutil.Error, IOError,) as err:
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['normal_loglevel_id'],
"WARNING!!! Failed to cope to oddity of %s " \
@@ -2135,7 +2135,7 @@ class Package:
if err.errno not in (errno.ENOENT, errno.EACCES,):
raise
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['normal_loglevel_id'],
"WARNING!!! Error during file move" \
@@ -2148,7 +2148,7 @@ class Package:
done = True
if not done:
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['normal_loglevel_id'],
"WARNING!!! Error during file move" \
@@ -2308,7 +2308,7 @@ class Package:
# check if protection is disabled for this element
if tofile in misc_settings['configprotectskip']:
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['normal_loglevel_id'],
"Skipping config file installation/removal, " \
@@ -2355,7 +2355,7 @@ class Package:
os.path.basename(oldtofile)[10:])
if not do_quiet:
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['normal_loglevel_id'],
"Protecting config file: %s" % (oldtofile,)
@@ -2388,7 +2388,7 @@ class Package:
level = "warning",
header = darkred(" ## ")
)
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['normal_loglevel_id'],
"WARNING!!! Collision found during install " \
@@ -2819,7 +2819,7 @@ class Package:
Post-remove phase of package install, this step removes older SPM
package entries from SPM db.
"""
self._entropy.clientLog.log(
self._entropy.logger.log(
"[Package]",
etpConst['logging']['normal_loglevel_id'],
"Remove old package (spm data): %s" % (self.pkgmeta['removeatom'],)
libraries/entropy/client/interfaces/repository.py
+1 -1
View File
@@ -226,7 +226,7 @@ class Repository:
security_intf = self._entropy.Security()
security_intf.sync()
except Exception as e:
entropy.tools.print_traceback(f = self._entropy.clientLog)
entropy.tools.print_traceback(f = self._entropy.logger)
mytxt = "%s: %s" % (red(_("Advisories fetch error")), e,)
self._entropy.output(
mytxt,
libraries/entropy/client/interfaces/trigger.py
+20 -20
View File
@@ -31,7 +31,7 @@ class Trigger:
mytxt = "A valid Entropy Instance is needed"
raise AttributeError(mytxt)
self.Entropy = entropy_client
self._entropy = entropy_client
self.pkgdata = pkgdata
self.prepared = False
self.triggers = []
@@ -40,7 +40,7 @@ class Trigger:
self.spm_support = True
try:
Spm = self.Entropy.Spm()
Spm = self._entropy.Spm()
self.Spm = Spm
except Exception as e:
entropy.tools.print_traceback()
@@ -50,7 +50,7 @@ class Trigger:
e,
_("please fix"),
)
self.Entropy.output(
self._entropy.output(
mytxt,
importance = 0,
header = bold(" !!! ")
@@ -83,7 +83,7 @@ class Trigger:
functions = []
if self.spm_support:
spm_class = self.Entropy.Spm_class()
spm_class = self._entropy.Spm_class()
phases_map = spm_class.package_phases_map()
while True:
if self.pkgdata['spm_phases'] is not None:
@@ -109,7 +109,7 @@ class Trigger:
# Portage phases
if self.spm_support:
spm_class = self.Entropy.Spm_class()
spm_class = self._entropy.Spm_class()
phases_map = spm_class.package_phases_map()
while True:
if self.pkgdata['spm_phases'] != None:
@@ -129,7 +129,7 @@ class Trigger:
functions = []
if self.spm_support:
spm_class = self.Entropy.Spm_class()
spm_class = self._entropy.Spm_class()
phases_map = spm_class.package_phases_map()
# doing here because we need /var/db/pkg stuff
@@ -161,7 +161,7 @@ class Trigger:
# Portage hook
if self.spm_support:
spm_class = self.Entropy.Spm_class()
spm_class = self._entropy.Spm_class()
phases_map = spm_class.package_phases_map()
while True:
@@ -196,9 +196,9 @@ class Trigger:
except Exception as e:
mykey = self.pkgdata['category']+"/"+self.pkgdata['name']
tb = entropy.tools.get_traceback()
self.Entropy.output(tb, importance = 0, level = "error")
self.Entropy.clientLog.write(tb)
self.Entropy.clientLog.log(
self._entropy.output(tb, importance = 0, level = "error")
self._entropy.logger.write(tb)
self._entropy.logger.log(
"[Trigger]",
etpConst['logging']['normal_loglevel_id'],
"[POST] ATTENTION Cannot run External trigger for " + \
@@ -210,7 +210,7 @@ class Trigger:
bold(mykey),
brown(_("Please report it")),
)
self.Entropy.output(
self._entropy.output(
mytxt,
importance = 0,
header = red(" ## ")
@@ -220,7 +220,7 @@ class Trigger:
class EntropyShSandbox:
def __init__(self, Entropy):
self.Entropy = Entropy
self._entropy = Entropy
def __env_setup(self, stage, pkgdata):
@@ -353,7 +353,7 @@ class Trigger:
class EntropyPySandbox:
def __init__(self, Entropy):
self.Entropy = Entropy
self._entropy = Entropy
def run(self, stage, pkgdata, trigger_file):
my_ext_status = 1
@@ -408,13 +408,13 @@ class Trigger:
entropy_sh = etpConst['trigger_sh_interpreter']
if interpreter == "#!%s" % (entropy_sh,):
os.chmod(triggerfile, 0o775)
my = self.EntropyShSandbox(self.Entropy)
my = self.EntropyShSandbox(self._entropy)
else:
my = self.EntropyPySandbox(self.Entropy)
my = self.EntropyPySandbox(self._entropy)
return my.run(self.phase, self.pkgdata, triggerfile)
def trigger_env_update(self):
self.Entropy.clientLog.log(
self._entropy.logger.log(
"[Trigger]",
etpConst['logging']['normal_loglevel_id'],
"[POST] Running env_update"
@@ -423,7 +423,7 @@ class Trigger:
def trigger_spm_postinstall(self):
self.Entropy.output(
self._entropy.output(
"SPM: %s" % (brown(_("post-install phase")),),
importance = 0,
header = red(" ## ")
@@ -432,7 +432,7 @@ class Trigger:
def trigger_spm_preinstall(self):
self.Entropy.output(
self._entropy.output(
"SPM: %s" % (brown(_("pre-install phase")),),
importance = 0,
header = red(" ## ")
@@ -441,7 +441,7 @@ class Trigger:
def trigger_spm_preremove(self):
self.Entropy.output(
self._entropy.output(
"SPM: %s" % (brown(_("pre-remove phase")),),
importance = 0,
header = red(" ## ")
@@ -450,7 +450,7 @@ class Trigger:
def trigger_spm_postremove(self):
self.Entropy.output(
self._entropy.output(
"SPM: %s" % (brown(_("post-remove phase")),),
importance = 0,
header = red(" ## ")
libraries/entropy/const.py
-1
View File
@@ -468,7 +468,6 @@ def const_default_settings(rootdir):
'syslogdir': default_etp_syslogdir, # Entropy system tools log directory
'entropylogfile': default_etp_syslogdir+"entropy.log",
'securitylogfile': default_etp_syslogdir+"security.log",
'equologfile': default_etp_syslogdir+"equo.log",
'spmlogfile': default_etp_syslogdir+"spm.log",
'etpdatabaseclientdir': default_etp_dir + default_etp_client_repodir + \