Merge remote-tracking branch 'upstream/debian/sid' into debian/sid

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

diff --git a/apt-private/private-install.h b/apt-private/private-install.h
index 439c89712b54306d307e2689d8a5ee706fd887f8..5e18560c55d35d5fd0898e6030e17d2786fa889e 100644 (file)
--- a/apt-private/private-install.h
+++ b/apt-private/private-install.h
@@ -1,24 +1,40 @@
 #ifndef APT_PRIVATE_INSTALL_H
 #define APT_PRIVATE_INSTALL_H
 
 #ifndef APT_PRIVATE_INSTALL_H
 #define APT_PRIVATE_INSTALL_H
 

+#include <apt-pkg/cachefile.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>

 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/cacheset.h>

-#include <apt-pkg/cmndline.h>

 #include <apt-pkg/strutl.h>
 #include <apt-pkg/strutl.h>

+#include <apt-pkg/algorithms.h>
+#include <apt-pkg/macros.h>
+
+#include <apt-private/private-output.h>
+
+#include <stddef.h>
+#include <iosfwd>
+#include <list>
+#include <map>
+#include <string>
+#include <utility>

 
 

-#include "private-cachefile.h"
-#include "private-output.h"

 
 #include <apti18n.h>
 
 
 #include <apti18n.h>
 

+class CacheFile;
+class CommandLine;
+

 #define RAMFS_MAGIC     0x858458f6
 
 #define RAMFS_MAGIC     0x858458f6
 

-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, CacheFile &Cache,
                                         std::map<unsigned short, APT::VersionSet> &verset);
 bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache);
 

-bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
+APT_PUBLIC bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,

                         bool Safety = true);
 
 
                         bool Safety = true);
 
 


@@ -95,6 +111,9 @@ struct TryToInstall {
         Cache->GetDepCache()->SetCandidateVersion(s->first);
 
       bool Success = true;
         Cache->GetDepCache()->SetCandidateVersion(s->first);
 
       bool Success = true;

+      // the Changed list contains:
+      //   first: "new version" 
+      //   second: "what-caused the change" 

       std::list<std::pair<pkgCache::VerIterator, pkgCache::VerIterator> > Changed;
       for (std::list<std::pair<pkgCache::VerIterator, std::string> >::const_iterator s = start.begin();
                s != start.end(); ++s)
       std::list<std::pair<pkgCache::VerIterator, pkgCache::VerIterator> > Changed;
       for (std::list<std::pair<pkgCache::VerIterator, std::string> >::const_iterator s = start.begin();
                s != start.end(); ++s)