Commit f9f5476d authored by Robey Pointer's avatar Robey Pointer

reviewed by: Eskil Heyn Olsen <eskil@eazel.com>

	(implicitly)

	Backport a few patches that appear to have only made it to the 1.0
	branch, so we can start building the installer on CVS head.

	* components/services/install/lib/eazel-install-logic2.c:
	(prune_failed_packages_helper):

	That cancelled vs. already-installed bug, plus the "not deduping
	myself" patch.

	* components/services/install-view/callbacks.c:
	(nautilus_service_install_done):

	Remove the spurious "panic" warning.
parent 15a9fb34
2001-03-10 Robey Pointer <robey@eazel.com>
reviewed by: Eskil Heyn Olsen <eskil@eazel.com>
(implicitly)
Backport a few patches that appear to have only made it to the 1.0
branch, so we can start building the installer on CVS head.
* components/services/install/lib/eazel-install-logic2.c:
(prune_failed_packages_helper):
That cancelled vs. already-installed bug, plus the "not deduping
myself" patch.
* components/services/install-view/callbacks.c:
(nautilus_service_install_done):
Remove the spurious "panic" warning.
2001-03-09 Maciej Stachowiak <mjs@eazel.com>
reviewed by: John Harper <jsh@eazel.com>
......
......@@ -530,7 +530,6 @@ nautilus_service_install_done (EazelInstallCallback *cb, gboolean success, Nauti
if (view->details->preflight_status == PREFLIGHT_PANIC_BUTTON) {
/* user actually destroyed us -- panic! */
g_warning ("done: panic!");
return;
}
......
......@@ -171,11 +171,6 @@ prune_failed_packages_helper (EazelInstall *service,
pack, pack->name,
packagedata_status_enum_to_str (pack->status));
#endif
/* If it's a suite and no dependencies, cancel it */
if (pack->suite_id && g_list_length (pack->depends)==0 && pack->status == PACKAGE_PARTLY_RESOLVED) {
pack->status = PACKAGE_CANCELLED;
}
/* If package is already installed, check if the service
settings requires us to fail it */
if (pack->status == PACKAGE_ALREADY_INSTALLED) {
......@@ -189,6 +184,11 @@ prune_failed_packages_helper (EazelInstall *service,
}
}
/* If it's a suite and no dependencies, cancel it */
if (pack->suite_id && g_list_length (pack->depends)==0 && pack->status == PACKAGE_PARTLY_RESOLVED) {
pack->status = PACKAGE_ALREADY_INSTALLED;
}
/* Recursion check */
if (g_list_find (*path, pack)) {
#if EI2_DEBUG & 0x4
......@@ -802,9 +802,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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment