summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2011-10-17 11:22:45 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2011-10-17 11:22:45 +0200
commitcd5e84440a9bb75a9cc2c142ac8bc214ba57685a (patch)
treeef98bfe313fb16147be056d248885b535e7b2fd4 /apt-pkg
parent28f7a8f269d704779d1eb192da0e052444064693 (diff)
* apt-pkg/packagemanager.cc:
- do not fail on unpacked packages in SmartUnPack, just don't shedule them for unpack, but do all checks and configure them
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/packagemanager.cc11
1 files changed, 2 insertions, 9 deletions
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index b9ef0f5d7..a97ce4833 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -551,14 +551,6 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
cout << endl;
}
- // Check if it is already unpacked
- if (Pkg.State() == pkgCache::PkgIterator::NeedsConfigure &&
- Cache[Pkg].Keep() == true)
- {
- cout << OutputInDepth(Depth) << "SmartUnPack called on Package " << Pkg.Name() << " but its unpacked" << endl;
- return false;
- }
-
VerIterator const instVer = Cache[Pkg].InstVerIter(Cache);
/* PreUnpack Checks: This loop checks and attempts to rectify and problems that would prevent the package being unpacked.
@@ -768,7 +760,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
return false;
}
}
- else if (Install(Pkg,FileNames[Pkg->ID]) == false)
+ // packages which are already unpacked don't need to be unpacked again
+ else if (Pkg.State() != pkgCache::PkgIterator::NeedsConfigure && Install(Pkg,FileNames[Pkg->ID]) == false)
return false;
if (Immediate == true) {