From fb2bfe0d4b93418a69d41699e07860b7092104f0 Mon Sep 17 00:00:00 2001
From: lxnay <lxnay@cd1c1023-2f26-0410-ae45-c471fc1f0318>
Date: Fri, 28 Mar 2008 00:40:25 +0000
Subject: [PATCH] Entropy Updates Notification Applet: - moved to entropy group
 run requirements - fixed an issue in showing latest entropy available - added
 a check to verify if runtime requirements are met

git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@1523 cd1c1023-2f26-0410-ae45-c471fc1f0318
---
 spritz/src/applet/etp_applet.py        | 51 ++++++++++++++------------
 spritz/src/applet/etp_applet_config.py |  6 +--
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/spritz/src/applet/etp_applet.py b/spritz/src/applet/etp_applet.py
index 7f24a760a..94464b87b 100644
--- a/spritz/src/applet/etp_applet.py
+++ b/spritz/src/applet/etp_applet.py
@@ -44,8 +44,8 @@ from i18n import _
 
 # Entropy imports
 from entropyConstants import *
-import exceptionTools
-from entropy import EquoInterface,RepoInterface,urlFetcher
+import exceptionTools, entropyTools
+from entropy import EquoInterface, RepoInterface, urlFetcher
 
 class Entropy(EquoInterface):
 
@@ -118,6 +118,7 @@ class GuiUrlFetcher(urlFetcher):
         self.progress(message)
 
 class rhnApplet:
+
     def set_state(self, new_state, use_busy_icon = 0):
         if not new_state in etp_applet_config.APPLET_STATES:
             raise "Error: invalid state %s" % new_state
@@ -154,10 +155,6 @@ class rhnApplet:
     def __init__(self):
 
         # this must be done before !!
-        self.Entropy = Entropy()
-        self.move_to_user_directory()
-        self.Entropy.validate_repositories_cache()
-
         self.destroyed = 0
         self.tooltip_text = ""
         gnome.program_init("spritz-updater", etpConst['entropyversion'])
@@ -263,15 +260,31 @@ class rhnApplet:
         self.available_packages = set()
         self.last_alert = None
 
-        # first refresh should be 2 minutes after execution; this
-        # should give the rest of the user's desktop environment time
-        # to load, etc, and avoid competing with nautilus or whatever
-        # else is loading.  subsequent intervals will be much larger.
-        self.set_state("OKAY")
-        self.update_tooltip(_("Waiting until first checkin..."))
-        self.enable_refresh_timer(50000)
+        permitted = entropyTools.is_user_in_entropy_group()
+        if not permitted:
 
-        self.Entropy.connect_progress_objects(self)
+            self.set_state("ERROR")
+            message = _("You must add yourself to the '%s' group.") % (etpConst['sysgroup'],) 
+            self.update_tooltip(message)
+            for key in self.menu_items:
+                if key in ['exit','web_site','about','web_panel','update_now']:
+                    continue
+                w = self.menu_items[key]
+                w.set_sensitive(False)
+                w.hide()
+
+        else:
+            # first refresh should be 2 minutes after execution; this
+            # should give the rest of the user's desktop environment time
+            # to load, etc, and avoid competing with nautilus or whatever
+            # else is loading.  subsequent intervals will be much larger.
+            self.set_state("OKAY")
+            self.update_tooltip(_("Waiting until first checkin..."))
+            self.enable_refresh_timer(50000)
+
+            # Entropy initialization
+            self.Entropy = Entropy()
+            self.Entropy.connect_progress_objects(self)
 
     def get_tray_coordinates(self):
         """
@@ -483,14 +496,6 @@ class rhnApplet:
         self.last_alert = (title,text)
         n.show()
 
-    def move_to_user_directory(self):
-        etpConst['dumpstoragedir'] = etp_applet_config.settings['CACHES_DIR']
-        for repoid in etpRepositories:
-            etpRepositories[repoid]['dbpath'] = etp_applet_config.settings['REPOS_DIR'] + "/" + repoid+ "/" + etpConst['product'] + "/" + etpConst['currentarch']
-            if not os.path.isdir(etpRepositories[repoid]['dbpath']):
-                os.makedirs(etpRepositories[repoid]['dbpath'])
-            self.Entropy.update_repository_revision(repoid)
-
     def compare_repositories_status(self):
         repos = {}
         try:
@@ -816,7 +821,7 @@ class rhnApplet:
 Your system currently has sys-apps/entropy <b>%s</b> installed, but the latest
 available version is <b>%s</b>.  It is recommended that you <b>upgrade
 to the latest</b> before updating any other packages.
-""") % (entropy_data['installed'], names[atom]['avail']))
+""") % (entropy_data['installed'], entropy_data['avail']))
 
         if critical_text:
             if self.old_critical_text != critical_text:
diff --git a/spritz/src/applet/etp_applet_config.py b/spritz/src/applet/etp_applet_config.py
index 57bc4ec0c..e80b96c06 100644
--- a/spritz/src/applet/etp_applet_config.py
+++ b/spritz/src/applet/etp_applet_config.py
@@ -44,8 +44,6 @@ home = os.getenv("HOME")
 if not home:
     home = "/tmp"
 SETTINGS_FILE = os.path.join(home, ".config/entropy/settings")
-REPOS_DIR = os.path.join(home, ".config/entropy/repos")
-CACHES_DIR = os.path.join(home, ".config/entropy/caches")
 
 def save_settings(settings):
     global SETTINGS_FILE
@@ -64,9 +62,7 @@ myconst = [
             ['REFRESH_INTERVAL',int],
             ['NETWORK_RETRY_INTERVAL',int],
             ['ERROR_THRESHOLD',int],
-            ['ANIMATION_TOTAL_TIME',float],
-            ['REPOS_DIR',basestring],
-            ['CACHES_DIR',basestring]
+            ['ANIMATION_TOTAL_TIME',float]
           ]
 
 for x in myconst: