diff options
author | Michael Vogt <mvo@debian.org> | 2013-07-24 22:06:18 +0200 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2013-07-24 22:06:18 +0200 |
commit | f39daeb1f66b8910f91274055bf07c3d008cdc50 (patch) | |
tree | 9283950ebf8a3089b8b16b1d09c3aec8ecc5eb07 /apt-pkg/cdrom.cc | |
parent | 267275c59cc35704789a228c6e9b1464c4cabd74 (diff) | |
parent | c7a629dd114c41a1244744e2f5085df2f505dc90 (diff) |
Merge remote-tracking branch 'upstream/debian/sid'
Diffstat (limited to 'apt-pkg/cdrom.cc')
-rw-r--r-- | apt-pkg/cdrom.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 9a9a854bf..a5668a50a 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -829,6 +829,14 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/ log->Update(msg.str()); log->Update(_("Copying package lists..."), STEP_COPY); } + + // check for existence and possibly create state directory for copying + string const listDir = _config->FindDir("Dir::State::lists"); + string const partialListDir = listDir + "partial/"; + if (CreateAPTDirectoryIfNeeded(_config->FindDir("Dir::State"), partialListDir) == false && + CreateAPTDirectoryIfNeeded(listDir, partialListDir) == false) + return _error->Errno("cdrom", _("List directory %spartial is missing."), listDir.c_str()); + // take care of the signatures and copy them if they are ok // (we do this before PackageCopy as it modifies "List" and "SourceList") SigVerify SignVerify; |