← Back to branch summary

~ubuntu-branches/ubuntu/trusty/apt/trusty

« back to all changes in this revision

Viewing changes to apt-pkg/depcache.cc

  • Committer: Package Import Robot
  • Author(s): Michael Vogt
  • Date: 2014-02-07 21:03:22 UTC
  • mfrom: (1.4.80 sid)
  • Revision ID: package-import@ubuntu.com-20140207210322-s7f833aga98ibdkm
Tags: 0.9.15.1ubuntu1
merged from debian/sid

Show diffs side-by-side

added added

removed removed

Lines of Context:
apt-pkg/depcache.cc
1134
1134
            std::clog << OutputInDepth(Depth) << Start << " can't be satisfied!" << std::endl;
1135
1135
         if (Start.IsCritical() == false)
1136
1136
            continue;
1137
 
         // if the dependency was critical, we can't install it, so remove it again
1138
 
         MarkDelete(Pkg,false,Depth + 1, false);
 
1137
         // if the dependency was critical, we have absolutely no chance to install it,
 
1138
         // so if it wasn't installed remove it again. If it was, discard the candidate
 
1139
         // as the problemresolver will trip over it otherwise trying to install it (#735967)
 
1140
         if (Pkg->CurrentVer == 0)
 
1141
            MarkDelete(Pkg,false,Depth + 1, false);
 
1142
         else
 
1143
            SetCandidateVersion(Pkg.CurrentVer());
1139
1144
         return false;
1140
1145
      }
1141
1146
 
1253
1258
            if (PkgState[Pkg->ID].InstallVer == 0)
1254
1259
               continue;
1255
1260
 
 
1261
            /* Ignore negative dependencies that we are not going to 
 
1262
               get installed */
 
1263
            if (PkgState[Pkg->ID].InstallVer != *I)
 
1264
               continue;
 
1265
 
1256
1266
            if ((Start->Version != 0 || TrgPkg != Pkg) &&
1257
1267
                PkgState[Pkg->ID].CandidateVer != PkgState[Pkg->ID].InstallVer &&
1258
1268
                PkgState[Pkg->ID].CandidateVer != *I &&