commit sabayon

3 May 2006

Hello community,

here is the log from the commit of package sabayon
checked in at Wed May 3 10:32:27 CEST 2006.

--------

--- GNOME/sabayon/sabayon.changes	2006-04-13 15:28:09.000000000 +0200
+++ STABLE/sabayon/sabayon.changes	2006-05-03 06:58:28.000000000 +0200
@@ -1,0 +2,6 @@
+Wed May  3 06:53:43 CEST 2006 - hpj@suse.de
+
+- Added patch to use gnome-vfs instead of gamin for file change
+  monitoring (Novell bug #167621).
+
+-------------------------------------------------------------------

New:
----
  sabayon-2.12.3-gnomevfs-monitoring.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ sabayon.spec ++++++
--- /var/tmp/diff_new_pack.FoNSic/_old	2006-05-03 10:32:00.000000000 +0200
+++ /var/tmp/diff_new_pack.FoNSic/_new	2006-05-03 10:32:00.000000000 +0200
@@ -12,7 +12,7 @@
 
 Name:           sabayon
 Version:        2.12.3
-Release:        12
+Release:        18
 Summary:        Tool to maintain user profiles in a GNOME desktop
 Group:          System/GUI/GNOME
 License:        GPL
@@ -46,6 +46,7 @@
 Patch5:         sabayon-2.12.3-use-subprocess.patch
 Patch6:         sabayon-2.12.3-desktop-file.patch
 Patch7:         sabayon-2.12.3-ooo-support.patch
+Patch8:         sabayon-2.12.3-gnomevfs-monitoring.patch
 
 %description
 Sabayon is a tool to help system administrators and users change and
@@ -87,6 +88,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 rename no nb po/no.*
@@ -180,6 +182,9 @@
 %{python_sitelib}/%{name}/lockdown
 
 %changelog -n sabayon
+* Wed May 03 2006 - hpj@suse.de
+- Added patch to use gnome-vfs instead of gamin for file change
+  monitoring (Novell bug #167621).
 * Thu Apr 13 2006 - jpr@suse.de
 - Regenerate patch with new file (#163735)
 * Fri Mar 24 2006 - hpj@suse.de

++++++ sabayon-2.12.3-gnomevfs-monitoring.patch ++++++
diff -Nurp sabayon-2.12.3-pre/lib/dirmonitor.py sabayon-2.12.3-post/lib/dirmonitor.py
--- sabayon-2.12.3-pre/lib/dirmonitor.py	2005-07-29 06:21:21.000000000 -0500
+++ sabayon-2.12.3-post/lib/dirmonitor.py	2006-05-02 17:34:04.000000000 -0500
@@ -21,15 +21,15 @@
 import os
 import os.path
 import gobject
-import gamin
+import gnomevfs
 import util
 import fnmatch
 
 N_WATCHES_LIMIT = 200
 
-CHANGED = gamin.GAMChanged
-DELETED = gamin.GAMDeleted
-CREATED = gamin.GAMCreated
+CHANGED = gnomevfs.MONITOR_EVENT_CHANGED
+DELETED = gnomevfs.MONITOR_EVENT_DELETED
+CREATED = gnomevfs.MONITOR_EVENT_CREATED
 
 def dprint (fmt, *args):
     util.debug_print (util.DEBUG_DIRMONITOR, fmt % args)
@@ -49,21 +49,16 @@ class DirectoryMonitor:
         self.directory = directory
         self.callback = callback
         self.data = data
-	self.mon = None
 	self.watches = {}
         self.too_many_watches = False
-	self.fd = -1
-	self.io_watch = None
         self.dirs_to_ignore = []
         self.files_to_ignore = []
 
     def set_directories_to_ignore (self, dirs):
-        assert self.mon == None
         self.dirs_to_ignore = dirs
         dprint ("Ignoring directories %s", self.dirs_to_ignore)
 
     def set_files_to_ignore (self, files):
-        assert self.mon == None
         self.files_to_ignore = files
         dprint ("Ignoring files %s", self.files_to_ignore)
 
@@ -77,33 +72,26 @@ class DirectoryMonitor:
             self.callback (path, event)
 
     #
-    # Called from the main loop when we have data
+    # Processing of a gnomevfs callback
     #
-    def __pending_data (self, fd, condition):
-	try:
-	    ret = self.mon.handle_events ()
-	except:
-	    util.print_exception ()
-	return True
-        
-    #
-    # Processing of a gamin callback
-    #
-    def __handle_gamin_event (self, path, event, monitor_file):
+    def __handle_gnomevfs_event (self, dir_uri, file_uri, event):
         if event == CHANGED or event == DELETED or event == CREATED:
-            if not os.path.isabs (path):
-		path = os.path.join (monitor_file, path)
+            # Strip 'file://'.
+            path = file_uri [7:]
 
-            dprint ("Got gamin event '%s' on '%s'", event_to_string (event), path)
+            # Strip trailing '/'.
+            path = os.path.normpath (path)
+            
+            dprint ("Got gnomevfs event '%s' on '%s'", event_to_string (event), path)
 
 	    if event == CREATED and os.path.isdir (path):
 		self.__monitor_dir_recurse (path, True)
 	    elif event == DELETED:
                 if path != self.directory and self.watches.has_key (path):
+                    gnomevfs.monitor_cancel (self.watches [path])
                     del self.watches[path]
                     if len (self.watches) < N_WATCHES_LIMIT:
                         self.too_many_watches = False
-                    self.mon.stop_watch (path)
 
             if not self.__should_ignore_dir (path) and \
                not self.__should_ignore_file (path):
@@ -136,6 +124,8 @@ class DirectoryMonitor:
         return self.__should_ignore_dir (os.path.dirname (file))
 
     def __monitor_dir (self, dir):
+        dir = os.path.normpath (dir)
+        
         if len (self.watches) >= N_WATCHES_LIMIT:
             if not self.too_many_watches:
                 print "Too many directories to watch on %s" % (self.directory)
@@ -146,9 +136,9 @@ class DirectoryMonitor:
             return
         
         try:
-            self.mon.watch_directory (dir, self.__handle_gamin_event, dir)
+            self.watches [dir] = gnomevfs.monitor_add (dir, gnomevfs.MONITOR_DIRECTORY, self.__handle_gnomevfs_event)
         except:
-            print _("Failed to add monitor for %s") % (dir)
+            print ("Failed to add monitor for %s") % (dir)
 	    util.print_exception ()
 
     def __monitor_dir_recurse (self, dir, new_dir = False):
@@ -167,39 +157,16 @@ class DirectoryMonitor:
                 self.__monitor_dir_recurse (path, new_dir)
                     
     def start (self):
-        if self.mon != None:
-	    return
-
         dprint ("Starting to recursively monitor '%s'", self.directory)
 
-	self.mon = gamin.WatchMonitor ()
-	# ignore (End)Exists events since we scan the tree ourselves
-	try:
-	    self.mon.no_exists ()
-	except:
-	    pass
-	self.fd = self.mon.get_fd ()
-	self.io_watch = gobject.io_add_watch (self.fd,
-                                              gobject.IO_IN|gobject.IO_PRI,
-                                              self.__pending_data)
         self.__monitor_dir (self.directory)
         self.__monitor_dir_recurse (self.directory)
 
     def stop (self):
-        if self.mon == None:
-	    return
-
         dprint ("Stopping recursive monitoring of '%s'", self.directory)
 
         for path in self.watches:
-            self.mon.stop_watch (path)
-        
-        gobject.source_remove (self.io_watch)
-	self.io_watch = 0
-        
-	self.mon.disconnect ()
-	self.mon = None
-	self.fd = -1
+            gnomevfs.monitor_cancel (self.watches [path])
 
 def run_unit_tests ():
     import tempfile
@@ -228,7 +195,7 @@ def run_unit_tests ():
     expected = []
     def should_not_be_reached (expected):
         for (path, event) in expected:
-            print _("Expected event: %s %s") % (path, event_to_string (event))
+            print ("Expected event: %s %s") % (path, event_to_string (event))
         assert False
         return True
     timeout = gobject.timeout_add (5 * 1000, should_not_be_reached, expected)

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)