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

[Daniel Burrows]

Author: dburrows
Date: Thu Sep 29 22:02:38 2005
New Revision: 4333

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/apt/download_update_manager.cc
Log:
Actually hook up the download status monitor when doing an update.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Thu Sep 29 22:02:38 2005
@@ -1,5 +1,11 @@
 2005-09-29  Daniel Burrows  <dburrows at debian.org>
 
+	* src/generic/apt/download_update_manager.cc:
+
+	  Instead of creating an Acquire object with no status callback,
+	  pass our status callback into its constructor; also save the
+	  signal generator in signallog rather than just ignoring it.
+
 	* src/ui.cc:
 
 	  First cut at using the download_manager code instead of the old

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	Thu Sep 29 22:02:38 2005
@@ -52,6 +52,8 @@
 				      pkgAcquireStatus &acqlog,
 				      download_signal_log *signallog)
 {
+  log = signallog;
+
   pkgSourceList src_list;
 
   if(apt_cache_file != NULL &&
@@ -79,7 +81,7 @@
 	}
     }
 
-  fetcher = new pkgAcquire(log);
+  fetcher = new pkgAcquire(&acqlog);
 
   if(!src_list.GetIndexes(fetcher))
     {