Hello community,
here is the log from the commit of package zmd
checked in at Fri May 19 17:01:53 CEST 2006.
--------
--- zmd/zmd.changes 2006-05-18 23:25:54.000000000 +0200
+++ zmd/zmd.changes 2006-05-19 02:36:14.000000000 +0200
@@ -1,0 +2,10 @@
+Fri May 19 02:27:45 CEST 2006 - thunder@suse.de
+
+- New source drop (r28625) which:
+- Adds initial support for parsing status messages from all helpers,
+ not just the 'transaction' helper.
+- Adds new status IDs for signature key and digest verification
+ events from the helpers.
+- Removed ostargets.xml patch, it's upstream now.
+
+-------------------------------------------------------------------
Old:
----
ostargets.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zmd.spec ++++++
--- /var/tmp/diff_new_pack.0EEpcF/_old 2006-05-19 17:01:42.000000000 +0200
+++ /var/tmp/diff_new_pack.0EEpcF/_new 2006-05-19 17:01:42.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: 40
+Release: 41
License: LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
@@ -22,8 +22,7 @@
Patch1: verified-certs.patch
Patch2: dont-run-transaction-test.patch
Patch3: zmd-networkmanager-reconnect.diff
-Patch4: ostargets.patch
-Patch5: retry-interval.patch
+Patch4: retry-interval.patch
Summary: Novell ZENworks Linux Management daemon
Group: System/Daemons
Autoreqprov: on
@@ -71,7 +70,6 @@
%patch2
%patch3
%patch4
-%patch5
%build
libtoolize -f
@@ -159,6 +157,13 @@
# %{_libdir}/monodoc/sources/*
%changelog -n zmd
+* Fri May 19 2006 - thunder@suse.de
+- New source drop (r28625) which:
+- Adds initial support for parsing status messages from all helpers,
+ not just the 'transaction' helper.
+- Adds new status IDs for signature key and digest verification
+ events from the helpers.
+- Removed ostargets.xml patch, it's upstream now.
* Thu May 18 2006 - maw@suse.de
- New source drop (r28510) which:
- Subscribes the catalogue of a one-catalog-only service
++++++ 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-05-17 00:55:13.000000000 +0200
+++ new/zmd-7.1.1.0/modules/ChangeLog 2006-05-19 02:02:30.000000000 +0200
@@ -1,3 +1,19 @@
+2006-05-18 Dan Mills
+
+ * linux/RedCarpetBackend.cs: All helpers print status on stdout
+ now (stderr is still error messages in the previous level|msg
+ format), so added status parsing to RCProgress. TransactionStatus
+ became RCHelper status, used by both RCProgress and
+ RCTransactionProgress. Added status types for new signature key
+ and digest verification events from the helpers.
+
+ * linux/RemotePackageManager.cs (GetWhitelistedKeys): Add stub;
+ will implement later.
+
+ * linux/SharedInterfaces.cs (IPackageManager): Add a method to the
+ package manager interface to get whitelisted keys.
+
+
2006-05-16 Chris Rivera
* linux/RemotePackageManager.cs: Mark MediaMessage with view privileges.
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-05-15 20:54:21.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs 2006-05-19 01:56:38.000000000 +0200
@@ -263,9 +263,12 @@
string path, Catalog catalog) {
try {
Database.GetLock (false);
- RCProgress progress = new RCProgress (Path.Combine (prefix, "parse-metadata"),
- String.Format ("'{0}' '{1}' '{2}' '{3}' '{4}'",
- DatabasePath, type, uri, path, catalog.Id));
+
+ ProcessStartInfo info = new ProcessStartInfo (Path.Combine (prefix, "parse-metadata"));
+ info.Arguments = String.Format ("'{0}' '{1}' '{2}' '{3}' '{4}'",
+ DatabasePath, type, uri, path, catalog.Id);
+ RCProgress progress = new RCProgress ();
+ progress.Start (info);
progress.WaitForStop ();
} finally {
Database.ReleaseLock (false);
@@ -490,7 +493,7 @@
return memory.GetBuffer ();
}
- private enum TransactionStatus {
+ private enum RCHelperStatus {
Unknown = -1,
Start = 0,
Step = 1,
@@ -498,8 +501,14 @@
Failure = 3,
Done = 4,
Verify = 5,
-
- MediaChange = 10
+ MediaChange = 10,
+ UnsignedFile = 21,
+ UnknownKey = 22,
+ UntrustedKey = 23,
+ KeyVerificationFailed = 24,
+ NoDigest = 25,
+ UnknownDigest = 26,
+ WrongDigest = 27
}
private class RCProgress : ProcessProgress {
@@ -512,7 +521,7 @@
public RCProgress () : this ("Red Carpet command") {}
public RCProgress (string name) : base (name) {
- catchStdout = true;
+ catchStdout = false;
}
public RCProgress (string filename, string arguments) : this () {
@@ -547,6 +556,7 @@
if (args.IsStdout) {
if (catchStdout)
log.Debug (args.Line);
+ ParseProgressLine (args.Line);
} else {
int level = -1;
string msg = args.Line;
@@ -569,6 +579,108 @@
log.Debug (msg);
}
}
+
+ private void ParseProgressLine (string line) {
+ string[] pieces = line.Split (new Char[] {'|'});
+
+ int status;
+ try {
+ status = Convert.ToInt32 (pieces[0]);
+ } catch {
+ status = -1;
+ }
+
+ RCHelperStatus phase = (RCHelperStatus) status;
+ switch (phase) {
+ case RCHelperStatus.UnsignedFile:
+ ParseUnsignedFile (pieces);
+ break;
+ case RCHelperStatus.UnknownKey:
+ ParseUnknownKey (pieces);
+ break;
+ case RCHelperStatus.UntrustedKey:
+ ParseUntrustedKey (pieces);
+ break;
+ case RCHelperStatus.KeyVerificationFailed:
+ ParseKeyVerificationFailed (pieces);
+ break;
+ case RCHelperStatus.NoDigest:
+ ParseNoDigest (pieces);
+ break;
+ case RCHelperStatus.UnknownDigest:
+ ParseUnknownDigest (pieces);
+ break;
+ case RCHelperStatus.WrongDigest:
+ ParseWrongDigest (pieces);
+ break;
+ default:
+ log.Info (line);
+ break;
+ }
+ }
+
+ private void ParseUnsignedFile (string[] pieces) {
+ if (pieces.Length < 1) {
+ log.Warn ("Can not parse 'unsigned file' status line");
+ return;
+ }
+ log.Debug (String.Format ("Unsigned file '{0}'", pieces[1]));
+ WriteToStdin ("1\n");
+ }
+
+ private void ParseUnknownKey (string[] pieces) {
+ if (pieces.Length < 4) {
+ log.Warn ("Can not parse 'unknown key' status line");
+ return;
+ }
+ log.Debug (String.Format ("Unknown key '{0}' ({1})", pieces[3], pieces[2]));
+ WriteToStdin ("1\n");
+ }
+
+ private void ParseUntrustedKey (string[] pieces) {
+ if (pieces.Length < 3) {
+ log.Warn ("Can not parse 'untrusted key' status line");
+ return;
+ }
+ log.Debug (String.Format ("Untrusted key '{0}' ({1})", pieces[2], pieces[1]));
+ WriteToStdin ("1\n");
+ }
+
+ private void ParseKeyVerificationFailed (string[] pieces) {
+ if (pieces.Length < 4) {
+ log.Warn ("Can not parse media 'key verification failed' status line");
+ return;
+ }
+ log.Debug (String.Format ("Key verification failed '{0}' ({1})", pieces[3], pieces[2]));
+ WriteToStdin ("1\n");
+ }
+
+ private void ParseNoDigest (string[] pieces) {
+ if (pieces.Length < 1) {
+ log.Warn ("Can not parse 'no digest' status line");
+ return;
+ }
+ log.Debug (String.Format ("No digest in file '{0}'", pieces[1]));
+ WriteToStdin ("1\n");
+ }
+
+ private void ParseUnknownDigest (string[] pieces) {
+ if (pieces.Length < 2) {
+ log.Warn ("Can not parse 'unknown digest' status line");
+ return;
+ }
+ log.Debug (String.Format ("Unknown digest '{0}'", pieces[2]));
+ WriteToStdin ("1\n");
+ }
+
+ private void ParseWrongDigest (string[] pieces) {
+ if (pieces.Length < 3) {
+ log.Warn ("Can not parse 'wrong digest' status line");
+ return;
+ }
+ log.Debug (String.Format ("Wrong digest '{0}' (expected '{1}')", pieces[3], pieces[2]));
+ WriteToStdin ("1\n");
+ }
}
private class FindFileProgress : RCProgress {
@@ -733,28 +845,49 @@
status = -1;
}
- TransactionStatus phase = (TransactionStatus) status;
+ RCHelperStatus phase = (RCHelperStatus) status;
switch (phase) {
- case TransactionStatus.Start:
+ case RCHelperStatus.Start:
ParseStart (pieces);
break;
- case TransactionStatus.Step:
+ case RCHelperStatus.Step:
ParseStep (pieces);
break;
- case TransactionStatus.Progress:
+ case RCHelperStatus.Progress:
ParseProgress (pieces);
break;
- case TransactionStatus.Failure:
+ case RCHelperStatus.Failure:
ParseFailure (pieces);
break;
- case TransactionStatus.Done:
+ case RCHelperStatus.Done:
break;
- case TransactionStatus.Verify:
+ case RCHelperStatus.Verify:
ParseVerify (pieces);
break;
- case TransactionStatus.MediaChange:
+ case RCHelperStatus.MediaChange:
ParseMediaChange (pieces);
break;
+ case RCHelperStatus.UnsignedFile:
+ ParseUnsignedFile (pieces);
+ break;
+ case RCHelperStatus.UnknownKey:
+ ParseUnknownKey (pieces);
+ break;
+ case RCHelperStatus.UntrustedKey:
+ ParseUntrustedKey (pieces);
+ break;
+ case RCHelperStatus.KeyVerificationFailed:
+ ParseKeyVerificationFailed (pieces);
+ break;
+ case RCHelperStatus.NoDigest:
+ ParseNoDigest (pieces);
+ break;
+ case RCHelperStatus.UnknownDigest:
+ ParseUnknownDigest (pieces);
+ break;
+ case RCHelperStatus.WrongDigest:
+ ParseWrongDigest (pieces);
+ break;
default:
log.Info (line);
break;
@@ -883,6 +1016,55 @@
if (MediaRequired != null)
MediaRequired (pieces[1], pieces[2]);
}
+
+ private void ParseUnsignedFile (string[] pieces) {
+ if (pieces.Length < 1) {
+ log.Warn ("Can not parse 'unsigned file' status line");
+ return;
+ }
+ }
+
+ private void ParseUnknownKey (string[] pieces) {
+ if (pieces.Length < 4) {
+ log.Warn ("Can not parse 'unknown key' status line");
+ return;
+ }
+ }
+
+ private void ParseUntrustedKey (string[] pieces) {
+ if (pieces.Length < 3) {
+ log.Warn ("Can not parse 'untrusted key' status line");
+ return;
+ }
+ }
+
+ private void ParseKeyVerificationFailed (string[] pieces) {
+ if (pieces.Length < 4) {
+ log.Warn ("Can not parse media 'key verification failed' status line");
+ return;
+ }
+ }
+
+ private void ParseNoDigest (string[] pieces) {
+ if (pieces.Length < 1) {
+ log.Warn ("Can not parse 'no digest' status line");
+ return;
+ }
+ }
+
+ private void ParseUnknownDigest (string[] pieces) {
+ if (pieces.Length < 2) {
+ log.Warn ("Can not parse 'unknown digest' status line");
+ return;
+ }
+ }
+
+ private void ParseWrongDigest (string[] pieces) {
+ if (pieces.Length < 3) {
+ log.Warn ("Can not parse 'wrong digest' status line");
+ return;
+ }
+ }
}
private sealed class SqlTransaction {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore 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-17 00:52:16.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/RemotePackageManager.cs 2006-05-18 23:52:54.000000000 +0200
@@ -487,6 +487,11 @@
return GetResolvableInfo (Product.GetLatestProduct (name, subscribedOnly));
}
+ [Privilege ("view")]
+ public KeyInfo[] GetWhitelistedKeys () {
+ return null;
+ }
+
// Helper methods for the remoting interface
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/SharedInterfaces.cs new/zmd-7.1.1.0/modules/linux/SharedInterfaces.cs
--- old/zmd-7.1.1.0/modules/linux/SharedInterfaces.cs 2006-04-11 15:15:54.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/SharedInterfaces.cs 2006-05-18 23:51:01.000000000 +0200
@@ -140,6 +140,9 @@
ResolvableInfo[] QueryProducts (params object[] query);
ResolvableInfo[] QueryLatestProducts (IList query);
ResolvableInfo GetLatestProduct (string name, bool subscribedOnly);
+
+ // For Zypp
+ KeyInfo[] GetWhitelistedKeys ();
}
public interface ITransactionProgress : IProgress {
@@ -317,4 +320,19 @@
Date = date;
}
}
+
+ [Serializable]
+ public struct KeyInfo {
+ public string Id;
+ public string Name;
+ public string Fingerprint;
+
+ public static KeyInfo Empty = new KeyInfo ();
+
+ public KeyInfo (string id, string name, string fingerprint) {
+ Id = id;
+ Name = name;
+ Fingerprint = fingerprint;
+ }
+ }
}
Binary files old/zmd-7.1.1.0/po/de_DE.gmo and new/zmd-7.1.1.0/po/de_DE.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/de_DE.po new/zmd-7.1.1.0/po/de_DE.po
--- old/zmd-7.1.1.0/po/de_DE.po 2006-05-17 21:04:33.000000000 +0200
+++ new/zmd-7.1.1.0/po/de_DE.po 2006-05-19 02:05:04.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-17 15:04-0400\n"
+"POT-Creation-Date: 2006-05-18 20:05-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -274,52 +274,52 @@
msgid "No bundle with id '{0}' was found."
msgstr "Kein Bundle mit ID '{0}' gefunden."
-#: src/BundleManager.cs:440
+#: src/BundleManager.cs:443
#, fuzzy, csharp-format
msgid "Bundle '{0}' (requires '{1}') is locked and can not be removed"
msgstr ""
"Bundle '{0}' erfordert das Bundle mit der ID '{1}', das jedoch nicht "
"gefunden wurde."
-#: src/BundleManager.cs:454 src/BundleManager.cs:563
+#: src/BundleManager.cs:457 src/BundleManager.cs:566
#, fuzzy, csharp-format
msgid "Bundle '{0}' is locked and can not be removed."
msgstr "Bundle '{0}' ist nicht vorbereitet."
-#: src/BundleManager.cs:479
+#: src/BundleManager.cs:482
#, csharp-format
msgid "Bundle '{0}' requires bundle with id '{1}', which was not found."
msgstr ""
"Bundle '{0}' erfordert das Bundle mit der ID '{1}', das jedoch nicht "
"gefunden wurde."
-#: src/BundleManager.cs:483
+#: src/BundleManager.cs:486
#, fuzzy, csharp-format
msgid "Bundle '{0}' (required by '{1}') is locked and cat not be installed."
msgstr ""
"Bundle '{0}' erfordert das Bundle mit der ID '{1}', das jedoch nicht "
"gefunden wurde."
-#: src/BundleManager.cs:498 src/BundleManager.cs:557
+#: src/BundleManager.cs:501 src/BundleManager.cs:560
#, fuzzy, csharp-format
msgid "Bundle '{0}' is locked and can not be installed."
msgstr "Bundle '{0}' ist nicht vorbereitet."
-#: src/BundleManager.cs:510
+#: src/BundleManager.cs:513
#, csharp-format
msgid "'{0}' is already installed."
msgstr "'{0}' ist bereits installiert."
-#: src/BundleManager.cs:516
+#: src/BundleManager.cs:519
#, csharp-format
msgid "'{0}' is not installed."
msgstr "'{0}' ist nicht installiert."
-#: src/BundleManager.cs:524
+#: src/BundleManager.cs:527
msgid "Preparing Bundles"
msgstr "Bundles werden vorbereitet."
-#: src/BundleManager.cs:549
+#: src/BundleManager.cs:552
msgid "Another transaction is already in progress"
msgstr "Eine andere Transaktion wird bereits ausgeführt."
Binary files old/zmd-7.1.1.0/po/en_US.gmo and new/zmd-7.1.1.0/po/en_US.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/en_US.po new/zmd-7.1.1.0/po/en_US.po
--- old/zmd-7.1.1.0/po/en_US.po 2006-05-17 21:04:33.000000000 +0200
+++ new/zmd-7.1.1.0/po/en_US.po 2006-05-19 02:05:04.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-17 15:04-0400\n"
+"POT-Creation-Date: 2006-05-18 20:05-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -271,46 +271,46 @@
msgid "No bundle with id '{0}' was found."
msgstr "No bundle with id '{0}' was found."
-#: src/BundleManager.cs:440
+#: src/BundleManager.cs:443
#, fuzzy, csharp-format
msgid "Bundle '{0}' (requires '{1}') is locked and can not be removed"
msgstr "Bundle '{0}' requires bundle with id '{1}', which was not found."
-#: src/BundleManager.cs:454 src/BundleManager.cs:563
+#: src/BundleManager.cs:457 src/BundleManager.cs:566
#, fuzzy, csharp-format
msgid "Bundle '{0}' is locked and can not be removed."
msgstr "Bundle '{0}' is not prepared."
-#: src/BundleManager.cs:479
+#: src/BundleManager.cs:482
#, csharp-format
msgid "Bundle '{0}' requires bundle with id '{1}', which was not found."
msgstr "Bundle '{0}' requires bundle with id '{1}', which was not found."
-#: src/BundleManager.cs:483
+#: src/BundleManager.cs:486
#, fuzzy, csharp-format
msgid "Bundle '{0}' (required by '{1}') is locked and cat not be installed."
msgstr "Bundle '{0}' requires bundle with id '{1}', which was not found."
-#: src/BundleManager.cs:498 src/BundleManager.cs:557
+#: src/BundleManager.cs:501 src/BundleManager.cs:560
#, fuzzy, csharp-format
msgid "Bundle '{0}' is locked and can not be installed."
msgstr "Bundle '{0}' is not prepared."
-#: src/BundleManager.cs:510
+#: src/BundleManager.cs:513
#, csharp-format
msgid "'{0}' is already installed."
msgstr "'{0}' is already installed."
-#: src/BundleManager.cs:516
+#: src/BundleManager.cs:519
#, csharp-format
msgid "'{0}' is not installed."
msgstr "'{0}' is not installed."
-#: src/BundleManager.cs:524
+#: src/BundleManager.cs:527
msgid "Preparing Bundles"
msgstr "Preparing Bundles"
-#: src/BundleManager.cs:549
+#: src/BundleManager.cs:552
msgid "Another transaction is already in progress"
msgstr "Another transaction is already in progress"
Binary files old/zmd-7.1.1.0/po/es_ES.gmo and new/zmd-7.1.1.0/po/es_ES.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/es_ES.po new/zmd-7.1.1.0/po/es_ES.po
--- old/zmd-7.1.1.0/po/es_ES.po 2006-05-17 21:04:33.000000000 +0200
+++ new/zmd-7.1.1.0/po/es_ES.po 2006-05-19 02:05:04.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-17 15:04-0400\n"
+"POT-Creation-Date: 2006-05-18 20:05-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -279,46 +279,46 @@
msgid "No bundle with id '{0}' was found."
msgstr "No se ha encontrado ningún lote con ID '{0}'."
-#: src/BundleManager.cs:440
+#: src/BundleManager.cs:443
#, fuzzy, csharp-format
msgid "Bundle '{0}' (requires '{1}') is locked and can not be removed"
msgstr "El lote '{0}' exige un ID '{1}' que no se ha encontrado."
-#: src/BundleManager.cs:454 src/BundleManager.cs:563
+#: src/BundleManager.cs:457 src/BundleManager.cs:566
#, fuzzy, csharp-format
msgid "Bundle '{0}' is locked and can not be removed."
msgstr "El lote '{0}' no está preparado."
-#: src/BundleManager.cs:479
+#: src/BundleManager.cs:482
#, csharp-format
msgid "Bundle '{0}' requires bundle with id '{1}', which was not found."
msgstr "El lote '{0}' exige un ID '{1}' que no se ha encontrado."
-#: src/BundleManager.cs:483
+#: src/BundleManager.cs:486
#, fuzzy, csharp-format
msgid "Bundle '{0}' (required by '{1}') is locked and cat not be installed."
msgstr "El lote '{0}' exige un ID '{1}' que no se ha encontrado."
-#: src/BundleManager.cs:498 src/BundleManager.cs:557
+#: src/BundleManager.cs:501 src/BundleManager.cs:560
#, fuzzy, csharp-format
msgid "Bundle '{0}' is locked and can not be installed."
msgstr "El lote '{0}' no está preparado."
-#: src/BundleManager.cs:510
+#: src/BundleManager.cs:513
#, csharp-format
msgid "'{0}' is already installed."
msgstr "'{0}' ya instalado."
-#: src/BundleManager.cs:516
+#: src/BundleManager.cs:519
#, csharp-format
msgid "'{0}' is not installed."
msgstr "'{0}' sin instalar."
-#: src/BundleManager.cs:524
+#: src/BundleManager.cs:527
msgid "Preparing Bundles"
msgstr "Preparando lotes"
-#: src/BundleManager.cs:549
+#: src/BundleManager.cs:552
msgid "Another transaction is already in progress"
msgstr "Hay otra transacción en proceso"
Binary files old/zmd-7.1.1.0/po/fr_FR.gmo and new/zmd-7.1.1.0/po/fr_FR.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/fr_FR.po new/zmd-7.1.1.0/po/fr_FR.po
--- old/zmd-7.1.1.0/po/fr_FR.po 2006-05-17 21:04:33.000000000 +0200
+++ new/zmd-7.1.1.0/po/fr_FR.po 2006-05-19 02:05:04.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-17 15:04-0400\n"
+"POT-Creation-Date: 2006-05-18 20:05-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -278,52 +278,52 @@
msgid "No bundle with id '{0}' was found."
msgstr "Aucun ensemble avec l'identificateur '{0}' n'a été trouvé."
-#: src/BundleManager.cs:440
+#: src/BundleManager.cs:443
#, fuzzy, csharp-format
msgid "Bundle '{0}' (requires '{1}') is locked and can not be removed"
msgstr ""
"L'ensemble '{0}' nécessite l'ensemble ayant l'identificateur '{1}' , qui n'a "
"pas été trouvé."
-#: src/BundleManager.cs:454 src/BundleManager.cs:563
+#: src/BundleManager.cs:457 src/BundleManager.cs:566
#, fuzzy, csharp-format
msgid "Bundle '{0}' is locked and can not be removed."
msgstr "L'ensemble '{0}' n'est pas préparé."
-#: src/BundleManager.cs:479
+#: src/BundleManager.cs:482
#, csharp-format
msgid "Bundle '{0}' requires bundle with id '{1}', which was not found."
msgstr ""
"L'ensemble '{0}' nécessite l'ensemble ayant l'identificateur '{1}' , qui n'a "
"pas été trouvé."
-#: src/BundleManager.cs:483
+#: src/BundleManager.cs:486
#, fuzzy, csharp-format
msgid "Bundle '{0}' (required by '{1}') is locked and cat not be installed."
msgstr ""
"L'ensemble '{0}' nécessite l'ensemble ayant l'identificateur '{1}' , qui n'a "
"pas été trouvé."
-#: src/BundleManager.cs:498 src/BundleManager.cs:557
+#: src/BundleManager.cs:501 src/BundleManager.cs:560
#, fuzzy, csharp-format
msgid "Bundle '{0}' is locked and can not be installed."
msgstr "L'ensemble '{0}' n'est pas préparé."
-#: src/BundleManager.cs:510
+#: src/BundleManager.cs:513
#, csharp-format
msgid "'{0}' is already installed."
msgstr "'{0}' est déjà installé."
-#: src/BundleManager.cs:516
+#: src/BundleManager.cs:519
#, csharp-format
msgid "'{0}' is not installed."
msgstr "'{0}' n'est pas installé"
-#: src/BundleManager.cs:524
+#: src/BundleManager.cs:527
msgid "Preparing Bundles"
msgstr "Préparation des ensembles"
-#: src/BundleManager.cs:549
+#: src/BundleManager.cs:552
msgid "Another transaction is already in progress"
msgstr "Une autre transaction est déjà en cours"
Binary files old/zmd-7.1.1.0/po/pt_BR.gmo and new/zmd-7.1.1.0/po/pt_BR.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/pt_BR.po new/zmd-7.1.1.0/po/pt_BR.po
--- old/zmd-7.1.1.0/po/pt_BR.po 2006-05-17 21:04:33.000000000 +0200
+++ new/zmd-7.1.1.0/po/pt_BR.po 2006-05-19 02:05:04.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-17 15:04-0400\n"
+"POT-Creation-Date: 2006-05-18 20:05-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -274,46 +274,46 @@
msgid "No bundle with id '{0}' was found."
msgstr "Não foi encontrado nenhum bundle com ID '{0}'."
-#: src/BundleManager.cs:440
+#: src/BundleManager.cs:443
#, fuzzy, csharp-format
msgid "Bundle '{0}' (requires '{1}') is locked and can not be removed"
msgstr "O bundle '{0}' requer o bundle com ID '{1}', que não foi encontrado."
-#: src/BundleManager.cs:454 src/BundleManager.cs:563
+#: src/BundleManager.cs:457 src/BundleManager.cs:566
#, fuzzy, csharp-format
msgid "Bundle '{0}' is locked and can not be removed."
msgstr "O bundle '{0}' não está preparado."
-#: src/BundleManager.cs:479
+#: src/BundleManager.cs:482
#, csharp-format
msgid "Bundle '{0}' requires bundle with id '{1}', which was not found."
msgstr "O bundle '{0}' requer o bundle com ID '{1}', que não foi encontrado."
-#: src/BundleManager.cs:483
+#: src/BundleManager.cs:486
#, fuzzy, csharp-format
msgid "Bundle '{0}' (required by '{1}') is locked and cat not be installed."
msgstr "O bundle '{0}' requer o bundle com ID '{1}', que não foi encontrado."
-#: src/BundleManager.cs:498 src/BundleManager.cs:557
+#: src/BundleManager.cs:501 src/BundleManager.cs:560
#, fuzzy, csharp-format
msgid "Bundle '{0}' is locked and can not be installed."
msgstr "O bundle '{0}' não está preparado."
-#: src/BundleManager.cs:510
+#: src/BundleManager.cs:513
#, csharp-format
msgid "'{0}' is already installed."
msgstr "'{0}' já está instalado."
-#: src/BundleManager.cs:516
+#: src/BundleManager.cs:519
#, csharp-format
msgid "'{0}' is not installed."
msgstr "'{0}' não está instalado."
-#: src/BundleManager.cs:524
+#: src/BundleManager.cs:527
msgid "Preparing Bundles"
msgstr "Preparando Bundles"
-#: src/BundleManager.cs:549
+#: src/BundleManager.cs:552
msgid "Another transaction is already in progress"
msgstr "Já existe outra transação em andamento"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/zmd.pot new/zmd-7.1.1.0/po/zmd.pot
--- old/zmd-7.1.1.0/po/zmd.pot 2006-05-17 21:06:11.000000000 +0200
+++ new/zmd-7.1.1.0/po/zmd.pot 2006-05-19 02:05:04.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-17 15:06-0400\n"
+"POT-Creation-Date: 2006-05-18 20:05-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -269,46 +269,46 @@
msgid "No bundle with id '{0}' was found."
msgstr ""
-#: src/BundleManager.cs:440
+#: src/BundleManager.cs:443
#, csharp-format
msgid "Bundle '{0}' (requires '{1}') is locked and can not be removed"
msgstr ""
-#: src/BundleManager.cs:454 src/BundleManager.cs:563
+#: src/BundleManager.cs:457 src/BundleManager.cs:566
#, csharp-format
msgid "Bundle '{0}' is locked and can not be removed."
msgstr ""
-#: src/BundleManager.cs:479
+#: src/BundleManager.cs:482
#, csharp-format
msgid "Bundle '{0}' requires bundle with id '{1}', which was not found."
msgstr ""
-#: src/BundleManager.cs:483
+#: src/BundleManager.cs:486
#, csharp-format
msgid "Bundle '{0}' (required by '{1}') is locked and cat not be installed."
msgstr ""
-#: src/BundleManager.cs:498 src/BundleManager.cs:557
+#: src/BundleManager.cs:501 src/BundleManager.cs:560
#, csharp-format
msgid "Bundle '{0}' is locked and can not be installed."
msgstr ""
-#: src/BundleManager.cs:510
+#: src/BundleManager.cs:513
#, csharp-format
msgid "'{0}' is already installed."
msgstr ""
-#: src/BundleManager.cs:516
+#: src/BundleManager.cs:519
#, csharp-format
msgid "'{0}' is not installed."
msgstr ""
-#: src/BundleManager.cs:524
+#: src/BundleManager.cs:527
msgid "Preparing Bundles"
msgstr ""
-#: src/BundleManager.cs:549
+#: src/BundleManager.cs:552
msgid "Another transaction is already in progress"
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/BuildConfig.cs new/zmd-7.1.1.0/src/BuildConfig.cs
--- old/zmd-7.1.1.0/src/BuildConfig.cs 2006-05-17 21:06:04.000000000 +0200
+++ new/zmd-7.1.1.0/src/BuildConfig.cs 2006-05-18 22:12:56.000000000 +0200
@@ -1,14 +1,14 @@
namespace Novell.Zenworks.Zmd {
public class BuildConfig {
- public const string PREFIX = "/opt/zypp";
- public const string SYSCONFDIR = "/opt/zypp/etc";
- public const string DATADIR = "/opt/zypp/share";
- public const string LIBDIR = "/opt/zypp/lib";
- public const string LIBDIR_MANAGED = "/opt/zypp" + "/lib";
- public const string LOCALSTATEDIR = "/opt/zypp/var";
+ public const string PREFIX = "/usr/local";
+ public const string SYSCONFDIR = "/usr/local/etc";
+ public const string DATADIR = "/usr/local/share";
+ public const string LIBDIR = "/usr/local/lib";
+ public const string LIBDIR_MANAGED = "/usr/local" + "/lib";
+ public const string LOCALSTATEDIR = "/usr/local/var";
- public const string LOGDIR = "/opt/zypp/var/log";
+ public const string LOGDIR = "/usr/local/var/log";
public const string LOGFILE = LOGDIR + "/zmd-messages.log";
public const string MODULE_PATH = LIBDIR_MANAGED + "/zmd/modules";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/BundleManager.cs new/zmd-7.1.1.0/src/BundleManager.cs
--- old/zmd-7.1.1.0/src/BundleManager.cs 2006-05-17 20:25:44.000000000 +0200
+++ new/zmd-7.1.1.0/src/BundleManager.cs 2006-05-19 02:03:25.000000000 +0200
@@ -237,6 +237,9 @@
}
public static Catalog LookupCatalogById (string id) {
+ if (id == system.Id)
+ return system;
+
lock (catalogs) {
foreach (Catalog catalog in catalogs) {
if (catalog.Id == id)
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-05-16 01:45:18.000000000 +0200
+++ new/zmd-7.1.1.0/src/ChangeLog 2006-05-19 02:03:43.000000000 +0200
@@ -1,3 +1,17 @@
+2006-05-18 Dan Mills
+
+ * ProcessProgress.cs (WriteToStdin): Implement.
+
+2006-05-18 James Willcox
+
+ * ostargets.xml: fix the targets for some of the sles 10 architecture
+ Patch from Michael Wolf.
+
+2006-05-18 Chris Rivera
+
+ * BundleManager.cs: Have LookupCatalogById check the system catalog
+ for a matching id.
+
2006-05-15 Chris Rivera
* WebProxy.cs: Catch ArgumentExceptions when getting the proxy password.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore 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-04-13 11:05:48.000000000 +0200
+++ new/zmd-7.1.1.0/src/ProcessProgress.cs 2006-05-19 01:45:08.000000000 +0200
@@ -26,6 +26,7 @@
using System.Threading;
using Novell.Zenworks.Zmd;
using Novell.Zenworks.Zmd.Public;
+using Novell.Zenworks.Utility;
using log4net;
namespace Novell.Zenworks.Zmd {
@@ -77,6 +78,7 @@
get { return proc.StartInfo; }
set {
value.UseShellExecute = false;
+ value.RedirectStandardInput = true;
value.RedirectStandardOutput = true;
value.RedirectStandardError = true;
@@ -194,5 +196,13 @@
Monitor.Pulse (procLock);
}
}
+
+ public void WriteToStdin (string s) {
+ lock (procLock) {
+ if (proc == null)
+ throw new ZenException (GettextCatalog.GetString ("Trying to write to stdin without a running process."));
+ proc.StandardInput.Write (s);
+ }
+ }
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/ostargets.xml new/zmd-7.1.1.0/src/ostargets.xml
--- old/zmd-7.1.1.0/src/ostargets.xml 2006-03-22 17:08:43.000000000 +0100
+++ new/zmd-7.1.1.0/src/ostargets.xml 2006-05-19 02:03:25.000000000 +0200
@@ -423,7 +423,7 @@
<pkgmgr>rpm</pkgmgr>
Server
<detect>
- <file source="/etc/SuSE-release" substring="SUSE LINUX Enterprise Server 9.90"/>
+ <file source="/etc/SuSE-release" substring="SUSE LINUX Enterprise Server 10"/>
</detect>
<products/>
</ostarget>
@@ -436,7 +436,7 @@
<pkgmgr>rpm</pkgmgr>
Server
<detect>
- <file source="/etc/SuSE-release" substring="SUSE Linux Enterprise Server 9.90"/>
+ <file source="/etc/SuSE-release" substring="SUSE Linux Enterprise Server 10"/>
</detect>
<products/>
</ostarget>
@@ -449,7 +449,7 @@
<pkgmgr>rpm</pkgmgr>
Server
<detect>
- <file source="/etc/SuSE-release" substring="SUSE Linux Enterprise Server 9.90"/>
+ <file source="/etc/SuSE-release" substring="SUSE Linux Enterprise Server 10"/>
</detect>
<products/>
</ostarget>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...