Hello community,
here is the log from the commit of package zmd
checked in at Wed Jun 14 13:35:57 CEST 2006.
--------
--- zmd/zmd.changes 2006-06-09 22:04:32.000000000 +0200
+++ zmd/zmd.changes 2006-06-12 19:07:27.000000000 +0200
@@ -1,0 +2,25 @@
+Mon Jun 12 19:03:34 CEST 2006 - maw@suse.de
+
+- New source drop (r30207) which:
+- Sets the UseBinary flag on the FtpWebRequest to true
+- Uses the TYPE command to set the data type before executing the
+ SIZE command, since many servers require it (#182633)
+- Gets proxy settings from ~/.curlrc if available (#175617)
+- Catches IOException in ProcessProgress in case the subprocess
+ is dead
+- Allows file bundles without a payload
+- Fixes the proxy settings so that the username and password
+ are only pulled from the system if we're using the system proxy
+- Orders service types by priority before calling CanMount ().
+- Passes empty strings for virtual path and query string when
+ creating SimpleWorkerRequest instead of nulls; it used to work
+ with nulls, but now we get a nice null ref exception
+- Fixes a typo (#182952)
+- Tries to download repmod.xml.key and repomd.xml.asc if the server
+ provides patches and if the security level preference is not
+ "none" (zmd side of #182222)
+- Returns false in CanMount (); NU services can't be
+ auto-detected because we aren't authorized to view the content
+ before the we've registered.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zmd.spec ++++++
--- /var/tmp/diff_new_pack.mn3k1e/_old 2006-06-14 13:35:45.000000000 +0200
+++ /var/tmp/diff_new_pack.mn3k1e/_new 2006-06-14 13:35: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.1.0
-Release: 50
+Release: 51
License: LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
@@ -171,6 +171,28 @@
# %{_libdir}/monodoc/sources/*
%changelog -n zmd
+* Mon Jun 12 2006 - maw@suse.de
+- New source drop (r30207) which:
+- Sets the UseBinary flag on the FtpWebRequest to true
+- Uses the TYPE command to set the data type before executing the
+ SIZE command, since many servers require it (#182633)
+- Gets proxy settings from ~/.curlrc if available (#175617)
+- Catches IOException in ProcessProgress in case the subprocess
+ is dead
+- Allows file bundles without a payload
+- Fixes the proxy settings so that the username and password
+ are only pulled from the system if we're using the system proxy
+- Orders service types by priority before calling CanMount ().
+- Passes empty strings for virtual path and query string when
+ creating SimpleWorkerRequest instead of nulls; it used to work
+ with nulls, but now we get a nice null ref exception
+- Fixes a typo (#182952)
+- Tries to download repmod.xml.key and repomd.xml.asc if the server
+ provides patches and if the security level preference is not
+ "none" (zmd side of #182222)
+- Returns false in CanMount (); NU services can't be
+ auto-detected because we aren't authorized to view the content
+ before the we've registered.
* Fri Jun 09 2006 - maw@suse.de
- Create an entry in /etc/logrotate.d (logrotate.patch) (#182495).
* Thu Jun 08 2006 - maw@suse.de
++++++ zmd-7.1.1.0.tar.bz2 ++++++
++++ 2038 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-06-02 22:23:49.000000000 +0200
+++ new/zmd-7.1.1.0/modules/ChangeLog 2006-06-09 22:01:30.000000000 +0200
@@ -1,3 +1,22 @@
+2006-06-09 Chris Rivera
+
+ * linux/NUService.cs: return false in CanMount (). NU services can't be
+ auto-detected because we aren't authorized to view the content before the
+ we've registered.
+
+2006-06-09 Tambet Ingo
+
+ * linux/NUService.cs: Fix a typo, fixing #182952.
+
+ * linux/PatchBundle.cs: Use Bundle.Status accessor instead of the
+ field.
+
+ * linux/NUService.cs: Try to download repmod.xml.key and
+ repomd.xml.asc if the server provides patches and if the security level
+ preference is not "none". Fixes zmd side of #182222.
+
+ * linux/YumService.cs: Ditto.
+
2006-06-02 Dan Mills
* linux/Makefile.am: Only copy libredcarpet when building the
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-06-02 16:46:23.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/NUService.cs 2006-06-09 22:01:30.000000000 +0200
@@ -48,7 +48,8 @@
}
public override bool CanMount (string uri) {
- return WebCache.Exists (WebCache.GetMergedUri (uri, "repoindex.xml"));
+ // we can't auto-detect NU services
+ return false;
}
public override Progress Mount (ServiceType service_type, string uri, IDictionary properties) {
@@ -125,7 +126,7 @@
if (mounting)
label = "Adding Novell Update Service " + Uri;
else
- label = "Refreshing" + Uri;
+ label = "Refreshing " + Uri;
refreshProgress = new MultiProgress (label);
@@ -217,7 +218,18 @@
}
private void ParseRepomd (ResolvableCatalog catalog) {
- string path = cache.Download (WebCache.GetMergedUri (catalog.Url, repomdFileName));
+ string repomdUrl = WebCache.GetMergedUri (catalog.Url, repomdFileName);
+
+ string path = cache.Download (repomdUrl);
+
+ if (PreferenceManager.GetString ("security-level") != "none") {
+ try {
+ cache.Download (repomdUrl + ".key");
+ cache.Download (repomdUrl + ".asc");
+ } catch {
+ // These files only exist on some servers and not on the others.
+ }
+ }
using (Stream stream = File.OpenRead (path)) {
XmlTextReader reader = new XmlTextReader (stream);
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/PatchBundle.cs new/zmd-7.1.1.0/modules/linux/PatchBundle.cs
--- old/zmd-7.1.1.0/modules/linux/PatchBundle.cs 2006-06-01 00:32:50.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/PatchBundle.cs 2006-06-09 22:01:30.000000000 +0200
@@ -232,7 +232,7 @@
ProcessProgressArgs args = a as ProcessProgressArgs;
if (args.IsStdout) {
if (args.Line == patchName)
- this.status = BundleStatus.Installed;
+ this.Status = BundleStatus.Installed;
} else {
log.Error ("online_update error: " + args.Line);
}
@@ -273,7 +273,7 @@
progress.Fail (String.Format (GettextCatalog.GetString ("Could not install patch \"{0}\": " +
"online_update exited with code {1}"),
patchName, proc.ExitCode));
- } else if (this.status != BundleStatus.Installed) {
+ } else if (this.Status != BundleStatus.Installed) {
progress.Fail (String.Format (GettextCatalog.GetString ("Could not install patch \"{0}\""), patchName));
} else {
progress.Finish ();
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-06-02 16:46:23.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/YumService.cs 2006-06-09 17:48:46.000000000 +0200
@@ -207,6 +207,17 @@
RepomdEntry patchEntry = md[RepomdEntryType.Patches];
if (!patchEntry.Equals (RepomdEntry.Empty)) {
+
+ if (PreferenceManager.GetString ("security-level") != "none") {
+ try {
+ DownloadProgress repomdProgress = refreshProgress["repomd"] as DownloadProgress;
+ cache.Download (repomdProgress.Uri + ".key");
+ cache.Download (repomdProgress.Uri + ".asc");
+ } catch {
+ // These files only exist on some servers and not on the others.
+ }
+ }
+
// Download and parse patches.xml
string path = cache.Download (WebCache.GetMergedUri (Uri, patchEntry.Location.Url));
PatchCollection patches = PatchCollection.FromXml (path);
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-06-07 23:18:30.000000000 +0200
+++ new/zmd-7.1.1.0/po/de_DE.po 2006-06-12 18:13:18.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-07 17:18-0400\n"
+"POT-Creation-Date: 2006-06-12 12:13-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -65,7 +65,7 @@
msgid "Failed to add packages from '{0}': {1}"
msgstr "Fehler beim Hinzufügen von Paketen aus '{0}': {1}"
-#: modules/linux/PackageBundle.cs:344 src/Bundle.cs:314 src/FileBundle.cs:377
+#: modules/linux/PackageBundle.cs:344 src/Bundle.cs:315 src/FileBundle.cs:377
#, csharp-format
msgid "Unknown bundle storage version '{0}'"
msgstr "Unbekannte Bundle-Speicherversion '{0}'"
@@ -457,19 +457,19 @@
msgid "Loading trusted certificates..."
msgstr "Vertrauenswürdige Zertifikate werden geladen..."
-#: src/FileBundle.cs:427
+#: src/FileBundle.cs:424
msgid "Preparing file bundle"
msgstr "Datei-Bundle wird vorbereitet"
-#: src/FileBundle.cs:429
+#: src/FileBundle.cs:432
msgid "Checking file bundle"
msgstr "Datei-Bundle wird geprüft"
-#: src/FileBundle.cs:451
+#: src/FileBundle.cs:454
msgid "Bundle has not been prepared"
msgstr "Bundle wurde nicht vorbereitet."
-#: src/FileBundle.cs:520
+#: src/FileBundle.cs:535
msgid "Checksums do not match"
msgstr "Die Prüfsummen stimmen nicht überein"
@@ -705,55 +705,55 @@
msgstr ""
"Der Startzeitpunkt kann nach Beginn des Zeitplans nicht mehr geändert werden"
-#: src/ServiceManager.cs:102
+#: src/ServiceManager.cs:121
msgid "Service Refresh"
msgstr "Dienstaktualisierung"
-#: src/ServiceManager.cs:126
+#: src/ServiceManager.cs:145
msgid "Initial services are already loaded."
msgstr ""
-#: src/ServiceManager.cs:196
+#: src/ServiceManager.cs:215
msgid "Initial service file did not contain an URL."
msgstr "Ursprüngliche Dienstdatei enthielt keine URL."
-#: src/ServiceManager.cs:224
+#: src/ServiceManager.cs:243
msgid "Mounting Initial Services"
msgstr "Aktivierung ursprünglicher Dienste"
-#: src/ServiceManager.cs:289
+#: src/ServiceManager.cs:308
msgid "This service type requires a network connection, but none is present."
msgstr ""
-#: src/ServiceManager.cs:295
+#: src/ServiceManager.cs:314
#, 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:309
+#: src/ServiceManager.cs:328
#, 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:352
+#: src/ServiceManager.cs:371
#, csharp-format
msgid "'{0}' is not a valid service type"
msgstr "'{0}' ist kein gültiger Diensttyp."
-#: src/ServiceManager.cs:377
+#: src/ServiceManager.cs:399
msgid "No suitable service types could be found"
msgstr ""
-#: src/ServiceManager.cs:541
+#: src/ServiceManager.cs:563
msgid "Refreshing Services"
msgstr "Dienstaktualisierung"
-#: src/ServiceManager.cs:651
+#: src/ServiceManager.cs:673
#, csharp-format
msgid "The '{0}' service does not support registration."
msgstr "Der Dienst '{0}' unterstützt keine Registrierung."
-#: src/ServiceManager.cs:814
+#: src/ServiceManager.cs:836
#, csharp-format
msgid "Unknown service storage version '{0}'"
msgstr "Unbekannte Dienstspeicherversion '{0}'"
@@ -798,24 +798,24 @@
msgid "Unsupported uri: '{0}'"
msgstr ""
-#: src/WebCache.cs:910
+#: src/WebCache.cs:911
#, csharp-format
msgid "Unknown cache storage version '{0}'"
msgstr "Unbekannte Cache-Speicherversion '{0}'"
-#: src/WebProxy.cs:78
+#: src/WebProxy.cs:125
msgid "Proxy URL"
msgstr "Proxy-URL"
-#: src/WebProxy.cs:79 src/WebProxy.cs:93 src/WebProxy.cs:105
+#: src/WebProxy.cs:126 src/WebProxy.cs:140 src/WebProxy.cs:152
msgid "Proxy"
msgstr "Proxy"
-#: src/WebProxy.cs:92
+#: src/WebProxy.cs:139
msgid "Proxy Username"
msgstr "Proxy-Benutzername"
-#: src/WebProxy.cs:104
+#: src/WebProxy.cs:151
msgid "Proxy Password"
msgstr "Proxy-Passwort"
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-06-07 23:18:31.000000000 +0200
+++ new/zmd-7.1.1.0/po/en_US.po 2006-06-12 18:13:18.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-07 17:18-0400\n"
+"POT-Creation-Date: 2006-06-12 12:13-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -65,7 +65,7 @@
msgid "Failed to add packages from '{0}': {1}"
msgstr "Failed to add packages from '{0}': {1}"
-#: modules/linux/PackageBundle.cs:344 src/Bundle.cs:314 src/FileBundle.cs:377
+#: modules/linux/PackageBundle.cs:344 src/Bundle.cs:315 src/FileBundle.cs:377
#, csharp-format
msgid "Unknown bundle storage version '{0}'"
msgstr "Unknown bundle storage version '{0}'"
@@ -449,19 +449,19 @@
msgid "Loading trusted certificates..."
msgstr "Loading trusted certificates..."
-#: src/FileBundle.cs:427
+#: src/FileBundle.cs:424
msgid "Preparing file bundle"
msgstr "Preparing file bundle"
-#: src/FileBundle.cs:429
+#: src/FileBundle.cs:432
msgid "Checking file bundle"
msgstr "Checking file bundle"
-#: src/FileBundle.cs:451
+#: src/FileBundle.cs:454
msgid "Bundle has not been prepared"
msgstr "Bundle has not been prepared"
-#: src/FileBundle.cs:520
+#: src/FileBundle.cs:535
msgid "Checksums do not match"
msgstr "Checksums do not match"
@@ -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:102
+#: src/ServiceManager.cs:121
msgid "Service Refresh"
msgstr "Service Refresh"
-#: src/ServiceManager.cs:126
+#: src/ServiceManager.cs:145
msgid "Initial services are already loaded."
msgstr ""
-#: src/ServiceManager.cs:196
+#: src/ServiceManager.cs:215
msgid "Initial service file did not contain an URL."
msgstr "Initial service file did not contain an URL."
-#: src/ServiceManager.cs:224
+#: src/ServiceManager.cs:243
msgid "Mounting Initial Services"
msgstr "Mounting Initial Services"
-#: src/ServiceManager.cs:289
+#: src/ServiceManager.cs:308
msgid "This service type requires a network connection, but none is present."
msgstr ""
-#: src/ServiceManager.cs:295
+#: src/ServiceManager.cs:314
#, 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:309
+#: src/ServiceManager.cs:328
#, 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:352
+#: src/ServiceManager.cs:371
#, csharp-format
msgid "'{0}' is not a valid service type"
msgstr "'{0}' is not a valid service type"
-#: src/ServiceManager.cs:377
+#: src/ServiceManager.cs:399
msgid "No suitable service types could be found"
msgstr ""
-#: src/ServiceManager.cs:541
+#: src/ServiceManager.cs:563
msgid "Refreshing Services"
msgstr "Refreshing Services"
-#: src/ServiceManager.cs:651
+#: src/ServiceManager.cs:673
#, csharp-format
msgid "The '{0}' service does not support registration."
msgstr "The '{0}' service does not support registration."
-#: src/ServiceManager.cs:814
+#: src/ServiceManager.cs:836
#, csharp-format
msgid "Unknown service storage version '{0}'"
msgstr "Unknown service storage version '{0}'"
@@ -785,24 +785,24 @@
msgid "Unsupported uri: '{0}'"
msgstr ""
-#: src/WebCache.cs:910
+#: src/WebCache.cs:911
#, csharp-format
msgid "Unknown cache storage version '{0}'"
msgstr "Unknown cache storage version '{0}'"
-#: src/WebProxy.cs:78
+#: src/WebProxy.cs:125
msgid "Proxy URL"
msgstr "Proxy URL"
-#: src/WebProxy.cs:79 src/WebProxy.cs:93 src/WebProxy.cs:105
+#: src/WebProxy.cs:126 src/WebProxy.cs:140 src/WebProxy.cs:152
msgid "Proxy"
msgstr "Proxy"
-#: src/WebProxy.cs:92
+#: src/WebProxy.cs:139
msgid "Proxy Username"
msgstr "Proxy Username"
-#: src/WebProxy.cs:104
+#: src/WebProxy.cs:151
msgid "Proxy Password"
msgstr "Proxy Password"
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-06-07 23:18:31.000000000 +0200
+++ new/zmd-7.1.1.0/po/es_ES.po 2006-06-12 18:13:19.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-07 17:18-0400\n"
+"POT-Creation-Date: 2006-06-12 12:13-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -65,7 +65,7 @@
msgid "Failed to add packages from '{0}': {1}"
msgstr "Fallo al añadir paquetes de '{0}': {1}"
-#: modules/linux/PackageBundle.cs:344 src/Bundle.cs:314 src/FileBundle.cs:377
+#: modules/linux/PackageBundle.cs:344 src/Bundle.cs:315 src/FileBundle.cs:377
#, csharp-format
msgid "Unknown bundle storage version '{0}'"
msgstr "Versión de almacenamiento de lote '{0}' desconocida"
@@ -455,19 +455,19 @@
msgid "Loading trusted certificates..."
msgstr "Cargando certificados de confianza..."
-#: src/FileBundle.cs:427
+#: src/FileBundle.cs:424
msgid "Preparing file bundle"
msgstr "Preparando lote de archivos"
-#: src/FileBundle.cs:429
+#: src/FileBundle.cs:432
msgid "Checking file bundle"
msgstr "Comprobando lote de archivos"
-#: src/FileBundle.cs:451
+#: src/FileBundle.cs:454
msgid "Bundle has not been prepared"
msgstr "Lote no preparado"
-#: src/FileBundle.cs:520
+#: src/FileBundle.cs:535
msgid "Checksums do not match"
msgstr "Las sumas de comprobación no coinciden"
@@ -703,55 +703,55 @@
msgstr ""
"No es posible cambiar la hora de inicio cuando la programación está en curso"
-#: src/ServiceManager.cs:102
+#: src/ServiceManager.cs:121
msgid "Service Refresh"
msgstr "Actualización de servicio"
-#: src/ServiceManager.cs:126
+#: src/ServiceManager.cs:145
msgid "Initial services are already loaded."
msgstr ""
-#: src/ServiceManager.cs:196
+#: src/ServiceManager.cs:215
msgid "Initial service file did not contain an URL."
msgstr "El archivo de servicio inicial no contenía ninguna URL."
-#: src/ServiceManager.cs:224
+#: src/ServiceManager.cs:243
msgid "Mounting Initial Services"
msgstr "Montando servicios iniciales"
-#: src/ServiceManager.cs:289
+#: src/ServiceManager.cs:308
msgid "This service type requires a network connection, but none is present."
msgstr ""
-#: src/ServiceManager.cs:295
+#: src/ServiceManager.cs:314
#, 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:309
+#: src/ServiceManager.cs:328
#, 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:352
+#: src/ServiceManager.cs:371
#, csharp-format
msgid "'{0}' is not a valid service type"
msgstr "'{0}' no es un tipo de servicio válido"
-#: src/ServiceManager.cs:377
+#: src/ServiceManager.cs:399
msgid "No suitable service types could be found"
msgstr ""
-#: src/ServiceManager.cs:541
+#: src/ServiceManager.cs:563
msgid "Refreshing Services"
msgstr "Actualizando servicios"
-#: src/ServiceManager.cs:651
+#: src/ServiceManager.cs:673
#, csharp-format
msgid "The '{0}' service does not support registration."
msgstr "El servicio '{0}' no admite registro."
-#: src/ServiceManager.cs:814
+#: src/ServiceManager.cs:836
#, csharp-format
msgid "Unknown service storage version '{0}'"
msgstr "Versión de almacenamiento de servicio no válida '{0}'"
@@ -796,24 +796,24 @@
msgid "Unsupported uri: '{0}'"
msgstr ""
-#: src/WebCache.cs:910
+#: src/WebCache.cs:911
#, csharp-format
msgid "Unknown cache storage version '{0}'"
msgstr "Versión de almacenamiento en caché '{0}' desconocida"
-#: src/WebProxy.cs:78
+#: src/WebProxy.cs:125
msgid "Proxy URL"
msgstr "URL del alterno"
-#: src/WebProxy.cs:79 src/WebProxy.cs:93 src/WebProxy.cs:105
+#: src/WebProxy.cs:126 src/WebProxy.cs:140 src/WebProxy.cs:152
msgid "Proxy"
msgstr "Alterno"
-#: src/WebProxy.cs:92
+#: src/WebProxy.cs:139
msgid "Proxy Username"
msgstr "Nombre de usuario de alterno"
-#: src/WebProxy.cs:104
+#: src/WebProxy.cs:151
msgid "Proxy Password"
msgstr "Contraseña de alterno"
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-06-07 23:18:31.000000000 +0200
+++ new/zmd-7.1.1.0/po/fr_FR.po 2006-06-12 18:13:19.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-07 17:18-0400\n"
+"POT-Creation-Date: 2006-06-12 12:13-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -65,7 +65,7 @@
msgid "Failed to add packages from '{0}': {1}"
msgstr "Échec de l'ajout de paquetages à partir de '{0}': {1}"
-#: modules/linux/PackageBundle.cs:344 src/Bundle.cs:314 src/FileBundle.cs:377
+#: modules/linux/PackageBundle.cs:344 src/Bundle.cs:315 src/FileBundle.cs:377
#, csharp-format
msgid "Unknown bundle storage version '{0}'"
msgstr "Version de stockage d'ensemble '{0}' inconnu"
@@ -462,19 +462,19 @@
msgid "Loading trusted certificates..."
msgstr "Chargement des certificats autorisés..."
-#: src/FileBundle.cs:427
+#: src/FileBundle.cs:424
msgid "Preparing file bundle"
msgstr "Préparation de l'ensemble de fichiers"
-#: src/FileBundle.cs:429
+#: src/FileBundle.cs:432
msgid "Checking file bundle"
msgstr "Vérification de l'ensemble de fichiers"
-#: src/FileBundle.cs:451
+#: src/FileBundle.cs:454
msgid "Bundle has not been prepared"
msgstr "L'ensemble n'a pas été préparé"
-#: src/FileBundle.cs:520
+#: src/FileBundle.cs:535
msgid "Checksums do not match"
msgstr "Les sommes de contrôle ne correspondent pas"
@@ -707,55 +707,55 @@
msgstr ""
"Changement de l'heure de début impossible lorsque la planification est lancée"
-#: src/ServiceManager.cs:102
+#: src/ServiceManager.cs:121
msgid "Service Refresh"
msgstr "Rafraîchissement du service"
-#: src/ServiceManager.cs:126
+#: src/ServiceManager.cs:145
msgid "Initial services are already loaded."
msgstr ""
-#: src/ServiceManager.cs:196
+#: src/ServiceManager.cs:215
msgid "Initial service file did not contain an URL."
msgstr "Le fichier de service initial ne contenait pas d'URL."
-#: src/ServiceManager.cs:224
+#: src/ServiceManager.cs:243
msgid "Mounting Initial Services"
msgstr "Montage des services initiaux"
-#: src/ServiceManager.cs:289
+#: src/ServiceManager.cs:308
msgid "This service type requires a network connection, but none is present."
msgstr ""
-#: src/ServiceManager.cs:295
+#: src/ServiceManager.cs:314
#, 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:309
+#: src/ServiceManager.cs:328
#, 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:352
+#: src/ServiceManager.cs:371
#, csharp-format
msgid "'{0}' is not a valid service type"
msgstr "'{0}' n'est pas un type de service valide"
-#: src/ServiceManager.cs:377
+#: src/ServiceManager.cs:399
msgid "No suitable service types could be found"
msgstr ""
-#: src/ServiceManager.cs:541
+#: src/ServiceManager.cs:563
msgid "Refreshing Services"
msgstr "Rafraîchissement des services"
-#: src/ServiceManager.cs:651
+#: src/ServiceManager.cs:673
#, csharp-format
msgid "The '{0}' service does not support registration."
msgstr "Le service '{0}' ne prend pas en charge l'enregistrement."
-#: src/ServiceManager.cs:814
+#: src/ServiceManager.cs:836
#, csharp-format
msgid "Unknown service storage version '{0}'"
msgstr "Version de stockage de service '{0}' inconnue"
@@ -800,24 +800,24 @@
msgid "Unsupported uri: '{0}'"
msgstr ""
-#: src/WebCache.cs:910
+#: src/WebCache.cs:911
#, csharp-format
msgid "Unknown cache storage version '{0}'"
msgstr "Version de stockage de cache '{0}' inconnue"
-#: src/WebProxy.cs:78
+#: src/WebProxy.cs:125
msgid "Proxy URL"
msgstr "URL proxy"
-#: src/WebProxy.cs:79 src/WebProxy.cs:93 src/WebProxy.cs:105
+#: src/WebProxy.cs:126 src/WebProxy.cs:140 src/WebProxy.cs:152
msgid "Proxy"
msgstr "Mandataire"
-#: src/WebProxy.cs:92
+#: src/WebProxy.cs:139
msgid "Proxy Username"
msgstr "Utilisateur proxy"
-#: src/WebProxy.cs:104
+#: src/WebProxy.cs:151
msgid "Proxy Password"
msgstr "Mot de passe du proxy"
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-06-07 23:18:31.000000000 +0200
+++ new/zmd-7.1.1.0/po/pt_BR.po 2006-06-12 18:13:19.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-07 17:18-0400\n"
+"POT-Creation-Date: 2006-06-12 12:13-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -65,7 +65,7 @@
msgid "Failed to add packages from '{0}': {1}"
msgstr "Falha ao adicionar pacotes de '{0}': {1}"
-#: modules/linux/PackageBundle.cs:344 src/Bundle.cs:314 src/FileBundle.cs:377
+#: modules/linux/PackageBundle.cs:344 src/Bundle.cs:315 src/FileBundle.cs:377
#, csharp-format
msgid "Unknown bundle storage version '{0}'"
msgstr "Versão de armazenamento de bundle desconhecida '{0}'"
@@ -451,19 +451,19 @@
msgid "Loading trusted certificates..."
msgstr "Carregando certificados confiáveis..."
-#: src/FileBundle.cs:427
+#: src/FileBundle.cs:424
msgid "Preparing file bundle"
msgstr "Preparando bundle de arquivo"
-#: src/FileBundle.cs:429
+#: src/FileBundle.cs:432
msgid "Checking file bundle"
msgstr "Verificando bundle de arquivo"
-#: src/FileBundle.cs:451
+#: src/FileBundle.cs:454
msgid "Bundle has not been prepared"
msgstr "O bundle não foi preparado"
-#: src/FileBundle.cs:520
+#: src/FileBundle.cs:535
msgid "Checksums do not match"
msgstr "Checksums não correspondentes"
@@ -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:102
+#: src/ServiceManager.cs:121
msgid "Service Refresh"
msgstr "Atualização de Serviço"
-#: src/ServiceManager.cs:126
+#: src/ServiceManager.cs:145
msgid "Initial services are already loaded."
msgstr ""
-#: src/ServiceManager.cs:196
+#: src/ServiceManager.cs:215
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:224
+#: src/ServiceManager.cs:243
msgid "Mounting Initial Services"
msgstr "Montando Serviços Iniciais"
-#: src/ServiceManager.cs:289
+#: src/ServiceManager.cs:308
msgid "This service type requires a network connection, but none is present."
msgstr ""
-#: src/ServiceManager.cs:295
+#: src/ServiceManager.cs:314
#, 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:309
+#: src/ServiceManager.cs:328
#, 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:352
+#: src/ServiceManager.cs:371
#, csharp-format
msgid "'{0}' is not a valid service type"
msgstr "'{0}' não é um tipo de serviço válido"
-#: src/ServiceManager.cs:377
+#: src/ServiceManager.cs:399
msgid "No suitable service types could be found"
msgstr ""
-#: src/ServiceManager.cs:541
+#: src/ServiceManager.cs:563
msgid "Refreshing Services"
msgstr "Atualizando Serviços"
-#: src/ServiceManager.cs:651
+#: src/ServiceManager.cs:673
#, csharp-format
msgid "The '{0}' service does not support registration."
msgstr "O serviço '{0}' não suporta registro."
-#: src/ServiceManager.cs:814
+#: src/ServiceManager.cs:836
#, csharp-format
msgid "Unknown service storage version '{0}'"
msgstr "Versão de armazenamento de serviço desconhecida '{0}'"
@@ -791,24 +791,24 @@
msgid "Unsupported uri: '{0}'"
msgstr ""
-#: src/WebCache.cs:910
+#: src/WebCache.cs:911
#, csharp-format
msgid "Unknown cache storage version '{0}'"
msgstr "Versão de armazenamento de cache desconhecida '{0}'"
-#: src/WebProxy.cs:78
+#: src/WebProxy.cs:125
msgid "Proxy URL"
msgstr "URL do Proxy"
-#: src/WebProxy.cs:79 src/WebProxy.cs:93 src/WebProxy.cs:105
+#: src/WebProxy.cs:126 src/WebProxy.cs:140 src/WebProxy.cs:152
msgid "Proxy"
msgstr "Proxy"
-#: src/WebProxy.cs:92
+#: src/WebProxy.cs:139
msgid "Proxy Username"
msgstr "Nome de Usuário Proxy"
-#: src/WebProxy.cs:104
+#: src/WebProxy.cs:151
msgid "Proxy Password"
msgstr "Senha Proxy"
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/Bundle.cs new/zmd-7.1.1.0/src/Bundle.cs
--- old/zmd-7.1.1.0/src/Bundle.cs 2006-06-01 00:32:48.000000000 +0200
+++ new/zmd-7.1.1.0/src/Bundle.cs 2006-06-09 22:01:30.000000000 +0200
@@ -152,7 +152,6 @@
protected string displayName;
protected string description;
protected string type;
- protected BundleStatus status;
protected int version;
protected bool prepared;
protected bool hidden;
@@ -163,6 +162,8 @@
protected ArrayList licenses;
protected ArrayList catalogs;
+ private BundleStatus status;
+
public string Id {
get { return id; }
set { id = value; }
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/BundleCapability.cs new/zmd-7.1.1.0/src/BundleCapability.cs
--- old/zmd-7.1.1.0/src/BundleCapability.cs 2006-06-01 00:32:48.000000000 +0200
+++ new/zmd-7.1.1.0/src/BundleCapability.cs 2006-06-09 22:01:30.000000000 +0200
@@ -85,14 +85,14 @@
public override void Install (Progress progress, BundleTransactionFlags flags) {
ProgressUpdater updater = new ProgressUpdater (progress, 200, 10);
updater.UpdateLoop ();
- status = BundleStatus.Installed;
+ Status = BundleStatus.Installed;
OnTransacted ();
}
public override void Remove (Progress progress, BundleTransactionFlags flags) {
ProgressUpdater updater = new ProgressUpdater (progress, 200, 10);
updater.UpdateLoop ();
- status = BundleStatus.NotInstalled;
+ Status = BundleStatus.NotInstalled;
OnTransacted ();
}
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/BundleManager.cs new/zmd-7.1.1.0/src/BundleManager.cs
--- old/zmd-7.1.1.0/src/BundleManager.cs 2006-06-06 20:22:05.000000000 +0200
+++ new/zmd-7.1.1.0/src/BundleManager.cs 2006-06-09 22:01:30.000000000 +0200
@@ -386,7 +386,7 @@
Bundle bundle = (Bundle) o;
bool needSave = false;
-
+
if (bundle.Status == BundleStatus.Installed) {
system.Add (bundle);
needSave = true;
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-06-07 23:07:44.000000000 +0200
+++ new/zmd-7.1.1.0/src/ChangeLog 2006-06-12 17:25:59.000000000 +0200
@@ -1,3 +1,55 @@
+2006-06-12 Tambet Ingo
+
+ * WorkerRequest.cs: Pass empty strings for virtual path and query
+ string when creating SimpleWorkerRequest instead of nulls. It used
+ to work with nulls, but now we get a nice null ref exception.
+
+2006-06-09 Chris Rivera
+
+ * ServiceType.cs: Add a priority here so we can control the order services
+ are detected in.
+
+ * ServiceManager.cs: Order service types by priority before calling
+ CanMount ().
+
+2006-06-09 Joe Shaw
+
+ * WebProxy.cs: Fix the proxy settings so that the username and
+ password are only pulled from the system if we're using the system
+ proxy.
+
+2006-06-09 Tambet Ingo
+
+ * FileBundle.cs: Allow file bundles without payload.
+ Use Bundle.Status accessor.
+
+ * BundleCapability.cs: Use Bundle.Status accessor to access status.
+
+ * Bundle.cs: Mark BundleStatus as hidden. Fixes #182989.
+
+2006-06-09 Dan Mills
+
+ * ProcessProgress.cs (WriteToStdin): Catch IOException in case the
+ subprocess is dead.
+
+2006-06-09 James Willcox
+
+ * WebProxy.cs: get proxy settings from ~/.curlrc if available.
+ Fixes Bug ##175617. Patch from Joe Shaw.
+
+2006-06-09 James Willcox
+
+ * ObjectDumper.cs: added
+
+2006-06-08 Joe Shaw
+
+ * WebCache.cs: Set the UseBinary flag on the FtpWebRequest to
+ true.
+
+ * ftp/FtpWebRequest.cs: Use the TYPE command to set the data type
+ before executing the SIZE command, since many servers require it.
+ Fixes bnc #182633.
+
2006-06-07 Chris Rivera
* ZenException.cs: correctly override GetObjectData() for the Key/Digest
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/FileBundle.cs new/zmd-7.1.1.0/src/FileBundle.cs
--- old/zmd-7.1.1.0/src/FileBundle.cs 2006-06-01 00:32:48.000000000 +0200
+++ new/zmd-7.1.1.0/src/FileBundle.cs 2006-06-09 22:01:30.000000000 +0200
@@ -380,7 +380,7 @@
public ulong GetInstalledSize () {
if (!havePayload)
- throw new ZenException ("Bundle payload isn't set");
+ return 0;
ulong size = 0;
@@ -421,11 +421,14 @@
}
public override Progress Prepare (BundleTransactionFlags flags) {
- if (!havePayload)
- throw new ZenException ("Bundle payload isn't set");
-
MultiProgress multi = new MultiProgress (GettextCatalog.GetString ("Preparing file bundle"));
+ if (!havePayload) {
+ prepared = true;
+ multi.Finish ();
+ return multi;
+ }
+
Progress check = new Progress (GettextCatalog.GetString ("Checking file bundle"));
multi.Add ("check", check);
@@ -452,11 +455,17 @@
return;
}
+ if (!havePayload) {
+ Status = BundleStatus.Installed;
+ progress.Finish ();
+ return;
+ }
+
try {
foreach (FileEntry entry in entries)
entry.Install ();
- status = BundleStatus.Installed;
+ Status = BundleStatus.Installed;
progress.Finish ();
OnTransacted ();
} catch (Exception e) {
@@ -465,11 +474,17 @@
}
public override void Remove (Progress progress, BundleTransactionFlags flags) {
+ if (!havePayload) {
+ Status = BundleStatus.NotInstalled;
+ progress.Finish ();
+ return;
+ }
+
try {
foreach (FileEntry entry in entries)
entry.Remove ();
- status = BundleStatus.NotInstalled;
+ Status = BundleStatus.NotInstalled;
prepared = false;
progress.Finish ();
OnTransacted ();
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/Makefile.am new/zmd-7.1.1.0/src/Makefile.am
--- old/zmd-7.1.1.0/src/Makefile.am 2006-06-06 23:21:26.000000000 +0200
+++ new/zmd-7.1.1.0/src/Makefile.am 2006-06-09 17:48:46.000000000 +0200
@@ -205,6 +205,7 @@
$(srcdir)/IServiceManager.cs \
$(srcdir)/IShutdown.cs \
$(srcdir)/ModuleInfo.cs \
+ $(srcdir)/ObjectDumper.cs \
$(srcdir)/OSTarget.cs \
$(srcdir)/ScheduleInfo.cs \
$(srcdir)/UnixClient.cs \
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/ObjectDumper.cs new/zmd-7.1.1.0/src/ObjectDumper.cs
--- old/zmd-7.1.1.0/src/ObjectDumper.cs 1970-01-01 01:00:00.000000000 +0100
+++ new/zmd-7.1.1.0/src/ObjectDumper.cs 2006-06-09 22:01:30.000000000 +0200
@@ -0,0 +1,124 @@
+
+using System;
+using System.Collections;
+using System.Reflection;
+
+namespace Novell.Zenworks.Zmd {
+
+ public class ObjectDumper {
+
+ public static void Dump (object o) {
+ Dump (o, 0, new ArrayList ());
+ }
+
+ private static string Pad (int level, string msg, params object[] args) {
+ string val = String.Format (msg, args);
+ return val.PadLeft ((level * 4) + val.Length);
+ }
+
+ private static void Dump (object o, int level, ArrayList previous) {
+ Type type = null;
+
+ if (o != null) {
+ type = o.GetType ();
+ }
+
+ Dump (o, type, null, level, previous);
+ }
+
+ private static void Dump (object o, Type type, string name, int level, ArrayList previous) {
+ if (o == null) {
+ Console.WriteLine (Pad (level, "{0} ({1}): (null)", name, type.Name));
+ return;
+ }
+
+ if (previous.Contains (o)) {
+ return;
+ }
+
+ previous.Add (o);
+
+ if (type.IsPrimitive || o is string) {
+ DumpPrimitive (o, type, name, level, previous);
+ } else {
+ DumpComposite (o, type, name, level, previous);
+ }
+ }
+
+ private static void DumpPrimitive (object o, Type type, string name, int level, ArrayList previous) {
+ if (name != null) {
+ Console.WriteLine (Pad (level, "{0} ({1}): {2}", name, type.Name, o));
+ } else {
+ Console.WriteLine (Pad (level, "({0}) {1}", type.Name, o));
+ }
+ }
+
+ private static void DumpComposite (object o, Type type, string name, int level, ArrayList previous) {
+
+ if (name != null) {
+ Console.WriteLine (Pad (level, "{0} ({1}):", name, type.Name));
+ } else {
+ Console.WriteLine (Pad (level, "({0})", type.Name));
+ }
+
+ if (o is IDictionary) {
+ DumpDictionary ((IDictionary) o, level, previous);
+ } else if (o is ICollection) {
+ DumpCollection ((ICollection) o, level, previous);
+ } else {
+ MemberInfo[] members = o.GetType ().GetMembers (BindingFlags.Instance | BindingFlags.Public |
+ BindingFlags.NonPublic);
+
+ foreach (MemberInfo member in members) {
+ try {
+ DumpMember (o, member, level, previous);
+ } catch {}
+ }
+ }
+ }
+
+ private static void DumpCollection (ICollection collection, int level, ArrayList previous) {
+ foreach (object child in collection) {
+ Dump (child, level + 1, previous);
+ }
+ }
+
+ private static void DumpDictionary (IDictionary dictionary, int level, ArrayList previous) {
+ foreach (object key in dictionary.Keys) {
+ Console.WriteLine (Pad (level + 1, "[{0}] ({1}):", key, key.GetType ().Name));
+
+ Dump (dictionary[key], level + 2, previous);
+ }
+ }
+
+ private static void DumpMember (object o, MemberInfo member, int level, ArrayList previous) {
+ if (member is MethodInfo || member is ConstructorInfo ||
+ member is EventInfo)
+ return;
+
+ if (member is FieldInfo) {
+ FieldInfo field = (FieldInfo) member;
+
+ string name = member.Name;
+ if ((field.Attributes & FieldAttributes.Public) == 0) {
+ name = "#" + name;
+ }
+
+ Dump (field.GetValue (o), field.FieldType, name, level + 1, previous);
+ } else if (member is PropertyInfo) {
+ PropertyInfo prop = (PropertyInfo) member;
+
+ if (prop.GetIndexParameters ().Length == 0 && prop.CanRead) {
+ string name = member.Name;
+ MethodInfo getter = prop.GetGetMethod ();
+
+ if ((getter.Attributes & MethodAttributes.Public) == 0) {
+ name = "#" + name;
+ }
+
+ Dump (prop.GetValue (o, null), prop.PropertyType, name, level + 1, previous);
+ }
+ }
+ }
+ }
+}
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/ProcessProgress.cs new/zmd-7.1.1.0/src/ProcessProgress.cs
--- old/zmd-7.1.1.0/src/ProcessProgress.cs 2006-06-07 23:07:27.000000000 +0200
+++ new/zmd-7.1.1.0/src/ProcessProgress.cs 2006-06-09 22:01:30.000000000 +0200
@@ -241,7 +241,11 @@
lock (procLock) {
if (proc == null)
throw new ZenException (GettextCatalog.GetString ("Trying to write to stdin without a running process."));
- proc.StandardInput.Write (s);
+ try {
+ proc.StandardInput.Write (s);
+ } catch (System.IO.IOException e) {
+ log.Error ("Could not write to stdin of subprocess.", e);
+ }
}
}
}
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-06-06 23:21:26.000000000 +0200
+++ new/zmd-7.1.1.0/src/ServiceManager.cs 2006-06-09 20:30:45.000000000 +0200
@@ -39,6 +39,25 @@
public class ServiceManager {
+ private class ServiceTypeComparer: IComparer {
+ public int Compare (object a, object b) {
+ ServiceType sa = a as ServiceType;
+ ServiceType sb = b as ServiceType;
+
+ if (sa == null || sb == null) {
+ return 0;
+ }
+
+ if (sa.Priority > sb.Priority) {
+ return -1;
+ } else if (sa.Priority < sb.Priority) {
+ return 1;
+ } else {
+ return 0;
+ }
+ }
+ }
+
private static readonly ILog log = LogManager.GetLogger (typeof (ServiceManager));
private static readonly string ServicesFile = BuildConfig.LOCALSTATEDIR + "/lib/zmd/services";
@@ -361,7 +380,10 @@
}
public static Progress Mount (string uri, IDictionary properties, bool ignoreFailure) {
- foreach (ServiceType type in ServiceTypes) {
+ ServiceType[] types = ServiceTypes;
+ Array.Sort (types, new ServiceTypeComparer ());
+
+ foreach (ServiceType type in types) {
Service service = CreateService (type);
if (service == null || (service.IsRemote && !NetworkStatus.IsNetworkConnected))
continue;
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/ServiceType.cs new/zmd-7.1.1.0/src/ServiceType.cs
--- old/zmd-7.1.1.0/src/ServiceType.cs 2006-06-01 00:32:48.000000000 +0200
+++ new/zmd-7.1.1.0/src/ServiceType.cs 2006-06-09 19:58:12.000000000 +0200
@@ -29,6 +29,7 @@
private string alias;
private string name;
private string description;
+ private int priority;
private bool unique = false;
public string Alias {
@@ -48,6 +49,15 @@
set { unique = value; }
}
+ public int Priority {
+ get { return priority; }
+ }
+
+ public ServiceType (string alias, string name, string description, int priority) :
+ this (alias, name, description) {
+ this.priority = priority;
+ }
+
public ServiceType (string alias, string name, string description) {
this.alias = alias;
this.name = name;
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/WebCache.cs new/zmd-7.1.1.0/src/WebCache.cs
--- old/zmd-7.1.1.0/src/WebCache.cs 2006-06-01 00:32:48.000000000 +0200
+++ new/zmd-7.1.1.0/src/WebCache.cs 2006-06-09 16:51:35.000000000 +0200
@@ -530,6 +530,7 @@
private string DownloadInternalFtp (Uri uri, DownloadProgress progress, CacheInfo info) {
FtpWebRequest request = (FtpWebRequest) WebRequest.Create (uri);
// request.Credentials = new NetworkCredential ("anonymous","janeDoe@contoso.com");
+ request.UseBinary = true;
request.UsePassive = true;
request.KeepAlive = false;
request.Timeout = 1000 * PreferenceManager.GetInteger ("http-timeout");
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/WebProxy.cs new/zmd-7.1.1.0/src/WebProxy.cs
--- old/zmd-7.1.1.0/src/WebProxy.cs 2006-06-01 00:32:48.000000000 +0200
+++ new/zmd-7.1.1.0/src/WebProxy.cs 2006-06-09 22:01:30.000000000 +0200
@@ -19,6 +19,7 @@
*/
using System;
+using System.IO;
using System.Net;
using Novell.Zenworks.Utility;
@@ -26,6 +27,11 @@
public sealed class WebProxy {
+
+ private static bool checkedProxyAuth = false;
+ private static string systemProxyUsername = null;
+ private static string systemProxyPassword = null;
+
public static string GetSystemProxy (bool https) {
if (https) {
return Environment.GetEnvironmentVariable ("https_proxy");
@@ -33,10 +39,49 @@
return Environment.GetEnvironmentVariable ("http_proxy");
}
}
-
+
+ private static void ParseCurlConfig () {
+ checkedProxyAuth = true;
+
+ if (!File.Exists ("/root/.curlrc"))
+ return;
+
+ StreamReader r = new StreamReader ("/root/.curlrc");
+ string l;
+
+ while ((l = r.ReadLine ()) != null) {
+ if (! l.StartsWith ("proxy-user"))
+ continue;
+
+ int start_idx, end_idx;
+
+ start_idx = l.IndexOf ('"');
+ end_idx = l.LastIndexOf ('"');
+
+ string tokens = l.Substring (start_idx + 1, end_idx - start_idx - 1);
+
+ int colon_idx = tokens.IndexOf (':');
+
+ if (colon_idx == -1) {
+ systemProxyUsername = tokens;
+ systemProxyPassword = null;
+ } else {
+ systemProxyUsername = tokens.Substring (0, colon_idx);
+ systemProxyPassword = tokens.Substring (colon_idx + 1);
+ }
+
+ break;
+ }
+
+ r.Close ();
+ }
+
public static IWebProxy GetProxy (Uri uri) {
IWebProxy proxy = GlobalProxySelection.GetEmptyWebProxy ();
+ if (! checkedProxyAuth)
+ ParseCurlConfig ();
+
string proxyUsername = PreferenceManager.GetString ("proxy-username");
string proxyPassword;
@@ -47,17 +92,19 @@
} catch (ArgumentException e) {
proxyPassword = "";
}
-
- ICredentials proxyCreds = null;
-
- if (proxyUsername != "")
- proxyCreds = new NetworkCredential (proxyUsername,
- proxyPassword != "" ? proxyPassword : null);
string proxyUrl = PreferenceManager.GetString ("proxy-url");
if (proxyUrl == null || proxyUrl == String.Empty) {
proxyUrl = GetSystemProxy (uri.Scheme == Uri.UriSchemeHttps);
+ proxyUsername = systemProxyUsername;
+ proxyPassword = systemProxyPassword;
}
+
+ ICredentials proxyCreds = null;
+
+ if (proxyUsername != "")
+ proxyCreds = new NetworkCredential (proxyUsername,
+ proxyPassword != "" ? proxyPassword : null);
if (proxyUrl != null && proxyUrl != String.Empty) {
proxy = new System.Net.WebProxy (proxyUrl,
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/WorkerRequest.cs new/zmd-7.1.1.0/src/WorkerRequest.cs
--- old/zmd-7.1.1.0/src/WorkerRequest.cs 2006-06-01 00:32:48.000000000 +0200
+++ new/zmd-7.1.1.0/src/WorkerRequest.cs 2006-06-12 17:25:59.000000000 +0200
@@ -39,7 +39,7 @@
string[][] unknownHeaders;
public RcdWorkerRequest (HttpHandler handler, Novell.Zenworks.Zmd.ApplicationHost host) :
- base (host.VPath, host.Path, null, null, null) {
+ base (host.VPath, host.Path, "", "", null) {
this.handler = handler;
this.host = host;
}
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/ftp/FtpWebRequest.cs new/zmd-7.1.1.0/src/ftp/FtpWebRequest.cs
--- old/zmd-7.1.1.0/src/ftp/FtpWebRequest.cs 2006-06-01 00:32:46.000000000 +0200
+++ new/zmd-7.1.1.0/src/ftp/FtpWebRequest.cs 2006-06-09 16:51:35.000000000 +0200
@@ -461,6 +461,14 @@
}
}
+ // Set the type to binary, since many FTP servers only support SIZE after TYPE I
+ status = SendCommand (TypeCommand, DataType);
+
+ if (status != FtpStatusCode.CommandOK) {
+ SetResponseError (CreateExceptionFromResponse ());
+ return;
+ }
+
// Get the content size
status = SendCommand (SizeCommand, requestUri.LocalPath);
switch (status) {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org