diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2010-04-03 18:50:07 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2010-04-03 18:50:07 +0200 |
| commit | 87af68aa09fd1b0ab4f87fd064654a032c4daf30 (patch) | |
| tree | 226140311576fe525302ef5c862e1777eef7226c | |
| parent | 5e8b2b74ab565ffb72e035ce89a7a991d4de3dcf (diff) | |
* apt-pkg/packagemanager.cc:
- don't try to "unpack" pseudo packages twice
| -rw-r--r-- | apt-pkg/packagemanager.cc | 14 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 034cc8339..eef79cccd 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -596,9 +596,17 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg) { if(Install(Pkg,FileNames[Pkg->ID]) == false) return false; - } else if (SmartUnPack(Pkg.Group().FindPkg("all")) == false) - return false; - + } else { + // Pseudo packages will not be unpacked - instead we will do this + // for the "real" package, but only once and if it is already + // configured we don't need to unpack it again… + PkgIterator const P = Pkg.Group().FindPkg("all"); + if (List->IsFlag(P,pkgOrderList::UnPacked) != true && + List->IsFlag(P,pkgOrderList::Configured) != true) { + if (SmartUnPack(P) == false) + return false; + } + } List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States); // Perform immedate configuration of the package. diff --git a/debian/changelog b/debian/changelog index 16800a9d1..71aeb1504 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ apt (0.7.26~exp4) experimental; urgency=low * apt-pkg/depcache.cc: - "reinstall" the correct version for a killed pseudo package + * apt-pkg/packagemanager.cc: + - don't try to "unpack" pseudo packages twice -- David Kalnischkies <kalnischkies@gmail.com> Sat, 03 Apr 2010 14:58:39 +0200 |