Hello community,
here is the log from the commit of package zmd
checked in at Thu Jun 8 15:20:32 CEST 2006.
--------
--- zmd/zmd.changes 2006-06-06 00:13:37.000000000 +0200
+++ zmd/zmd.changes 2006-06-08 00:38:52.000000000 +0200
@@ -1,0 +2,13 @@
+Thu Jun 8 00:37:15 CEST 2006 - maw@suse.de
+
+- New source drop (r29995) which:
+- Marks the schedule list with view privileges
+- Does Fail/Finish in the OnExit method, not OnExitInternal, as
+ subclasses need the ability oto set their own failure messages
+- Resets the sleep schedule before adding it
+- Ensures that the sleep schedule is not started until after all
+ initial services are added
+- Doesn't start the sleep schedule until after remoting has
+ been started. #178389
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zmd.spec ++++++
--- /var/tmp/diff_new_pack.iwH7ix/_old 2006-06-08 15:18:35.000000000 +0200
+++ /var/tmp/diff_new_pack.iwH7ix/_new 2006-06-08 15:18:35.000000000 +0200
@@ -14,7 +14,7 @@
BuildRequires: dbus-1-mono libzypp-zmd-backend log4net mono-basic mono-data-sqlite mono-devel perl-XML-Parser rpm-devel sqlite-devel
URL: http://www.novell.com
Version: 7.1.1.0
-Release: 48
+Release: 49
License: LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
@@ -169,6 +169,16 @@
# %{_libdir}/monodoc/sources/*
%changelog -n zmd
+* Thu Jun 08 2006 - maw@suse.de
+- New source drop (r29995) which:
+- Marks the schedule list with view privileges
+- Does Fail/Finish in the OnExit method, not OnExitInternal, as
+ subclasses need the ability oto set their own failure messages
+- Resets the sleep schedule before adding it
+- Ensures that the sleep schedule is not started until after all
+ initial services are added
+- Doesn't start the sleep schedule until after remoting has
+ been started. #178389
* Tue Jun 06 2006 - maw@suse.de
- Populate /var/adm/fillup-templates/sysconfig.zmd and
/etc/sysconfig/zmd. #162794
++++++ zmd-7.1.1.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/ChangeLog new/zmd-7.1.1.0/ChangeLog
--- old/zmd-7.1.1.0/ChangeLog 2006-06-01 23:16:05.000000000 +0200
+++ new/zmd-7.1.1.0/ChangeLog 2006-06-02 22:23:49.000000000 +0200
@@ -1,3 +1,7 @@
+2006-06-02 Dan Mills
+
+ * build-buddy.conf: Fix for BB 1.8.
+
2006-06-01 James Willcox
* zmd.init.lsb.in: fix try-restart when zmd isn't running, and
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/ChangeLog new/zmd-7.1.1.0/modules/ChangeLog
--- old/zmd-7.1.1.0/modules/ChangeLog 2006-06-02 17:56:03.000000000 +0200
+++ new/zmd-7.1.1.0/modules/ChangeLog 2006-06-02 22:23:49.000000000 +0200
@@ -1,3 +1,8 @@
+2006-06-02 Dan Mills
+
+ * linux/Makefile.am: Only copy libredcarpet when building the
+ backend.
+
2006-06-02 Chris Rivera
* linux/Transaction: See if we're updating ourself and delay the call
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/Makefile.am new/zmd-7.1.1.0/modules/linux/Makefile.am
--- old/zmd-7.1.1.0/modules/linux/Makefile.am 2006-06-01 00:32:50.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/Makefile.am 2006-06-02 22:23:49.000000000 +0200
@@ -101,9 +101,11 @@
done;
if COPY_LIBS
+if BUILD_BACKEND
$(INSTALL) `pkg-config --variable=libdir libredcarpet`/libredcarpet.so.0 $(DESTDIR)$(libdir)/zmd
ln -sf $(libdir)/zmd/libredcarpet.so.0 $(DESTDIR)$(libdir)/zmd/libredcarpet.so
endif
+endif
CLEANFILES = $(zmdmodule_DATA) $(zmdlibs_DATA) $(GAC_ASSEMBLIES)
EXTRA_DIST = \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/Makefile.in new/zmd-7.1.1.0/modules/linux/Makefile.in
--- old/zmd-7.1.1.0/modules/linux/Makefile.in 2006-06-02 16:47:52.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/Makefile.in 2006-06-06 23:58:33.000000000 +0200
@@ -759,8 +759,8 @@
$(GACUTIL) /i $$asm /package $(PACKAGE) /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib; \
done;
-@COPY_LIBS_TRUE@ $(INSTALL) `pkg-config --variable=libdir libredcarpet`/libredcarpet.so.0 $(DESTDIR)$(libdir)/zmd
-@COPY_LIBS_TRUE@ ln -sf $(libdir)/zmd/libredcarpet.so.0 $(DESTDIR)$(libdir)/zmd/libredcarpet.so
+@BUILD_BACKEND_TRUE@@COPY_LIBS_TRUE@ $(INSTALL) `pkg-config --variable=libdir libredcarpet`/libredcarpet.so.0 $(DESTDIR)$(libdir)/zmd
+@BUILD_BACKEND_TRUE@@COPY_LIBS_TRUE@ ln -sf $(libdir)/zmd/libredcarpet.so.0 $(DESTDIR)$(libdir)/zmd/libredcarpet.so
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Binary files old/zmd-7.1.1.0/po/de_DE.gmo and new/zmd-7.1.1.0/po/de_DE.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/de_DE.po new/zmd-7.1.1.0/po/de_DE.po
--- old/zmd-7.1.1.0/po/de_DE.po 2006-06-02 17:56:58.000000000 +0200
+++ new/zmd-7.1.1.0/po/de_DE.po 2006-06-07 23:18:30.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-02 11:56-0400\n"
+"POT-Creation-Date: 2006-06-07 17:18-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -268,52 +268,52 @@
msgid "No bundle with id '{0}' was found."
msgstr "Kein Bundle mit ID '{0}' gefunden."
-#: src/BundleManager.cs:443
+#: src/BundleManager.cs:429
#, fuzzy, csharp-format
msgid "Bundle '{0}' (requires '{1}') is locked and can not be removed"
msgstr ""
"Bundle '{0}' erfordert das Bundle mit der ID '{1}', das jedoch nicht "
"gefunden wurde."
-#: src/BundleManager.cs:457 src/BundleManager.cs:566
+#: src/BundleManager.cs:443 src/BundleManager.cs:552
#, fuzzy, csharp-format
msgid "Bundle '{0}' is locked and can not be removed."
msgstr "Bundle '{0}' ist nicht vorbereitet."
-#: src/BundleManager.cs:482
+#: src/BundleManager.cs:468
#, csharp-format
msgid "Bundle '{0}' requires bundle with id '{1}', which was not found."
msgstr ""
"Bundle '{0}' erfordert das Bundle mit der ID '{1}', das jedoch nicht "
"gefunden wurde."
-#: src/BundleManager.cs:486
+#: src/BundleManager.cs:472
#, fuzzy, csharp-format
msgid "Bundle '{0}' (required by '{1}') is locked and cat not be installed."
msgstr ""
"Bundle '{0}' erfordert das Bundle mit der ID '{1}', das jedoch nicht "
"gefunden wurde."
-#: src/BundleManager.cs:501 src/BundleManager.cs:560
+#: src/BundleManager.cs:487 src/BundleManager.cs:546
#, fuzzy, csharp-format
msgid "Bundle '{0}' is locked and can not be installed."
msgstr "Bundle '{0}' ist nicht vorbereitet."
-#: src/BundleManager.cs:513
+#: src/BundleManager.cs:499
#, csharp-format
msgid "'{0}' is already installed."
msgstr "'{0}' ist bereits installiert."
-#: src/BundleManager.cs:519
+#: src/BundleManager.cs:505
#, csharp-format
msgid "'{0}' is not installed."
msgstr "'{0}' ist nicht installiert."
-#: src/BundleManager.cs:527
+#: src/BundleManager.cs:513
msgid "Preparing Bundles"
msgstr "Bundles werden vorbereitet."
-#: src/BundleManager.cs:552
+#: src/BundleManager.cs:538
msgid "Another transaction is already in progress"
msgstr "Eine andere Transaktion wird bereits ausgeführt."
@@ -705,55 +705,55 @@
msgstr ""
"Der Startzeitpunkt kann nach Beginn des Zeitplans nicht mehr geändert werden"
-#: src/ServiceManager.cs:111
+#: src/ServiceManager.cs:102
msgid "Service Refresh"
msgstr "Dienstaktualisierung"
-#: src/ServiceManager.cs:135
+#: src/ServiceManager.cs:126
msgid "Initial services are already loaded."
msgstr ""
-#: src/ServiceManager.cs:205
+#: src/ServiceManager.cs:196
msgid "Initial service file did not contain an URL."
msgstr "Ursprüngliche Dienstdatei enthielt keine URL."
-#: src/ServiceManager.cs:233
+#: src/ServiceManager.cs:224
msgid "Mounting Initial Services"
msgstr "Aktivierung ursprünglicher Dienste"
-#: src/ServiceManager.cs:298
+#: src/ServiceManager.cs:289
msgid "This service type requires a network connection, but none is present."
msgstr ""
-#: src/ServiceManager.cs:304
+#: src/ServiceManager.cs:295
#, csharp-format
msgid "Service '{0}' at '{1}' already exists on this client."
msgstr "Dienst '{0}' an '{1}' ist auf diesem Client bereits vorhanden."
-#: src/ServiceManager.cs:318
+#: src/ServiceManager.cs:309
#, csharp-format
msgid "A service of type '{0}' already exists on this client"
msgstr "Ein Dienst des Typs '{0}' ist auf diesem Client bereits vorhanden."
-#: src/ServiceManager.cs:361
+#: src/ServiceManager.cs:352
#, csharp-format
msgid "'{0}' is not a valid service type"
msgstr "'{0}' ist kein gültiger Diensttyp."
-#: src/ServiceManager.cs:386
+#: src/ServiceManager.cs:377
msgid "No suitable service types could be found"
msgstr ""
-#: src/ServiceManager.cs:550
+#: src/ServiceManager.cs:541
msgid "Refreshing Services"
msgstr "Dienstaktualisierung"
-#: src/ServiceManager.cs:657
+#: src/ServiceManager.cs:651
#, csharp-format
msgid "The '{0}' service does not support registration."
msgstr "Der Dienst '{0}' unterstützt keine Registrierung."
-#: src/ServiceManager.cs:820
+#: src/ServiceManager.cs:814
#, csharp-format
msgid "Unknown service storage version '{0}'"
msgstr "Unbekannte Dienstspeicherversion '{0}'"
Binary files old/zmd-7.1.1.0/po/en_US.gmo and new/zmd-7.1.1.0/po/en_US.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/en_US.po new/zmd-7.1.1.0/po/en_US.po
--- old/zmd-7.1.1.0/po/en_US.po 2006-06-02 17:56:59.000000000 +0200
+++ new/zmd-7.1.1.0/po/en_US.po 2006-06-07 23:18:31.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-02 11:56-0400\n"
+"POT-Creation-Date: 2006-06-07 17:18-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -266,46 +266,46 @@
msgid "No bundle with id '{0}' was found."
msgstr "No bundle with id '{0}' was found."
-#: src/BundleManager.cs:443
+#: src/BundleManager.cs:429
#, fuzzy, csharp-format
msgid "Bundle '{0}' (requires '{1}') is locked and can not be removed"
msgstr "Bundle '{0}' requires bundle with id '{1}', which was not found."
-#: src/BundleManager.cs:457 src/BundleManager.cs:566
+#: src/BundleManager.cs:443 src/BundleManager.cs:552
#, fuzzy, csharp-format
msgid "Bundle '{0}' is locked and can not be removed."
msgstr "Bundle '{0}' is not prepared."
-#: src/BundleManager.cs:482
+#: src/BundleManager.cs:468
#, csharp-format
msgid "Bundle '{0}' requires bundle with id '{1}', which was not found."
msgstr "Bundle '{0}' requires bundle with id '{1}', which was not found."
-#: src/BundleManager.cs:486
+#: src/BundleManager.cs:472
#, fuzzy, csharp-format
msgid "Bundle '{0}' (required by '{1}') is locked and cat not be installed."
msgstr "Bundle '{0}' requires bundle with id '{1}', which was not found."
-#: src/BundleManager.cs:501 src/BundleManager.cs:560
+#: src/BundleManager.cs:487 src/BundleManager.cs:546
#, fuzzy, csharp-format
msgid "Bundle '{0}' is locked and can not be installed."
msgstr "Bundle '{0}' is not prepared."
-#: src/BundleManager.cs:513
+#: src/BundleManager.cs:499
#, csharp-format
msgid "'{0}' is already installed."
msgstr "'{0}' is already installed."
-#: src/BundleManager.cs:519
+#: src/BundleManager.cs:505
#, csharp-format
msgid "'{0}' is not installed."
msgstr "'{0}' is not installed."
-#: src/BundleManager.cs:527
+#: src/BundleManager.cs:513
msgid "Preparing Bundles"
msgstr "Preparing Bundles"
-#: src/BundleManager.cs:552
+#: src/BundleManager.cs:538
msgid "Another transaction is already in progress"
msgstr "Another transaction is already in progress"
@@ -692,55 +692,55 @@
msgid "Cannot change start time after schedule is running"
msgstr "Cannot change start time after schedule is running"
-#: src/ServiceManager.cs:111
+#: src/ServiceManager.cs:102
msgid "Service Refresh"
msgstr "Service Refresh"
-#: src/ServiceManager.cs:135
+#: src/ServiceManager.cs:126
msgid "Initial services are already loaded."
msgstr ""
-#: src/ServiceManager.cs:205
+#: src/ServiceManager.cs:196
msgid "Initial service file did not contain an URL."
msgstr "Initial service file did not contain an URL."
-#: src/ServiceManager.cs:233
+#: src/ServiceManager.cs:224
msgid "Mounting Initial Services"
msgstr "Mounting Initial Services"
-#: src/ServiceManager.cs:298
+#: src/ServiceManager.cs:289
msgid "This service type requires a network connection, but none is present."
msgstr ""
-#: src/ServiceManager.cs:304
+#: src/ServiceManager.cs:295
#, csharp-format
msgid "Service '{0}' at '{1}' already exists on this client."
msgstr "Service '{0}' at '{1}' already exists on this client."
-#: src/ServiceManager.cs:318
+#: src/ServiceManager.cs:309
#, csharp-format
msgid "A service of type '{0}' already exists on this client"
msgstr "A service of type '{0}' already exists on this client"
-#: src/ServiceManager.cs:361
+#: src/ServiceManager.cs:352
#, csharp-format
msgid "'{0}' is not a valid service type"
msgstr "'{0}' is not a valid service type"
-#: src/ServiceManager.cs:386
+#: src/ServiceManager.cs:377
msgid "No suitable service types could be found"
msgstr ""
-#: src/ServiceManager.cs:550
+#: src/ServiceManager.cs:541
msgid "Refreshing Services"
msgstr "Refreshing Services"
-#: src/ServiceManager.cs:657
+#: src/ServiceManager.cs:651
#, csharp-format
msgid "The '{0}' service does not support registration."
msgstr "The '{0}' service does not support registration."
-#: src/ServiceManager.cs:820
+#: src/ServiceManager.cs:814
#, csharp-format
msgid "Unknown service storage version '{0}'"
msgstr "Unknown service storage version '{0}'"
Binary files old/zmd-7.1.1.0/po/es_ES.gmo and new/zmd-7.1.1.0/po/es_ES.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/es_ES.po new/zmd-7.1.1.0/po/es_ES.po
--- old/zmd-7.1.1.0/po/es_ES.po 2006-06-02 17:56:59.000000000 +0200
+++ new/zmd-7.1.1.0/po/es_ES.po 2006-06-07 23:18:31.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-02 11:56-0400\n"
+"POT-Creation-Date: 2006-06-07 17:18-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -272,46 +272,46 @@
msgid "No bundle with id '{0}' was found."
msgstr "No se ha encontrado ningún lote con ID '{0}'."
-#: src/BundleManager.cs:443
+#: src/BundleManager.cs:429
#, fuzzy, csharp-format
msgid "Bundle '{0}' (requires '{1}') is locked and can not be removed"
msgstr "El lote '{0}' exige un ID '{1}' que no se ha encontrado."
-#: src/BundleManager.cs:457 src/BundleManager.cs:566
+#: src/BundleManager.cs:443 src/BundleManager.cs:552
#, fuzzy, csharp-format
msgid "Bundle '{0}' is locked and can not be removed."
msgstr "El lote '{0}' no está preparado."
-#: src/BundleManager.cs:482
+#: src/BundleManager.cs:468
#, csharp-format
msgid "Bundle '{0}' requires bundle with id '{1}', which was not found."
msgstr "El lote '{0}' exige un ID '{1}' que no se ha encontrado."
-#: src/BundleManager.cs:486
+#: src/BundleManager.cs:472
#, fuzzy, csharp-format
msgid "Bundle '{0}' (required by '{1}') is locked and cat not be installed."
msgstr "El lote '{0}' exige un ID '{1}' que no se ha encontrado."
-#: src/BundleManager.cs:501 src/BundleManager.cs:560
+#: src/BundleManager.cs:487 src/BundleManager.cs:546
#, fuzzy, csharp-format
msgid "Bundle '{0}' is locked and can not be installed."
msgstr "El lote '{0}' no está preparado."
-#: src/BundleManager.cs:513
+#: src/BundleManager.cs:499
#, csharp-format
msgid "'{0}' is already installed."
msgstr "'{0}' ya instalado."
-#: src/BundleManager.cs:519
+#: src/BundleManager.cs:505
#, csharp-format
msgid "'{0}' is not installed."
msgstr "'{0}' sin instalar."
-#: src/BundleManager.cs:527
+#: src/BundleManager.cs:513
msgid "Preparing Bundles"
msgstr "Preparando lotes"
-#: src/BundleManager.cs:552
+#: src/BundleManager.cs:538
msgid "Another transaction is already in progress"
msgstr "Hay otra transacción en proceso"
@@ -703,55 +703,55 @@
msgstr ""
"No es posible cambiar la hora de inicio cuando la programación está en curso"
-#: src/ServiceManager.cs:111
+#: src/ServiceManager.cs:102
msgid "Service Refresh"
msgstr "Actualización de servicio"
-#: src/ServiceManager.cs:135
+#: src/ServiceManager.cs:126
msgid "Initial services are already loaded."
msgstr ""
-#: src/ServiceManager.cs:205
+#: src/ServiceManager.cs:196
msgid "Initial service file did not contain an URL."
msgstr "El archivo de servicio inicial no contenía ninguna URL."
-#: src/ServiceManager.cs:233
+#: src/ServiceManager.cs:224
msgid "Mounting Initial Services"
msgstr "Montando servicios iniciales"
-#: src/ServiceManager.cs:298
+#: src/ServiceManager.cs:289
msgid "This service type requires a network connection, but none is present."
msgstr ""
-#: src/ServiceManager.cs:304
+#: src/ServiceManager.cs:295
#, csharp-format
msgid "Service '{0}' at '{1}' already exists on this client."
msgstr "El servicio '{0}' de '{1}' ya existe en este cliente."
-#: src/ServiceManager.cs:318
+#: src/ServiceManager.cs:309
#, csharp-format
msgid "A service of type '{0}' already exists on this client"
msgstr "Ya existe un servicio del tipo '{0}' en este cliente"
-#: src/ServiceManager.cs:361
+#: src/ServiceManager.cs:352
#, csharp-format
msgid "'{0}' is not a valid service type"
msgstr "'{0}' no es un tipo de servicio válido"
-#: src/ServiceManager.cs:386
+#: src/ServiceManager.cs:377
msgid "No suitable service types could be found"
msgstr ""
-#: src/ServiceManager.cs:550
+#: src/ServiceManager.cs:541
msgid "Refreshing Services"
msgstr "Actualizando servicios"
-#: src/ServiceManager.cs:657
+#: src/ServiceManager.cs:651
#, csharp-format
msgid "The '{0}' service does not support registration."
msgstr "El servicio '{0}' no admite registro."
-#: src/ServiceManager.cs:820
+#: src/ServiceManager.cs:814
#, csharp-format
msgid "Unknown service storage version '{0}'"
msgstr "Versión de almacenamiento de servicio no válida '{0}'"
Binary files old/zmd-7.1.1.0/po/fr_FR.gmo and new/zmd-7.1.1.0/po/fr_FR.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/fr_FR.po new/zmd-7.1.1.0/po/fr_FR.po
--- old/zmd-7.1.1.0/po/fr_FR.po 2006-06-02 17:56:59.000000000 +0200
+++ new/zmd-7.1.1.0/po/fr_FR.po 2006-06-07 23:18:31.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-02 11:56-0400\n"
+"POT-Creation-Date: 2006-06-07 17:18-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -272,52 +272,52 @@
msgid "No bundle with id '{0}' was found."
msgstr "Aucun ensemble avec l'identificateur '{0}' n'a été trouvé."
-#: src/BundleManager.cs:443
+#: src/BundleManager.cs:429
#, fuzzy, csharp-format
msgid "Bundle '{0}' (requires '{1}') is locked and can not be removed"
msgstr ""
"L'ensemble '{0}' nécessite l'ensemble ayant l'identificateur '{1}' , qui n'a "
"pas été trouvé."
-#: src/BundleManager.cs:457 src/BundleManager.cs:566
+#: src/BundleManager.cs:443 src/BundleManager.cs:552
#, fuzzy, csharp-format
msgid "Bundle '{0}' is locked and can not be removed."
msgstr "L'ensemble '{0}' n'est pas préparé."
-#: src/BundleManager.cs:482
+#: src/BundleManager.cs:468
#, csharp-format
msgid "Bundle '{0}' requires bundle with id '{1}', which was not found."
msgstr ""
"L'ensemble '{0}' nécessite l'ensemble ayant l'identificateur '{1}' , qui n'a "
"pas été trouvé."
-#: src/BundleManager.cs:486
+#: src/BundleManager.cs:472
#, fuzzy, csharp-format
msgid "Bundle '{0}' (required by '{1}') is locked and cat not be installed."
msgstr ""
"L'ensemble '{0}' nécessite l'ensemble ayant l'identificateur '{1}' , qui n'a "
"pas été trouvé."
-#: src/BundleManager.cs:501 src/BundleManager.cs:560
+#: src/BundleManager.cs:487 src/BundleManager.cs:546
#, fuzzy, csharp-format
msgid "Bundle '{0}' is locked and can not be installed."
msgstr "L'ensemble '{0}' n'est pas préparé."
-#: src/BundleManager.cs:513
+#: src/BundleManager.cs:499
#, csharp-format
msgid "'{0}' is already installed."
msgstr "'{0}' est déjà installé."
-#: src/BundleManager.cs:519
+#: src/BundleManager.cs:505
#, csharp-format
msgid "'{0}' is not installed."
msgstr "'{0}' n'est pas installé"
-#: src/BundleManager.cs:527
+#: src/BundleManager.cs:513
msgid "Preparing Bundles"
msgstr "Préparation des ensembles"
-#: src/BundleManager.cs:552
+#: src/BundleManager.cs:538
msgid "Another transaction is already in progress"
msgstr "Une autre transaction est déjà en cours"
@@ -707,55 +707,55 @@
msgstr ""
"Changement de l'heure de début impossible lorsque la planification est lancée"
-#: src/ServiceManager.cs:111
+#: src/ServiceManager.cs:102
msgid "Service Refresh"
msgstr "Rafraîchissement du service"
-#: src/ServiceManager.cs:135
+#: src/ServiceManager.cs:126
msgid "Initial services are already loaded."
msgstr ""
-#: src/ServiceManager.cs:205
+#: src/ServiceManager.cs:196
msgid "Initial service file did not contain an URL."
msgstr "Le fichier de service initial ne contenait pas d'URL."
-#: src/ServiceManager.cs:233
+#: src/ServiceManager.cs:224
msgid "Mounting Initial Services"
msgstr "Montage des services initiaux"
-#: src/ServiceManager.cs:298
+#: src/ServiceManager.cs:289
msgid "This service type requires a network connection, but none is present."
msgstr ""
-#: src/ServiceManager.cs:304
+#: src/ServiceManager.cs:295
#, csharp-format
msgid "Service '{0}' at '{1}' already exists on this client."
msgstr "Le service '{0}' à '{1}' existe déjà sur ce client."
-#: src/ServiceManager.cs:318
+#: src/ServiceManager.cs:309
#, csharp-format
msgid "A service of type '{0}' already exists on this client"
msgstr "Un service de type '{0}' existe déjà sur ce client."
-#: src/ServiceManager.cs:361
+#: src/ServiceManager.cs:352
#, csharp-format
msgid "'{0}' is not a valid service type"
msgstr "'{0}' n'est pas un type de service valide"
-#: src/ServiceManager.cs:386
+#: src/ServiceManager.cs:377
msgid "No suitable service types could be found"
msgstr ""
-#: src/ServiceManager.cs:550
+#: src/ServiceManager.cs:541
msgid "Refreshing Services"
msgstr "Rafraîchissement des services"
-#: src/ServiceManager.cs:657
+#: src/ServiceManager.cs:651
#, csharp-format
msgid "The '{0}' service does not support registration."
msgstr "Le service '{0}' ne prend pas en charge l'enregistrement."
-#: src/ServiceManager.cs:820
+#: src/ServiceManager.cs:814
#, csharp-format
msgid "Unknown service storage version '{0}'"
msgstr "Version de stockage de service '{0}' inconnue"
Binary files old/zmd-7.1.1.0/po/pt_BR.gmo and new/zmd-7.1.1.0/po/pt_BR.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/pt_BR.po new/zmd-7.1.1.0/po/pt_BR.po
--- old/zmd-7.1.1.0/po/pt_BR.po 2006-06-02 17:56:59.000000000 +0200
+++ new/zmd-7.1.1.0/po/pt_BR.po 2006-06-07 23:18:31.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-02 11:56-0400\n"
+"POT-Creation-Date: 2006-06-07 17:18-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -268,46 +268,46 @@
msgid "No bundle with id '{0}' was found."
msgstr "Não foi encontrado nenhum bundle com ID '{0}'."
-#: src/BundleManager.cs:443
+#: src/BundleManager.cs:429
#, fuzzy, csharp-format
msgid "Bundle '{0}' (requires '{1}') is locked and can not be removed"
msgstr "O bundle '{0}' requer o bundle com ID '{1}', que não foi encontrado."
-#: src/BundleManager.cs:457 src/BundleManager.cs:566
+#: src/BundleManager.cs:443 src/BundleManager.cs:552
#, fuzzy, csharp-format
msgid "Bundle '{0}' is locked and can not be removed."
msgstr "O bundle '{0}' não está preparado."
-#: src/BundleManager.cs:482
+#: src/BundleManager.cs:468
#, csharp-format
msgid "Bundle '{0}' requires bundle with id '{1}', which was not found."
msgstr "O bundle '{0}' requer o bundle com ID '{1}', que não foi encontrado."
-#: src/BundleManager.cs:486
+#: src/BundleManager.cs:472
#, fuzzy, csharp-format
msgid "Bundle '{0}' (required by '{1}') is locked and cat not be installed."
msgstr "O bundle '{0}' requer o bundle com ID '{1}', que não foi encontrado."
-#: src/BundleManager.cs:501 src/BundleManager.cs:560
+#: src/BundleManager.cs:487 src/BundleManager.cs:546
#, fuzzy, csharp-format
msgid "Bundle '{0}' is locked and can not be installed."
msgstr "O bundle '{0}' não está preparado."
-#: src/BundleManager.cs:513
+#: src/BundleManager.cs:499
#, csharp-format
msgid "'{0}' is already installed."
msgstr "'{0}' já está instalado."
-#: src/BundleManager.cs:519
+#: src/BundleManager.cs:505
#, csharp-format
msgid "'{0}' is not installed."
msgstr "'{0}' não está instalado."
-#: src/BundleManager.cs:527
+#: src/BundleManager.cs:513
msgid "Preparing Bundles"
msgstr "Preparando Bundles"
-#: src/BundleManager.cs:552
+#: src/BundleManager.cs:538
msgid "Another transaction is already in progress"
msgstr "Já existe outra transação em andamento"
@@ -698,55 +698,55 @@
"Não é possível mudar o horário de início depois que a programação está em "
"execução"
-#: src/ServiceManager.cs:111
+#: src/ServiceManager.cs:102
msgid "Service Refresh"
msgstr "Atualização de Serviço"
-#: src/ServiceManager.cs:135
+#: src/ServiceManager.cs:126
msgid "Initial services are already loaded."
msgstr ""
-#: src/ServiceManager.cs:205
+#: src/ServiceManager.cs:196
msgid "Initial service file did not contain an URL."
msgstr "O arquivo de serviço inicial não contém um URL."
-#: src/ServiceManager.cs:233
+#: src/ServiceManager.cs:224
msgid "Mounting Initial Services"
msgstr "Montando Serviços Iniciais"
-#: src/ServiceManager.cs:298
+#: src/ServiceManager.cs:289
msgid "This service type requires a network connection, but none is present."
msgstr ""
-#: src/ServiceManager.cs:304
+#: src/ServiceManager.cs:295
#, csharp-format
msgid "Service '{0}' at '{1}' already exists on this client."
msgstr "O serviço '{0}' em '{1}' já existe neste cliente."
-#: src/ServiceManager.cs:318
+#: src/ServiceManager.cs:309
#, csharp-format
msgid "A service of type '{0}' already exists on this client"
msgstr "Um serviço do tipo '{0}' já existe neste cliente"
-#: src/ServiceManager.cs:361
+#: src/ServiceManager.cs:352
#, csharp-format
msgid "'{0}' is not a valid service type"
msgstr "'{0}' não é um tipo de serviço válido"
-#: src/ServiceManager.cs:386
+#: src/ServiceManager.cs:377
msgid "No suitable service types could be found"
msgstr ""
-#: src/ServiceManager.cs:550
+#: src/ServiceManager.cs:541
msgid "Refreshing Services"
msgstr "Atualizando Serviços"
-#: src/ServiceManager.cs:657
+#: src/ServiceManager.cs:651
#, csharp-format
msgid "The '{0}' service does not support registration."
msgstr "O serviço '{0}' não suporta registro."
-#: src/ServiceManager.cs:820
+#: src/ServiceManager.cs:814
#, csharp-format
msgid "Unknown service storage version '{0}'"
msgstr "Versão de armazenamento de serviço desconhecida '{0}'"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/zmd.pot new/zmd-7.1.1.0/po/zmd.pot
--- old/zmd-7.1.1.0/po/zmd.pot 2006-06-02 17:56:58.000000000 +0200
+++ new/zmd-7.1.1.0/po/zmd.pot 2006-06-07 23:18:30.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-02 11:56-0400\n"
+"POT-Creation-Date: 2006-06-07 17:18-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -264,46 +264,46 @@
msgid "No bundle with id '{0}' was found."
msgstr ""
-#: src/BundleManager.cs:443
+#: src/BundleManager.cs:429
#, csharp-format
msgid "Bundle '{0}' (requires '{1}') is locked and can not be removed"
msgstr ""
-#: src/BundleManager.cs:457 src/BundleManager.cs:566
+#: src/BundleManager.cs:443 src/BundleManager.cs:552
#, csharp-format
msgid "Bundle '{0}' is locked and can not be removed."
msgstr ""
-#: src/BundleManager.cs:482
+#: src/BundleManager.cs:468
#, csharp-format
msgid "Bundle '{0}' requires bundle with id '{1}', which was not found."
msgstr ""
-#: src/BundleManager.cs:486
+#: src/BundleManager.cs:472
#, csharp-format
msgid "Bundle '{0}' (required by '{1}') is locked and cat not be installed."
msgstr ""
-#: src/BundleManager.cs:501 src/BundleManager.cs:560
+#: src/BundleManager.cs:487 src/BundleManager.cs:546
#, csharp-format
msgid "Bundle '{0}' is locked and can not be installed."
msgstr ""
-#: src/BundleManager.cs:513
+#: src/BundleManager.cs:499
#, csharp-format
msgid "'{0}' is already installed."
msgstr ""
-#: src/BundleManager.cs:519
+#: src/BundleManager.cs:505
#, csharp-format
msgid "'{0}' is not installed."
msgstr ""
-#: src/BundleManager.cs:527
+#: src/BundleManager.cs:513
msgid "Preparing Bundles"
msgstr ""
-#: src/BundleManager.cs:552
+#: src/BundleManager.cs:538
msgid "Another transaction is already in progress"
msgstr ""
@@ -686,55 +686,55 @@
msgid "Cannot change start time after schedule is running"
msgstr ""
-#: src/ServiceManager.cs:111
+#: src/ServiceManager.cs:102
msgid "Service Refresh"
msgstr ""
-#: src/ServiceManager.cs:135
+#: src/ServiceManager.cs:126
msgid "Initial services are already loaded."
msgstr ""
-#: src/ServiceManager.cs:205
+#: src/ServiceManager.cs:196
msgid "Initial service file did not contain an URL."
msgstr ""
-#: src/ServiceManager.cs:233
+#: src/ServiceManager.cs:224
msgid "Mounting Initial Services"
msgstr ""
-#: src/ServiceManager.cs:298
+#: src/ServiceManager.cs:289
msgid "This service type requires a network connection, but none is present."
msgstr ""
-#: src/ServiceManager.cs:304
+#: src/ServiceManager.cs:295
#, csharp-format
msgid "Service '{0}' at '{1}' already exists on this client."
msgstr ""
-#: src/ServiceManager.cs:318
+#: src/ServiceManager.cs:309
#, csharp-format
msgid "A service of type '{0}' already exists on this client"
msgstr ""
-#: src/ServiceManager.cs:361
+#: src/ServiceManager.cs:352
#, csharp-format
msgid "'{0}' is not a valid service type"
msgstr ""
-#: src/ServiceManager.cs:386
+#: src/ServiceManager.cs:377
msgid "No suitable service types could be found"
msgstr ""
-#: src/ServiceManager.cs:550
+#: src/ServiceManager.cs:541
msgid "Refreshing Services"
msgstr ""
-#: src/ServiceManager.cs:657
+#: src/ServiceManager.cs:651
#, csharp-format
msgid "The '{0}' service does not support registration."
msgstr ""
-#: src/ServiceManager.cs:820
+#: src/ServiceManager.cs:814
#, csharp-format
msgid "Unknown service storage version '{0}'"
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/BundleManager.cs new/zmd-7.1.1.0/src/BundleManager.cs
--- old/zmd-7.1.1.0/src/BundleManager.cs 2006-06-01 00:32:48.000000000 +0200
+++ new/zmd-7.1.1.0/src/BundleManager.cs 2006-06-06 20:22:05.000000000 +0200
@@ -278,20 +278,6 @@
return (Catalog[]) ret.ToArray (typeof (Catalog));
}
- public static Catalog[] GetServiceCatalogs (Service service) {
- ArrayList ret = new ArrayList ();
-
- lock (catalogs) {
- foreach (Catalog cat in catalogs) {
- if (cat.Service == service) {
- ret.Add (cat);
- }
- }
- }
-
- return (Catalog[]) ret.ToArray (typeof (Catalog));
- }
-
public static IEnumerable Query (IList query) {
MultiEnumerable multi = new MultiEnumerable ();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/ChangeLog new/zmd-7.1.1.0/src/ChangeLog
--- old/zmd-7.1.1.0/src/ChangeLog 2006-06-01 18:41:07.000000000 +0200
+++ new/zmd-7.1.1.0/src/ChangeLog 2006-06-07 23:07:44.000000000 +0200
@@ -1,3 +1,53 @@
+2006-06-07 Chris Rivera
+
+ * ZenException.cs: correctly override GetObjectData() for the Key/Digest
+ exceptions.
+
+ * RemoteScheduleManager.cs: Mark the schedule list with view.
+
+2006-06-07 James Willcox
+
+ * ProcessProgress.cs: do Fail/Finish in the OnExit method, not
+ OnExitInternal, as subclasses need the ability to set their own
+ failure messages.
+
+2006-06-06 James Willcox
+
+ * ScheduleManager.cs: reset the sleep schedule before adding it
+
+2006-06-06 James Willcox
+
+ * Daemon.cs: ensure that the sleep schedule is not started until
+ after all initial services are added.
+
+2006-06-06 James Willcox
+
+ * Add the beginnings of a remoting event system
+ (RemoteEventDispatcher.cs, RemoteEventQueue.cs, IEventDispatcher.cs
+ IEventQueue.cs, EventMessage.cs)
+
+2006-06-06 Tambet Ingo
+
+ * BundleManager.cs: Revert Rian's patch to subscribe to all catalogs
+ which are single catalogs from a service.
+
+ * ServiceManager.cs: Ditto.
+
+2006-06-05 James Willcox
+
+ * Daemon.cs: don't start the sleep schedule until after remoting
+ has been started. Fixes Bug 178389.
+
+2006-06-03 Dan Mills
+
+ * ProcessProgress.cs (OnExitInternal): Run Finish () or Fail ()
+ depending on process exit code.
+
+2006-06-02 Dan Mills
+
+ * Makefile.am: Fix docdir to use DESTDIR, and mkdir /var/cache/zmd
+ when installing.
+
2006-06-01 James Willcox
* UnixClient.cs: don't like Sockets when setting a new one.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/Daemon.cs new/zmd-7.1.1.0/src/Daemon.cs
--- old/zmd-7.1.1.0/src/Daemon.cs 2006-06-01 18:41:07.000000000 +0200
+++ new/zmd-7.1.1.0/src/Daemon.cs 2006-06-07 00:09:56.000000000 +0200
@@ -337,7 +337,13 @@
Progress progress = ServiceManager.MountExisting ();
if (IsSleepResume && progress != null) {
log.Info ("Waiting for services to mount...");
+ progress.Stopped += delegate {
+ ScheduleManager.Instance.AddSleepSchedule ();
+ };
+
progress.WaitForStop ();
+ } else {
+ ScheduleManager.Instance.AddSleepSchedule ();
}
IsSleepResume = false;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/EventMessage.cs new/zmd-7.1.1.0/src/EventMessage.cs
--- old/zmd-7.1.1.0/src/EventMessage.cs 1970-01-01 01:00:00.000000000 +0100
+++ new/zmd-7.1.1.0/src/EventMessage.cs 2006-06-06 23:21:26.000000000 +0200
@@ -0,0 +1,15 @@
+using System;
+
+namespace Novell.Zenworks.Zmd.Public {
+
+ [Serializable]
+ public class EventMessage {
+ public string Name;
+ public object Data;
+
+ public EventMessage (string name, object data) {
+ Name = name;
+ Data = data;
+ }
+ }
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/IEventDispatcher.cs new/zmd-7.1.1.0/src/IEventDispatcher.cs
--- old/zmd-7.1.1.0/src/IEventDispatcher.cs 1970-01-01 01:00:00.000000000 +0100
+++ new/zmd-7.1.1.0/src/IEventDispatcher.cs 2006-06-06 23:21:26.000000000 +0200
@@ -0,0 +1,9 @@
+using System;
+
+namespace Novell.Zenworks.Zmd.Public {
+
+ public interface IEventDispatcher {
+ IEventQueue CreateQueue ();
+ void DestroyQueue (IEventQueue q);
+ }
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/IEventQueue.cs new/zmd-7.1.1.0/src/IEventQueue.cs
--- old/zmd-7.1.1.0/src/IEventQueue.cs 1970-01-01 01:00:00.000000000 +0100
+++ new/zmd-7.1.1.0/src/IEventQueue.cs 2006-06-06 23:21:26.000000000 +0200
@@ -0,0 +1,8 @@
+using System;
+
+namespace Novell.Zenworks.Zmd.Public {
+
+ public interface IEventQueue {
+ EventMessage GetNextEvent ();
+ }
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/Makefile.am new/zmd-7.1.1.0/src/Makefile.am
--- old/zmd-7.1.1.0/src/Makefile.am 2006-06-01 00:32:48.000000000 +0200
+++ new/zmd-7.1.1.0/src/Makefile.am 2006-06-06 23:21:26.000000000 +0200
@@ -113,6 +113,8 @@
$(srcdir)/QueryResult.cs \
$(srcdir)/RegistrationService.cs \
$(srcdir)/RemoteBundleManager.cs \
+ $(srcdir)/RemoteEventDispatcher.cs \
+ $(srcdir)/RemoteEventQueue.cs \
$(srcdir)/RemoteLifetimeManager.cs \
$(srcdir)/RemoteModuleLoader.cs \
$(srcdir)/RemotePreferenceManager.cs \
@@ -181,6 +183,9 @@
$(srcdir)/BundleQueryInfo.cs \
$(srcdir)/ResolverInfo.cs \
$(srcdir)/CatalogInfo.cs \
+ $(srcdir)/EventMessage.cs \
+ $(srcdir)/IEventDispatcher.cs \
+ $(srcdir)/IEventQueue.cs \
$(srcdir)/IKey.cs \
$(srcdir)/IKeyManager.cs \
$(srcdir)/IProgress.cs \
@@ -226,7 +231,7 @@
DOC_ASSEMBLER=@MONODOC@ --assemble
if HAVE_MONODOC
-docdir = `@MONODOC@ --get-sourcesdir`
+docdir = $(DESTDIR)`@MONODOC@ --get-sourcesdir`
doc_DATA = \
zmd-docs.zip \
zmd-docs.tree \
@@ -291,6 +296,7 @@
for asm in $(GAC_ASSEMBLIES); do \
$(GACUTIL) /i $$asm /package $(PACKAGE) /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib; \
done;
+ mkdir -p $(DESTDIR)$(localstatedir)/cache/zmd
if COPY_LIBS
mkdir -p $(DESTDIR)$(libdir)/zmd
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/Makefile.in new/zmd-7.1.1.0/src/Makefile.in
--- old/zmd-7.1.1.0/src/Makefile.in 2006-06-02 16:47:53.000000000 +0200
+++ new/zmd-7.1.1.0/src/Makefile.in 2006-06-06 23:58:34.000000000 +0200
@@ -367,6 +367,8 @@
$(srcdir)/QueryResult.cs \
$(srcdir)/RegistrationService.cs \
$(srcdir)/RemoteBundleManager.cs \
+ $(srcdir)/RemoteEventDispatcher.cs \
+ $(srcdir)/RemoteEventQueue.cs \
$(srcdir)/RemoteLifetimeManager.cs \
$(srcdir)/RemoteModuleLoader.cs \
$(srcdir)/RemotePreferenceManager.cs \
@@ -435,6 +437,9 @@
$(srcdir)/BundleQueryInfo.cs \
$(srcdir)/ResolverInfo.cs \
$(srcdir)/CatalogInfo.cs \
+ $(srcdir)/EventMessage.cs \
+ $(srcdir)/IEventDispatcher.cs \
+ $(srcdir)/IEventQueue.cs \
$(srcdir)/IKey.cs \
$(srcdir)/IKeyManager.cs \
$(srcdir)/IProgress.cs \
@@ -478,7 +483,7 @@
DOC_UPDATER = @MONODOCER@ -delete
DOC_ASSEMBLER = @MONODOC@ --assemble
-@HAVE_MONODOC_TRUE@docdir = `@MONODOC@ --get-sourcesdir`
+@HAVE_MONODOC_TRUE@docdir = $(DESTDIR)`@MONODOC@ --get-sourcesdir`
@HAVE_MONODOC_TRUE@doc_DATA = \
@HAVE_MONODOC_TRUE@ zmd-docs.zip \
@HAVE_MONODOC_TRUE@ zmd-docs.tree \
@@ -935,6 +940,7 @@
for asm in $(GAC_ASSEMBLIES); do \
$(GACUTIL) /i $$asm /package $(PACKAGE) /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib; \
done;
+ mkdir -p $(DESTDIR)$(localstatedir)/cache/zmd
@COPY_LIBS_TRUE@ mkdir -p $(DESTDIR)$(libdir)/zmd
@COPY_LIBS_TRUE@ $(INSTALL) `pkg-config --variable=libdir glib-2.0`/libglib-2.0.so.0 $(DESTDIR)$(libdir)/zmd
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/ProcessProgress.cs new/zmd-7.1.1.0/src/ProcessProgress.cs
--- old/zmd-7.1.1.0/src/ProcessProgress.cs 2006-06-01 00:32:48.000000000 +0200
+++ new/zmd-7.1.1.0/src/ProcessProgress.cs 2006-06-07 23:07:27.000000000 +0200
@@ -169,6 +169,10 @@
}
protected virtual void OnExit (object sender, EventArgs args) {
+ if (success)
+ Finish ();
+ else
+ Fail (String.Format (GettextCatalog.GetString ("Process exited with exit code {0}"), ExitCode));
}
private void StdoutReader () {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/RemoteEventDispatcher.cs new/zmd-7.1.1.0/src/RemoteEventDispatcher.cs
--- old/zmd-7.1.1.0/src/RemoteEventDispatcher.cs 1970-01-01 01:00:00.000000000 +0100
+++ new/zmd-7.1.1.0/src/RemoteEventDispatcher.cs 2006-06-06 23:21:26.000000000 +0200
@@ -0,0 +1,66 @@
+using System;
+using System.Collections;
+using System.Runtime.Remoting;
+using Novell.Zenworks.Zmd.Public;
+
+namespace Novell.Zenworks.Zmd {
+
+ [RemoteServer (Location="IEventDispatcher", Mode=WellKnownObjectMode.Singleton)]
+ public class RemoteEventDispatcher : MarshalByRefObject, IEventDispatcher {
+
+ private static RemoteEventDispatcher instance;
+
+ private ArrayList queues = new ArrayList ();
+
+ public static RemoteEventDispatcher Instance {
+ get {
+ if (instance == null)
+ instance = new RemoteEventDispatcher ();
+
+ return instance;
+ }
+ }
+
+ private RemoteEventDispatcher () {
+ // FIXME: hook up to a bunch of other events here
+ ServiceManager.ServiceRefreshed += delegate (Service service) {
+ Dispatch (new EventMessage ("service-refreshed", new RemoteService (service)));
+ };
+ }
+
+ public IEventQueue CreateQueue () {
+ RemoteEventQueue q = new RemoteEventQueue ();
+
+ lock (queues) {
+ q.Expired += OnQueueExpired;
+ queues.Add (q);
+
+ return q;
+ }
+ }
+
+ private void OnQueueExpired (object o, EventArgs args) {
+ lock (queues) {
+ queues.Remove (o);
+ }
+ }
+
+ public void DestroyQueue (IEventQueue q) {
+ lock (queues) {
+ ((RemoteEventQueue) q).Dispose ();
+ }
+ }
+
+ public void Dispatch (EventMessage msg) {
+ lock (queues) {
+ foreach (RemoteEventQueue q in queues) {
+ q.PushEvent (msg);
+ }
+ }
+ }
+
+ public override Object InitializeLifetimeService () {
+ return null;
+ }
+ }
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/RemoteEventQueue.cs new/zmd-7.1.1.0/src/RemoteEventQueue.cs
--- old/zmd-7.1.1.0/src/RemoteEventQueue.cs 1970-01-01 01:00:00.000000000 +0100
+++ new/zmd-7.1.1.0/src/RemoteEventQueue.cs 2006-06-06 23:21:26.000000000 +0200
@@ -0,0 +1,80 @@
+using System;
+using System.Collections;
+using System.Threading;
+using System.Runtime.Remoting.Lifetime;
+using Novell.Zenworks.Zmd.Public;
+
+namespace Novell.Zenworks.Zmd {
+
+ public class RemoteEventQueue : MarshalByRefObject, ISponsor, IEventQueue, IDisposable {
+
+ private Queue queue = new Queue ();
+ private bool disposed = false;
+ private DateTime lastPoll;
+ private bool isPolling;
+
+ public event EventHandler Expired;
+
+ public void Dispose () {
+ Dispose (true);
+ }
+
+ private void Dispose (bool disposing) {
+ if (Expired != null)
+ Expired (this, new EventArgs ());
+
+ if (disposing) {
+ disposed = true;
+ lock (queue) {
+ Monitor.Pulse (queue);
+ }
+ }
+ }
+
+ public EventMessage GetNextEvent () {
+ lock (queue) {
+ EventMessage msg;
+
+ if (queue.Count == 0) {
+ isPolling = true;
+ Monitor.Wait (queue);
+ isPolling = false;
+ }
+
+ if (disposed)
+ return null;
+
+ lastPoll = DateTime.Now;
+ return (EventMessage) queue.Dequeue ();
+ }
+ }
+
+ public void PushEvent (EventMessage msg) {
+ lock (queue) {
+ queue.Enqueue (msg);
+ Monitor.Pulse (queue);
+ }
+ }
+
+ public override object InitializeLifetimeService () {
+ ILease lease = (ILease) base.InitializeLifetimeService ();
+
+ lease.Register (this);
+ return lease;
+ }
+
+ public TimeSpan Renewal (ILease lease) {
+ lock (queue) {
+ if (!isPolling && DateTime.Now - lastPoll > TimeSpan.FromMinutes (1)) {
+ if (Expired != null) {
+ Expired (this, new EventArgs ());
+ }
+
+ return TimeSpan.FromSeconds (0);
+ } else {
+ return lease.InitialLeaseTime;
+ }
+ }
+ }
+ }
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/RemoteScheduleManager.cs new/zmd-7.1.1.0/src/RemoteScheduleManager.cs
--- old/zmd-7.1.1.0/src/RemoteScheduleManager.cs 2006-06-01 00:32:48.000000000 +0200
+++ new/zmd-7.1.1.0/src/RemoteScheduleManager.cs 2006-06-07 20:51:28.000000000 +0200
@@ -33,6 +33,7 @@
private static ArrayList extras = new ArrayList ();
public ScheduleInfo[] Schedules {
+ [Privilege ("view")]
get {
return GetScheduleInfo (ScheduleManager.Instance.Schedules);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/ScheduleManager.cs new/zmd-7.1.1.0/src/ScheduleManager.cs
--- old/zmd-7.1.1.0/src/ScheduleManager.cs 2006-06-01 00:32:48.000000000 +0200
+++ new/zmd-7.1.1.0/src/ScheduleManager.cs 2006-06-07 02:34:02.000000000 +0200
@@ -73,8 +73,6 @@
sleeper = new SleepSchedule ();
sleeper.Triggered += OnSleepTriggered;
- AddSchedule (sleeper);
-
maintenance = new RecurringSchedule ("Maintenance");
maintenance.PreventsSleep = false;
maintenance.StartTime = DateTime.Now;
@@ -84,6 +82,11 @@
AddSchedule (maintenance);
}
+ public void AddSleepSchedule () {
+ sleeper.Reset ();
+ AddSchedule (sleeper);
+ }
+
public DateTime GetWakeupTime () {
foreach (Schedule schedule in Schedules) {
if (!schedule.PreventsSleep || schedule.Next < DateTime.Now)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/ServiceManager.cs new/zmd-7.1.1.0/src/ServiceManager.cs
--- old/zmd-7.1.1.0/src/ServiceManager.cs 2006-06-01 18:41:07.000000000 +0200
+++ new/zmd-7.1.1.0/src/ServiceManager.cs 2006-06-06 23:21:26.000000000 +0200
@@ -56,6 +56,7 @@
public static event ServiceEventHandler ServiceAdded;
public static event ServiceEventHandler ServiceRemoved;
+ public static event ServiceEventHandler ServiceRefreshed;
public static ServiceType[] ServiceTypes {
get {
@@ -92,21 +93,11 @@
services = new ArrayList ();
disconnServices = new ArrayList ();
disconnExisting = new ArrayList ();
-
- ServiceAdded += SubscribeToSingleCatalog;
}
private ServiceManager () {
}
- private static void SubscribeToSingleCatalog (Service service) {
- Catalog[] cats = BundleManager.GetServiceCatalogs (service);
-
- if (cats.Length == 1) {
- cats[0].IsSubscribed = true;
- }
- }
-
private static void CreateRefreshSchedule () {
RefreshSchedule sched = new RefreshSchedule (GettextCatalog.GetString ("Service Refresh"));
sched.RecurrenceType = RecurrenceType.Custom;
@@ -579,6 +570,9 @@
if (progress.Status == ProgressStatus.Finished) {
service.Status = ServiceStatus.Active;
log.Info (String.Format ("Service '{0}' successfully refreshed", service.Name));
+
+ if (ServiceRefreshed != null)
+ ServiceRefreshed (service);
} else {
log.Error (String.Format ("Service refresh failed for '{0}': {1}", service.Name,
progress.GetError ()));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/ZenException.cs new/zmd-7.1.1.0/src/ZenException.cs
--- old/zmd-7.1.1.0/src/ZenException.cs 2006-06-01 00:38:23.000000000 +0200
+++ new/zmd-7.1.1.0/src/ZenException.cs 2006-06-07 00:01:33.000000000 +0200
@@ -35,7 +35,7 @@
File = info.GetString ("file");
}
- public void GetObjectData (SerializationInfo info, StreamingContext context) {
+ public override void GetObjectData (SerializationInfo info, StreamingContext context) {
base.GetObjectData (info, context);
info.AddValue ("file", File);
}
@@ -60,7 +60,7 @@
Fingerprint = info.GetString ("fingerprint");
}
- public void GetObjectData (SerializationInfo info, StreamingContext context) {
+ public override void GetObjectData (SerializationInfo info, StreamingContext context) {
base.GetObjectData (info, context);
info.AddValue ("name", Name);
info.AddValue ("id", Id);
@@ -87,7 +87,7 @@
Fingerprint = info.GetString ("fingerprint");
}
- public void GetObjectData (SerializationInfo info, StreamingContext context) {
+ public override void GetObjectData (SerializationInfo info, StreamingContext context) {
base.GetObjectData (info, context);
info.AddValue ("name", Name);
info.AddValue ("id", Id);
@@ -117,7 +117,7 @@
Fingerprint = info.GetString ("fingerprint");
}
- public void GetObjectData (SerializationInfo info, StreamingContext context) {
+ public override void GetObjectData (SerializationInfo info, StreamingContext context) {
base.GetObjectData (info, context);
info.AddValue ("file", File);
info.AddValue ("name", Name);
@@ -138,7 +138,7 @@
File = info.GetString ("file");
}
- public void GetObjectData (SerializationInfo info, StreamingContext context) {
+ public override void GetObjectData (SerializationInfo info, StreamingContext context) {
base.GetObjectData (info, context);
info.AddValue ("file", File);
}
@@ -160,7 +160,7 @@
Digest = info.GetString ("digest");
}
- public void GetObjectData (SerializationInfo info, StreamingContext context) {
+ public override void GetObjectData (SerializationInfo info, StreamingContext context) {
base.GetObjectData (info, context);
info.AddValue ("file", File);
info.AddValue ("digest", Digest);
@@ -186,7 +186,7 @@
ExpectedDigest = info.GetString ("expected-digest");
}
- public void GetObjectData (SerializationInfo info, StreamingContext context) {
+ public override void GetObjectData (SerializationInfo info, StreamingContext context) {
base.GetObjectData (info, context);
info.AddValue ("file", File);
info.AddValue ("wrong-digest", WrongDigest);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org