Mailinglist Archive: opensuse-commit (1028 mails)

< Previous Next >
commit zmd
  • From: root@xxxxxxx (h_root)
  • Date: Wed, 21 Jun 2006 01:41:00 +0200 (CEST)
  • Message-id: <20060620234100.698476C491@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package zmd
checked in at Wed Jun 21 01:41:00 CEST 2006.

--------
--- zmd/zmd.changes 2006-06-17 00:50:12.000000000 +0200
+++ zmd/zmd.changes 2006-06-20 16:38:50.000000000 +0200
@@ -1,0 +2,24 @@
+Tue Jun 20 16:35:38 CEST 2006 - thunder@xxxxxxx
+
+- New source drop (r30715):
+- For yum and nu services, don't use WebCache.Exists() at all.
+ Fixes #183381
+
+-------------------------------------------------------------------
+Mon Jun 19 20:42:22 CEST 2006 - thunder@xxxxxxx
+
+- New source drop (r30653):
+- Implement a remote call IPreferenceManager.CleanAtNextStartup()
+ that makes zmd to rewrite it's sqlite database at next start and
+ whatever else we might need to clean up in the future. Workaround
+ for #186208.
+- Fix issue with duplicates in the SystemResolvableCatalog.
+
+-------------------------------------------------------------------
+Sat Jun 17 00:45:56 CEST 2006 - thunder@xxxxxxx
+
+- New source drop (r30635):
+- If parse-metadata fails throw progress.Exception if it exists
+ instead of a generic ZenException. This fixes 185941.
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ zmd.spec ++++++
--- /var/tmp/diff_new_pack.YIukhZ/_old 2006-06-21 01:40:53.000000000 +0200
+++ /var/tmp/diff_new_pack.YIukhZ/_new 2006-06-21 01:40:53.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: 55
+Release: 56
License: LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
@@ -171,7 +171,21 @@
# %{_libdir}/monodoc/sources/*

