From bf9f16868fbc701388d2aafb520b156a9a4e5e03 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Wed, 12 Oct 2011 15:11:42 +0200
Subject: [PATCH] [eit.commands.*] make use of EitCommand._call_locked method

---
 server/eit/commands/add.py    |  2 +-
 server/eit/commands/commit.py | 30 ++----------------------------
 server/eit/commands/repack.py |  2 +-
 server/eit/commands/status.py | 30 ++----------------------------
 4 files changed, 6 insertions(+), 58 deletions(-)

diff --git a/server/eit/commands/add.py b/server/eit/commands/add.py
index 81640be2e..fb0874799 100644
--- a/server/eit/commands/add.py
+++ b/server/eit/commands/add.py
@@ -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(
diff --git a/server/eit/commands/commit.py b/server/eit/commands/commit.py
index 92287f1d5..58d2cb336 100644
--- a/server/eit/commands/commit.py
+++ b/server/eit/commands/commit.py
@@ -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()
diff --git a/server/eit/commands/repack.py b/server/eit/commands/repack.py
index d612930d5..ab98cb9d5 100644
--- a/server/eit/commands/repack.py
+++ b/server/eit/commands/repack.py
@@ -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(
diff --git a/server/eit/commands/status.py b/server/eit/commands/status.py
index c34d13280..581ed29e9 100644
--- a/server/eit/commands/status.py
+++ b/server/eit/commands/status.py
@@ -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()