rred: Only call pkgInitConfig() in test mode

[apt.git] / apt-private / private-install.h

diff --git a/apt-private/private-install.h b/apt-private/private-install.h
index 8daa4a7769e2e0c9939bf1476cfdcdd06cff1e1b..7a8cd551349cb732d10b66701abbd900f0e57083 100644 (file)
--- a/apt-private/private-install.h
+++ b/apt-private/private-install.h
@@ -16,12 +16,11 @@ class CacheFile;
 class CommandLine;
 class pkgProblemResolver;
 
 class CommandLine;
 class pkgProblemResolver;
 

-#define RAMFS_MAGIC     0x858458f6
-

 APT_PUBLIC bool DoInstall(CommandLine &Cmd);
 
 APT_PUBLIC bool DoInstall(CommandLine &Cmd);
 

-bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache,
+bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, std::vector<const char*> &VolatileCmdL, CacheFile &Cache,

                                         std::map<unsigned short, APT::VersionSet> &verset, int UpgradeMode);
                                         std::map<unsigned short, APT::VersionSet> &verset, int UpgradeMode);

+bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, std::vector<const char*> &VolatileCmdL, CacheFile &Cache, int UpgradeMode);

 bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache, int UpgradeMode);
 
 APT_PUBLIC bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
 bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache, int UpgradeMode);
 
 APT_PUBLIC bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,


@@ -29,7 +28,7 @@ APT_PUBLIC bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
 
 
 // TryToInstall - Mark a package for installation                      /*{{{*/
 
 
 // TryToInstall - Mark a package for installation                      /*{{{*/

-struct APT_PUBLIC TryToInstall {
+struct TryToInstall {

    pkgCacheFile* Cache;
    pkgProblemResolver* Fix;
    bool FixBroken;
    pkgCacheFile* Cache;
    pkgProblemResolver* Fix;
    bool FixBroken;


@@ -45,7 +44,7 @@ struct APT_PUBLIC TryToInstall {
 };
                                                                        /*}}}*/
 // TryToRemove - Mark a package for removal                            /*{{{*/
 };
                                                                        /*}}}*/
 // TryToRemove - Mark a package for removal                            /*{{{*/

-struct APT_PUBLIC TryToRemove {
+struct TryToRemove {

    pkgCacheFile* Cache;
    pkgProblemResolver* Fix;
    bool PurgePkgs;
    pkgCacheFile* Cache;
    pkgProblemResolver* Fix;
    bool PurgePkgs;