Hello community, here is the log from the commit of package zmd checked in at Wed May 3 10:36:57 CEST 2006. -------- --- zmd/zmd.changes 2006-05-01 17:56:37.000000000 +0200 +++ STABLE/zmd/zmd.changes 2006-05-03 07:36:23.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 3 07:35:10 CEST 2006 - maw@suse.de + +- New source drop (r27768) which: +- Runs update-status after we call parse-metadata for zypp + services. (#170152) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zmd.spec ++++++ --- /var/tmp/diff_new_pack.O9WLKk/_old 2006-05-03 10:35:26.000000000 +0200 +++ /var/tmp/diff_new_pack.O9WLKk/_new 2006-05-03 10:35:26.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: dbus-1-mono 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: 31 +Release: 33 License: LGPL BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 @@ -155,6 +155,10 @@ # %{_libdir}/monodoc/sources/* %changelog -n zmd +* Wed May 03 2006 - maw@suse.de +- New source drop (r27768) which: +- Runs update-status after we call parse-metadata for zypp + services. (#170152) * Mon May 01 2006 - maw@suse.de - New source drop (r27683) which: - Marks a few bundle methods as view ++++++ 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-04-07 17:07:28.000000000 +0200 +++ new/zmd-7.1.1.0/ChangeLog 2006-05-02 17:07:36.000000000 +0200 @@ -1,3 +1,18 @@ +2006-05-02 Tambet Ingo <tambet@ximian.com> + + * Makefile.am: Install zmd.conf file with 0600 permissions. + +2006-05-01 James Willcox <james@ximian.com> + + * zmd.init.lsb.in: oops, making try-restart equivalent is to restart + is not what we want at all. Make SIGHUP cause zmd to restart + when it's ready, and have try-restart use that. + +2006-05-01 James Willcox <james@ximian.com> + + * zmd.init.lsb.in: don't send SIGQUIT to zmd. It doesn't handle it + at all anymore. + 2006-04-07 Dan Mills <thunder@ximian.com> * configure.in: Add a nano version. We are now version 7.1.1.0. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/Makefile.am new/zmd-7.1.1.0/Makefile.am --- old/zmd-7.1.1.0/Makefile.am 2006-03-15 20:56:39.000000000 +0100 +++ new/zmd-7.1.1.0/Makefile.am 2006-05-02 17:07:36.000000000 +0200 @@ -35,7 +35,7 @@ fi if test '!' -f $(DESTDIR)$(confdir)/zmd.conf; then \ - $(INSTALL_DATA) $(srcdir)/zmd.conf $(DESTDIR)$(confdir)/zmd.conf; \ + $(INSTALL_DATA) -m 0600 $(srcdir)/zmd.conf $(DESTDIR)$(confdir)/zmd.conf; \ fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/Makefile.in new/zmd-7.1.1.0/Makefile.in --- old/zmd-7.1.1.0/Makefile.in 2006-04-25 20:35:58.000000000 +0200 +++ new/zmd-7.1.1.0/Makefile.in 2006-05-02 23:27:04.000000000 +0200 @@ -771,7 +771,7 @@ fi if test '!' -f $(DESTDIR)$(confdir)/zmd.conf; then \ - $(INSTALL_DATA) $(srcdir)/zmd.conf $(DESTDIR)$(confdir)/zmd.conf; \ + $(INSTALL_DATA) -m 0600 $(srcdir)/zmd.conf $(DESTDIR)$(confdir)/zmd.conf; \ fi snap: dist 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-04-28 15:33:41.000000000 +0200 +++ new/zmd-7.1.1.0/modules/ChangeLog 2006-05-03 01:55:48.000000000 +0200 @@ -1,3 +1,13 @@ +2006-05-02 Chris Rivera <cmr@ximian.com> + + * linux/ZyppService.cs: call update-status after the metadata is parsed. + +2006-05-02 Tambet Ingo <tambet@ximian.com> + + * linux/RCEPackage.cs: Optimze the XML parser. Don't create new string + per each (possibly duplicate) dependency. Don't intern string since + they come from XmlNameTable already. + 2006-04-28 Tambet Ingo <tambet@ximian.com> * linux/RemotePackageManager.cs: Mark QueryLatest with "view" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/RCEPackage.cs new/zmd-7.1.1.0/modules/linux/RCEPackage.cs --- old/zmd-7.1.1.0/modules/linux/RCEPackage.cs 2006-04-25 23:00:02.000000000 +0200 +++ new/zmd-7.1.1.0/modules/linux/RCEPackage.cs 2006-05-02 17:07:35.000000000 +0200 @@ -32,7 +32,46 @@ } private static int GetDepKey (string name, string epoch, string version, string release, string op) { - return String.Format ("{0}{1}{2}{3}{4}", op, name, epoch, version, release).GetHashCode (); + int h = 0; + int i, len; + + // That's what other mono classes do to avoid creation of new strings to get the hash code + // of multiple strings. + + if (name != null) { + len = name.Length; + for (i = 0; i < len; i++) + h = (h << 5) - h + name[i]; + } + + if (epoch != null) { + len = epoch.Length; + for (i = 0; i < len; i++) + h = (h << 5) - h + epoch[i]; + } + + if (version != null) { + len = version.Length; + for (i = 0; i < len; i++) + h = (h << 5) - h + version[i]; + } + + if (release != null) { + len = release.Length; + for (i = 0; i < len; i++) + h = (h << 5) - h + release[i]; + } + + if (op != null) { + len = op.Length; + for (i = 0; i < len; i++) + h = (h << 5) - h + op[i]; + } + + // h must be be >= 0 + h &= 0x7FFFFFFF; + + return h; } private static void ParseDeps (ResolvableDepCollection collection, Hashtable dephash, XmlTextReader reader, @@ -53,8 +92,13 @@ if (!reader.HasAttributes) continue; - int key = GetDepKey (reader["name"], reader["epoch"], reader["version"], reader["release"], - reader["op"]); + string name = reader["name"]; + string epoch = reader["epoch"]; + string version = reader["version"]; + string release = reader["release"]; + string op = reader["op"]; + + int key = GetDepKey (name, epoch, version, release, op); ResolvableDep dep = (ResolvableDep) dephash[key]; if (dep != null) { @@ -63,29 +107,25 @@ } else { dep = new ResolvableDep (); } - - string tmp; - ResolvableOperation op = ResolvableOperation.Any; - tmp = reader["op"]; - if (tmp != null) - op = ResolvableDep.OperationFromString (tmp); - - dep.Name = String.Intern (reader["name"]); - - tmp = reader["epoch"]; - if (tmp != null) - dep.Epoch = XmlConvert.ToInt32 (tmp); + ResolvableOperation operation = ResolvableOperation.Any; + if (op != null) + operation = ResolvableDep.OperationFromString (op); + + dep.Name = name; + + if (epoch != null) + dep.Epoch = XmlConvert.ToInt32 (epoch); else dep.Epoch = 0; - if (reader["version"] != null) - dep.Version = String.Intern (reader["version"]); + if (version != null) + dep.Version = version; - if (reader["release"] != null) - dep.Release = String.Intern (reader["release"]); - - dep.Operation = op; + if (release != null) + dep.Release = release; + + dep.Operation = operation; collection.Add (dep); dephash[key] = dep; } 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-04-24 20:04:00.000000000 +0200 +++ new/zmd-7.1.1.0/modules/linux/ZyppService.cs 2006-05-02 23:18:03.000000000 +0200 @@ -131,6 +131,7 @@ private void DoRefresh () { Backend.Current.ParseMetadata ("zypp", typeof (ZyppPackage), uri, uri, catalog); BundleManager.Add (catalog); + RedCarpetBackend.UpdatePatchStatus (); lock (this) { refreshProgress.Finish (); 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-05-01 17:33:34.000000000 +0200 +++ new/zmd-7.1.1.0/po/de_DE.po 2006-05-03 02:03:56.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-01 11:33-0400\n" +"POT-Creation-Date: 2006-05-02 20:03-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher@novell.com>\n" "Language-Team: LANGUAGE <language@novell.com>\n" @@ -449,16 +449,16 @@ msgid "Don't load initial services" msgstr "Ursprüngliche Dienste nicht laden" -#: src/Daemon.cs:233 +#: src/Daemon.cs:232 #, csharp-format msgid "Unknown certificate extension for: {0}" msgstr "Unbekannte Zertifikaterweiterung für: {0}" -#: src/Daemon.cs:248 +#: src/Daemon.cs:247 msgid "A daemon is already running" msgstr "Es wird bereits ein Daemon ausgeführt." -#: src/Daemon.cs:307 +#: src/Daemon.cs:306 msgid "Loading trusted certificates..." msgstr "Vertrauenswürdige Zertifikate werden geladen..." 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-05-01 17:33:34.000000000 +0200 +++ new/zmd-7.1.1.0/po/en_US.po 2006-05-03 02:03:56.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-01 11:33-0400\n" +"POT-Creation-Date: 2006-05-02 20:03-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher@novell.com>\n" "Language-Team: LANGUAGE <language@novell.com>\n" @@ -439,16 +439,16 @@ msgid "Don't load initial services" msgstr "Don't load initial services" -#: src/Daemon.cs:233 +#: src/Daemon.cs:232 #, csharp-format msgid "Unknown certificate extension for: {0}" msgstr "Unknown certificate extension for: {0}" -#: src/Daemon.cs:248 +#: src/Daemon.cs:247 msgid "A daemon is already running" msgstr "A daemon is already running" -#: src/Daemon.cs:307 +#: src/Daemon.cs:306 msgid "Loading trusted certificates..." msgstr "Loading trusted certificates..." 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-05-01 17:33:34.000000000 +0200 +++ new/zmd-7.1.1.0/po/es_ES.po 2006-05-03 02:03:56.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-01 11:33-0400\n" +"POT-Creation-Date: 2006-05-02 20:03-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher@novell.com>\n" "Language-Team: LANGUAGE <language@novell.com>\n" @@ -447,16 +447,16 @@ msgid "Don't load initial services" msgstr "No cargar servicios iniciales" -#: src/Daemon.cs:233 +#: src/Daemon.cs:232 #, csharp-format msgid "Unknown certificate extension for: {0}" msgstr "Extensión de certificado desconocida para: {0}" -#: src/Daemon.cs:248 +#: src/Daemon.cs:247 msgid "A daemon is already running" msgstr "Ya hay un daemon ejecutándose" -#: src/Daemon.cs:307 +#: src/Daemon.cs:306 msgid "Loading trusted certificates..." msgstr "Cargando certificados de confianza..." 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-05-01 17:33:34.000000000 +0200 +++ new/zmd-7.1.1.0/po/fr_FR.po 2006-05-03 02:03:56.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-01 11:33-0400\n" +"POT-Creation-Date: 2006-05-02 20:03-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher@novell.com>\n" "Language-Team: LANGUAGE <language@novell.com>\n" @@ -453,16 +453,16 @@ msgid "Don't load initial services" msgstr "Ne pas charger de services initiaux" -#: src/Daemon.cs:233 +#: src/Daemon.cs:232 #, csharp-format msgid "Unknown certificate extension for: {0}" msgstr "Extension du certificat inconnue pour : {0}" -#: src/Daemon.cs:248 +#: src/Daemon.cs:247 msgid "A daemon is already running" msgstr "Un daemon est déjà en cours d'exécution" -#: src/Daemon.cs:307 +#: src/Daemon.cs:306 msgid "Loading trusted certificates..." msgstr "Chargement des certificats autorisés..." 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-05-01 17:33:35.000000000 +0200 +++ new/zmd-7.1.1.0/po/pt_BR.po 2006-05-03 02:03:56.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-01 11:33-0400\n" +"POT-Creation-Date: 2006-05-02 20:03-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher@novell.com>\n" "Language-Team: LANGUAGE <language@novell.com>\n" @@ -442,16 +442,16 @@ msgid "Don't load initial services" msgstr "Não carregar serviços iniciais" -#: src/Daemon.cs:233 +#: src/Daemon.cs:232 #, csharp-format msgid "Unknown certificate extension for: {0}" msgstr "Extensão de certificado desconhecida para: {0}" -#: src/Daemon.cs:248 +#: src/Daemon.cs:247 msgid "A daemon is already running" msgstr "Já existe um daemon em execução" -#: src/Daemon.cs:307 +#: src/Daemon.cs:306 msgid "Loading trusted certificates..." msgstr "Carregando certificados confiáveis..." 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-05-01 17:33:34.000000000 +0200 +++ new/zmd-7.1.1.0/po/zmd.pot 2006-05-03 02:03:56.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-01 11:33-0400\n" +"POT-Creation-Date: 2006-05-02 20:03-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -437,16 +437,16 @@ msgid "Don't load initial services" msgstr "" -#: src/Daemon.cs:233 +#: src/Daemon.cs:232 #, csharp-format msgid "Unknown certificate extension for: {0}" msgstr "" -#: src/Daemon.cs:248 +#: src/Daemon.cs:247 msgid "A daemon is already running" msgstr "" -#: src/Daemon.cs:307 +#: src/Daemon.cs:306 msgid "Loading trusted certificates..." 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-05-01 17:33:29.000000000 +0200 +++ new/zmd-7.1.1.0/src/BuildConfig.cs 2006-05-03 02:03:52.000000000 +0200 @@ -1,14 +1,14 @@ namespace Novell.Zenworks.Zmd { public class BuildConfig { - public const string PREFIX = "/opt/zypp"; - public const string SYSCONFDIR = "/opt/zypp/etc"; - public const string DATADIR = "/opt/zypp/share"; - public const string LIBDIR = "/opt/zypp/lib"; - public const string LIBDIR_MANAGED = "/opt/zypp" + "/lib"; - public const string LOCALSTATEDIR = "/opt/zypp/var"; + public const string PREFIX = "/usr"; + public const string SYSCONFDIR = "/etc"; + public const string DATADIR = "/usr/share"; + public const string LIBDIR = "/usr/lib64"; + public const string LIBDIR_MANAGED = "/usr" + "/lib"; + public const string LOCALSTATEDIR = "/var"; - public const string LOGDIR = "/opt/zypp/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-04-28 18:20:47.000000000 +0200 +++ new/zmd-7.1.1.0/src/ChangeLog 2006-05-02 17:07:35.000000000 +0200 @@ -1,3 +1,8 @@ +2006-05-02 Tambet Ingo <tambet@ximian.com> + + * Daemon.cs: Set IsSleepResume to false after initial services are + loaded. Fixes #171042. + 2006-04-28 Chris Rivera <cmr@ximian.com> * RemoteBundleManager.cs: Mark a few bundle methods with the view priv. 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-04-25 23:00:02.000000000 +0200 +++ new/zmd-7.1.1.0/src/Daemon.cs 2006-05-02 17:07:35.000000000 +0200 @@ -145,8 +145,7 @@ log.Info("Received signal " + sig.ToString ()); if (sig == Signum.SIGHUP) { - ModuleLoader.Load (); - ServiceManager.Refresh (); + ShutdownManager.Restart (false); } else { ShutdownManager.Shutdown (false); } @@ -334,6 +333,7 @@ progress.WaitForStop (); } + IsSleepResume = false; CreateChannelSinks (); RegisterRemotableObjects (); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/zmd.init.lsb.in new/zmd-7.1.1.0/zmd.init.lsb.in --- old/zmd-7.1.1.0/zmd.init.lsb.in 2006-04-05 21:20:18.000000000 +0200 +++ new/zmd-7.1.1.0/zmd.init.lsb.in 2006-05-02 17:07:35.000000000 +0200 @@ -15,7 +15,7 @@ # Visit http://www.novell.com for more information. ### END INIT INFO -# $Id: zmd.init.lsb.in 26734 2006-04-05 18:52:33Z rhunter $ +# $Id: zmd.init.lsb.in 27746 2006-05-01 23:53:34Z james $ # Source SuSE config PATH=/sbin:/bin:/usr/sbin:/usr/bin @@ -146,7 +146,7 @@ echo -n "Restarting ZENworks Management Daemon: " if check_running; then \ - kill -QUIT `cat /var/run/zmd.pid` + kill -HUP `cat /var/run/zmd.pid` fi rc_status -v ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root@suse.de