diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-08 15:38:45 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-08 15:38:45 +0200 |
| commit | 3278fe66567d149ea92c1afa78941f2bc3c71c85 (patch) | |
| tree | 3a735d19278bb8f5aa19ba2707f3a09cf52e1d21 /apt-pkg/indexcopy.cc | |
| parent | 37cc828e003f51d63ed991be5acac36765b8230a (diff) | |
| parent | 885594fc8831d1be5a254557385e3dbefb564fbf (diff) | |
merged bundle from david
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 f53989bdb..a262ef789 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -141,7 +141,6 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List, File = OrigPath + ChopDirs(File,Chop); // See if the file exists - bool Mangled = false; if (NoStat == false || Hits < 10) { // Attempt to fix broken structure @@ -164,6 +163,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List, if (stat(string(CDROM + Prefix + File).c_str(),&Buf) != 0 || Buf.st_size == 0) { + bool Mangled = false; // Attempt to fix busted symlink support for one instance string OrigFile = File; string::size_type Start = File.find("binary-"); @@ -681,9 +681,7 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/ unsigned int WrongSize = 0; unsigned int Packages = 0; for (vector<string>::iterator I = List.begin(); I != List.end(); ++I) - { - string OrigPath = string(*I,CDROM.length()); - + { // Open the package file FileFd Pkg(*I, FileFd::ReadOnly, FileFd::Auto); off_t const FileSize = Pkg.Size(); |