Commit 5af5d90f authored by Robey Pointer's avatar Robey Pointer

fix dumb typo i introduced on the last checkin; finish rpm delete-files...

fix dumb typo i introduced on the last checkin; finish rpm delete-files implementation to actually traverse the package tree and delete all the rpm files
parent b7a541a1
2000-07-27 Robey Pointer <robey@eazel.com>
*
components/services/install/command-line/eazel-alt-install-corba.c:
(eazel_install_progress_signal):
* components/services/install/lib/eazel-install-object.c:
(eazel_install_install_packages):
Fix dumb \n -> \r typo I introduced on the last checkin. Finish
RPM delete-files implementation to actually traverse the package
tree and delete all the RPM files.
2000-07-27 Arlo Rose <arlo@eazel.com>
* icons/eazel/*.png
......
......@@ -198,7 +198,7 @@ eazel_install_progress_signal (EazelInstallCallback *service,
if (amount==0) {
fprintf (stdout, "%s %s: \"%20.20s\"...\n", title, pack->name, pack->summary);
} else if (amount != total ) {
fprintf (stdout, "(%d/%d), (%d/%d)b - (%d/%d) %% %f\n",
fprintf (stdout, "(%d/%d), (%d/%d)b - (%d/%d) %% %f\r",
package_num, num_packages,
total_size_completed, total_size,
amount, total,
......
......@@ -660,18 +660,35 @@ eazel_install_install_packages (EazelInstall *service, GList *categories)
g_warning (_("Install failed"));
}
if (eazel_install_emit_delete_files (service)) {
GList *item;
GList *cat;
GList *top_item, *sub_item;
CategoryData *cd;
PackageData *pack;
g_message ("*** deleting the RPM files");
for (cat = g_list_first (categories); cat; cat = g_list_next (cat)) {
cd = (CategoryData *)cat->data;
for (item = g_list_first (cd->packages); item; item = g_list_next (item)) {
pack = (PackageData *)item->data;
g_message ("*** package '%s'", (char *)pack->filename);
unlink ((char *)pack->filename);
PackageData *top_pack, *sub_pack;
g_message ("*** deleting the package files");
for (top_item = g_list_first (service->private->transaction); top_item;
top_item = g_list_next (top_item)) {
top_pack = (PackageData *) top_item->data;
g_message ("*** package '%s'", (char *) top_pack->filename);
if (unlink ((char *) top_pack->filename) != 0) {
g_warning ("unable to delete file %s !", top_pack->filename);
}
for (sub_item = g_list_first (top_pack->soft_depends); sub_item;
sub_item = g_list_next (sub_item)) {
sub_pack = (PackageData *) sub_item->data;
g_message ("*** package '%s'", (char *) sub_pack->filename);
if (unlink ((char *) sub_pack->filename) != 0) {
g_warning ("unable to delete file %s !", (char *) sub_pack->filename);
}
}
for (sub_item = g_list_first (top_pack->hard_depends); sub_item;
sub_item = g_list_next (sub_item)) {
sub_pack = (PackageData *) sub_item->data;
g_message ("*** package '%s'", (char *) sub_pack->filename);
if (unlink ((char *) sub_pack->filename) != 0) {
g_warning ("unable to delete file %s !", (char *) sub_pack->filename);
}
}
}
}
......
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