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

[entropy.client] rename calculate_world_updates into calculate_updates

Browse Source
This commit is contained in:
Fabio Erculiani
2009-12-25 12:13:47 +01:00
parent a3c82717c6
commit 559dd5d5eb
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/text_ui.py
View File

@@ -270,7 +270,7 @@ def upgrade_packages(onlyfetch = False, replay = False, resume = False,
print_info(red(" @@ ")+blue("%s..." % (_("Calculating System Updates"),) ))
try:
update, remove, fine, spm_fine = E_CLIENT.calculate_world_updates(
update, remove, fine, spm_fine = E_CLIENT.calculate_updates(
empty_deps = replay)
except SystemDatabaseError:
# handled in equo.py

2
libraries/entropy/client/interfaces/cache.py
View File

@@ -71,7 +71,7 @@ class CacheMixin:
# we can barely ignore any exception from here
# especially cases where client db does not exist
try:
update, remove, fine, spm_fine = self.calculate_world_updates()
update, remove, fine, spm_fine = self.calculate_updates()
del fine, spm_fine, remove
if do_install_queue:
self.get_install_queue(update, False, False)

2
libraries/entropy/client/interfaces/client.py
View File

@@ -208,7 +208,7 @@ class ClientSystemSettingsPlugin(SystemSettingsPlugin):
# issues with metadata not being available
try:
update, remove, fine, spm_fine = \
self._helper.calculate_world_updates(
self._helper.calculate_updates(
critical_updates = False)
except (ValueError, SystemDatabaseError, RepositoryError,):
# RepositoryError is triggered when branch is hopped

4
libraries/entropy/client/interfaces/dep.py
View File

@@ -1594,7 +1594,7 @@ class CalculatorsMixin:
return data
def calculate_world_updates(self, empty_deps = False, use_cache = True,
def calculate_updates(self, empty_deps = False, use_cache = True,
critical_updates = True):
cl_settings = self.SystemSettings[self.sys_settings_client_plugin_id]
@@ -1631,7 +1631,7 @@ class CalculatorsMixin:
maxlen = len(idpackages)
count = 0
mytxt = _("Calculating world packages")
mytxt = _("Calculating updates")
for idpackage in idpackages:
count += 1

4
services/client-updates-daemon
View File

@@ -353,7 +353,7 @@ class UpdatesDaemon(dbus.service.Object):
try:
update, remove, fine, spm_fine = \
entropy.calculate_world_updates(use_cache = False)
entropy.calculate_updates(use_cache = False)
del fine, remove
except Exception, err:
entropyTools.print_traceback(f = DAEMON_LOG)
@@ -460,7 +460,7 @@ class UpdatesDaemon(dbus.service.Object):
try:
update, remove, fine, spm_fine = \
entropy.calculate_world_updates(use_cache = False)
entropy.calculate_updates(use_cache = False)
except Exception, err:
entropyTools.print_traceback(f = DAEMON_LOG)
msg = "get_updates: %s: %s" % (_("Updates: error"), err,)

2
sulfur/src/sulfur/packages.py
View File

@@ -748,7 +748,7 @@ class EntropyPackages:
try:
updates, remove, fine, spm_fine = \
self.Entropy.calculate_world_updates(
self.Entropy.calculate_updates(
critical_updates = critical_updates)
except SystemDatabaseError:
# broken client db