Merge pkgAcquire::RunFdsSane back into RunFds

2 files changed, 4 insertions, 15 deletions

diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 8ebac6d2a..fffe76f46 100644
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -536,18 +536,12 @@ void pkgAcquire::SetFds(int &Fd,fd_set *RSet,fd_set *WSet)
    }
 }
 									/*}}}*/
-// Acquire::RunFds - compatibility remove on next abi/api break		/*{{{*/
-void pkgAcquire::RunFds(fd_set *RSet,fd_set *WSet)
-{
-   RunFdsSane(RSet, WSet);
-}
-									/*}}}*/
-// Acquire::RunFdsSane - Deal with active FDs				/*{{{*/
+// Acquire::RunFds - Deal with active FDs				/*{{{*/
 // ---------------------------------------------------------------------
 /* Dispatch active FDs over to the proper workers. It is very important
    that a worker never be erased while this is running! The queue class
    should never erase a worker except during shutdown processing. */
-bool pkgAcquire::RunFdsSane(fd_set *RSet,fd_set *WSet)
+bool pkgAcquire::RunFds(fd_set *RSet,fd_set *WSet)
 {
    bool Res = true;
 
@@ -726,7 +720,7 @@ pkgAcquire::RunResult pkgAcquire::Run(int PulseIntervall)
 	 break;
       }
 
-      if(RunFdsSane(&RFds,&WFds) == false)
+      if(RunFds(&RFds,&WFds) == false)
          break;
 
       // Timeout, notify the log class
diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index d8fadce66..c71c01e2f 100644
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -233,12 +233,7 @@ class pkgAcquire
     *
     * \return false if there is an error condition on one of the fds
     */
-   bool RunFdsSane(fd_set *RSet,fd_set *WSet);
-
-   // just here for compatibility, needs to be removed on the next
-   // ABI/API break. RunFdsSane() is what should be used as it
-   // returns if there is an error condition on one of the fds
-   virtual void RunFds(fd_set *RSet,fd_set *WSet);
+   virtual bool RunFds(fd_set *RSet,fd_set *WSet);
 
    /** \brief Check for idle queues with ready-to-fetch items.
     *