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

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

	Added debug info of packages modifies list, so the logging on
	upgrading packages isn't so confusing.

	* components/services/install/lib/eazel-install-xml-package-list.c:
	(eazel_install_packagelist_parse):

	Force the XML parser to ignore any <xmp> .. </xmp> tags, which may
	or may not fix some people's issues with the installer not being
	able to parse the server XML sometimes.

	* components/services/install/lib/eazel-package-system-types.h:

	Fix old reference to soft_depends.

	* components/services/install-view/Makefile.am:
	* components/services/install-view/nautilus-service-install.c:
	* components/services/install-view/nautilus-service-install.h:

	These files are useless.

	* nautilus-installer/src/installer.c: (collect_failure_info),
	(eazel_install_get_depends), (eazel_installer_initialize):

	Use the new path to the package-list.xml file.

	* nautilus-installer/src/main.c: (segv_handler):

	Spelling fix.

2 files changed, 9 insertions, 4 deletions

diff --git a/nautilus-installer/src/installer.c b/nautilus-installer/src/installer.c
index a6755624d..7564cc377 100644
--- a/nautilus-installer/src/installer.c
+++ b/nautilus-installer/src/installer.c
@@ -63,6 +63,7 @@
 #define RPMRC		"/usr/lib/rpm/rpmrc"
 #define REMOTE_RPM_DIR	"/RPMS"
 #define PACKAGE_LIST	"package-list.xml"
+#define PACKAGE_LIST_URL_PATH	"/downloads/eazel-installer/package-list.xml"
 #define TEXT_LIST	"installer-strings"
 
 #define LOGFILE		"eazel-install.log"
@@ -965,6 +966,7 @@ collect_failure_info (EazelInstall *service,
 		      gboolean uninstall)
 {
 	GList *failure_info_addition;
+        GList *iter;
 
 	eazel_install_problem_tree_to_case (installer->problem,
 					    pd,
@@ -981,6 +983,10 @@ collect_failure_info (EazelInstall *service,
 		} else {
 			installer->failure_info = failure_info_addition;
 		}
+
+                for (iter = g_list_first (failure_info_addition); iter != NULL; iter = g_list_next (iter)) {
+                        g_message ("fail %s: %s", pd->name, (char *) iter->data);
+                }
 	}
 
 	while (gtk_events_pending ()) {
@@ -1771,10 +1777,10 @@ eazel_install_get_depends (EazelInstaller *installer, const char *dest_dir)
 	char *destination;
 	gboolean result = TRUE;
 
-	url = g_strdup_printf ("http://%s:%d/%s", 
+	url = g_strdup_printf ("http://%s:%d%s", 
 			       eazel_install_get_server (installer->service),
 			       eazel_install_get_server_port (installer->service),
-			       PACKAGE_LIST);
+			       PACKAGE_LIST_URL_PATH);
 
 	destination = g_strdup_printf ("%s/%s", dest_dir, PACKAGE_LIST);
 
@@ -2100,7 +2106,6 @@ eazel_installer_initialize (EazelInstaller *object)
 					       "server_port", 
 					       installer_server_port ? installer_server_port : PORT_NUMBER,
 					       "package_list", package_destination, 
-					       "package_list_storage_path", PACKAGE_LIST,
 					       "transaction_dir", installer_tmpdir,
 					       "cgi_path", installer_cgi_path ? installer_cgi_path : CGI_PATH,
 					       NULL));
diff --git a/nautilus-installer/src/main.c b/nautilus-installer/src/main.c
index b3b227ba6..f20e512c2 100644
--- a/nautilus-installer/src/main.c
+++ b/nautilus-installer/src/main.c
@@ -122,7 +122,7 @@ check_disk_space (void)
 static void
 segv_handler (int signo)
 {
-	fprintf (stderr, "\n\nSEGV (%d) -- SOMEBODY SET US UP THE BOMB.\n\n", signo);
+	fprintf (stderr, "\n\nSEGV (%d) -- SOMEBODY SET UP US THE BOMB.\n\n", signo);
 	while (1) {
 		sleep (1);
 	}