Hello community,
here is the log from the commit of package zmd
checked in at Thu Apr 13 17:16:52 CEST 2006.
--------
--- zmd/zmd.changes 2006-04-11 18:48:37.000000000 +0200
+++ STABLE/zmd/zmd.changes 2006-04-12 20:40:43.000000000 +0200
@@ -1,0 +2,9 @@
+Wed Apr 12 20:20:47 CEST 2006 - maw@suse.de
+
+- New source drop (r27024) which:
+- Fixes casting of IResolvables to Packages (#165532)
+- Pretends we download zipp packages even though we don't. libzypp
+ downloads the mlater (#165597)
+- Has RCE service fixes.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zmd.spec ++++++
--- /var/tmp/diff_new_pack.8IMLvj/_old 2006-04-13 17:16:20.000000000 +0200
+++ /var/tmp/diff_new_pack.8IMLvj/_new 2006-04-13 17:16:20.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: 7
+Release: 9
License: LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
@@ -156,6 +156,12 @@
# %{_libdir}/monodoc/sources/*
%changelog -n zmd
+* Wed Apr 12 2006 - maw@suse.de
+- New source drop (r27024) which:
+- Fixes casting of IResolvables to Packages (#165532)
+- Pretends we download zipp packages even though we don't. libzypp
+ downloads the mlater (#165597)
+- Has RCE service fixes.
* Tue Apr 11 2006 - maw@suse.de
- New source drop (r26951) which:
- Fixes patch updates
++++++ 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-04-11 17:03:49.000000000 +0200
+++ new/zmd-7.1.1.0/modules/ChangeLog 2006-04-12 19:42:44.000000000 +0200
@@ -1,3 +1,16 @@
+2006-04-12 Dan Mills
+
+ * linux/Transaction.cs: Fix casting of IResolvables to Packages.
+ Sometimes, they aren't.
+
+ * linux/ZyppService.cs (Fetch): Pretend we downloaded zypp
+ packages. Libzypp downloads them later.
+
+ * linux/RedCarpetBackend.cs: Fix some debug strings.
+
+ * linux/RCEService.cs (RCECatalog): Subclass from
+ ResolvableCatalog instead of Catalog.
+
2006-04-11 Chris Rivera
* linux/Patch.cs: change GetUpdates (). A patch is an update if it is
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/RCEService.cs new/zmd-7.1.1.0/modules/linux/RCEService.cs
--- old/zmd-7.1.1.0/modules/linux/RCEService.cs 2006-04-05 16:58:00.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/RCEService.cs 2006-04-12 12:26:23.000000000 +0200
@@ -138,7 +138,7 @@
return;
foreach (RCECatalog c in catalogs) {
- PackageManager.RemoveAvailablePackages (c.Packages);
+ PackageManager.RemoveAvailablePackages (c);
BundleManager.Remove (c);
}
@@ -341,7 +341,7 @@
try {
ParsePackageInfo (catalog, dp.Path);
- PackageManager.AddAvailablePackages (catalog.Packages);
+ PackageManager.AddAvailablePackages (catalog);
BundleManager.Add (catalog);
packageProgress.Finish ();
@@ -357,19 +357,18 @@
using (Stream stream = Novell.Zenworks.Zmd.Util.OpenMaybeCompressedFile (path, FileMode.Open)) {
XmlTextReader reader = new XmlTextReader (stream);
ResolvableCatalog pkgs = RCEPackage.FromXml (reader, catalog, dephash);
- catalog.Packages = pkgs;
+ catalog.Clear ();
+ catalog.AddPackages (pkgs);
Console.WriteLine ("Added {0} packages ({1})", pkgs.Count, catalog.Name);
}
}
}
}
- public class RCECatalog : Catalog {
+ public class RCECatalog : ResolvableCatalog {
private string purl;
private string furl;
- private WebCache cache;
- private ResolvableCatalog packages = new ResolvableCatalog ();
public string PackageInfoUrl {
get { return purl; }
@@ -379,16 +378,6 @@
get { return furl; }
}
- public WebCache Cache {
- get { return cache; }
- set { cache = value; }
- }
-
- public ResolvableCatalog Packages {
- get { return packages; }
- set { packages = value; }
- }
-
private static bool IsTargetApplicable (string targetList) {
string[] splitTargets = targetList.Split (':');
if (splitTargets.Length > 1) {
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-04-11 12:57:37.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs 2006-04-12 17:57:20.000000000 +0200
@@ -101,7 +101,10 @@
}
private void OnCatalogAdded (object o, Catalog catalog) {
- log.Debug (String.Format ("Catalog '{0}' added, adding resolvables to database (if any)", catalog.DisplayName));
+ string name = catalog.Name;
+ if (catalog.DisplayName != null)
+ name = catalog.DisplayName;
+ log.Debug (String.Format ("Catalog '{0}' added, adding resolvables to database (if any)", name));
ResolvableCatalog cat = catalog as ResolvableCatalog;
if (cat != null) {
@@ -126,7 +129,10 @@
}
private void OnCatalogRemoved (object o, Catalog catalog) {
- log.Debug (String.Format ("Catalog '{0}' removed, removing resolvables from database (if any)", catalog.DisplayName));
+ string name = catalog.Name;
+ if (catalog.DisplayName != null)
+ name = catalog.DisplayName;
+ log.Debug (String.Format ("Catalog '{0}' removed, removing resolvables from database (if any)", name));
ResolvableCatalog cat = catalog as ResolvableCatalog;
if (cat != null) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/Transaction.cs new/zmd-7.1.1.0/modules/linux/Transaction.cs
--- old/zmd-7.1.1.0/modules/linux/Transaction.cs 2006-04-11 15:15:54.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/Transaction.cs 2006-04-12 19:41:22.000000000 +0200
@@ -137,15 +137,17 @@
ArrayList list = new ArrayList ();
if (installs != null) {
- foreach (Package pkg in installs) {
- if (pkg.FileName == null)
+ foreach (IResolvable res in installs) {
+ Package pkg = res as Package;
+ if (pkg != null && pkg.FileName == null)
list.Add (pkg);
}
}
if (upgrades != null) {
- foreach (Package pkg in upgrades) {
- if (pkg.FileName == null)
+ foreach (IResolvable res in upgrades) {
+ Package pkg = res as Package;
+ if (pkg != null && pkg.FileName == null)
list.Add (pkg);
}
}
@@ -209,13 +211,15 @@
if ((flags & TransactionFlags.AllowReinstalls) > 0)
return;
- foreach (Package p in installs) {
- if (PackageManager.InstalledPackages.Contains (p))
+ foreach (IResolvable r in installs) {
+ Package p = r as Package;
+ if (p != null && PackageManager.InstalledPackages.Contains (p))
throw new ZenException (GettextCatalog.GetString ("Package {0} is already installed."), p.ToString ());
}
- foreach (Package p in upgrades) {
- if (PackageManager.InstalledPackages.Contains (p))
+ foreach (IResolvable r in upgrades) {
+ Package p = r as Package;
+ if (p != null && PackageManager.InstalledPackages.Contains (p))
throw new ZenException (GettextCatalog.GetString ("Package {0} is already installed."), p.ToString ());
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/ZyppService.cs new/zmd-7.1.1.0/modules/linux/ZyppService.cs
--- old/zmd-7.1.1.0/modules/linux/ZyppService.cs 2006-04-11 12:52:59.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/ZyppService.cs 2006-04-12 17:01:53.000000000 +0200
@@ -140,7 +140,9 @@
public class ZyppPackage : SqlPackage {
public override Progress Fetch () {
- throw new System.NotSupportedException ();
+ Progress progress = new Progress ("fake zypp package download");
+ progress.Finish ();
+ return progress;
}
}
}
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-04-11 18:13:44.000000000 +0200
+++ new/zmd-7.1.1.0/po/de_DE.po 2006-04-12 19:59:02.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 12:13-0400\n"
+"POT-Creation-Date: 2006-04-12 13:59-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -151,17 +151,17 @@
msgid "A transaction is already in progress"
msgstr "Eine andere Transaktion wird bereits ausgeführt."
-#: modules/linux/Transaction.cs:214 modules/linux/Transaction.cs:219
+#: modules/linux/Transaction.cs:217 modules/linux/Transaction.cs:223
#, fuzzy, csharp-format
msgid "Package {0} is already installed."
msgstr "'{0}' ist bereits installiert."
-#: modules/linux/Transaction.cs:232
+#: modules/linux/Transaction.cs:236
#, csharp-format
msgid "Can not download package {0}."
msgstr ""
-#: modules/linux/Transaction.cs:261
+#: modules/linux/Transaction.cs:265
msgid "Running Test..."
msgstr ""
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-04-11 18:13:44.000000000 +0200
+++ new/zmd-7.1.1.0/po/en_US.po 2006-04-12 19:59:02.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 12:13-0400\n"
+"POT-Creation-Date: 2006-04-12 13:59-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -148,17 +148,17 @@
msgid "A transaction is already in progress"
msgstr "Another transaction is already in progress"
-#: modules/linux/Transaction.cs:214 modules/linux/Transaction.cs:219
+#: modules/linux/Transaction.cs:217 modules/linux/Transaction.cs:223
#, fuzzy, csharp-format
msgid "Package {0} is already installed."
msgstr "'{0}' is already installed."
-#: modules/linux/Transaction.cs:232
+#: modules/linux/Transaction.cs:236
#, csharp-format
msgid "Can not download package {0}."
msgstr ""
-#: modules/linux/Transaction.cs:261
+#: modules/linux/Transaction.cs:265
msgid "Running Test..."
msgstr ""
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-04-11 18:13:44.000000000 +0200
+++ new/zmd-7.1.1.0/po/es_ES.po 2006-04-12 19:59:02.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 12:13-0400\n"
+"POT-Creation-Date: 2006-04-12 13:59-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -154,17 +154,17 @@
msgid "A transaction is already in progress"
msgstr "Hay otra transacción en proceso"
-#: modules/linux/Transaction.cs:214 modules/linux/Transaction.cs:219
+#: modules/linux/Transaction.cs:217 modules/linux/Transaction.cs:223
#, fuzzy, csharp-format
msgid "Package {0} is already installed."
msgstr "'{0}' ya instalado."
-#: modules/linux/Transaction.cs:232
+#: modules/linux/Transaction.cs:236
#, csharp-format
msgid "Can not download package {0}."
msgstr ""
-#: modules/linux/Transaction.cs:261
+#: modules/linux/Transaction.cs:265
msgid "Running Test..."
msgstr ""
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-04-11 18:13:44.000000000 +0200
+++ new/zmd-7.1.1.0/po/fr_FR.po 2006-04-12 19:59:02.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 12:13-0400\n"
+"POT-Creation-Date: 2006-04-12 13:59-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -153,17 +153,17 @@
msgid "A transaction is already in progress"
msgstr "Une autre transaction est déjà en cours"
-#: modules/linux/Transaction.cs:214 modules/linux/Transaction.cs:219
+#: modules/linux/Transaction.cs:217 modules/linux/Transaction.cs:223
#, fuzzy, csharp-format
msgid "Package {0} is already installed."
msgstr "'{0}' est déjà installé."
-#: modules/linux/Transaction.cs:232
+#: modules/linux/Transaction.cs:236
#, csharp-format
msgid "Can not download package {0}."
msgstr ""
-#: modules/linux/Transaction.cs:261
+#: modules/linux/Transaction.cs:265
msgid "Running Test..."
msgstr ""
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-04-11 18:13:44.000000000 +0200
+++ new/zmd-7.1.1.0/po/pt_BR.po 2006-04-12 19:59:02.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 12:13-0400\n"
+"POT-Creation-Date: 2006-04-12 13:59-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -150,17 +150,17 @@
msgid "A transaction is already in progress"
msgstr "Já existe outra transação em andamento"
-#: modules/linux/Transaction.cs:214 modules/linux/Transaction.cs:219
+#: modules/linux/Transaction.cs:217 modules/linux/Transaction.cs:223
#, fuzzy, csharp-format
msgid "Package {0} is already installed."
msgstr "'{0}' já está instalado."
-#: modules/linux/Transaction.cs:232
+#: modules/linux/Transaction.cs:236
#, csharp-format
msgid "Can not download package {0}."
msgstr ""
-#: modules/linux/Transaction.cs:261
+#: modules/linux/Transaction.cs:265
msgid "Running Test..."
msgstr ""
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-04-11 18:13:43.000000000 +0200
+++ new/zmd-7.1.1.0/po/zmd.pot 2006-04-12 19:59:02.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 12:13-0400\n"
+"POT-Creation-Date: 2006-04-12 13:59-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -146,17 +146,17 @@
msgid "A transaction is already in progress"
msgstr ""
-#: modules/linux/Transaction.cs:214 modules/linux/Transaction.cs:219
+#: modules/linux/Transaction.cs:217 modules/linux/Transaction.cs:223
#, csharp-format
msgid "Package {0} is already installed."
msgstr ""
-#: modules/linux/Transaction.cs:232
+#: modules/linux/Transaction.cs:236
#, csharp-format
msgid "Can not download package {0}."
msgstr ""
-#: modules/linux/Transaction.cs:261
+#: modules/linux/Transaction.cs:265
msgid "Running Test..."
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-04-11 18:13:39.000000000 +0200
+++ new/zmd-7.1.1.0/src/BuildConfig.cs 2006-04-12 18:38:32.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/ChangeLog new/zmd-7.1.1.0/src/ChangeLog
--- old/zmd-7.1.1.0/src/ChangeLog 2006-04-11 16:59:14.000000000 +0200
+++ new/zmd-7.1.1.0/src/ChangeLog 2006-04-12 19:00:24.000000000 +0200
@@ -1,3 +1,7 @@
+2006-04-12 Dan Mills
+
+ * ProcessProgress.cs (Start): Log the process we're about to run.
+
2006-04-11 Chris Rivera
* RemotePreferenceManager.cs: mark List () as view. This is ok
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-03-22 17:08:43.000000000 +0100
+++ new/zmd-7.1.1.0/src/ProcessProgress.cs 2006-04-12 18:04:31.000000000 +0200
@@ -50,6 +50,8 @@
public class ProcessProgress : Progress {
+ private static readonly ILog log = LogManager.GetLogger (typeof (Progress));
+
protected object procLock = new object ();
protected Process proc;
@@ -83,6 +85,8 @@
}
public void Start () {
+ log.Debug (String.Format ("Running: {0} {1}", proc.StartInfo.FileName, proc.StartInfo.Arguments));
+
this.status = ProgressStatus.Running;
proc.Start ();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...