Commit c315eeef authored by Eskil Heyn Olsen's avatar Eskil Heyn Olsen

Added some more settings

	* components/services/docs/install-user-settings:
	Added some more settings

	* components/services/install/lib/eazel-install-query.c:
	(eazel_install_simple_rpm_query):
	Some debug output

	* components/services/install/lib/eazel-install-rpm-glue.c:
	(eazel_install_free_rpm_system),
	(eazel_install_check_existing_packages):
	free_rpm_system null's the pointers, prevents horrible rpm
	crashes. Check_existing correctly sets the modify flag.
	Better transaction reports.

	* components/services/install/lib/eazel-install-xml-package-list.c:
	(eazel_install_packagedata_to_xml):
	cutn''pasta typo.
parent 175a812e
2000-07-26 Eskil Heyn Olsen <eskil@eazel.com>
* components/services/docs/install-user-settings:
Added some more settings
* components/services/install/lib/eazel-install-query.c:
(eazel_install_simple_rpm_query):
Some debug output
* components/services/install/lib/eazel-install-rpm-glue.c:
(eazel_install_free_rpm_system),
(eazel_install_check_existing_packages):
free_rpm_system null's the pointers, prevents horrible rpm
crashes. Check_existing correctly sets the modify flag.
Better transaction reports.
* components/services/install/lib/eazel-install-xml-package-list.c:
(eazel_install_packagedata_to_xml):
cutn''pasta typo.
2000-07-26 Darin Adler <darin@eazel.com>
* libnautilus-extensions/nautilus-directory-async.c:
......
......@@ -5,13 +5,15 @@ libeazelinstall:
name values userlevel default
rpmrc filename hacker /usr/lib/rpm/rpmrc
protocol [http|ftp] hacker http
logfile string intermediate /var/log/somewhere
logfile string intermediate ~/.nautilus/update.log
verbose-log boolean intermediate false
force-install boolean hacker false
upgrade-install boolean hacker true
rpm-server string intermediate something.eazel.com
rpm-sever-port int intermediate 80 (for http)
transaction boolean hacker true
transctiondir string intermediate ~/.nautilus/transactions
tmpdir string intermediate /tmp/eazel-update.$UID/
install-view:
......
......@@ -104,6 +104,7 @@ eazel_install_simple_rpm_query (EazelInstall *service,
open and close at the end. That way, this
func can be used in both various enviroments */
if (db == NULL) {
g_message ("PREPARING PACKAGE SYS");
eazel_install_prepare_package_system (service);
db = service->private->packsys.rpm.db;
close_db = TRUE;
......@@ -150,6 +151,7 @@ eazel_install_simple_rpm_query (EazelInstall *service,
}
if (close_db) {
g_message ("KILLING PACKAGE SYS");
eazel_install_free_package_system (service);
}
......
......@@ -831,10 +831,12 @@ eazel_install_free_rpm_system (EazelInstall *service)
if (*db) {
rpmdbClose (*db);
(*db) = NULL;
}
/*
if (*set != NULL) {
rpmtransFree (*set);
(*set) = NULL;
}
*/
return TRUE;
......@@ -1034,13 +1036,20 @@ eazel_install_check_existing_packages (EazelInstall *service,
int res;
PackageData *existing_package;
existing_package = (PackageData*)existing_iterator->data;
existing_package->modify_status = PACKAGE_MOD_UPGRADED;
existing_package = (PackageData*)existing_iterator->data;
pack->modifies = g_list_prepend (pack->modifies, existing_package);
existing_package->status = PACKAGE_RESOLVED;
/* The order of arguments to rpmvercmp is important... */
res = rpmvercmp (pack->version, existing_package->version);
if (res == 0) {
existing_package->modify_status = PACKAGE_MOD_UNTOUCHED;
} else if (res > 0) {
existing_package->modify_status = PACKAGE_MOD_UPGRADED;
} else {
existing_package->modify_status = PACKAGE_MOD_DOWNGRADED;
}
if (res == 0 && result > 0) {
result = 0;
} else if (res > 0 && result > 1) {
......
......@@ -359,7 +359,7 @@ eazel_install_packagedata_to_xml (const PackageData *pack, char *title, xmlNodeP
node = xmlNewChild (root, NULL, "ARCH", pack->archtype);
node = xmlNewChild (root, NULL, "SUMMARY", pack->summary);
node = xmlNewChild (root, NULL, "STATUS", packagedata_status_enum_to_str (pack->status));
node = xmlNewChild (root, NULL, "MODSTATUS", packagedata_modstatus_enum_to_str (pack->status));
node = xmlNewChild (root, NULL, "MODSTATUS", packagedata_modstatus_enum_to_str (pack->modify_status));
tmp = trilobite_get_distribution_name(pack->distribution, FALSE);
node = xmlNewChild (root, NULL, "DISTRIBUTION", tmp);
......
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