debian/gbp.conf: point debian-branch to master

[apt.git] / apt-pkg / packagemanager.cc

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index ceeb60a034ec9de60360ed5e16e72644e03d886c..9cbb3fbd2373c1963ad871787c3328ace880f150 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -416,7 +416,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
          // to do anything at all
         for (DepIterator Cur = Start; true; ++Cur)
         {
-           std::unique_ptr<Version *> VList(Cur.AllTargets());
+           std::unique_ptr<Version *[]> VList(Cur.AllTargets());
 
            for (Version **I = VList.get(); *I != 0; ++I)
            {
@@ -466,7 +466,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
          // probably due to loops.
         for (DepIterator Cur = Start; true; ++Cur)
         {
-           std::unique_ptr<Version *> VList(Cur.AllTargets());
+           std::unique_ptr<Version *[]> VList(Cur.AllTargets());
 
            for (Version **I = VList.get(); *I != 0; ++I)
            {
@@ -541,7 +541,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
         // Search for dependencies which are unpacked but aren't configured yet (maybe loops)
         for (DepIterator Cur = Start; true; ++Cur)
         {
-           std::unique_ptr<Version *> VList(Cur.AllTargets());
+           std::unique_ptr<Version *[]> VList(Cur.AllTargets());
 
            for (Version **I = VList.get(); *I != 0; ++I)
            {
@@ -760,7 +760,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
            // Look for easy targets: packages that are already okay
            for (DepIterator Cur = Start; Bad == true; ++Cur)
            {
-              std::unique_ptr<Version *> VList(Cur.AllTargets());
+              std::unique_ptr<Version *[]> VList(Cur.AllTargets());
               for (Version **I = VList.get(); *I != 0; ++I)
               {
                  VerIterator Ver(Cache,*I);
@@ -904,7 +904,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
                     if (Debug)
                     {
                        clog << OutputInDepth(Depth) << "Avoidance unpack of " << ConflictPkg.FullName() << " failed for " << End << " ignoring:" << std::endl;
-                       _error->DumpErrors(std::clog);
+                       _error->DumpErrors(std::clog, GlobalError::DEBUG, false);
                     }
                     _error->RevertToStack();
                     // ignorance can only happen if a) one of the offenders is already gone