diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-08-22 23:08:16 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-08-22 23:08:16 +0200 |
| commit | 95b5f6c19d361745c4e11b214f0f07ad10c9b5b3 (patch) | |
| tree | 507966b581536a11acd5c87bfcf4fc8a276d845f | |
| parent | 1207cf3f9bd77664d6b7de9b8a7fdd33c0bed23a (diff) | |
* apt-pkg/acquire.cc:
- non-existing directories are by definition clean
| -rw-r--r-- | apt-pkg/acquire.cc | 4 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index a2da196be..ef120d8e9 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -445,6 +445,10 @@ pkgAcquire::Worker *pkgAcquire::WorkerStep(Worker *I) if it is part of the download set. */ bool pkgAcquire::Clean(string Dir) { + // non-existing directories are by definition clean… + if (DirectoryExists(Dir) == false) + return true; + DIR *D = opendir(Dir.c_str()); if (D == 0) return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str()); diff --git a/debian/changelog b/debian/changelog index eea258ccb..495249855 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,8 +17,10 @@ apt (0.8.15.7) UNRELEASED; urgency=low * apt-pkg/acquire-item.cc: - if no Release.gpg file is found try to verify with hashes, but do not fail if a hash can't be found + * apt-pkg/acquire.cc: + - non-existing directories are by definition clean - -- David Kalnischkies <kalnischkies@gmail.com> Mon, 22 Aug 2011 22:50:44 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Mon, 22 Aug 2011 23:07:29 +0200 apt (0.8.15.6) unstable; urgency=low |