diff options
| author | Eskil Olsen <eskil@eazel.com> | 2001-03-10 03:05:06 +0000 |
|---|---|---|
| committer | Eskil Heyn Olsen <eskil@src.gnome.org> | 2001-03-10 03:05:06 +0000 |
| commit | a466feefe7795d163484d8f43cdaff3a32cd7a6f (patch) | |
| tree | 03e517e9c8de248a37868e49eae141c41382c865 | |
| parent | 24ae9b484d47749da128989e51c4d5f914f6b94f (diff) | |
| download | nautilus-a466feefe7795d163484d8f43cdaff3a32cd7a6f.tar.gz | |
reviewed by: Robey Pointer <robey@eazel.com>
2001-03-09 Eskil Olsen <eskil@eazel.com>
reviewed by: Robey Pointer <robey@eazel.com>
Fixes bug 7648, log xml to track softcat weirdness.
* components/services/install/lib/eazel-install-logic2.c:
(post_get_softcat_info), (dedupe_foreach_depends):
* components/services/install/lib/eazel-softcat.c:
(eazel_softcat_query):
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | components/services/install/lib/eazel-install-logic2.c | 19 | ||||
| -rw-r--r-- | components/services/install/lib/eazel-softcat.c | 13 |
3 files changed, 39 insertions, 5 deletions
@@ -1,3 +1,15 @@ +2001-03-09 Eskil Olsen <eskil@eazel.com> + + reviewed by: Robey Pointer <robey@eazel.com> + + Fixes bug 7648, log xml to track softcat weirdness. + + * components/services/install/lib/eazel-install-logic2.c: + (post_get_softcat_info), (dedupe_foreach_depends): + * components/services/install/lib/eazel-softcat.c: + (eazel_softcat_query): + + 2001-03-10 Mike Fleming <mfleming@eazel.com> Merge from HEAD: diff --git a/components/services/install/lib/eazel-install-logic2.c b/components/services/install/lib/eazel-install-logic2.c index aff8c7bde..7e4b3759e 100644 --- a/components/services/install/lib/eazel-install-logic2.c +++ b/components/services/install/lib/eazel-install-logic2.c @@ -591,7 +591,7 @@ post_get_softcat_info (EazelInstall *service, /* Don't dedupe yourself */ if (p1 != (*package)) { #if EI2_DEBUG & 0x4 - trilobite_debug ("\tdeduping %p %s to %p", *package, (*package)->name, p1); + trilobite_debug ("\tdeduping(a) %p %s to %p", *package, (*package)->name, p1); #endif gtk_object_ref (GTK_OBJECT (p1)); @@ -599,7 +599,7 @@ post_get_softcat_info (EazelInstall *service, (*package) = p1; } else { #if EI2_DEBUG & 0x4 - trilobite_debug ("\tnot deduping myself %p %s", *package, (*package)->name, p1); + trilobite_debug ("\tnot deduping(a) myself %p %s", *package, (*package)->name, p1); #endif } } @@ -799,9 +799,18 @@ dedupe_foreach_depends (PackageDependency *d, p11 = g_hash_table_lookup (service->private->dedupe_hash, p1->md5); if (p11) { - gtk_object_ref (GTK_OBJECT (p11)); - gtk_object_unref (GTK_OBJECT (p1)); - d->package = p11; + if (p11 != p1) { +#if EI2_DEBUG & 0x4 + trilobite_debug ("\tdeduping(b) %p %s to %p", p11, p11->name, p1); +#endif + gtk_object_ref (GTK_OBJECT (p11)); + gtk_object_unref (GTK_OBJECT (p1)); + d->package = p11; + } else { +#if EI2_DEBUG & 0x4 + trilobite_debug ("\tnot deduping(b) myself %p %s", p11, p11->name, p1); +#endif + } } else { add_to_dedupe_hash (service, p1); dedupe_foreach (p1, service); diff --git a/components/services/install/lib/eazel-softcat.c b/components/services/install/lib/eazel-softcat.c index e0911eed6..6dfa20938 100644 --- a/components/services/install/lib/eazel-softcat.c +++ b/components/services/install/lib/eazel-softcat.c @@ -652,7 +652,20 @@ eazel_softcat_query (EazelSoftCat *softcat, PackageData *package, int sense_flag for (got_happy = FALSE, tries_left = softcat->private->retries; !got_happy && (tries_left > 0); tries_left--) { + got_happy = trilobite_fetch_uri (search_url, &body, &length); + + { + char **strs; + int i; + body [length] = 0; + strs = g_strsplit (body, "\n", 0); + for (i = 0; strs[i] != NULL; i++) { + trilobite_debug ("xml spam: %s", strs[i]); + } + g_strfreev (strs); + } + if (got_happy) { got_happy = eazel_install_packagelist_parse (&packages, body, length, &db_revision); if (! got_happy) { |