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

[Daniel Burrows]

Author: dburrows
Date: Thu Sep 29 22:07:59 2005
New Revision: 4334

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/apt/download_install_manager.cc
   branches/aptitude-0.3/aptitude/src/generic/apt/download_install_manager.h
   branches/aptitude-0.3/aptitude/src/ui.cc
Log:
Move download_only to the constructor of download_install_manager.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Thu Sep 29 22:07:59 2005
@@ -1,5 +1,10 @@
 2005-09-29  Daniel Burrows  <dburrows at debian.org>
 
+	* src/generic/apt/download_install_manager.cc, src/generic/apt/download_install_manager.h, src/ui.cc:
+
+	  Make download_only a constructor parameter of the
+	  download_install_manager, not an argument of finish().
+
 	* src/generic/apt/download_update_manager.cc:
 
 	  Instead of creating an Acquire object with no status callback,

Modified: branches/aptitude-0.3/aptitude/src/generic/apt/download_install_manager.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/download_install_manager.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/download_install_manager.cc	Thu Sep 29 22:07:59 2005
@@ -32,8 +32,8 @@
 
 using namespace std;
 
-download_install_manager::download_install_manager()
-  : log(NULL), download_only(false), pm(new pkgDPkgPM(*apt_cache_file))
+download_install_manager::download_install_manager(bool _download_only)
+  : log(NULL), download_only(_download_only), pm(new pkgDPkgPM(*apt_cache_file))
 {
 }
 
@@ -43,7 +43,6 @@
 }
 
 bool download_install_manager::prepare(OpProgress &progress,
-				       bool download_only,
 				       pkgAcquireStatus *acqlog,
 				       download_signal_log *signallog)
 {

Modified: branches/aptitude-0.3/aptitude/src/generic/apt/download_install_manager.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/download_install_manager.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/download_install_manager.h	Thu Sep 29 22:07:59 2005
@@ -52,7 +52,11 @@
   result execute_install_run(pkgAcquire::RunResult res,
 			     OpProgress &load_progress);
 public:
-  download_install_manager();
+  /** \param _download_only if \b true, this download process will
+   *  stop after downloading files (i.e., it won't run the package
+   *  manager).
+   */
+  download_install_manager(bool _download_only);
   ~download_install_manager();
 
   /** Set up an install run.  Does not take ownership of any of the
@@ -72,7 +76,6 @@
    *  \return \b true iff the preparation was successful.
    */
   bool prepare(OpProgress &progress,
-	       bool _download_only,
 	       pkgAcquireStatus *acqlog,
 	       download_signal_log *signallog);
 

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	Thu Sep 29 22:07:59 2005
@@ -1028,7 +1028,8 @@
   background_status st;
 public:
   ui_install_manager()
-    : t(NULL),
+    : download_install_manager(false),
+      t(NULL),
       log(gen_download_progress(false, false,
 				_("Downloading packages"),
 				_("View the progress of the package download"),
@@ -1065,8 +1066,7 @@
   {
     vs_progress_ref p = gen_progress_bar();
 
-    bool ok = prepare(*p.unsafe_get_ref(),
-		      false, &st, log);
+    bool ok = prepare(*p.unsafe_get_ref(), &st, log);
 
     p->destroy();