diff options
| author | Michael Vogt <mvo@debian.org> | 2013-11-29 20:11:47 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-11-29 20:11:47 +0100 |
| commit | ec980be7637b735aa91d7091dae6e18b150cb724 (patch) | |
| tree | ff2b4d4b2b3f9a5257a0de6d59039da3236049a1 /apt-pkg | |
| parent | e2264d3f957694e229a9f6976fc136b8f82ad770 (diff) | |
| parent | 804d195655c48a448d576b2b196d18c2c816e824 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 1 | ||||
| -rw-r--r-- | apt-pkg/depcache.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 8ab0c74c6..918fb32e5 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1529,6 +1529,7 @@ bool pkgDPkgPM::GoNoABIBreak(APT::Progress::PackageManager *progress) if(stopOnError) { CloseLog(); + StopPtyMagic(); d->progress->Stop(); return false; } diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index a06789cdf..f9c891c86 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1522,7 +1522,7 @@ bool pkgDepCache::SetCandidateRelease(pkgCache::VerIterator TargetVer, if (itsFine == false) { // change the candidate - Changed.push_back(make_pair(oldCand, TargetVer)); + Changed.push_back(make_pair(V, TargetVer)); if (SetCandidateRelease(V, TargetRel, Changed) == false) { if (stillOr == false) |