%changelog -n zmd
+* Tue Jun 20 2006 - thunder@xxxxxxx
+- New source drop (r30715):
+- For yum and nu services, don't use WebCache.Exists() at all.
+ Fixes #183381
+* Mon Jun 19 2006 - thunder@xxxxxxx
+- New source drop (r30653):
+- Implement a remote call IPreferenceManager.CleanAtNextStartup()
+ that makes zmd to rewrite it's sqlite database at next start and
+ whatever else we might need to clean up in the future. Workaround
+ for #186208.
+- Fix issue with duplicates in the SystemResolvableCatalog.
* Sat Jun 17 2006 - thunder@xxxxxxx
+- New source drop (r30635):
+- If parse-metadata fails throw progress.Exception if it exists
+ instead of a generic ZenException. This fixes 185941.
- New source drop (r30603):
- Fixes strerr parsing for the 'transact' helper (#185006).
- Run update-status after adding NU services (#185924).


++++++ zmd-7.1.1.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/ChangeLog new/zmd-7.1.1.0/ChangeLog
--- old/zmd-7.1.1.0/ChangeLog 2006-06-03 23:52:26.000000000 +0200
+++ new/zmd-7.1.1.0/ChangeLog 2006-06-19 15:22:40.000000000 +0200
@@ -1,3 +1,8 @@
+2006-06-17 Dan Mills <thunder@xxxxxxxxxx>
+
+ * build-buddy.conf: Add a "devel" build with less strict
+ requires/buildrequires, for those not using novell-zenworks-*.
+
2006-06-02 Dan Mills <thunder@xxxxxxxxxx>

* build-buddy.conf: Fix for BB 1.8.
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-16 23:13:19.000000000 +0200
+++ new/zmd-7.1.1.0/modules/ChangeLog 2006-06-20 15:49:23.000000000 +0200
@@ -1,3 +1,28 @@
+2006-06-20 Tambet Ingo <tambet@xxxxxxxxxx>
+
+ * linux/YumService.cs: Revert the previous command and don't use
+ WebCache.Exists() at all - it's a static method of WebCache and thus
+ can't use the WebCache's authentication. Finally fixes #183381.
+
+ * linux/NUService.cs: Ditto.
+
+ * linux/YumService.cs: Always try to download repomd.xml.asc and if
+ that succeeds, try to download repomd.xml.key as well.
+
+ * linux/NUService.cs: Ditto.
+
+2006-06-19 Chris Rivera <cmr@xxxxxxxxxx>
+
+ * linux/SqlPackage.cs: Use catalog='@system' instead of installed=1
+ when querying for system packages. Remote packages are marked as installed
+ and this was causing duplicates in the SystemResolvableCatalog.
+
+2006-06-19 Tambet Ingo <tambet@xxxxxxxxxx>
+
+ * linux/Database.cs: Handle Daemon.CleanStart flag.
+
+ * linux/SystemResolvableCatalog.cs: Ditto.
+
2006-06-16 Dan Mills <thunder@xxxxxxxxxx>

* linux/RedCarpetBackend.cs: Parse standard error from the
@@ -5,6 +30,12 @@

2006-06-16 Chris Rivera <cmr@xxxxxxxxxx>

+ * linux/RedCarpetBackend.cs: If ParseMetadata() throws an exception
+ throw Progress.Exception if it exists. This is important for key/digest
+ exceptions. This fixes 185941.
+
+2006-06-16 Chris Rivera <cmr@xxxxxxxxxx>
+
* linux/NUService.cs: Run update-status after we run parse-metadata.
This fixes 185924. Also, make sure the repomd keys exist before we
try and download them.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/Database.cs new/zmd-7.1.1.0/modules/linux/Database.cs
--- old/zmd-7.1.1.0/modules/linux/Database.cs 2006-05-31 19:42:58.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/Database.cs 2006-06-19 20:15:11.000000000 +0200
@@ -102,8 +102,8 @@
cmd.Dispose ();
}

- if (Connection != null && version != DBVERSION) {
- log.Info ("Incompatible database schema detected, rewriting");
+ if (Connection != null && (Daemon.CleanStart || version != DBVERSION)) {
+ log.Info ("Rewriting the database");
string fn = Connection.Database;
Connection.Close ();
Connection = null;
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-16 23:10:08.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/NUService.cs 2006-06-20 15:49:23.000000000 +0200
@@ -226,10 +226,13 @@

if (PreferenceManager.GetString ("security-level") != "none") {
try {
- if (WebCache.Exists (repomdUrl + ".key")) {
- cache.Download (repomdUrl + ".key");
- cache.Download (repomdUrl + ".asc");
- }
+ cache.Download (repomdUrl + ".asc");
+ } catch {
+ // These files only exist on some servers and not on the others.
+ }
+
+ try {
+ cache.Download (repomdUrl + ".key");
} catch {
// These files only exist on some servers and not on the others.
}
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-16 23:07:07.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs 2006-06-19 15:22:40.000000000 +0200
@@ -277,8 +277,16 @@
RCProgress progress = new RCProgress ();
progress.Start (info);
progress.WaitForStop ();
- if (progress.Status == ProgressStatus.Failed)
- throw new ZenException (progress.Message);
+
+ // It's important to make sure that the key/digest errors
+ // are thrown if they are there.
+ if (progress.Status == ProgressStatus.Failed) {
+ if (progress.Exception == null) {
+ throw new ZenException (progress.Message);
+ } else {
+ throw progress.Exception;
+ }
+ }
} finally {
Database.ReleaseLock (false);
}
@@ -678,6 +686,7 @@
log.Warn ("Can not parse 'untrusted key' status line");
return;
}
+
if (PreferenceManager.GetString ("security-level") != "signature"
|| KeyManager.Match (pieces[2], pieces[1], pieces[3])) {
WriteToStdin ("1\n");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/SqlPackage.cs new/zmd-7.1.1.0/modules/linux/SqlPackage.cs
--- old/zmd-7.1.1.0/modules/linux/SqlPackage.cs 2006-05-31 19:42:58.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/SqlPackage.cs 2006-06-19 22:20:28.000000000 +0200
@@ -160,7 +160,7 @@
}

public static ArrayList GetInstalledPackages () {
- return GetPackages (typeof (SystemPackage), "installed = 1");
+ return GetPackages (typeof (SystemPackage), "catalog='@system'");
}

public static Package GetPackageById (Int64 id) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/SystemResolvableCatalog.cs new/zmd-7.1.1.0/modules/linux/SystemResolvableCatalog.cs
--- old/zmd-7.1.1.0/modules/linux/SystemResolvableCatalog.cs 2006-05-31 19:42:58.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/SystemResolvableCatalog.cs 2006-06-19 20:15:11.000000000 +0200
@@ -14,7 +14,7 @@
private static readonly string StampFile = BuildConfig.LOCALSTATEDIR + "/lib/zmd/installed-packages-stamp";

public SystemResolvableCatalog () {
- LoadInstalledPackages ();
+ LoadInstalledPackages (Daemon.CleanStart);

Backend.Current.InstalledPackagesChanged += delegate (object o, EventArgs e) {
LoadInstalledPackages ();
@@ -36,12 +36,16 @@
}

private void LoadInstalledPackages () {
+ LoadInstalledPackages (false);
+ }
+
+ private void LoadInstalledPackages (bool force) {
lock (list) {
- if (NeedReload ()) {
+ if (force || NeedReload ()) {
Backend.Current.GetInstalledPackages ();
WriteStamp ();
}
-
+
list = SystemPackage.FromDatabase (BundleManager.SystemCatalog);
OnChanged ();
}
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-16 23:10:08.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/YumService.cs 2006-06-20 15:49:23.000000000 +0200
@@ -251,10 +251,13 @@

if (PreferenceManager.GetString ("security-level") != "none") {
try {
- if (WebCache.Exists (dp.Uri + ".key")) {
- cache.Download (dp.Uri + ".key");
- cache.Download (dp.Uri + ".asc");
- }
+ cache.Download (dp.Uri + ".asc");
+ } catch {
+ // These files only exist on some servers and not on the others.
+ }
+
+ try {
+ cache.Download (dp.Uri + ".key");
} catch {
// These files only exist on some servers and not on the others.
}
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-17 00:09:29.000000000 +0200
+++ new/zmd-7.1.1.0/po/zmd.pot 2006-06-20 16:02:59.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 18:09-0400\n"
+"POT-Creation-Date: 2006-06-20 10:02-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -434,16 +434,16 @@
msgid "Don't load initial services"
msgstr ""

-#: src/Daemon.cs:236
+#: src/Daemon.cs:240
#, csharp-format
msgid "Unknown certificate extension for: {0}"
msgstr ""

-#: src/Daemon.cs:251
+#: src/Daemon.cs:255
msgid "A daemon is already running"
msgstr ""

-#: src/Daemon.cs:313
+#: src/Daemon.cs:316
msgid "Loading trusted certificates..."
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-15 21:50:59.000000000 +0200
+++ new/zmd-7.1.1.0/src/ChangeLog 2006-06-19 20:15:11.000000000 +0200
@@ -1,3 +1,14 @@
+2006-06-19 Tambet Ingo <tambet@xxxxxxxxxx>
+
+ * Daemon.cs:
+ * PreferenceManager.cs:
+ * RemotePreferenceManager.cs:
+ * IPreferenceManager.cs:
+
+ Implement a remote call IPreferenceManager.CleanAtNextStartup() that
+ makes zmd to rewrite it's sqlite database at next start and whatever
+ else we might need to clean up in the future. Workaround for #186208.
+
2006-06-15 Chris Rivera <cmr@xxxxxxxxxx>

* KeyManager.cs: Make sure the security-level string is signature, checksum,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/Daemon.cs new/zmd-7.1.1.0/src/Daemon.cs
--- old/zmd-7.1.1.0/src/Daemon.cs 2006-06-07 22:34:03.000000000 +0200
+++ new/zmd-7.1.1.0/src/Daemon.cs 2006-06-19 20:15:11.000000000 +0200
@@ -68,6 +68,8 @@

private static bool running = false;

+ public static bool CleanStart = false;
+
private static TcpWebServer tcp_server;
private static UnixWebServer unix_server;

@@ -154,6 +156,8 @@
private static void RegisterOptions () {
CommandLineParser.AutoRegister (typeof (Daemon));
CommandLineParser.AutoRegister (typeof (RemoteServerEnabledPref));
+
+ CleanStart = PreferenceManager.ReadCleanStart ();
}

private static void OnShutdown (ShutdownType type) {
@@ -275,7 +279,6 @@
log.Info (String.Format ("Starting ZMD version {0}", BuildConfig.VERSION));
log.InfoFormat ("Using {0}", DaemonProperties.MonoVersion);

-
PreferenceManager.AutoregisterPreferences ();

// Try to detect the operating system.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/IPreferenceManager.cs new/zmd-7.1.1.0/src/IPreferenceManager.cs
--- old/zmd-7.1.1.0/src/IPreferenceManager.cs 2006-05-31 19:42:56.000000000 +0200
+++ new/zmd-7.1.1.0/src/IPreferenceManager.cs 2006-06-19 20:15:11.000000000 +0200
@@ -25,5 +25,6 @@
PreferenceInfo[] List ();
object GetValue (string name);
void SetValue (string name, object value);
+ void CleanAtNextStartup ();
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/PreferenceManager.cs new/zmd-7.1.1.0/src/PreferenceManager.cs
--- old/zmd-7.1.1.0/src/PreferenceManager.cs 2006-05-31 19:42:56.000000000 +0200
+++ new/zmd-7.1.1.0/src/PreferenceManager.cs 2006-06-19 20:15:11.000000000 +0200
@@ -209,6 +209,23 @@
return secret;
}

+ private static readonly string cleanFlagPath = BuildConfig.LOCALSTATEDIR + "/lib/zmd/clean";
+
+ public static void SetCleanStart () {
+ using (FileStream stream = File.Open (cleanFlagPath, FileMode.Create)) {}
+ }
+
+ internal static bool ReadCleanStart () {
+ bool ret = false;
+
+ if (File.Exists (cleanFlagPath)) {
+ File.Delete (cleanFlagPath);
+ ret = true;
+ }
+
+ return ret;
+ }
+
public static void AutoregisterPreferences () {
AutoregisterPreferences (Assembly.GetCallingAssembly ());
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/RemotePreferenceManager.cs new/zmd-7.1.1.0/src/RemotePreferenceManager.cs
--- old/zmd-7.1.1.0/src/RemotePreferenceManager.cs 2006-05-31 19:42:56.000000000 +0200
+++ new/zmd-7.1.1.0/src/RemotePreferenceManager.cs 2006-06-19 20:15:11.000000000 +0200
@@ -49,5 +49,9 @@
public void SetValue (string name, object value) {
PreferenceManager.SetValue (name, value);
}
+
+ public void CleanAtNextStartup () {
+ PreferenceManager.SetCleanStart ();
+ }
}
}


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit-help@xxxxxxxxxxxx

< Previous Next >