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

[equo] text_ui: always acquire entropy lock before doing anything

Browse Source
This commit is contained in:
Fabio Erculiani
2010-07-31 13:10:30 +02:00
parent 8782df8ae1
commit b0a34a77c6
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/text_ui.py
View File

@@ -26,7 +26,8 @@ from entropy.output import red, blue, brown, darkred, bold, darkgreen, bold, \
from entropy.client.interfaces import Client
from entropy.client.interfaces.package import Package as ClientPkg
from entropy.i18n import _
from text_tools import countdown, enlightenatom
from text_tools import countdown, enlightenatom, acquire_entropy_locks, \
release_entropy_locks
import entropy.tools
import entropy.dump
@@ -138,8 +139,13 @@ def package(options):
myopts = _myopts
entropy_client = None
acquired = False
try:
entropy_client = Client()
acquired = acquire_entropy_locks(entropy_client)
if not acquired:
print_error(darkgreen(_("Another Entropy is currently running.")))
return 1
if cmd == "deptest":
rc, garbage = _dependencies_test(entropy_client)
@@ -269,6 +275,8 @@ def package(options):
show_config_files_to_update(entropy_client)
finally:
if acquired and (entropy_client is not None):
release_entropy_locks(entropy_client)
if entropy_client is not None:
entropy_client.shutdown()