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

[eit.commands.*] make use of EitCommand._call_locked method

Browse Source
This commit is contained in:
Fabio Erculiani
2011-10-12 15:11:42 +02:00
parent ca965c03c0
commit bf9f16868f
4 changed files with 6 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/eit/commands/add.py
View File

@@ -57,7 +57,7 @@ class EitAdd(EitCommit):
# setup atoms variable before spawning commit
self._packages = nsargs.packages[:]
return self._commit, [nsargs.to]
return self._call_locked, [self._commit, nsargs.to]
EitCommandDescriptor.register(
EitCommandDescriptor(

30
server/eit/commands/commit.py
View File

@@ -72,35 +72,9 @@ class EitCommit(EitCommand):
if not self._interactive:
self._ask = not nsargs.quick
return self._commit, [nsargs.repo]
return self._call_locked, [self._commit, nsargs.repo]
def _commit(self, repo):
"""
Commit command body.
"""
server = None
acquired = False
try:
try:
server = self._entropy(default_repository=repo)
except PermissionDenied as err:
print_error(err.value)
return 1
acquired = entropy.tools.acquire_entropy_locks(server)
if not acquired:
entropy_server.output(
darkgreen(_("Another Entropy is currently running.")),
level="error", importance=1
)
return 1
return self.__commit(server)
finally:
if server is not None:
if acquired:
entropy.tools.release_entropy_locks(server)
server.shutdown()
def __commit(self, entropy_server):
def _commit(self, entropy_server):
to_be_added = set()
to_be_removed = set()
to_be_injected = set()

2
server/eit/commands/repack.py
View File

@@ -58,7 +58,7 @@ class EitRepack(EitCommit):
# setup atoms variable before spawning commit
self._packages = nsargs.packages[:]
self._repackage = self._packages
return self._commit, [nsargs.into]
return self._call_locked, [self._commit, nsargs.into]
EitCommandDescriptor.register(
EitCommandDescriptor(

30
server/eit/commands/status.py
View File

@@ -51,35 +51,9 @@ class EitStatus(EitCommand):
except IOError as err:
return parser.print_help, []
return self._status, [nsargs.repo]
return self._call_locked, [self._status, nsargs.repo]
def _status(self, repo):
"""
Status command body.
"""
server = None
acquired = False
try:
try:
server = self._entropy(default_repository=repo)
except PermissionDenied as err:
print_error(err.value)
return 1
acquired = entropy.tools.acquire_entropy_locks(server)
if not acquired:
entropy_server.output(
darkgreen(_("Another Entropy is currently running.")),
level="error", importance=1
)
return 1
return self.__status(server)
finally:
if server is not None:
if acquired:
entropy.tools.release_entropy_locks(server)
server.shutdown()
def __status(self, entropy_server):
def _status(self, entropy_server):
plugin_id = etpConst['system_settings_plugins_ids']['server_plugin']
repos_data = self._settings()[plugin_id]['server']['repositories']
repo_id = entropy_server.repository()