set a primary-keyring only if we have access to it

[apt.git] / apt-pkg / edsp.h

diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h
index 828ee3753c44528633f7cbc5bd723bb037a8ac58..9e833556ab4935638e0f58d08733f0ecc63e6f19 100644 (file)
--- a/apt-pkg/edsp.h
+++ b/apt-pkg/edsp.h
@@ -9,8 +9,12 @@
 #ifndef PKGLIB_EDSP_H
 #define PKGLIB_EDSP_H
 
-#include <apt-pkg/pkgcache.h>
 #include <apt-pkg/cacheset.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/macros.h>
+
+#include <stdio.h>
 
 #include <list>
 #include <string>
@@ -29,15 +33,15 @@ class EDSP                                                          /*{{{*/
        static const char * const PrioMap[];
        static const char * const DepMap[];
 
-       bool static ReadLine(int const input, std::string &line);
-       bool static StringToBool(char const *answer, bool const defValue);
+       APT_HIDDEN bool static ReadLine(int const input, std::string &line);
+       APT_HIDDEN bool static StringToBool(char const *answer, bool const defValue);
 
-       void static WriteScenarioVersion(pkgDepCache &Cache, FILE* output,
+       APT_HIDDEN void static WriteScenarioVersion(pkgDepCache &Cache, FILE* output,
                                         pkgCache::PkgIterator const &Pkg,
                                         pkgCache::VerIterator const &Ver);
-       void static WriteScenarioDependency(FILE* output,
+       APT_HIDDEN void static WriteScenarioDependency(FILE* output,
                                            pkgCache::VerIterator const &Ver);
-       void static WriteScenarioLimitedDependency(FILE* output,
+       APT_HIDDEN void static WriteScenarioLimitedDependency(FILE* output,
                                                   pkgCache::VerIterator const &Ver,
                                                   APT::PackageSet const &pkgset);
 public:
@@ -201,10 +205,10 @@ public:
         *  \param[out] solver_in will be the stdin of the solver
         *  \param[out] solver_out will be the stdout of the solver
         *
-        *  \return true if the solver could be started and the pipes
-        *  are set up correctly, otherwise false and the pipes are invalid
+        *  \return PID of the started solver or 0 if failure occurred
         */
-       bool static ExecuteSolver(const char* const solver, int *solver_in, int *solver_out);
+       pid_t static ExecuteSolver(const char* const solver, int * const solver_in, int * const solver_out, bool /*overload*/);
+       APT_DEPRECATED bool static ExecuteSolver(const char* const solver, int *solver_in, int *solver_out);
 
        /** \brief call an external resolver to handle the request
         *