Hello community, here is the log from the commit of package zeitgeist for openSUSE:Factory checked in at Wed Aug 3 17:13:18 CEST 2011.
-------- --- GNOME/zeitgeist/zeitgeist.changes 2011-07-20 10:54:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/zeitgeist/zeitgeist.changes 2011-07-24 14:10:50.000000000 +0200 @@ -1,0 +2,16 @@ +Sun Jul 24 14:07:29 CEST 2011 - [email protected] + +- Update to version 0.8.1.1: + + Engine: + - Load extensions after the internal database lookup/cache + tables have been initialized. + - Fix problem when replacing an existing Zeitgeist instance + (lp#809569). + - Fix possible crash when zeitgeist-datahub isn't available + (lp#791392). + + Python API: + - Fix regression that broke properties (get_version and + get_extensions). +- Drop zeitgeist-properties-regression.patch: fixed upstream. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- zeitgeist-0.8.1.tar.gz zeitgeist-properties-regression.patch New: ---- zeitgeist-0.8.1.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zeitgeist.spec ++++++ --- /var/tmp/diff_new_pack.I4wnqQ/_old 2011-08-03 17:12:59.000000000 +0200 +++ /var/tmp/diff_new_pack.I4wnqQ/_new 2011-08-03 17:12:59.000000000 +0200 @@ -19,15 +19,13 @@ Name: zeitgeist -Version: 0.8.1 -Release: 2 +Version: 0.8.1.1 +Release: 1 License: LGPLv2.1+ Summary: Zeitgeist Engine Url: https://launchpad.net/zeitgeist Group: Productivity/Other Source: %{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM zeitgeist-properties-regression.patch [email protected] -- Fix regression that broke properties (get_version and get_extensions). Patch taken from launchpad, rev 1789. -Patch0: zeitgeist-properties-regression.patch # dbus required for file ownership only. BuildRequires: dbus-1 BuildRequires: fdupes @@ -53,7 +51,6 @@ %lang_package %prep %setup -q -%patch0 -p0 %build %configure ++++++ zeitgeist-0.8.1.tar.gz -> zeitgeist-0.8.1.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.8.1/ChangeLog new/zeitgeist-0.8.1.1/ChangeLog --- old/zeitgeist-0.8.1/ChangeLog 2011-07-07 16:43:57.000000000 +0200 +++ new/zeitgeist-0.8.1.1/ChangeLog 2011-07-22 23:26:08.000000000 +0200 @@ -1,5 +1,68 @@ # Generated by Makefile. Do not edit. +2011-07-22 Siegfried-Angel Gevatter Pujals <[email protected]> + + * NEWS: + * VERSION: + * configure.ac: + * doc/zeitgeist/source/conf.py: + + Release 0.8.1.1. + +2011-07-22 Siegfried-Angel Gevatter Pujals <[email protected]> + + * zeitgeist-daemon.py: + + Fix possible crash when zeitgeist-datahub isn't available (LP: #791392). + + It turns out glib's spawn method now returns GError. + +2011-07-14 Seif Lotfy <[email protected]> + + * _zeitgeist/singleton.py: + * zeitgeist/client.py: + + add an option to _DBusInterface and ZeitgeistDBusInterface to not reconnect automatically (I think this part is useful anyway). + fixes bug #809569 + +2011-07-14 Siegfried-Angel Gevatter Pujals <[email protected]> + + * _zeitgeist/singleton.py: + * zeitgeist/client.py: + + _DBusInterface: Add option to not reconnect automatically. Use + said option in singleton.py to avoid unwanted behavior. + +2011-07-10 Seif Lotfy <[email protected]> + + * test/data/apriori_events_sets-2.js: + * test/data/apriori_events_sets.js: + * test/data/apriori_events.js: + + removed unused test data and improved apriori_events.js + +2011-07-10 Kristjan Schmidt <[email protected]> + + * po/eo.po: + + Add esperanto translation by Kristjan Schmidt + +2011-07-09 Siegfried-Angel Gevatter Pujals <[email protected]> + + * NEWS: + * _zeitgeist/engine/main.py: + + Load extensions after the internal database lookup/cache tables have + been initialized. + +2011-07-08 Siegfried-Angel Gevatter Pujals <[email protected]> + + * NEWS: + * test/remote-test.py: + * zeitgeist/client.py: + + Fix regression that broke properties (get_version and get_extensions). + 2011-07-07 Siegfried-Angel Gevatter Pujals <[email protected]> * NEWS: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.8.1/configure new/zeitgeist-0.8.1.1/configure --- old/zeitgeist-0.8.1/configure 2011-07-07 16:41:48.000000000 +0200 +++ new/zeitgeist-0.8.1.1/configure 2011-07-22 23:25:47.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for zeitgeist 0.8.1. +# Generated by GNU Autoconf 2.68 for zeitgeist 0.8.1.1. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -557,8 +557,8 @@ # Identity of this package. PACKAGE_NAME='zeitgeist' PACKAGE_TARNAME='zeitgeist' -PACKAGE_VERSION='0.8.1' -PACKAGE_STRING='zeitgeist 0.8.1' +PACKAGE_VERSION='0.8.1.1' +PACKAGE_STRING='zeitgeist 0.8.1.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1298,7 +1298,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures zeitgeist 0.8.1 to adapt to many kinds of systems. +\`configure' configures zeitgeist 0.8.1.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1364,7 +1364,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of zeitgeist 0.8.1:";; + short | recursive ) echo "Configuration of zeitgeist 0.8.1.1:";; esac cat <<\_ACEOF @@ -1454,7 +1454,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -zeitgeist configure 0.8.1 +zeitgeist configure 0.8.1.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1819,7 +1819,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by zeitgeist $as_me 0.8.1, which was +It was created by zeitgeist $as_me 0.8.1.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2635,7 +2635,7 @@ # Define the identity of the package. PACKAGE='zeitgeist' - VERSION='0.8.1' + VERSION='0.8.1.1' cat >>confdefs.h <<_ACEOF @@ -6201,7 +6201,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by zeitgeist $as_me 0.8.1, which was +This file was extended by zeitgeist $as_me 0.8.1.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6258,7 +6258,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -zeitgeist config.status 0.8.1 +zeitgeist config.status 0.8.1.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.8.1/configure.ac new/zeitgeist-0.8.1.1/configure.ac --- old/zeitgeist-0.8.1/configure.ac 2011-07-07 16:41:14.000000000 +0200 +++ new/zeitgeist-0.8.1.1/configure.ac 2011-07-22 23:25:38.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([zeitgeist], [0.8.1]) +AC_INIT([zeitgeist], [0.8.1.1]) AC_CONFIG_SRCDIR(zeitgeist-daemon.py) AM_INIT_AUTOMAKE([1.9 foreign]) GNOME_COMMON_INIT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.8.1/doc/zeitgeist/source/conf.py new/zeitgeist-0.8.1.1/doc/zeitgeist/source/conf.py --- old/zeitgeist-0.8.1/doc/zeitgeist/source/conf.py 2011-07-07 16:41:14.000000000 +0200 +++ new/zeitgeist-0.8.1.1/doc/zeitgeist/source/conf.py 2011-07-22 23:25:38.000000000 +0200 @@ -51,7 +51,7 @@ # The short X.Y version. version = '0.8.1' # The full version, including alpha/beta/rc tags. -release = '0.8.1' +release = '0.8.1.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.8.1/NEWS new/zeitgeist-0.8.1.1/NEWS --- old/zeitgeist-0.8.1/NEWS 2011-07-07 16:41:14.000000000 +0200 +++ new/zeitgeist-0.8.1.1/NEWS 2011-07-22 23:25:38.000000000 +0200 @@ -1,4 +1,18 @@ -2011-07-7: Zeitgeist 0.8.1 "The Snake and the Holy Grail" +2011-07-22: Zeitgeist 0.8.1.1 "Grass Frog" +------------------------------------------ + +Engine: + + - Load extensions after the internal database lookup/cache tables have + been initialized. + - Fix problem when replacing an existing Zeitgeist instance (LP: #809569). + - Fix possible crash when zeitgeist-datahub isn't available (LP: #791392). + +Python API: + + - Fix regression that broke properties (get_version and get_extensions). + +2011-07-07: Zeitgeist 0.8.1 "The Snake and the Holy Grail" --------------------------------------------------------- Engine: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.8.1/po/eo.po new/zeitgeist-0.8.1.1/po/eo.po --- old/zeitgeist-0.8.1/po/eo.po 2011-07-07 16:41:14.000000000 +0200 +++ new/zeitgeist-0.8.1.1/po/eo.po 2011-07-22 23:25:38.000000000 +0200 @@ -8,43 +8,44 @@ "Project-Id-Version: zeitgeist\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-12-07 21:46+0000\n" -"PO-Revision-Date: 2010-06-07 04:18+0000\n" -"Last-Translator: Zeitgeist Framework Team <[email protected]>\n" +"PO-Revision-Date: 2011-07-10 09:31+0200\n" +"Last-Translator: Kristjan SCHMIDT <[email protected]>\n" "Language-Team: Esperanto <[email protected]>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-03-21 04:50+0000\n" -"X-Generator: Launchpad (build 12559)\n" +"X-Launchpad-Export-Date: 2011-07-10 07:24+0000\n" +"X-Generator: Launchpad (build 13376)\n" "Language: eo\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" #: ../zeitgeist-daemon.py:71 ../zeitgeist-daemon.py:84 msgid "if another Zeitgeist instance is already running, replace it" -msgstr "" +msgstr "se alia aperaĵo de Zeitgeist jam rulas, anstataŭigi ĝin" #: ../zeitgeist-daemon.py:75 msgid "do not start zeitgeist-datahub automatically" -msgstr "" +msgstr "ne starti zeitgeist-datumkoncentrilon aŭtomate" #: ../zeitgeist-daemon.py:79 msgid "how much information should be printed; possible values:" -msgstr "" - -#~ msgid "Tags" -#~ msgstr "Etikedoj" +msgstr "kiom da informoj presendas; eblaj valoroj:" #~ msgid "Lost connection to zeitgeist-daemon, terminating." #~ msgstr "Konekto al Zeitgeist-demono perdiĝis, mi ĉesas." +#~ msgid "Starting Zeitgeist service..." +#~ msgstr "Startigo de servo \"Zeitgeist\"..." + +#~ msgid "Tags" +#~ msgstr "Etikedoj" + #~ msgid "Comments" #~ msgstr "Komentoj" #~ msgid "Bookmarks" #~ msgstr "Legosignoj" -#~ msgid "Starting Zeitgeist service..." -#~ msgstr "Startigo de servo \"Zeitgeist\"..." - #~ msgid "Documents" #~ msgstr "Dokumentoj" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.8.1/zeitgeist/client.py new/zeitgeist-0.8.1.1/zeitgeist/client.py --- old/zeitgeist-0.8.1/zeitgeist/client.py 2011-07-07 16:41:14.000000000 +0200 +++ new/zeitgeist-0.8.1.1/zeitgeist/client.py 2011-07-22 23:25:38.000000000 +0200 @@ -67,15 +67,18 @@ return methods, signals def reconnect(self): - self.__proxy = dbus.SessionBus().get_object(self.__iface.requested_bus_name, - self.__object_path) + if not self._reconnect_when_needed: + return + self.__proxy = dbus.SessionBus().get_object( + self.__iface.requested_bus_name, self.__object_path) self.__iface = dbus.Interface(self.__proxy, self.__interface_name) self._load_introspection_data() - def _disconnection_safe(self, method_name, *args, **kwargs): + def _disconnection_safe(self, method_getter, *args, **kwargs): """ - Executes the given method. If it fails because the D-Bus connection - was lost, attempts to recover it and executes the method again. + Executes the method returned by method_getter. If it fails because + the D-Bus connection was lost, it attempts to recover it and executes + the method again. """ custom_error_handler = None @@ -87,8 +90,7 @@ self.reconnect() # We don't use the reconnecting_error_handler here since that'd # get us into an endless loop if Zeitgeist really isn't there. - meth = getattr(self.__iface, method_name) - return meth(*args, **original_kwargs) + return method_getter()(*args, **original_kwargs) else: if custom_error_handler is not None: custom_error_handler(e) @@ -102,8 +104,7 @@ kwargs['error_handler'] = reconnecting_error_handler try: - meth = getattr(self.__iface, method_name) - return meth(*args, **kwargs) + return method_getter()(*args, **kwargs) except dbus.exceptions.DBusException, e: return reconnecting_error_handler(e) @@ -115,9 +116,15 @@ Method wrapping around a D-Bus call, which attempts to recover the connection to Zeitgeist if it got lost. """ - return self._disconnection_safe(name, *args, **kwargs) + return self._disconnection_safe( + lambda: getattr(self.__iface, name), *args, **kwargs) return _ProxyMethod + def get_property(self, property_name): + return self._disconnection_safe( + lambda: self.__proxy.get_dbus_method("Get", dbus.PROPERTIES_IFACE), + self.__interface_name, property_name) + def connect(self, signal, callback, **kwargs): """Connect a callback to a signal of the current proxy instance.""" if self.__signals is None: @@ -151,11 +158,12 @@ self.__methods, self.__signals = self.get_members( self.__proxy.Introspect()) - def __init__(self, proxy, interface_name, object_path): + def __init__(self, proxy, interface_name, object_path, reconnect=True): self.__proxy = proxy self.__interface_name = interface_name self.__object_path = object_path self.__iface = dbus.Interface(proxy, interface_name) + self._reconnect_when_needed = reconnect self._load_introspection_data() self._disconnect_callbacks = set() @@ -168,6 +176,8 @@ callbacks = self._disconnect_callbacks self.__methods = self.__signals = None else: + if not self._reconnect_when_needed: + return self.reconnect() callbacks = self._reconnect_callbacks for signal, callback in self._generic_callbacks: @@ -201,18 +211,12 @@ def version(self): """Returns the API version""" dbus_interface = self.__shared_state["dbus_interface"] - return dbus_interface._disconnection_safe( - dbus_interface.proxy.get_dbus_method("Get", - dbus_interface=dbus.PROPERTIES_IFACE), - self.INTERFACE_NAME, "version") + return dbus_interface.get_property("version") def extensions(self): """Returns active extensions""" dbus_interface = self.__shared_state["dbus_interface"] - return dbus_interface._disconnection_safe( - dbus_interface.proxy.get_dbus_method("Get", - dbus_interface=dbus.PROPERTIES_IFACE), - self.INTERFACE_NAME, "extensions") + return dbus_interface.get_property("extensions") def get_extension(cls, name, path, busname=None): """ Returns an interface to the given extension. @@ -236,7 +240,7 @@ cls.__shared_state["extension_interfaces"][name] = iface return cls.__shared_state["extension_interfaces"][name] - def __init__(self): + def __init__(self, reconnect=True): if not "dbus_interface" in self.__shared_state: try: proxy = dbus.SessionBus().get_object(self.BUS_NAME, @@ -250,7 +254,7 @@ raise self.__shared_state["extension_interfaces"] = {} self.__shared_state["dbus_interface"] = _DBusInterface(proxy, - self.INTERFACE_NAME, self.OBJECT_PATH) + self.INTERFACE_NAME, self.OBJECT_PATH, reconnect) class Monitor(dbus.service.Object): """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.8.1/_zeitgeist/engine/main.py new/zeitgeist-0.8.1.1/_zeitgeist/engine/main.py --- old/zeitgeist-0.8.1/_zeitgeist/engine/main.py 2011-07-07 16:41:14.000000000 +0200 +++ new/zeitgeist-0.8.1.1/_zeitgeist/engine/main.py 2011-07-22 23:25:38.000000000 +0200 @@ -117,16 +117,16 @@ # to be 100% sure. raise RuntimeError("old database version") - # Load extensions - default_extensions = get_extensions() - self.__extensions = ExtensionsCollection(self, - defaults=default_extensions) - self._interpretation = TableLookup(cursor, "interpretation") self._manifestation = TableLookup(cursor, "manifestation") self._mimetype = TableLookup(cursor, "mimetype") self._actor = TableLookup(cursor, "actor") self._event_cache = LRUCache(constants.CACHE_SIZE) + + # Load extensions + default_extensions = get_extensions() + self.__extensions = ExtensionsCollection(self, + defaults=default_extensions) @property def extensions(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.8.1/_zeitgeist/singleton.py new/zeitgeist-0.8.1.1/_zeitgeist/singleton.py --- old/zeitgeist-0.8.1/_zeitgeist/singleton.py 2011-07-07 16:41:14.000000000 +0200 +++ new/zeitgeist-0.8.1.1/_zeitgeist/singleton.py 2011-07-22 23:25:38.000000000 +0200 @@ -84,7 +84,7 @@ else: logging.debug("Replacing currently running process...") try: - interface = ZeitgeistDBusInterface() + interface = ZeitgeistDBusInterface(reconnect=False) interface.Quit() while dbus.SessionBus().name_has_owner(ZeitgeistDBusInterface.BUS_NAME): pass diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.8.1/zeitgeist-daemon new/zeitgeist-0.8.1.1/zeitgeist-daemon --- old/zeitgeist-0.8.1/zeitgeist-daemon 2011-07-07 16:42:13.000000000 +0200 +++ new/zeitgeist-0.8.1.1/zeitgeist-daemon 2011-07-22 23:26:04.000000000 +0200 @@ -113,7 +113,7 @@ pid, stdin, stdout, stderr = glib.spawn_async( [DATAHUB,], flags=glib.SPAWN_SEARCH_PATH | glib.SPAWN_STDOUT_TO_DEV_NULL | glib.SPAWN_STDERR_TO_DEV_NULL) - except OSError: + except (OSError, glib.GError): logging.warning("Unable to start the datahub, no binary found") else: # TODO: delayed check if the datahub is still running after some time diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zeitgeist-0.8.1/zeitgeist-daemon.py new/zeitgeist-0.8.1.1/zeitgeist-daemon.py --- old/zeitgeist-0.8.1/zeitgeist-daemon.py 2011-07-07 16:41:14.000000000 +0200 +++ new/zeitgeist-0.8.1.1/zeitgeist-daemon.py 2011-07-22 23:25:38.000000000 +0200 @@ -113,7 +113,7 @@ pid, stdin, stdout, stderr = glib.spawn_async( [DATAHUB,], flags=glib.SPAWN_SEARCH_PATH | glib.SPAWN_STDOUT_TO_DEV_NULL | glib.SPAWN_STDERR_TO_DEV_NULL) - except OSError: + except (OSError, glib.GError): logging.warning("Unable to start the datahub, no binary found") else: # TODO: delayed check if the datahub is still running after some time ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
