[Aptitude-svn-commit] r4373 - in branches/aptitude-0.3/aptitude: . src src/cmdline src/generic/apt

[Daniel Burrows]

Author: dburrows
Date: Fri Sep 30 18:20:36 2005
New Revision: 4373

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_update.cc
   branches/aptitude-0.3/aptitude/src/generic/apt/download_update_manager.cc
   branches/aptitude-0.3/aptitude/src/ui.cc
Log:
Add missing hook connections.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Fri Sep 30 18:20:36 2005
@@ -1,5 +1,9 @@
 2005-09-30  Daniel Burrows  <dburrows at debian.org>
 
+	* src/cmdline/cmdline_update.cc, src/generic/apt/download_update_manager.cc, src/ui.cc:
+
+	  Add some missing connections to the download managers' hooks.
+
 	* src/cmdline/cmdline_changelog.cc:
 
 	  Kill off some memory leaks.

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_update.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_update.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_update.cc	Fri Sep 30 18:20:36 2005
@@ -28,6 +28,11 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/progress.h>
 
+void print_autoclean_msg()
+{
+  printf(_("Deleting obsolete downloaded files\n"));
+}
+
 int cmdline_update(int argc, char *argv[])
 {
   _error->DumpErrors();
@@ -49,6 +54,7 @@
     }
 
   download_update_manager m;
+  m->pre_autoclean_hook.connect(sigc::ptr_fun(print_autoclean_msg));
   int rval =
     (cmdline_do_download(&m) == download_manager::success ? 0 : -1);
 

Modified: branches/aptitude-0.3/aptitude/src/generic/apt/download_update_manager.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/download_update_manager.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/download_update_manager.cc	Fri Sep 30 18:20:36 2005
@@ -128,11 +128,6 @@
     {
       pre_autoclean_hook();
 
-#if 0
-      // TODO: move this code to the appropriate frontends
-      printf(_("Deleting obsolete downloaded files\n"));
-#endif
-
       my_cleaner cleaner;
       cleaner.Go(aptcfg->FindDir("Dir::Cache::archives"), *apt_cache_file);
       cleaner.Go(aptcfg->FindDir("Dir::Cache::archives")+"partial/",

Modified: branches/aptitude-0.3/aptitude/src/ui.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/ui.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/ui.cc	Fri Sep 30 18:20:36 2005
@@ -1036,6 +1036,7 @@
 
   m->pre_install_hook.connect(sigc::ptr_fun(&vscreen_suspend));
   m->post_install_hook.connect(sigc::ptr_fun(&finish_install_run));
+  m->post_forget_new_hook.connect(package_states_changed.make_slot());
 
   (new ui_download_manager(m, false, false,
 			   _("Downloading packages"),
@@ -1364,6 +1365,7 @@
   download_update_manager *m = new download_update_manager;
   m->pre_autoclean_hook.connect(sigc::bind(sigc::ptr_fun(lists_autoclean_msg),
 					   m));
+  m->post_forget_new_hook.connect(package_states_changed.make_slot());
   (new ui_download_manager(m, false, true,
 			   _("Updating package lists"),
 			   _("View the progress of the package list update"),