test framework: More noopchroot fixes

[apt.git] / apt-pkg / deb / debsystem.h

diff --git a/apt-pkg/deb/debsystem.h b/apt-pkg/deb/debsystem.h
index 23215525675761dbdb81552bb276e34efb374786..5185c92d8912ee32586776cc9081b34d67f3e83d 100644 (file)
--- a/apt-pkg/deb/debsystem.h
+++ b/apt-pkg/deb/debsystem.h
@@ -11,30 +11,47 @@
 #define PKGLIB_DEBSYSTEM_H
 
 #include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
 
+#include <vector>
+class Configuration;
+class pkgIndexFile;
+class pkgPackageManager;
 class debSystemPrivate;
+class pkgDepCache;
 
+#ifndef APT_10_CLEANER_HEADERS
 class debStatusIndex;
+#endif
+
 class debSystem : public pkgSystem
 {
    // private d-pointer
-   debSystemPrivate *d;
-   bool CheckUpdates();
+   debSystemPrivate * const d;
+   APT_HIDDEN bool CheckUpdates();
 
    public:
 
-   virtual bool Lock();
-   virtual bool UnLock(bool NoErrors = false);   
-   virtual pkgPackageManager *CreatePM(pkgDepCache *Cache) const;
-   virtual bool Initialize(Configuration &Cnf);
-   virtual bool ArchiveSupported(const char *Type);
-   virtual signed Score(Configuration const &Cnf);
-   virtual bool AddStatusFiles(std::vector<pkgIndexFile *> &List);
+   virtual bool Lock() APT_OVERRIDE;
+   virtual bool UnLock(bool NoErrors = false) APT_OVERRIDE;
+   virtual pkgPackageManager *CreatePM(pkgDepCache *Cache) const APT_OVERRIDE;
+   virtual bool Initialize(Configuration &Cnf) APT_OVERRIDE;
+   virtual bool ArchiveSupported(const char *Type) APT_OVERRIDE;
+   virtual signed Score(Configuration const &Cnf) APT_OVERRIDE;
+   virtual bool AddStatusFiles(std::vector<pkgIndexFile *> &List) APT_OVERRIDE;
    virtual bool FindIndex(pkgCache::PkgFileIterator File,
-                         pkgIndexFile *&Found) const;
+                         pkgIndexFile *&Found) const APT_OVERRIDE;
 
    debSystem();
    virtual ~debSystem();
+
+   APT_HIDDEN static std::string GetDpkgExecutable();
+   APT_HIDDEN static std::vector<std::string> GetDpkgBaseCommand();
+   APT_HIDDEN static void DpkgChrootDirectory();
+   APT_HIDDEN static pid_t ExecDpkg(std::vector<std::string> const &sArgs, int * const inputFd, int * const outputFd, bool const DiscardOutput);
+   APT_HIDDEN static bool SupportsMultiArch();
+   APT_HIDDEN static std::vector<std::string> SupportedArchitectures();
 };
 
 extern debSystem debSys;