properly format multiline error messages

[apt.git] / apt-pkg / upgrade.h

diff --git a/apt-pkg/upgrade.h b/apt-pkg/upgrade.h
index 894f0625e3f9ee8d5c6a35e2537e31f5414e4d9f..71dbb4fd3619fbb7fb04e7a1242605204ac3f9dc 100644 (file)
--- a/apt-pkg/upgrade.h
+++ b/apt-pkg/upgrade.h
@@ -11,6 +11,7 @@
 #define PKGLIB_UPGRADE_H
 
 #include <stddef.h>
 #define PKGLIB_UPGRADE_H
 
 #include <stddef.h>

+#include <apt-pkg/macros.h>

 
 class pkgDepCache;
 class OpProgress;
 
 class pkgDepCache;
 class OpProgress;


@@ -20,15 +21,15 @@ namespace APT {
       // FIXME: make this "enum class UpgradeMode {" once we enable c++11
       enum UpgradeMode {
          FORBID_REMOVE_PACKAGES = 1,
       // FIXME: make this "enum class UpgradeMode {" once we enable c++11
       enum UpgradeMode {
          FORBID_REMOVE_PACKAGES = 1,

-         FORBID_INSTALL_NEW_PACKAGES = 2
+         FORBID_INSTALL_NEW_PACKAGES = 2,
+        ALLOW_EVERYTHING = 0

       };
       bool Upgrade(pkgDepCache &Cache, int UpgradeMode, OpProgress * const Progress = NULL);
    }
 }
 
       };
       bool Upgrade(pkgDepCache &Cache, int UpgradeMode, OpProgress * const Progress = NULL);
    }
 }
 

-// please use APT::Upgrade::Upgrade() instead
-bool pkgDistUpgrade(pkgDepCache &Cache, OpProgress * const Progress = NULL);
-bool pkgAllUpgrade(pkgDepCache &Cache, OpProgress * const Progress = NULL);
+APT_DEPRECATED_MSG("Use APT::Upgrade::Upgrade() instead") bool pkgDistUpgrade(pkgDepCache &Cache);
+APT_DEPRECATED_MSG("Use APT::Upgrade::Upgrade() instead") bool pkgAllUpgrade(pkgDepCache &Cache);

 
 bool pkgMinimizeUpgrade(pkgDepCache &Cache);
 #endif
 
 bool pkgMinimizeUpgrade(pkgDepCache &Cache);
 #endif