Port TagIterator to correctly support ReMap (doh).

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

diff --git a/apt-private/private-install.h b/apt-private/private-install.h
index 828163e404497efa3213ffd1a6bda5d912cfd8bc..d2a9bed3f52e8f4a93b7ccb2ed504b33aaa349a3 100644 (file)
--- a/apt-private/private-install.h
+++ b/apt-private/private-install.h
@@ -16,20 +16,21 @@ 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,
-                                        std::map<unsigned short, APT::VersionSet> &verset);
-bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache);
+bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, std::vector<std::string> &VolatileCmdL, CacheFile &Cache,
+                                        std::map<unsigned short, APT::VersionSet> &verset, int UpgradeMode);
+bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, std::vector<std::string> &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 Safety = true);
 
 
 APT_PUBLIC bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
                         bool Safety = true);
 

+bool CheckNothingBroken(CacheFile &Cache);
+bool DoAutomaticRemove(CacheFile &Cache);

 
 // 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 +46,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;