kdenonbeta/kdedebian/kapture

[Peter Rockai]

CVS commit by mornfall: 

Start cleanups in package download/commit code.


  M +0 -2      libcapture/dpkgpm.cpp   1.7
  M +1 -7      libkapture/kapturemanager.cpp   1.29


--- kdenonbeta/kdedebian/kapture/libcapture/dpkgpm.cpp  #1.6:1.7
@@ -114,6 +114,4 @@ bool DPkgPM::forkDpkg (char *const argv[
 
     // Check for an error code.
-    // XXX: possibly move to Go () and make forkDpkg hand it exitstatus and
-    // exitsignal
     if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0)
     {

--- kdenonbeta/kdedebian/kapture/libkapture/kapturemanager.cpp  #1.28:1.29
@@ -53,14 +53,9 @@ void KaptureManager::update (void)
                                                                     /* {{{ */
 void KaptureManager::download (void)
-    // XXX: set _config, then call commit () and reset the _config
 {
     kdDebug () << "download ()" << endl;
-    PkgManager::cache () -> applyAWanted ();
-    CommitStatus *st = new CommitStatus;
     bool donl = _config -> FindB ("APT::Get::Download-Only", false);
     _config -> Set ("APT::Get::Download-Only", true);
-    PkgManager::commit (st);
-    delete st;
-    ErrorDialog::dumpErrors (m_top);
+    commit ();
     _config -> Set ("APT::Get::Download-Only", donl);
 }
@@ -73,5 +68,4 @@ void KaptureManager::commit (void)
     CommitStatus *st = new CommitStatus;
     PkgManager::commit (st);
-    // XXX: handle _error
     delete st;
     ErrorDialog::dumpErrors (m_top);