Hello community,
here is the log from the commit of package zmd
checked in at Wed Jul 5 11:47:38 CEST 2006.
--------
--- zmd/zmd.changes 2006-06-30 19:51:03.000000000 +0200
+++ zmd/zmd.changes 2006-07-01 00:59:31.000000000 +0200
@@ -1,0 +2,16 @@
+Sat Jul 1 00:59:04 CEST 2006 - maw@suse.de
+
+- Remove dont-remove-on-max-retries.patch, as it is now present
+ in r31486.
+
+-------------------------------------------------------------------
+Fri Jun 30 23:48:40 CEST 2006 - maw@suse.de
+
+- New source drop (r31486) which:
+- Fixs a problem where ServiceManager could return a reference
+ that got set to null on refresh completion
+- On refresh of zypp services, only drops catalogs, doesn't clear
+ them first (#188086)
+- Fixes other various locking fixes (more #188086).
+
+-------------------------------------------------------------------
Old:
----
dont-remove-on-max-retries.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zmd.spec ++++++
--- /var/tmp/diff_new_pack.fvRIaf/_old 2006-07-05 11:47:07.000000000 +0200
+++ /var/tmp/diff_new_pack.fvRIaf/_new 2006-07-05 11:47:07.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: 61
+Release: 62
License: LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
@@ -29,7 +29,6 @@
Patch7: zmd-init.patch
Patch8: logrotate.patch
Patch9: zmd-inventory-disable.patch
-Patch10: dont-remove-on-max-retries.patch
Summary: Novell ZENworks Linux Management daemon
Group: System/Daemons
Autoreqprov: on
@@ -82,7 +81,6 @@
%patch7
%patch8
%patch9
-%patch10
%build
libtoolize -f
@@ -175,6 +173,16 @@
# %{_libdir}/monodoc/sources/*
%changelog -n zmd
+* Sat Jul 01 2006 - maw@suse.de
+- Remove dont-remove-on-max-retries.patch, as it is now present
+ in r31486.
+* Fri Jun 30 2006 - maw@suse.de
+- New source drop (r31486) which:
+- Fixs a problem where ServiceManager could return a reference
+ that got set to null on refresh completion
+- On refresh of zypp services, only drops catalogs, doesn't clear
+ them first (#188086)
+- Fixes other various locking fixes (more #188086).
* Fri Jun 30 2006 - maw@suse.de
- New patch (dont-remove-on-max-retries.patch) which:
- Doesn't remove services when we've reached the max no. of
++++++ zmd-7.1.1.0.tar.bz2 ++++++
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-27 20:52:13.000000000 +0200
+++ new/zmd-7.1.1.0/modules/ChangeLog 2006-06-30 22:47:06.000000000 +0200
@@ -1,3 +1,13 @@
+2006-06-30 Dan Mills
+
+ * linux/ZyppService.cs (Remove): Don't clear the catalog, just
+ remove it. Fixes (or greatly improves) #188086.
+
+ * linux/SqlPackage.cs (RemovePackages):
+ * linux/RedCarpetBackend.cs:
+
+ Locking fixes.
+
2006-06-27 Dan Mills
* linux/RedCarpetBackend.cs: Serialize our catalog
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs new/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs
--- old/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs 2006-06-27 20:11:30.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs 2006-06-30 21:46:01.000000000 +0200
@@ -156,21 +156,27 @@
foreach (Package pkg in catalog) {
pkg.FileNameChanged -= OnPackageFileNameChanged;
}
- SqlPackage.RemovePackages (catalog);
+ lock (catalogLock) {
+ SqlPackage.RemovePackages (catalog);
+ }
}
private void OnPackagesAddedToCatalog (object o, ICollection pkgs) {
foreach (Package pkg in pkgs) {
pkg.FileNameChanged += OnPackageFileNameChanged;
}
- SqlPackage.AddPackages (pkgs);
+ lock (catalogLock) {
+ SqlPackage.AddPackages (pkgs);
+ }
}
private void OnPackagesRemovedFromCatalog (object o, ICollection pkgs) {
foreach (Package pkg in pkgs) {
pkg.FileNameChanged -= OnPackageFileNameChanged;
}
- SqlPackage.RemovePackages (pkgs);
+ lock (catalogLock) {
+ SqlPackage.RemovePackages (pkgs);
+ }
}
private void OnPackageFileNameChanged (object o, EventArgs args) {
@@ -1344,8 +1350,8 @@
cmd.Parameters.Add (id);
cmd.Prepare ();
- Database.Begin ();
Database.GetLock (false);
+ Database.Begin ();
try {
if (installs != null) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/SqlPackage.cs new/zmd-7.1.1.0/modules/linux/SqlPackage.cs
--- old/zmd-7.1.1.0/modules/linux/SqlPackage.cs 2006-06-22 20:45:06.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/SqlPackage.cs 2006-06-29 22:05:01.000000000 +0200
@@ -211,6 +211,7 @@
if (pkgs.Count < 1)
return;
+ Database.GetLock (false);
Database.Begin ();
IDbCommand command = Database.Connection.CreateCommand ();
command.CommandText = "DELETE FROM resolvables WHERE id = ?";
@@ -218,8 +219,6 @@
IDataParameter id = new SqliteParameter ("id", DbType.Int64);
command.Parameters.Add (id);
- Database.GetLock (false);
-
try {
foreach (Package pkg in pkgs) {
id.Value = pkg.Id;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/ZyppService.cs new/zmd-7.1.1.0/modules/linux/ZyppService.cs
--- old/zmd-7.1.1.0/modules/linux/ZyppService.cs 2006-06-27 20:12:11.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/ZyppService.cs 2006-06-30 20:45:10.000000000 +0200
@@ -105,7 +105,6 @@
private void Remove () {
if (catalog != null && BundleManager.LookupCatalogById (catalog.Id) != null) {
- catalog.Clear ();
BundleManager.Remove (catalog);
}
}
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-28 22:25:59.000000000 +0200
+++ new/zmd-7.1.1.0/po/zmd.pot 2006-06-30 22:55:25.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-28 16:25-0400\n"
+"POT-Creation-Date: 2006-06-30 16:55-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -725,16 +725,16 @@
msgid "No suitable service types could be found"
msgstr ""
-#: src/ServiceManager.cs:563
+#: src/ServiceManager.cs:565
msgid "Refreshing Services"
msgstr ""
-#: src/ServiceManager.cs:673
+#: src/ServiceManager.cs:680
#, csharp-format
msgid "The '{0}' service does not support registration."
msgstr ""
-#: src/ServiceManager.cs:836
+#: src/ServiceManager.cs:843
#, 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/BuildConfig.cs new/zmd-7.1.1.0/src/BuildConfig.cs
--- old/zmd-7.1.1.0/src/BuildConfig.cs 2006-06-28 16:59:41.000000000 +0200
+++ new/zmd-7.1.1.0/src/BuildConfig.cs 2006-06-30 21:47:24.000000000 +0200
@@ -1,14 +1,14 @@
namespace Novell.Zenworks.Zmd {
public class BuildConfig {
- public const string PREFIX = "/usr/local";
- public const string SYSCONFDIR = "/usr/local/etc";
- public const string DATADIR = "/usr/local/share";
- public const string LIBDIR = "/usr/local/lib";
- public const string LIBDIR_MANAGED = "/usr/local" + "/lib";
- public const string LOCALSTATEDIR = "/usr/local/var";
+ public const string PREFIX = "/usr";
+ public const string SYSCONFDIR = "/etc";
+ public const string DATADIR = "/usr/share";
+ public const string LIBDIR = "/usr/lib";
+ public const string LIBDIR_MANAGED = "/usr" + "/lib";
+ public const string LOCALSTATEDIR = "/var";
- public const string LOGDIR = "/usr/local/var/log";
+ public const string LOGDIR = "/var/log";
public const string LOGFILE = LOGDIR + "/zmd-messages.log";
public const string MODULE_PATH = LIBDIR_MANAGED + "/zmd/modules";
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-27 21:09:57.000000000 +0200
+++ new/zmd-7.1.1.0/src/ChangeLog 2006-06-30 22:43:24.000000000 +0200
@@ -1,3 +1,14 @@
+2006-06-30 Dan Mills
+
+ * ServiceManager.cs (Refresh): Return a new reference to the
+ refreshProgress if it's already running. Catch exceptions during
+ each service's Refresh and make a failed progress for those.
+
+2006-06-28 James Willcox
+
+ * ServiceManager.cs: don't remove services when we've reached the
+ max number of retries. Fixes Bug #184813
+
2006-06-27 Dan Mills
* Prefs.cs: Revert change that split inventory-enabled into two.
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-28 22:25:41.000000000 +0200
+++ new/zmd-7.1.1.0/src/ServiceManager.cs 2006-06-30 22:38:33.000000000 +0200
@@ -474,7 +474,6 @@
if (schedule.Attempts >= PreferenceManager.GetInteger ("max-retries")) {
ScheduleManager.Instance.RemoveSchedule (schedule);
- Remove (schedule.Service);
log.Error (String.Format ("Maximum number of retry attempts reached for adding service '{0}'",
schedule.Service.Uri));
@@ -556,9 +555,12 @@
public static Progress Refresh () {
lock (typeof (ServiceManager)) {
- // If a refresh is already in progress, return that
- if (refreshProgress != null)
- return refreshProgress;
+ // If a refresh is already in progress, return that.
+ // See comment below for why we make a new reference.
+ if (refreshProgress != null) {
+ Progress ret = refreshProgress;
+ return ret;
+ }
refreshProgress = new MultiProgress (GettextCatalog.GetString ("Refreshing Services"));
refreshProgress.KillChildren = false;
@@ -650,14 +652,19 @@
return progress;
ShutdownManager.Block ();
-
- progress = service.Refresh ();
-
- progress.SetData ("service", service);
-
- busyServices[GetServiceKey (service.Uri, service.ServiceType.Alias)] = progress;
- progress.Stopped += OnServiceRefreshFinished;
-
+
+ try {
+ progress = service.Refresh ();
+ progress.SetData ("service", service);
+ busyServices[GetServiceKey (service.Uri, service.ServiceType.Alias)] = progress;
+ progress.Stopped += OnServiceRefreshFinished;
+ } catch (Exception e) {
+ progress = new Progress ("failed service");
+ progress.Fail (e, "Service refresh raised an exception.");
+ log.Error (String.Format ("Service refresh failed for '{0}': {1}", service.Name,
+ progress.GetError ()));
+ }
+
return progress;
}
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org