Hello community,
here is the log from the commit of package zmd
checked in at Sun Jun 25 01:29:06 CEST 2006.
--------
--- zmd/zmd.changes 2006-06-21 17:24:03.000000000 +0200
+++ zmd/zmd.changes 2006-06-23 18:00:48.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Jun 23 17:37:50 CEST 2006 - thunder@suse.de
+
+- New source drop (r31009):
+- Parse standard error messages in RCResolverProgress.
+- Use keep-alive when downloading patch files.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zmd.spec ++++++
--- /var/tmp/diff_new_pack.shM1yi/_old 2006-06-25 01:27:18.000000000 +0200
+++ /var/tmp/diff_new_pack.shM1yi/_new 2006-06-25 01:27:18.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: 57
+Release: 58
License: LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
@@ -173,6 +173,10 @@
# %{_libdir}/monodoc/sources/*
%changelog -n zmd
+* Fri Jun 23 2006 - thunder@suse.de
+- New source drop (r31009):
+- Parse standard error messages in RCResolverProgress.
+- Use keep-alive when downloading patch files.
* Wed Jun 21 2006 - thunder@suse.de
- New source drop (r30777):
- Hide username and password part of service uris if the caller
++++++ zmd-7.1.1.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/ChangeLog new/zmd-7.1.1.0/modules/ChangeLog
--- old/zmd-7.1.1.0/modules/ChangeLog 2006-06-21 15:37:05.000000000 +0200
+++ new/zmd-7.1.1.0/modules/ChangeLog 2006-06-23 17:04:40.000000000 +0200
@@ -1,3 +1,13 @@
+2006-06-23 James Willcox
+
+ * linux/NUService.cs: use keep-alive when downloading patch files
+ * linux/YumService.cs: ditto
+
+2006-06-22 Chris Rivera
+
+ * linux/RedCarpetBackend.cs: Parse stderror and exit with the correct
+ error message in RCResolverProgress.
+
2006-06-21 Tambet Ingo
* linux/RedCarpetBackend.cs: Reload system resolvables even if
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore 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-20 15:49:23.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/NUService.cs 2006-06-23 17:04:40.000000000 +0200
@@ -278,6 +278,7 @@
private void DownloadPatches (string path, ResolvableCatalog catalog) {
bool initialCacheState = WebCache.ForceCache;
WebCache.ForceCache = true;
+ cache.KeepAlive = true;
using (Stream stream = Novell.Zenworks.Zmd.Util.OpenMaybeCompressedFile (path, FileMode.Open)) {
XmlTextReader reader = new XmlTextReader (stream);
@@ -289,6 +290,7 @@
}
}
+ cache.KeepAlive = false;
WebCache.ForceCache = initialCacheState;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs new/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs
--- old/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs 2006-06-21 15:37:05.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs 2006-06-23 17:04:40.000000000 +0200
@@ -786,6 +786,7 @@
private class RCResolverProgress : ProcessProgress {
+ private string lastError;
private StringBuilder lines;
public RCResolverProgress () : this (false) {}
@@ -811,6 +812,8 @@
Fail (sigError);
} else if (err.Length > 0) {
Fail (err);
+ } else if (lastError != null) {
+ Fail (lastError);
} else {
Fail (GettextCatalog.GetString ("Unknown failure"));
}
@@ -823,6 +826,26 @@
if (args.IsStdout) {
lines.Append (args.Line);
lines.Append ('\n');
+ } else {
+ int level = -1;
+ string msg = args.Line;
+
+ string[] pieces = args.Line.Split (new Char[] {'|'});
+ if (pieces.Length == 2) {
+ try {
+ level = Convert.ToInt32 (pieces[0]);
+ msg = pieces[1];
+ lastError = msg;
+ } catch (Exception e) {
+ // We can't change the world.
+ }
+ }
+
+ // level 4 is RC_DEBUG_LEVEL_MESSAGE
+ if (level < 4)
+ log.Info (msg);
+ else
+ log.Debug (msg);
}
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore 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-21 15:37:05.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/YumService.cs 2006-06-23 17:04:40.000000000 +0200
@@ -238,10 +238,12 @@
// Download patch files
bool initialCacheState = WebCache.ForceCache;
WebCache.ForceCache = true;
+ cache.KeepAlive = true;
foreach (DownloadProgress dp in patchesProgress.Children)
cache.Download (dp);
+ cache.KeepAlive = false;
WebCache.ForceCache = initialCacheState;
}
Binary files old/zmd-7.1.1.0/po/de_DE.gmo and new/zmd-7.1.1.0/po/de_DE.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/de_DE.po new/zmd-7.1.1.0/po/de_DE.po
--- old/zmd-7.1.1.0/po/de_DE.po 2006-06-14 06:18:10.000000000 +0200
+++ new/zmd-7.1.1.0/po/de_DE.po 2006-06-23 17:07:40.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-14 00:18-0400\n"
+"POT-Creation-Date: 2006-06-23 11:07-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -444,16 +444,16 @@
msgid "Don't load initial services"
msgstr "Ursprüngliche Dienste nicht laden"
-#: src/Daemon.cs:236
+#: src/Daemon.cs:240
#, csharp-format
msgid "Unknown certificate extension for: {0}"
msgstr "Unbekannte Zertifikaterweiterung für: {0}"
-#: src/Daemon.cs:251
+#: src/Daemon.cs:255
msgid "A daemon is already running"
msgstr "Es wird bereits ein Daemon ausgeführt."
-#: src/Daemon.cs:313
+#: src/Daemon.cs:316
msgid "Loading trusted certificates..."
msgstr "Vertrauenswürdige Zertifikate werden geladen..."
@@ -779,26 +779,26 @@
msgid "System"
msgstr "System"
-#: src/WebCache.cs:346
+#: src/WebCache.cs:352
msgid "Expiring cached files..."
msgstr "Ablauf der Dateien im Cache..."
-#: src/WebCache.cs:437 src/WebCache.cs:440
+#: src/WebCache.cs:443 src/WebCache.cs:446
#, csharp-format
msgid "Download failed: ({0}) {1}"
msgstr "Fehler beim Herunterladen: ({0}) {1}"
-#: src/WebCache.cs:494
+#: src/WebCache.cs:500
#, csharp-format
msgid "File not found: {0}"
msgstr "Datei nicht gefunden: {0}"
-#: src/WebCache.cs:523
+#: src/WebCache.cs:529
#, csharp-format
msgid "Unsupported uri: '{0}'"
msgstr ""
-#: src/WebCache.cs:911
+#: src/WebCache.cs:917
#, csharp-format
msgid "Unknown cache storage version '{0}'"
msgstr "Unbekannte Cache-Speicherversion '{0}'"
Binary files old/zmd-7.1.1.0/po/en_US.gmo and new/zmd-7.1.1.0/po/en_US.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/en_US.po new/zmd-7.1.1.0/po/en_US.po
--- old/zmd-7.1.1.0/po/en_US.po 2006-06-14 06:18:10.000000000 +0200
+++ new/zmd-7.1.1.0/po/en_US.po 2006-06-23 17:07:40.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-14 00:18-0400\n"
+"POT-Creation-Date: 2006-06-23 11:07-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -436,16 +436,16 @@
msgid "Don't load initial services"
msgstr "Don't load initial services"
-#: src/Daemon.cs:236
+#: src/Daemon.cs:240
#, csharp-format
msgid "Unknown certificate extension for: {0}"
msgstr "Unknown certificate extension for: {0}"
-#: src/Daemon.cs:251
+#: src/Daemon.cs:255
msgid "A daemon is already running"
msgstr "A daemon is already running"
-#: src/Daemon.cs:313
+#: src/Daemon.cs:316
msgid "Loading trusted certificates..."
msgstr "Loading trusted certificates..."
@@ -766,26 +766,26 @@
msgid "System"
msgstr "system"
-#: src/WebCache.cs:346
+#: src/WebCache.cs:352
msgid "Expiring cached files..."
msgstr "Expiring cached files..."
-#: src/WebCache.cs:437 src/WebCache.cs:440
+#: src/WebCache.cs:443 src/WebCache.cs:446
#, csharp-format
msgid "Download failed: ({0}) {1}"
msgstr "Download failed: ({0}) {1}"
-#: src/WebCache.cs:494
+#: src/WebCache.cs:500
#, csharp-format
msgid "File not found: {0}"
msgstr "File not found: {0}"
-#: src/WebCache.cs:523
+#: src/WebCache.cs:529
#, csharp-format
msgid "Unsupported uri: '{0}'"
msgstr ""
-#: src/WebCache.cs:911
+#: src/WebCache.cs:917
#, csharp-format
msgid "Unknown cache storage version '{0}'"
msgstr "Unknown cache storage version '{0}'"
Binary files old/zmd-7.1.1.0/po/es_ES.gmo and new/zmd-7.1.1.0/po/es_ES.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/es_ES.po new/zmd-7.1.1.0/po/es_ES.po
--- old/zmd-7.1.1.0/po/es_ES.po 2006-06-14 06:18:10.000000000 +0200
+++ new/zmd-7.1.1.0/po/es_ES.po 2006-06-23 17:07:41.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-14 00:18-0400\n"
+"POT-Creation-Date: 2006-06-23 11:07-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -442,16 +442,16 @@
msgid "Don't load initial services"
msgstr "No cargar servicios iniciales"
-#: src/Daemon.cs:236
+#: src/Daemon.cs:240
#, csharp-format
msgid "Unknown certificate extension for: {0}"
msgstr "Extensión de certificado desconocida para: {0}"
-#: src/Daemon.cs:251
+#: src/Daemon.cs:255
msgid "A daemon is already running"
msgstr "Ya hay un daemon ejecutándose"
-#: src/Daemon.cs:313
+#: src/Daemon.cs:316
msgid "Loading trusted certificates..."
msgstr "Cargando certificados de confianza..."
@@ -777,26 +777,26 @@
msgid "System"
msgstr "sistema"
-#: src/WebCache.cs:346
+#: src/WebCache.cs:352
msgid "Expiring cached files..."
msgstr "Comprobando caducidad de archivos del caché..."
-#: src/WebCache.cs:437 src/WebCache.cs:440
+#: src/WebCache.cs:443 src/WebCache.cs:446
#, csharp-format
msgid "Download failed: ({0}) {1}"
msgstr "Error de descarga: ({0}) {1}"
-#: src/WebCache.cs:494
+#: src/WebCache.cs:500
#, csharp-format
msgid "File not found: {0}"
msgstr "Archivo no encontrado: {0}"
-#: src/WebCache.cs:523
+#: src/WebCache.cs:529
#, csharp-format
msgid "Unsupported uri: '{0}'"
msgstr ""
-#: src/WebCache.cs:911
+#: src/WebCache.cs:917
#, csharp-format
msgid "Unknown cache storage version '{0}'"
msgstr "Versión de almacenamiento en caché '{0}' desconocida"
Binary files old/zmd-7.1.1.0/po/fr_FR.gmo and new/zmd-7.1.1.0/po/fr_FR.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/fr_FR.po new/zmd-7.1.1.0/po/fr_FR.po
--- old/zmd-7.1.1.0/po/fr_FR.po 2006-06-14 06:18:10.000000000 +0200
+++ new/zmd-7.1.1.0/po/fr_FR.po 2006-06-23 17:07:41.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-14 00:18-0400\n"
+"POT-Creation-Date: 2006-06-23 11:07-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -449,16 +449,16 @@
msgid "Don't load initial services"
msgstr "Ne pas charger de services initiaux"
-#: src/Daemon.cs:236
+#: src/Daemon.cs:240
#, csharp-format
msgid "Unknown certificate extension for: {0}"
msgstr "Extension du certificat inconnue pour : {0}"
-#: src/Daemon.cs:251
+#: src/Daemon.cs:255
msgid "A daemon is already running"
msgstr "Un daemon est déjà en cours d'exécution"
-#: src/Daemon.cs:313
+#: src/Daemon.cs:316
msgid "Loading trusted certificates..."
msgstr "Chargement des certificats autorisés..."
@@ -781,26 +781,26 @@
msgid "System"
msgstr "Système"
-#: src/WebCache.cs:346
+#: src/WebCache.cs:352
msgid "Expiring cached files..."
msgstr "Expiration des fichiers cache..."
-#: src/WebCache.cs:437 src/WebCache.cs:440
+#: src/WebCache.cs:443 src/WebCache.cs:446
#, csharp-format
msgid "Download failed: ({0}) {1}"
msgstr "Échec du téléchargement :({0}) {1}"
-#: src/WebCache.cs:494
+#: src/WebCache.cs:500
#, csharp-format
msgid "File not found: {0}"
msgstr "Fichier introuvable {0}"
-#: src/WebCache.cs:523
+#: src/WebCache.cs:529
#, csharp-format
msgid "Unsupported uri: '{0}'"
msgstr ""
-#: src/WebCache.cs:911
+#: src/WebCache.cs:917
#, csharp-format
msgid "Unknown cache storage version '{0}'"
msgstr "Version de stockage de cache '{0}' inconnue"
Binary files old/zmd-7.1.1.0/po/pt_BR.gmo and new/zmd-7.1.1.0/po/pt_BR.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/pt_BR.po new/zmd-7.1.1.0/po/pt_BR.po
--- old/zmd-7.1.1.0/po/pt_BR.po 2006-06-14 06:18:10.000000000 +0200
+++ new/zmd-7.1.1.0/po/pt_BR.po 2006-06-23 17:07:41.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-14 00:18-0400\n"
+"POT-Creation-Date: 2006-06-23 11:07-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -438,16 +438,16 @@
msgid "Don't load initial services"
msgstr "Não carregar serviços iniciais"
-#: src/Daemon.cs:236
+#: src/Daemon.cs:240
#, csharp-format
msgid "Unknown certificate extension for: {0}"
msgstr "Extensão de certificado desconhecida para: {0}"
-#: src/Daemon.cs:251
+#: src/Daemon.cs:255
msgid "A daemon is already running"
msgstr "Já existe um daemon em execução"
-#: src/Daemon.cs:313
+#: src/Daemon.cs:316
msgid "Loading trusted certificates..."
msgstr "Carregando certificados confiáveis..."
@@ -772,26 +772,26 @@
msgid "System"
msgstr "sistema"
-#: src/WebCache.cs:346
+#: src/WebCache.cs:352
msgid "Expiring cached files..."
msgstr "Expirando arquivos em cache..."
-#: src/WebCache.cs:437 src/WebCache.cs:440
+#: src/WebCache.cs:443 src/WebCache.cs:446
#, csharp-format
msgid "Download failed: ({0}) {1}"
msgstr "Falha de download: ({0}) {1}"
-#: src/WebCache.cs:494
+#: src/WebCache.cs:500
#, csharp-format
msgid "File not found: {0}"
msgstr "Arquivo não encontrado: {0}"
-#: src/WebCache.cs:523
+#: src/WebCache.cs:529
#, csharp-format
msgid "Unsupported uri: '{0}'"
msgstr ""
-#: src/WebCache.cs:911
+#: src/WebCache.cs:917
#, csharp-format
msgid "Unknown cache storage version '{0}'"
msgstr "Versão de armazenamento de cache desconhecida '{0}'"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/zmd.pot new/zmd-7.1.1.0/po/zmd.pot
--- old/zmd-7.1.1.0/po/zmd.pot 2006-06-21 16:52:31.000000000 +0200
+++ new/zmd-7.1.1.0/po/zmd.pot 2006-06-23 17:07:40.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-21 10:52-0400\n"
+"POT-Creation-Date: 2006-06-23 11:07-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -759,26 +759,26 @@
msgid "System"
msgstr ""
-#: src/WebCache.cs:346
+#: src/WebCache.cs:352
msgid "Expiring cached files..."
msgstr ""
-#: src/WebCache.cs:437 src/WebCache.cs:440
+#: src/WebCache.cs:443 src/WebCache.cs:446
#, csharp-format
msgid "Download failed: ({0}) {1}"
msgstr ""
-#: src/WebCache.cs:494
+#: src/WebCache.cs:500
#, csharp-format
msgid "File not found: {0}"
msgstr ""
-#: src/WebCache.cs:523
+#: src/WebCache.cs:529
#, csharp-format
msgid "Unsupported uri: '{0}'"
msgstr ""
-#: src/WebCache.cs:911
+#: src/WebCache.cs:917
#, csharp-format
msgid "Unknown cache storage version '{0}'"
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/ChangeLog new/zmd-7.1.1.0/src/ChangeLog
--- old/zmd-7.1.1.0/src/ChangeLog 2006-06-21 16:51:26.000000000 +0200
+++ new/zmd-7.1.1.0/src/ChangeLog 2006-06-23 17:04:40.000000000 +0200
@@ -1,3 +1,7 @@
+2006-06-23 James Willcox
+
+ * WebCache.cs: add a KeepAlive property
+
2006-06-21 Tambet Ingo
* RemoteService.cs: Hide username and password part of service uris
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore 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-09 00:20:44.000000000 +0200
+++ new/zmd-7.1.1.0/src/WebCache.cs 2006-06-23 17:04:40.000000000 +0200
@@ -53,6 +53,7 @@
private string cachedir;
private WebHeaderCollection requestHeaders;
private bool preauth = true;
+ private bool keepAlive = false;
public static bool ForceCache {
get { return forceCache; }
@@ -69,6 +70,11 @@
set { password = value; }
}
+ public bool KeepAlive {
+ get { return keepAlive; }
+ set { keepAlive = value; }
+ }
+
public string CacheDirectory {
get { return cachedir; }
set { cachedir = value; }
@@ -629,9 +635,9 @@
HttpWebRequest request = (HttpWebRequest)WebRequest.Create(uri);
request.PreAuthenticate = this.preauth;
- request.KeepAlive = false;
request.Credentials = this;
request.Timeout = 1000 * PreferenceManager.GetInteger ("http-timeout");
+ request.KeepAlive = keepAlive;
request.Proxy = WebProxy.GetProxy (uri);
log.DebugFormat ("Using proxy '{0}'", request.Proxy.GetProxy (uri));
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org