Hello community,
here is the log from the commit of package zmd
checked in at Fri Oct 13 03:54:07 CEST 2006.
--------
--- zmd/zmd.changes 2006-10-11 19:43:34.000000000 +0200
+++ /mounts/work_src_done/STABLE/zmd/zmd.changes 2006-10-13 00:09:31.000000000 +0200
@@ -1,0 +2,15 @@
+Thu Oct 12 23:59:18 CEST 2006 - maw@suse.de
+
+- New source drop (r35388) which:
+- Filters out duplicate and old patch updates (#201768)
+- Only prints transaction step and progress messages if debug
+ is on
+- Makes sure we listen to the Changed event when AddCatalog()
+ is called, even if the catalog already exists in the database;
+ this is required for existing catalogs to have their subscription
+ state stay in sync with the database
+- Adds triggers to automatically remove rows from delta_packages,
+ patch_packages, and patch_packages_baseversions tables
+- Updates DBVERSION to 4.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zmd.spec ++++++
--- /var/tmp/diff_new_pack.vMT9oL/_old 2006-10-13 03:53:45.000000000 +0200
+++ /var/tmp/diff_new_pack.vMT9oL/_new 2006-10-13 03:53:45.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.100.0
-Release: 10
+Release: 11
License: LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
@@ -184,6 +184,18 @@
%{_libdir}/pkgconfig/rpm-sharp.pc
%changelog -n zmd
+* Thu Oct 12 2006 - maw@suse.de
+- New source drop (r35388) which:
+- Filters out duplicate and old patch updates (#201768)
+- Only prints transaction step and progress messages if debug
+ is on
+- Makes sure we listen to the Changed event when AddCatalog()
+ is called, even if the catalog already exists in the database;
+ this is required for existing catalogs to have their subscription
+ state stay in sync with the database
+- Adds triggers to automatically remove rows from delta_packages,
+ patch_packages, and patch_packages_baseversions tables
+- Updates DBVERSION to 4.
* Mon Oct 09 2006 - maw@suse.de
- New source drop (r35239) which:
- Doesn't spin forever if the client returns no data, fixing an
++++++ zmd-7.1.100.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.100.0/modules/ChangeLog new/zmd-7.1.100.0/modules/ChangeLog
--- old/zmd-7.1.100.0/modules/ChangeLog 2006-10-09 19:02:59.000000000 +0200
+++ new/zmd-7.1.100.0/modules/ChangeLog 2006-10-12 23:13:22.000000000 +0200
@@ -1,3 +1,21 @@
+2006-10-12 Chris Rivera
+
+ * linux/Patch.cs: Make sure we filter out duplicate and old patch
+ updates. This fixes 201768.
+
+ * linux/ZyppBackend.cs:
+ * linux/RedCarpetBackend.cs:
+
+ Only print transaction step and progress messages if debug is on. This
+ was causing heavy spam in zmd's logs. This fixes 194783.
+
+2006-10-10 Chris Rivera
+
+ * linux/Database.cs: Make sure we listen to the Changed event when
+ AddCatalog() is called, even if the catalog already exists in the database.
+ This is required for existing catalogs to have their subscription state
+ stay in sync with the database.
+
2006-10-09 Tambet Ingo
* linux/Database.cs: Add triggers to automatically remove rows from
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.100.0/modules/linux/Database.cs new/zmd-7.1.100.0/modules/linux/Database.cs
--- old/zmd-7.1.100.0/modules/linux/Database.cs 2006-10-09 19:02:59.000000000 +0200
+++ new/zmd-7.1.100.0/modules/linux/Database.cs 2006-10-12 23:13:22.000000000 +0200
@@ -154,6 +154,8 @@
}
public static bool AddCatalog (Catalog catalog) {
+ catalog.Changed += UpdateCatalog;
+
if (Array.IndexOf (GetCatalogIds (), catalog.Id) >= 0)
return false;
@@ -161,8 +163,6 @@
writer.Write (catalog);
}
- catalog.Changed += UpdateCatalog;
-
return true;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.100.0/modules/linux/Patch.cs new/zmd-7.1.100.0/modules/linux/Patch.cs
--- old/zmd-7.1.100.0/modules/linux/Patch.cs 2006-09-08 18:40:47.000000000 +0200
+++ new/zmd-7.1.100.0/modules/linux/Patch.cs 2006-10-12 23:13:22.000000000 +0200
@@ -62,6 +62,27 @@
return latest;
}
+ private static IList FilterDuplicates (Patch[] patches) {
+ Hashtable ht = new Hashtable ();
+ foreach (Patch p in patches) {
+ if (!ht.Contains (p.Name)) {
+ ht[p.Name] = p;
+ } else {
+ Patch op = ht[p.Name] as Patch;
+ if (Backend.Current.CompareVersion (p, op) > 0) {
+ ht[p.Name] = p;
+ }
+ }
+ }
+
+ ArrayList ret = new ArrayList ();
+ foreach (Patch p in ht.Values) {
+ ret.Add (p);
+ }
+
+ return ret;
+ }
+
public static Patch[] GetUpdates () {
return GetUpdates (null);
}
@@ -80,7 +101,7 @@
ArrayList ret = null;
Patch[] patches = GetPatches (sb.ToString ());
- foreach (Patch p in patches) {
+ foreach (Patch p in FilterDuplicates (patches)) {
if (!p.RestartRequired) {
continue;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.100.0/modules/linux/RedCarpetBackend.cs new/zmd-7.1.100.0/modules/linux/RedCarpetBackend.cs
--- old/zmd-7.1.100.0/modules/linux/RedCarpetBackend.cs 2006-09-08 18:40:50.000000000 +0200
+++ new/zmd-7.1.100.0/modules/linux/RedCarpetBackend.cs 2006-10-12 23:13:22.000000000 +0200
@@ -142,7 +142,7 @@
Update (((double) (seqno - 1) / (double) steps) * 100.0, stepStr);
}
- log.Info (String.Format ("Transaction step. seqno {0} ({1})",
+ log.Debug (String.Format ("Transaction step. seqno {0} ({1})",
seqno, stepStr));
}
@@ -160,7 +160,7 @@
return;
}
- log.Info (String.Format ("Transaction progress. {0} of {1}", amount, total));
+ log.Debug (String.Format ("Transaction progress. {0} of {1}", amount, total));
double stepPercent = (double) (seqno - 1) / (double) steps;
stepPercent += ((double) 1 / (double) steps) * ((double) amount / (double) total);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.100.0/modules/linux/ZyppBackend.cs new/zmd-7.1.100.0/modules/linux/ZyppBackend.cs
--- old/zmd-7.1.100.0/modules/linux/ZyppBackend.cs 2006-09-26 18:41:10.000000000 +0200
+++ new/zmd-7.1.100.0/modules/linux/ZyppBackend.cs 2006-10-12 23:13:22.000000000 +0200
@@ -292,7 +292,7 @@
Update (((double) (seqno - 1) / (double) steps) * 100.0, stepStr);
}
- log.Info (String.Format ("Transaction step. seqno {0} ({1})",
+ log.Debug (String.Format ("Transaction step. seqno {0} ({1})",
seqno, stepStr));
}
@@ -312,7 +312,7 @@
return;
}
- log.Info (String.Format ("Transaction progress. {0} of {1}", amount, total));
+ log.Debug (String.Format ("Transaction progress. {0} of {1}", amount, total));
double stepPercent = (double) (seqno - 1) / (double) steps;
stepPercent += ((double) 1 / (double) steps) * ((double) amount / (double) total);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.100.0/po/zmd.pot new/zmd-7.1.100.0/po/zmd.pot
--- old/zmd-7.1.100.0/po/zmd.pot 2006-10-09 21:05:04.000000000 +0200
+++ new/zmd-7.1.100.0/po/zmd.pot 2006-10-12 23:13:35.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-09 14:05-0500\n"
+"POT-Creation-Date: 2006-10-12 17:13-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.100.0/src/BuildConfig.cs new/zmd-7.1.100.0/src/BuildConfig.cs
--- old/zmd-7.1.100.0/src/BuildConfig.cs 2006-10-09 21:04:39.000000000 +0200
+++ new/zmd-7.1.100.0/src/BuildConfig.cs 2006-10-03 21:02:33.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 = "/opt/breakout";
+ public const string SYSCONFDIR = "/opt/breakout/etc";
+ public const string DATADIR = "/opt/breakout/share";
+ public const string LIBDIR = "/opt/breakout/lib";
+ public const string LIBDIR_MANAGED = "/opt/breakout" + "/lib";
+ public const string LOCALSTATEDIR = "/opt/breakout/var";
- public const string LOGDIR = "/usr/local/var/log";
+ public const string LOGDIR = "/opt/breakout/var/log";
public const string LOGFILE = LOGDIR + "/zmd-messages.log";
public const string MODULE_PATH = LIBDIR_MANAGED + "/zmd/modules";
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org