From 358c6cc80c4d4e38b8075644a84c31eb031d133b Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Sun, 8 Dec 2013 14:42:23 +0100
Subject: [PATCH] [entropy.client.repository] drop unlocked_sync(), locking
 happens externally nowadays

---
 lib/entropy/client/interfaces/repository.py | 29 +++++++++------------
 rigo/RigoDaemon/app.py                      |  2 +-
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/lib/entropy/client/interfaces/repository.py b/lib/entropy/client/interfaces/repository.py
index 3a0377afe..d0484d4a0 100644
--- a/lib/entropy/client/interfaces/repository.py
+++ b/lib/entropy/client/interfaces/repository.py
@@ -311,21 +311,6 @@ class Repository:
                 header = darkred(" @@ ")
             )
 
-    def unlocked_sync(self):
-        """
-        Start repository synchronization without acquiring
-        Entropy Resources Lock.
-        """
-        rc = self._run_sync(_unlocked=True)
-        if rc:
-            return rc
-        if self.not_available >= len(self.repo_ids):
-            return 2
-        elif self.not_available > 0:
-            return 1
-        self._set_last_successful_sync_time()
-        return 0
-
     def sync(self):
         """
         Start repository synchronization.
@@ -334,7 +319,7 @@ class Repository:
         @rtype: int
         """
         self._entropy.close_repositories()
-        # let's dance!
+
         mytxt = darkgreen("%s ...") % (_("Repositories synchronization"),)
         self._entropy.output(
             mytxt,
@@ -343,4 +328,14 @@ class Repository:
             header = darkred(" @@ ")
         )
 
-        return self.unlocked_sync()
+        rc = self._run_sync(_unlocked=True)
+        if rc:
+            return rc
+
+        if self.not_available >= len(self.repo_ids):
+            return 2
+        elif self.not_available > 0:
+            return 1
+
+        self._set_last_successful_sync_time()
+        return 0
diff --git a/rigo/RigoDaemon/app.py b/rigo/RigoDaemon/app.py
index ad1355aec..280962fe5 100755
--- a/rigo/RigoDaemon/app.py
+++ b/rigo/RigoDaemon/app.py
@@ -1398,7 +1398,7 @@ class RigoDaemonService(dbus.service.Object):
                     with self._inhibit_shutdown(activity):
                         updater = self._entropy.Repositories(
                             repositories, force = force)
-                        result = updater.unlocked_sync()
+                        result = updater.sync()
 
             except AttributeError as err:
                 write_output("_update_repositories error: %s" % (err,))