diff options
| author | Michael Vogt <mvo@debian.org> | 2014-03-27 15:19:29 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-03-27 15:19:29 +0100 |
| commit | 62f1ee1cc7a5e16ca0cbfbee3c00cefab1892f87 (patch) | |
| tree | 811c93213ce371ea12384994615a6e98366221a0 /apt-private/private-install.h | |
| parent | 8d50b63f28f0d68ca72b6dc6e50e09cfec9842be (diff) | |
| parent | 21b3eac8f9ab8e12b43fa8998a5aa5465f29adc5 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid' into debian/sid
Diffstat (limited to 'apt-private/private-install.h')
| -rw-r--r-- | apt-private/private-install.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apt-private/private-install.h b/apt-private/private-install.h index 79769d470..5e18560c5 100644 --- a/apt-private/private-install.h +++ b/apt-private/private-install.h @@ -9,6 +9,9 @@ #include <apt-pkg/cacheset.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> @@ -17,7 +20,6 @@ #include <string> #include <utility> -#include "private-output.h" #include <apti18n.h> @@ -26,13 +28,13 @@ class CommandLine; #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 InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, +APT_PUBLIC bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, bool Safety = true); |