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/indexcopy.cc | |
| parent | 267275c59cc35704789a228c6e9b1464c4cabd74 (diff) | |
| parent | c7a629dd114c41a1244744e2f5085df2f505dc90 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid'
Diffstat (limited to 'apt-pkg/indexcopy.cc')
| -rw-r--r-- | apt-pkg/indexcopy.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 0e36b3ded..1d61b974d 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -544,11 +544,9 @@ bool SigVerify::CopyMetaIndex(string CDROM, string CDName, /*{{{*/ FileFd Rel; Target.Open(TargetF,FileFd::WriteAtomic); Rel.Open(prefix + file,FileFd::ReadOnly); - if (_error->PendingError() == true) - return false; if (CopyFile(Rel,Target) == false) - return false; - + return _error->Error("Copying of '%s' for '%s' from '%s' failed", file.c_str(), CDName.c_str(), prefix.c_str()); + return true; } /*}}}*/ |