Hello community, here is the log from the commit of package zmd checked in at Fri Jun 2 02:16:23 CEST 2006. -------- --- zmd/zmd.changes 2006-05-31 02:46:57.000000000 +0200 +++ zmd/zmd.changes 2006-06-01 19:17:57.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Jun 1 19:16:49 CEST 2006 - maw@suse.de + +- New source drop (r29565) which: +- Fixes #180392 +- Implements unmount for all services types +- Makes sure we properly fail the progress when we run into + key/digest errors +- Doesn't leak sockets when setting a new one +- Makes sure new Key/Digest exceptions are serialized correctly. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zmd.spec ++++++ --- /var/tmp/diff_new_pack.C8h8v3/_old 2006-06-02 02:16:11.000000000 +0200 +++ /var/tmp/diff_new_pack.C8h8v3/_new 2006-06-02 02:16:11.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: 45 +Release: 46 License: LGPL BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 @@ -159,6 +159,14 @@ # %{_libdir}/monodoc/sources/* %changelog -n zmd +* Thu Jun 01 2006 - maw@suse.de +- New source drop (r29565) which: +- Fixes #180392 +- Implements unmount for all services types +- Makes sure we properly fail the progress when we run into + key/digest errors +- Doesn't leak sockets when setting a new one +- Makes sure new Key/Digest exceptions are serialized correctly. * Wed May 31 2006 - maw@suse.de - New source drop (r29403) which: - Adds new exceptions for key and digest errors ++++++ zmd-7.1.1.0.tar.bz2 ++++++ ++++ 1603 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 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-05-31 00:13:24.000000000 +0200 +++ new/zmd-7.1.1.0/modules/ChangeLog 2006-06-01 18:43:33.000000000 +0200 @@ -1,3 +1,25 @@ +2006-06-01 Chris Rivera <cmr@ximian.com> + + * linux/RemotePackageManager.cs: Sigh. s/GetPatchInfo/GetResolvableInfo/ + for Products and Patterns. This fixes 180392. + +2006-06-01 Tambet Ingo <tambet@ximian.com> + + * linux/NUService.cs: Implement Unmount. + + * linux/YumService.cs: Ditto. + + * linux/RCEService.cs: Ditto. + + * linux/ZyppService.cs: Ditto. + + * linux/MountService.cs: Ditto. + +2006-05-31 Chris Rivera <cmr@ximian.com> + + * linux/RedCarpetBackend.cs: Make sure we properly fail the progress + when we run into key/digest errors. + 2006-05-30 Chris Rivera <cmr@ximian.com> * linux/RedCarpetBackend.cs: Change the key/digest related parsing diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1.0/modules/linux/MountService.cs new/zmd-7.1.1.0/modules/linux/MountService.cs --- old/zmd-7.1.1.0/modules/linux/MountService.cs 2006-04-06 19:01:09.000000000 +0200 +++ new/zmd-7.1.1.0/modules/linux/MountService.cs 2006-06-01 18:41:07.000000000 +0200 @@ -35,7 +35,6 @@ private string path; private bool recursive = false; private ResolvableCatalog catalog; - protected bool disposed; public MountService () { this.remote = false; // we don't require network @@ -138,13 +137,14 @@ catalog.IsSubscribed = true; } - protected override void Dispose (bool disposing) { - if (!disposed) { - if (disposing) { - Remove (); - } + public override void Unmount (UnmountType type) { + if (type == UnmountType.Regular) + Remove (); + } - disposed = true; + protected override void Dispose (bool disposing) { + if (disposing) { + Unmount (UnmountType.Regular); } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1.0/modules/linux/NUService.cs new/zmd-7.1.1.0/modules/linux/NUService.cs --- old/zmd-7.1.1.0/modules/linux/NUService.cs 2006-05-26 17:09:06.000000000 +0200 +++ new/zmd-7.1.1.0/modules/linux/NUService.cs 2006-06-01 18:41:07.000000000 +0200 @@ -33,8 +33,6 @@ namespace Novell.Zenworks.Zmd.Packaging { public class NUService : Service, IRegisterable { - protected bool disposed; - private string repoUri; private ResolvableCatalog[] catalogs; private WebCache cache; @@ -95,13 +93,14 @@ return Refresh (); } - protected override void Dispose (bool disposing) { - if (!disposed) { - if (disposing) { - Remove (); - } + public override void Unmount (UnmountType type) { + if (type == UnmountType.Regular) + Remove (); + } - disposed = true; + protected override void Dispose (bool disposing) { + if (disposing) { + Unmount (UnmountType.Regular); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1.0/modules/linux/RCEService.cs new/zmd-7.1.1.0/modules/linux/RCEService.cs --- old/zmd-7.1.1.0/modules/linux/RCEService.cs 2006-05-23 17:51:01.000000000 +0200 +++ new/zmd-7.1.1.0/modules/linux/RCEService.cs 2006-06-01 18:41:07.000000000 +0200 @@ -44,7 +44,6 @@ private WebCache cache; private RCECatalog[] catalogs; private Hashtable dephash; - private bool ignoreDispose; public RCEService () { cache = new WebCache (); @@ -105,7 +104,6 @@ ShutdownManager.SleepData[uri + type + "id"] = id; ShutdownManager.SleepData[uri + type + "name"] = name; ShutdownManager.SleepData[uri + type + "x-rc-auth"] = cache.RequestHeaders["X-RC-Auth"]; - ignoreDispose = true; } } @@ -192,12 +190,18 @@ catalogs = null; } - protected override void Dispose (bool disposing) { - if (!disposed && disposing && !ignoreDispose) { + public override void Unmount (UnmountType type) { + if (type == UnmountType.Regular) { RemoveCatalogs (); } } + protected override void Dispose (bool disposing) { + if (disposing) { + Unmount (UnmountType.Regular); + } + } + ~RCEService () { Dispose (false); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 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-05-31 00:10:11.000000000 +0200 +++ new/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs 2006-06-01 01:12:25.000000000 +0200 @@ -271,7 +271,6 @@ Database.GetLock (false); ProcessStartInfo info = new ProcessStartInfo (Path.Combine (prefix, "parse-metadata")); - info.EnvironmentVariables["KEYRING_CALLBACK"] = "y"; info.Arguments = String.Format ("'{0}' '{1}' '{2}' '{3}' '{4}'", DatabasePath, type, uri, path, catalog.Id); RCProgress progress = new RCProgress (); @@ -647,9 +646,8 @@ WriteToStdin ("1\n"); } else { string msg = String.Format ("Unsigned file '{0}'", pieces[1]); - exception = new UnsignedFileException (msg, pieces[1]); - log.Debug (msg); WriteToStdin ("0\n"); + Fail (new UnsignedFileException (msg, pieces[1]), msg); } } @@ -663,9 +661,8 @@ WriteToStdin ("1\n"); } else { string msg = String.Format ("Unknown key '{0}' ({1})", pieces[3], pieces[2]); - exception = new UnknownKeyException (msg, pieces[3], pieces[2], pieces[2]); - log.Debug (msg); WriteToStdin ("0\n"); + Fail (new UnknownKeyException (msg, pieces[3], pieces[2], pieces[2]), msg); } } @@ -679,9 +676,8 @@ WriteToStdin ("1\n"); } else { string msg = String.Format ("Untrusted key '{0}' ({1})", pieces[2], pieces[1]); - exception = new UntrustedKeyException (msg, pieces[2], pieces[1], pieces[3]); - log.Debug (msg); WriteToStdin ("0\n"); + Fail (new UntrustedKeyException (msg, pieces[2], pieces[1], pieces[3]), msg); } } @@ -695,9 +691,8 @@ WriteToStdin ("1\n"); } else { string msg = String.Format ("Key verification for '{0}' failed '{1}' ({2})", pieces[1], pieces[3], pieces[2]); - exception = new KeyVerificationFailedException (msg, pieces[1], pieces[3], pieces[2], pieces[4]); - log.Debug (msg); WriteToStdin ("0\n"); + Fail (new KeyVerificationFailedException (msg, pieces[1], pieces[3], pieces[2], pieces[4]), msg); } } @@ -711,9 +706,8 @@ WriteToStdin ("1\n"); } else { string msg = String.Format ("No digest in file '{0}'", pieces[1]); - exception = new NoDigestException (msg, pieces[1]); - log.Debug (msg); WriteToStdin ("0\n"); + Fail (new NoDigestException (msg, pieces[1]), msg); } } @@ -727,9 +721,8 @@ WriteToStdin ("1\n"); } else { string msg = String.Format ("Unknown digest '{0}'", pieces[2]); - exception = new UnknownDigestException (msg, pieces[1], pieces[2]); - log.Debug (msg); WriteToStdin ("0\n"); + Fail (new UnknownDigestException (msg, pieces[1], pieces[2]), msg); } } @@ -743,9 +736,8 @@ WriteToStdin ("1\n"); } else { string msg = String.Format ("Wrong digest '{0}' (expected '{1}')", pieces[3], pieces[2]); - exception = new WrongDigestException (msg, pieces[1], pieces[3], pieces[2]); - log.Debug (msg); WriteToStdin ("0\n"); + Fail (new WrongDigestException (msg, pieces[1], pieces[3], pieces[2]), msg); } } } @@ -1107,9 +1099,8 @@ WriteToStdin ("1\n"); } else { string msg = String.Format ("Unsigned file '{0}'", pieces[1]); - exception = new UnsignedFileException (msg, pieces[1]); - log.Debug (msg); WriteToStdin ("0\n"); + Fail (new UnsignedFileException (msg, pieces[1], msg), msg); } } @@ -1123,9 +1114,8 @@ WriteToStdin ("1\n"); } else { string msg = String.Format ("Unknown key '{0}' ({1})", pieces[3], pieces[2]); - exception = new UnknownKeyException (msg, pieces[3], pieces[2], pieces[4]); - log.Debug (msg); WriteToStdin ("0\n"); + Fail (new UnknownKeyException (msg, pieces[3], pieces[2], pieces[4]), msg); } } @@ -1139,9 +1129,8 @@ WriteToStdin ("1\n"); } else { string msg = String.Format ("Untrusted key '{0}' ({1})", pieces[2], pieces[1]); - exception = new UntrustedKeyException (msg, pieces[2], pieces[1], pieces[3]); - log.Debug (msg); WriteToStdin ("0\n"); + Fail (new UntrustedKeyException (msg, pieces[2], pieces[1], pieces[3]), msg); } } @@ -1155,9 +1144,8 @@ WriteToStdin ("1\n"); } else { string msg = String.Format ("Key verification for '{0}'failed '{1}' ({2})", pieces[1], pieces[3], pieces[2]); - exception = new KeyVerificationFailedException (msg, pieces[1], pieces[3], pieces[2], pieces[4]); - log.Debug (msg); WriteToStdin ("0\n"); + Fail (new KeyVerificationFailedException (msg, pieces[1], pieces[3], pieces[2], pieces[4]), msg); } } @@ -1171,9 +1159,8 @@ WriteToStdin ("1\n"); } else { string msg = String.Format ("No digest in file '{0}'", pieces[1]); - exception = new NoDigestException (msg, pieces[1]); - log.Debug (msg); WriteToStdin ("0\n"); + Fail (new NoDigestException (msg, pieces[1]), msg); } } @@ -1187,9 +1174,8 @@ WriteToStdin ("1\n"); } else { string msg = String.Format ("Unknown digest '{0}'", pieces[2]); - exception = new UnknownDigestException (msg, pieces[1], pieces[2]); - log.Debug (msg); WriteToStdin ("0\n"); + Fail (new UnknownDigestException (msg, pieces[1], pieces[2]), msg); } } @@ -1203,9 +1189,8 @@ WriteToStdin ("1\n"); } else { string msg = String.Format ("Wrong digest '{0}' (expected '{1}')", pieces[3], pieces[2]); - exception = new WrongDigestException (msg, pieces[1], pieces[3], pieces[2]); - log.Debug (msg); WriteToStdin ("0\n"); + Fail (new WrongDigestException (msg, pieces[1], pieces[3], pieces[2]), msg); } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1.0/modules/linux/RemotePackageManager.cs new/zmd-7.1.1.0/modules/linux/RemotePackageManager.cs --- old/zmd-7.1.1.0/modules/linux/RemotePackageManager.cs 2006-05-26 19:54:42.000000000 +0200 +++ new/zmd-7.1.1.0/modules/linux/RemotePackageManager.cs 2006-06-01 17:46:33.000000000 +0200 @@ -464,7 +464,7 @@ [Privilege ("view")] public ResolvableInfo[] GetPatternUpdates () { - return GetPatchInfo (Product.GetUpdates ()); + return GetResolvableInfo (Product.GetUpdates ()); } [Privilege ("view")] @@ -494,7 +494,7 @@ [Privilege ("view")] public ResolvableInfo[] GetProductUpdates () { - return GetPatchInfo (Product.GetUpdates ()); + return GetResolvableInfo (Product.GetUpdates ()); } // Helper methods for the remoting interface diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1.0/modules/linux/YumService.cs new/zmd-7.1.1.0/modules/linux/YumService.cs --- old/zmd-7.1.1.0/modules/linux/YumService.cs 2006-05-04 16:45:37.000000000 +0200 +++ new/zmd-7.1.1.0/modules/linux/YumService.cs 2006-06-01 18:41:07.000000000 +0200 @@ -31,13 +31,10 @@ namespace Novell.Zenworks.Zmd.Packaging { public class YumService : Novell.Zenworks.Zmd.Service { - protected bool disposed; - private WebCache cache; private ResolvableCatalog catalog; private MultiProgress refreshProgress; private Repomd currentRepomd = Repomd.Empty; - private bool ignoreDispose; private static string repomdFileName = "repodata/repomd.xml"; @@ -87,8 +84,6 @@ catalog.DisplayName = name; catalog.Service = this; - ShutdownManager.ShuttingDown += OnShutdown; - if (Daemon.IsSleepResume) { try { RestoreFromSleep (); @@ -103,12 +98,6 @@ return Refresh (true); } - private void OnShutdown (ShutdownType stype) { - if (stype == ShutdownType.Sleep && catalog != null) { - ignoreDispose = true; - } - } - private void RestoreFromSleep () { ArrayList pkgs = SqlPackage.GetPackagesByCatalog (typeof (YumPackage), catalog); @@ -132,14 +121,16 @@ Dispose (false); } - protected override void Dispose (bool disposing) { - if (!disposed && !ignoreDispose) { - if (disposing) { - Remove (); - RedCarpetBackend.UpdatePatchStatus (); - } + public override void Unmount (UnmountType type) { + if (type == UnmountType.Regular) { + Remove (); + RedCarpetBackend.UpdatePatchStatus (); + } + } - disposed = true; + protected override void Dispose (bool disposing) { + if (disposing) { + Unmount (UnmountType.Regular); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 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-05-02 23:18:03.000000000 +0200 +++ new/zmd-7.1.1.0/modules/linux/ZyppService.cs 2006-06-01 18:41:07.000000000 +0200 @@ -30,8 +30,6 @@ namespace Novell.Zenworks.Zmd.Packaging { public class ZyppService : Novell.Zenworks.Zmd.Service { - protected bool disposed; - private ResolvableCatalog catalog; private Progress refreshProgress; @@ -92,13 +90,16 @@ Dispose (false); } - protected override void Dispose (bool disposing) { - if (!disposed) { - if (disposing) { - Remove (); - } + public override void Unmount (UnmountType type) { + if (type == UnmountType.Regular) { + Remove (); + RedCarpetBackend.UpdatePatchStatus (); + } + } - disposed = true; + protected override void Dispose (bool disposing) { + if (disposing) { + Unmount (UnmountType.Regular); } } 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 --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 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-31 00:50:24.000000000 +0200 +++ new/zmd-7.1.1.0/po/de_DE.po 2006-06-01 19:04:51.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-30 18:50-0400\n" +"POT-Creation-Date: 2006-06-01 13:04-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" @@ -55,12 +55,12 @@ msgid "Parsing Metadata" msgstr "Metadaten werden analysiert" -#: modules/linux/MountService.cs:109 +#: modules/linux/MountService.cs:108 #, csharp-format msgid "Path '{0}' is not valid." msgstr "Pfad '{0}' ist ungültig." -#: modules/linux/MountService.cs:121 +#: modules/linux/MountService.cs:120 #, csharp-format msgid "Failed to add packages from '{0}': {1}" msgstr "Fehler beim Hinzufügen von Paketen aus '{0}': {1}" @@ -444,16 +444,16 @@ msgid "Don't load initial services" msgstr "Ursprüngliche Dienste nicht laden" -#: src/Daemon.cs:232 +#: src/Daemon.cs:236 #, csharp-format msgid "Unknown certificate extension for: {0}" msgstr "Unbekannte Zertifikaterweiterung für: {0}" -#: src/Daemon.cs:247 +#: src/Daemon.cs:251 msgid "A daemon is already running" msgstr "Es wird bereits ein Daemon ausgeführt." -#: src/Daemon.cs:309 +#: src/Daemon.cs:313 msgid "Loading trusted certificates..." msgstr "Vertrauenswürdige Zertifikate werden geladen..." @@ -709,51 +709,51 @@ msgid "Service Refresh" msgstr "Dienstaktualisierung" -#: src/ServiceManager.cs:134 +#: src/ServiceManager.cs:135 msgid "Initial services are already loaded." msgstr "" -#: src/ServiceManager.cs:204 +#: src/ServiceManager.cs:205 msgid "Initial service file did not contain an URL." msgstr "Ursprüngliche Dienstdatei enthielt keine URL." -#: src/ServiceManager.cs:232 +#: src/ServiceManager.cs:233 msgid "Mounting Initial Services" msgstr "Aktivierung ursprünglicher Dienste" -#: src/ServiceManager.cs:297 +#: src/ServiceManager.cs:298 msgid "This service type requires a network connection, but none is present." msgstr "" -#: src/ServiceManager.cs:303 +#: src/ServiceManager.cs:304 #, 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:317 +#: src/ServiceManager.cs:318 #, 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:360 +#: src/ServiceManager.cs:361 #, csharp-format msgid "'{0}' is not a valid service type" msgstr "'{0}' ist kein gültiger Diensttyp." -#: src/ServiceManager.cs:385 +#: src/ServiceManager.cs:386 msgid "No suitable service types could be found" msgstr "" -#: src/ServiceManager.cs:549 +#: src/ServiceManager.cs:550 msgid "Refreshing Services" msgstr "Dienstaktualisierung" -#: src/ServiceManager.cs:656 +#: src/ServiceManager.cs:657 #, csharp-format msgid "The '{0}' service does not support registration." msgstr "Der Dienst '{0}' unterstützt keine Registrierung." -#: src/ServiceManager.cs:819 +#: src/ServiceManager.cs:820 #, csharp-format msgid "Unknown service storage version '{0}'" msgstr "Unbekannte Dienstspeicherversion '{0}'" @@ -847,23 +847,23 @@ msgid "Registration failed: {0}" msgstr "Fehler bei der Registrierung: {0}" -#: src/ZenService.cs:319 +#: src/ZenService.cs:323 msgid "Unable to determine target" msgstr "Ziel kann nicht ermittelt werden." -#: src/ZenService.cs:343 +#: src/ZenService.cs:347 msgid "Error parsing service.xml: " msgstr "Fehler bei der Analyse von service.xml: " -#: src/ZenService.cs:353 +#: src/ZenService.cs:357 msgid "Error in registration: " msgstr "Fehler bei der Registrierung: " -#: src/ZenService.cs:492 +#: src/ZenService.cs:496 msgid "Registering" msgstr "Registrierung" -#: src/ZenService.cs:507 +#: src/ZenService.cs:511 msgid "No registration URL is available" msgstr "Keine Registrierungs-URL verfügbar" 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 --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 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-31 00:50:24.000000000 +0200 +++ new/zmd-7.1.1.0/po/en_US.po 2006-06-01 19:04:51.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-30 18:50-0400\n" +"POT-Creation-Date: 2006-06-01 13:04-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" @@ -55,12 +55,12 @@ msgid "Parsing Metadata" msgstr "Parsing Metadata" -#: modules/linux/MountService.cs:109 +#: modules/linux/MountService.cs:108 #, csharp-format msgid "Path '{0}' is not valid." msgstr "Path '{0}' is not valid." -#: modules/linux/MountService.cs:121 +#: modules/linux/MountService.cs:120 #, csharp-format msgid "Failed to add packages from '{0}': {1}" msgstr "Failed to add packages from '{0}': {1}" @@ -436,16 +436,16 @@ msgid "Don't load initial services" msgstr "Don't load initial services" -#: src/Daemon.cs:232 +#: src/Daemon.cs:236 #, csharp-format msgid "Unknown certificate extension for: {0}" msgstr "Unknown certificate extension for: {0}" -#: src/Daemon.cs:247 +#: src/Daemon.cs:251 msgid "A daemon is already running" msgstr "A daemon is already running" -#: src/Daemon.cs:309 +#: src/Daemon.cs:313 msgid "Loading trusted certificates..." msgstr "Loading trusted certificates..." @@ -696,51 +696,51 @@ msgid "Service Refresh" msgstr "Service Refresh" -#: src/ServiceManager.cs:134 +#: src/ServiceManager.cs:135 msgid "Initial services are already loaded." msgstr "" -#: src/ServiceManager.cs:204 +#: src/ServiceManager.cs:205 msgid "Initial service file did not contain an URL." msgstr "Initial service file did not contain an URL." -#: src/ServiceManager.cs:232 +#: src/ServiceManager.cs:233 msgid "Mounting Initial Services" msgstr "Mounting Initial Services" -#: src/ServiceManager.cs:297 +#: src/ServiceManager.cs:298 msgid "This service type requires a network connection, but none is present." msgstr "" -#: src/ServiceManager.cs:303 +#: src/ServiceManager.cs:304 #, 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:317 +#: src/ServiceManager.cs:318 #, 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:360 +#: src/ServiceManager.cs:361 #, csharp-format msgid "'{0}' is not a valid service type" msgstr "'{0}' is not a valid service type" -#: src/ServiceManager.cs:385 +#: src/ServiceManager.cs:386 msgid "No suitable service types could be found" msgstr "" -#: src/ServiceManager.cs:549 +#: src/ServiceManager.cs:550 msgid "Refreshing Services" msgstr "Refreshing Services" -#: src/ServiceManager.cs:656 +#: src/ServiceManager.cs:657 #, csharp-format msgid "The '{0}' service does not support registration." msgstr "The '{0}' service does not support registration." -#: src/ServiceManager.cs:819 +#: src/ServiceManager.cs:820 #, csharp-format msgid "Unknown service storage version '{0}'" msgstr "Unknown service storage version '{0}'" @@ -834,23 +834,23 @@ msgid "Registration failed: {0}" msgstr "Registration failed: {0}" -#: src/ZenService.cs:319 +#: src/ZenService.cs:323 msgid "Unable to determine target" msgstr "Unable to determine target" -#: src/ZenService.cs:343 +#: src/ZenService.cs:347 msgid "Error parsing service.xml: " msgstr "Error parsing service.xml: " -#: src/ZenService.cs:353 +#: src/ZenService.cs:357 msgid "Error in registration: " msgstr "Error in registration: " -#: src/ZenService.cs:492 +#: src/ZenService.cs:496 msgid "Registering" msgstr "Registering" -#: src/ZenService.cs:507 +#: src/ZenService.cs:511 msgid "No registration URL is available" msgstr "No registration URL is available" 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 --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 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-31 00:50:24.000000000 +0200 +++ new/zmd-7.1.1.0/po/es_ES.po 2006-06-01 19:04:52.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-30 18:50-0400\n" +"POT-Creation-Date: 2006-06-01 13:04-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" @@ -55,12 +55,12 @@ msgid "Parsing Metadata" msgstr "Analizando metadatos" -#: modules/linux/MountService.cs:109 +#: modules/linux/MountService.cs:108 #, csharp-format msgid "Path '{0}' is not valid." msgstr "La vía {0} no es válida." -#: modules/linux/MountService.cs:121 +#: modules/linux/MountService.cs:120 #, csharp-format msgid "Failed to add packages from '{0}': {1}" msgstr "Fallo al añadir paquetes de '{0}': {1}" @@ -442,16 +442,16 @@ msgid "Don't load initial services" msgstr "No cargar servicios iniciales" -#: src/Daemon.cs:232 +#: src/Daemon.cs:236 #, csharp-format msgid "Unknown certificate extension for: {0}" msgstr "Extensión de certificado desconocida para: {0}" -#: src/Daemon.cs:247 +#: src/Daemon.cs:251 msgid "A daemon is already running" msgstr "Ya hay un daemon ejecutándose" -#: src/Daemon.cs:309 +#: src/Daemon.cs:313 msgid "Loading trusted certificates..." msgstr "Cargando certificados de confianza..." @@ -707,51 +707,51 @@ msgid "Service Refresh" msgstr "Actualización de servicio" -#: src/ServiceManager.cs:134 +#: src/ServiceManager.cs:135 msgid "Initial services are already loaded." msgstr "" -#: src/ServiceManager.cs:204 +#: src/ServiceManager.cs:205 msgid "Initial service file did not contain an URL." msgstr "El archivo de servicio inicial no contenía ninguna URL." -#: src/ServiceManager.cs:232 +#: src/ServiceManager.cs:233 msgid "Mounting Initial Services" msgstr "Montando servicios iniciales" -#: src/ServiceManager.cs:297 +#: src/ServiceManager.cs:298 msgid "This service type requires a network connection, but none is present." msgstr "" -#: src/ServiceManager.cs:303 +#: src/ServiceManager.cs:304 #, 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:317 +#: src/ServiceManager.cs:318 #, 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:360 +#: src/ServiceManager.cs:361 #, csharp-format msgid "'{0}' is not a valid service type" msgstr "'{0}' no es un tipo de servicio válido" -#: src/ServiceManager.cs:385 +#: src/ServiceManager.cs:386 msgid "No suitable service types could be found" msgstr "" -#: src/ServiceManager.cs:549 +#: src/ServiceManager.cs:550 msgid "Refreshing Services" msgstr "Actualizando servicios" -#: src/ServiceManager.cs:656 +#: src/ServiceManager.cs:657 #, csharp-format msgid "The '{0}' service does not support registration." msgstr "El servicio '{0}' no admite registro." -#: src/ServiceManager.cs:819 +#: src/ServiceManager.cs:820 #, csharp-format msgid "Unknown service storage version '{0}'" msgstr "Versión de almacenamiento de servicio no válida '{0}'" @@ -845,23 +845,23 @@ msgid "Registration failed: {0}" msgstr "Error de registro: {0}" -#: src/ZenService.cs:319 +#: src/ZenService.cs:323 msgid "Unable to determine target" msgstr "No es posible determinar el destino" -#: src/ZenService.cs:343 +#: src/ZenService.cs:347 msgid "Error parsing service.xml: " msgstr "Error al analizar service.xml: " -#: src/ZenService.cs:353 +#: src/ZenService.cs:357 msgid "Error in registration: " msgstr "Error de registro: " -#: src/ZenService.cs:492 +#: src/ZenService.cs:496 msgid "Registering" msgstr "Registrando" -#: src/ZenService.cs:507 +#: src/ZenService.cs:511 msgid "No registration URL is available" msgstr "No hay ninguna URL de registro disponible" 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 --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 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-31 00:50:24.000000000 +0200 +++ new/zmd-7.1.1.0/po/fr_FR.po 2006-06-01 19:04:52.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-30 18:50-0400\n" +"POT-Creation-Date: 2006-06-01 13:04-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" @@ -55,12 +55,12 @@ msgid "Parsing Metadata" msgstr "Analyse des métadonnées" -#: modules/linux/MountService.cs:109 +#: modules/linux/MountService.cs:108 #, csharp-format msgid "Path '{0}' is not valid." msgstr "Le chemin d'accès '{0}' n'est pas valide." -#: modules/linux/MountService.cs:121 +#: modules/linux/MountService.cs:120 #, csharp-format msgid "Failed to add packages from '{0}': {1}" msgstr "Échec de l'ajout de paquetages à partir de '{0}': {1}" @@ -449,16 +449,16 @@ msgid "Don't load initial services" msgstr "Ne pas charger de services initiaux" -#: src/Daemon.cs:232 +#: src/Daemon.cs:236 #, csharp-format msgid "Unknown certificate extension for: {0}" msgstr "Extension du certificat inconnue pour : {0}" -#: src/Daemon.cs:247 +#: src/Daemon.cs:251 msgid "A daemon is already running" msgstr "Un daemon est déjà en cours d'exécution" -#: src/Daemon.cs:309 +#: src/Daemon.cs:313 msgid "Loading trusted certificates..." msgstr "Chargement des certificats autorisés..." @@ -711,51 +711,51 @@ msgid "Service Refresh" msgstr "Rafraîchissement du service" -#: src/ServiceManager.cs:134 +#: src/ServiceManager.cs:135 msgid "Initial services are already loaded." msgstr "" -#: src/ServiceManager.cs:204 +#: src/ServiceManager.cs:205 msgid "Initial service file did not contain an URL." msgstr "Le fichier de service initial ne contenait pas d'URL." -#: src/ServiceManager.cs:232 +#: src/ServiceManager.cs:233 msgid "Mounting Initial Services" msgstr "Montage des services initiaux" -#: src/ServiceManager.cs:297 +#: src/ServiceManager.cs:298 msgid "This service type requires a network connection, but none is present." msgstr "" -#: src/ServiceManager.cs:303 +#: src/ServiceManager.cs:304 #, 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:317 +#: src/ServiceManager.cs:318 #, 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:360 +#: src/ServiceManager.cs:361 #, csharp-format msgid "'{0}' is not a valid service type" msgstr "'{0}' n'est pas un type de service valide" -#: src/ServiceManager.cs:385 +#: src/ServiceManager.cs:386 msgid "No suitable service types could be found" msgstr "" -#: src/ServiceManager.cs:549 +#: src/ServiceManager.cs:550 msgid "Refreshing Services" msgstr "Rafraîchissement des services" -#: src/ServiceManager.cs:656 +#: src/ServiceManager.cs:657 #, csharp-format msgid "The '{0}' service does not support registration." msgstr "Le service '{0}' ne prend pas en charge l'enregistrement." -#: src/ServiceManager.cs:819 +#: src/ServiceManager.cs:820 #, csharp-format msgid "Unknown service storage version '{0}'" msgstr "Version de stockage de service '{0}' inconnue" @@ -849,23 +849,23 @@ msgid "Registration failed: {0}" msgstr "Échec de l'enregistrement : {0}" -#: src/ZenService.cs:319 +#: src/ZenService.cs:323 msgid "Unable to determine target" msgstr "Impossible de déterminer la cible" -#: src/ZenService.cs:343 +#: src/ZenService.cs:347 msgid "Error parsing service.xml: " msgstr "Erreur d'analyse de service.xml : " -#: src/ZenService.cs:353 +#: src/ZenService.cs:357 msgid "Error in registration: " msgstr "Erreur dans le registre : " -#: src/ZenService.cs:492 +#: src/ZenService.cs:496 msgid "Registering" msgstr "Enregistrement" -#: src/ZenService.cs:507 +#: src/ZenService.cs:511 msgid "No registration URL is available" msgstr "Aucune URL d'enregistrement n'est disponible" 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 --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 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-31 00:50:24.000000000 +0200 +++ new/zmd-7.1.1.0/po/pt_BR.po 2006-06-01 19:04:52.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-30 18:50-0400\n" +"POT-Creation-Date: 2006-06-01 13:04-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" @@ -55,12 +55,12 @@ msgid "Parsing Metadata" msgstr "Analisando Metadados" -#: modules/linux/MountService.cs:109 +#: modules/linux/MountService.cs:108 #, csharp-format msgid "Path '{0}' is not valid." msgstr "O caminho '{0}' não é válido." -#: modules/linux/MountService.cs:121 +#: modules/linux/MountService.cs:120 #, csharp-format msgid "Failed to add packages from '{0}': {1}" msgstr "Falha ao adicionar pacotes de '{0}': {1}" @@ -438,16 +438,16 @@ msgid "Don't load initial services" msgstr "Não carregar serviços iniciais" -#: src/Daemon.cs:232 +#: src/Daemon.cs:236 #, csharp-format msgid "Unknown certificate extension for: {0}" msgstr "Extensão de certificado desconhecida para: {0}" -#: src/Daemon.cs:247 +#: src/Daemon.cs:251 msgid "A daemon is already running" msgstr "Já existe um daemon em execução" -#: src/Daemon.cs:309 +#: src/Daemon.cs:313 msgid "Loading trusted certificates..." msgstr "Carregando certificados confiáveis..." @@ -702,51 +702,51 @@ msgid "Service Refresh" msgstr "Atualização de Serviço" -#: src/ServiceManager.cs:134 +#: src/ServiceManager.cs:135 msgid "Initial services are already loaded." msgstr "" -#: src/ServiceManager.cs:204 +#: src/ServiceManager.cs:205 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:232 +#: src/ServiceManager.cs:233 msgid "Mounting Initial Services" msgstr "Montando Serviços Iniciais" -#: src/ServiceManager.cs:297 +#: src/ServiceManager.cs:298 msgid "This service type requires a network connection, but none is present." msgstr "" -#: src/ServiceManager.cs:303 +#: src/ServiceManager.cs:304 #, 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:317 +#: src/ServiceManager.cs:318 #, 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:360 +#: src/ServiceManager.cs:361 #, csharp-format msgid "'{0}' is not a valid service type" msgstr "'{0}' não é um tipo de serviço válido" -#: src/ServiceManager.cs:385 +#: src/ServiceManager.cs:386 msgid "No suitable service types could be found" msgstr "" -#: src/ServiceManager.cs:549 +#: src/ServiceManager.cs:550 msgid "Refreshing Services" msgstr "Atualizando Serviços" -#: src/ServiceManager.cs:656 +#: src/ServiceManager.cs:657 #, csharp-format msgid "The '{0}' service does not support registration." msgstr "O serviço '{0}' não suporta registro." -#: src/ServiceManager.cs:819 +#: src/ServiceManager.cs:820 #, csharp-format msgid "Unknown service storage version '{0}'" msgstr "Versão de armazenamento de serviço desconhecida '{0}'" @@ -840,23 +840,23 @@ msgid "Registration failed: {0}" msgstr "Falha do registro: {0}" -#: src/ZenService.cs:319 +#: src/ZenService.cs:323 msgid "Unable to determine target" msgstr "Não foi possível determinar destino" -#: src/ZenService.cs:343 +#: src/ZenService.cs:347 msgid "Error parsing service.xml: " msgstr "Erro ao analisar service.xml: " -#: src/ZenService.cs:353 +#: src/ZenService.cs:357 msgid "Error in registration: " msgstr "Erro no registro: " -#: src/ZenService.cs:492 +#: src/ZenService.cs:496 msgid "Registering" msgstr "Registrando" -#: src/ZenService.cs:507 +#: src/ZenService.cs:511 msgid "No registration URL is available" msgstr "Nenhum URL de registro disponível" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 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-05-31 00:11:06.000000000 +0200 +++ new/zmd-7.1.1.0/src/ChangeLog 2006-06-01 18:41:07.000000000 +0200 @@ -1,3 +1,32 @@ +2006-06-01 James Willcox <james@ximian.com> + + * UnixClient.cs: don't like Sockets when setting a new one. + +2006-06-01 Tambet Ingo <tambet@ximian.com> + + * ZenService.cs: Implement Unmount. + + * Daemon.cs: On shutdown, call ServiceManager.UnloadServices with + correct unmount type. + + * Service.cs: Add abstract method Unmount. Create new type UnmountType + which is used as the argument for Unmount call. + + * ServiceManager.cs: Call Service.Unmount() with specific UnmountType + so services can do different things on shutdown and regular unmount. + Fixes #180482. + +2006-05-31 Chris Rivera <cmr@ximian.com> + + * ZenException.cs: Implement ISerializable for the new exception types so + the exception fields get serialized correctly. + +2006-05-31 Tambet Ingo <tambet@ximian.com> + + * util.c (get_terminal_size): Implement. It's only used by rug, + so technically, it should be there but whatever. Helps fixing + #179854. + 2006-05-30 Chris Rivera <cmr@ximian.com> * ZenException.cs: Add new exceptions for key and digest errors. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 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-05-24 16:46:42.000000000 +0200 +++ new/zmd-7.1.1.0/src/Daemon.cs 2006-06-01 18:41:07.000000000 +0200 @@ -162,7 +162,11 @@ ChannelServices.UnregisterChannel (remotingChannel); } - ServiceManager.UnloadServices (); + UnmountType unmountType = UnmountType.Shutdown; + if (type == ShutdownType.Sleep) + unmountType = UnmountType.Sleep; + + ServiceManager.UnloadServices (unmountType); } catch (Exception e) { // ssssshhhh } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1.0/src/Service.cs new/zmd-7.1.1.0/src/Service.cs --- old/zmd-7.1.1.0/src/Service.cs 2006-03-11 05:29:34.000000000 +0100 +++ new/zmd-7.1.1.0/src/Service.cs 2006-06-01 18:41:07.000000000 +0200 @@ -27,6 +27,12 @@ namespace Novell.Zenworks.Zmd { + public enum UnmountType { + Regular, + Shutdown, + Sleep + } + public abstract class Service : IDisposable { private static int counter = 0; @@ -89,5 +95,7 @@ } protected abstract void Dispose (bool disposing); + + public abstract void Unmount (UnmountType type); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 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-05-17 20:25:43.000000000 +0200 +++ new/zmd-7.1.1.0/src/ServiceManager.cs 2006-06-01 18:41:07.000000000 +0200 @@ -122,10 +122,11 @@ ScheduleManager.Instance.AddSchedule (refreshSchedule); } - public static void UnloadServices () { + public static void UnloadServices (UnmountType type) { lock (services) { - foreach (Service s in services) - s.Dispose (); + foreach (Service s in services) { + s.Unmount (type); + } } } @@ -528,7 +529,7 @@ if (ServiceRemoved != null) ServiceRemoved (service); - service.Dispose (); + service.Unmount (UnmountType.Regular); } catch (Exception e) { log.Info (String.Format ("Failed to unmount '{0}': {1}", service.Uri, e)); } finally { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1.0/src/UnixClient.cs new/zmd-7.1.1.0/src/UnixClient.cs --- old/zmd-7.1.1.0/src/UnixClient.cs 2006-03-11 05:29:34.000000000 +0100 +++ new/zmd-7.1.1.0/src/UnixClient.cs 2006-06-01 18:41:07.000000000 +0200 @@ -76,6 +76,12 @@ protected Socket Client { get { return client; } set { + if (client != null) { + try { + client.Close (); + } catch {} + } + client = value; stream = null; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 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-05-30 23:52:34.000000000 +0200 +++ new/zmd-7.1.1.0/src/ZenException.cs 2006-06-01 00:38:23.000000000 +0200 @@ -24,16 +24,25 @@ namespace Novell.Zenworks.Zmd.Public { [Serializable] - public class UnsignedFileException : ZenException { + public class UnsignedFileException : ZenException, ISerializable { public string File; public UnsignedFileException (string message, string file, params object[] args) : base (message, args) { File = file; } + + public UnsignedFileException (SerializationInfo info, StreamingContext context) : base (info, context) { + File = info.GetString ("file"); + } + + public void GetObjectData (SerializationInfo info, StreamingContext context) { + base.GetObjectData (info, context); + info.AddValue ("file", File); + } } [Serializable] - public class UnknownKeyException : ZenException { + public class UnknownKeyException : ZenException, ISerializable { public string Name; public string Id; public string Fingerprint; @@ -44,10 +53,23 @@ Id = id; Fingerprint = fingerprint; } + + public UnknownKeyException (SerializationInfo info, StreamingContext context) : base (info, context) { + Name = info.GetString ("name"); + Id = info.GetString ("id"); + Fingerprint = info.GetString ("fingerprint"); + } + + public void GetObjectData (SerializationInfo info, StreamingContext context) { + base.GetObjectData (info, context); + info.AddValue ("name", Name); + info.AddValue ("id", Id); + info.AddValue ("fingerprint", Fingerprint); + } } [Serializable] - public class UntrustedKeyException : ZenException { + public class UntrustedKeyException : ZenException, ISerializable { public string Name; public string Id; public string Fingerprint; @@ -58,10 +80,23 @@ Id = id; Fingerprint = fingerprint; } + + public UntrustedKeyException (SerializationInfo info, StreamingContext context) : base (info, context) { + Name = info.GetString ("name"); + Id = info.GetString ("id"); + Fingerprint = info.GetString ("fingerprint"); + } + + public void GetObjectData (SerializationInfo info, StreamingContext context) { + base.GetObjectData (info, context); + info.AddValue ("name", Name); + info.AddValue ("id", Id); + info.AddValue ("fingerprint", Fingerprint); + } } [Serializable] - public class KeyVerificationFailedException : ZenException { + public class KeyVerificationFailedException : ZenException, ISerializable { public string File; public string Name; public string Id; @@ -74,19 +109,43 @@ Id = id; Fingerprint = fingerprint; } + + public KeyVerificationFailedException (SerializationInfo info, StreamingContext context) : base (info, context) { + File = info.GetString ("file"); + Name = info.GetString ("name"); + Id = info.GetString ("id"); + Fingerprint = info.GetString ("fingerprint"); + } + + public void GetObjectData (SerializationInfo info, StreamingContext context) { + base.GetObjectData (info, context); + info.AddValue ("file", File); + info.AddValue ("name", Name); + info.AddValue ("id", Id); + info.AddValue ("fingerprint", Fingerprint); + } } [Serializable] - public class NoDigestException : ZenException { + public class NoDigestException : ZenException, ISerializable { public string File; public NoDigestException (string message, string file, params object[] args) : base (message, args) { File = file; } + + public NoDigestException (SerializationInfo info, StreamingContext context) : base (info, context) { + File = info.GetString ("file"); + } + + public void GetObjectData (SerializationInfo info, StreamingContext context) { + base.GetObjectData (info, context); + info.AddValue ("file", File); + } } [Serializable] - public class UnknownDigestException : ZenException { + public class UnknownDigestException : ZenException, ISerializable { public string File; public string Digest; @@ -95,10 +154,21 @@ File = file; Digest = digest; } + + public UnknownDigestException (SerializationInfo info, StreamingContext context) : base (info, context) { + File = info.GetString ("file"); + Digest = info.GetString ("digest"); + } + + public void GetObjectData (SerializationInfo info, StreamingContext context) { + base.GetObjectData (info, context); + info.AddValue ("file", File); + info.AddValue ("digest", Digest); + } } [Serializable] - public class WrongDigestException : ZenException { + public class WrongDigestException : ZenException, ISerializable { public string File; public string WrongDigest; public string ExpectedDigest; @@ -109,6 +179,19 @@ WrongDigest = wrong; ExpectedDigest = expected; } + + public WrongDigestException (SerializationInfo info, StreamingContext context) : base (info, context) { + File = info.GetString ("file"); + WrongDigest = info.GetString ("wrong-digest"); + ExpectedDigest = info.GetString ("expected-digest"); + } + + public void GetObjectData (SerializationInfo info, StreamingContext context) { + base.GetObjectData (info, context); + info.AddValue ("file", File); + info.AddValue ("wrong-digest", WrongDigest); + info.AddValue ("expected-digest", ExpectedDigest); + } } [Serializable] diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1.0/src/ZenService.cs new/zmd-7.1.1.0/src/ZenService.cs --- old/zmd-7.1.1.0/src/ZenService.cs 2006-03-11 05:29:34.000000000 +0100 +++ new/zmd-7.1.1.0/src/ZenService.cs 2006-06-01 18:41:07.000000000 +0200 @@ -296,12 +296,16 @@ } } + public override void Unmount (UnmountType type) { + foreach (ICapability cap in caps) { + cap.Dispose (); + } + } + protected override void Dispose (bool disposing) { lock (this) { if (disposing) { - foreach (ICapability cap in caps) { - cap.Dispose (); - } + Unmount (UnmountType.Regular); } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1.0/src/util.c new/zmd-7.1.1.0/src/util.c --- old/zmd-7.1.1.0/src/util.c 2006-04-13 12:00:02.000000000 +0200 +++ new/zmd-7.1.1.0/src/util.c 2006-06-01 00:32:48.000000000 +0200 @@ -1,8 +1,11 @@ +#include <stdio.h> #include <string.h> #include <sys/types.h> #include <sys/socket.h> #include <sys/utsname.h> #include <signal.h> +#include <sys/ioctl.h> + #define PIPE_DATA "woo" #define PIPE_DATA_LEN 4 @@ -92,3 +95,19 @@ { signal (sig, SIG_DFL); } + +void +get_terminal_size (int *x, int *y) +{ + struct winsize ws; + int i; + FILE *fds[] = { stdin, stdout, stderr }; + + for (i = 0; i < 3; i++) { + if (ioctl (fileno (fds[i]), TIOCGWINSZ, &ws) >= 0) { + *x = ws.ws_col; + *y = ws.ws_row; + break; + } + } +} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org