test framework: Correctly generate new paths in noopchroot

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

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 7ddbb9d44bf6f775da456d804e218ffa21478fdb..4b84b83240ca0cd85acd8287ca43515644167d9c 100644 (file)
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -933,7 +933,7 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix)
                                 Start.TargetPkg()->CurrentVer == 0 &&
                                 Cache[Start.TargetPkg()].Delete() == false &&
                                 (Flags[Start.TargetPkg()->ID] & ToRemove) != ToRemove &&
                                 Start.TargetPkg()->CurrentVer == 0 &&
                                 Cache[Start.TargetPkg()].Delete() == false &&
                                 (Flags[Start.TargetPkg()->ID] & ToRemove) != ToRemove &&

-                                Cache.GetCandidateVer(Start.TargetPkg()).end() == false)
+                                Cache.GetCandidateVersion(Start.TargetPkg()).end() == false)

                        {
                           /* Before removing or keeping the package with the broken dependency
                              try instead to install the first not previously installed package
                        {
                           /* Before removing or keeping the package with the broken dependency
                              try instead to install the first not previously installed package


@@ -1315,7 +1315,7 @@ void pkgProblemResolver::InstallProtect()
 struct PrioComp {
    pkgCache &PrioCache;
 
 struct PrioComp {
    pkgCache &PrioCache;
 

-   PrioComp(pkgCache &PrioCache) : PrioCache(PrioCache) {
+   explicit PrioComp(pkgCache &PrioCache) : PrioCache(PrioCache) {

    }
 
    bool operator() (pkgCache::Version * const &A, pkgCache::Version * const &B) {
    }
 
    bool operator() (pkgCache::Version * const &A, pkgCache::Version * const &B) {