diff options
Diffstat (limited to 'ftparchive')
| -rw-r--r-- | ftparchive/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ftparchive/contents.cc | 2 | ||||
| -rw-r--r-- | ftparchive/writer.cc | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/ftparchive/CMakeLists.txt b/ftparchive/CMakeLists.txt index 799fd7335..bbd2848c1 100644 --- a/ftparchive/CMakeLists.txt +++ b/ftparchive/CMakeLists.txt @@ -1,5 +1,7 @@ include_directories(${BERKELEY_DB_INCLUDE_DIRS}) -# Create the executable tasks +# Definition of the C++ files used to build the program - note that this +# is expanded at CMake time, so you have to rerun cmake if you add or remove +# a file (you can just run cmake . in the build directory) file(GLOB_RECURSE source "*.cc") add_executable(apt-ftparchive ${source}) diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc index 0ce15b3d6..ae8a7e991 100644 --- a/ftparchive/contents.cc +++ b/ftparchive/contents.cc @@ -140,7 +140,7 @@ GenContents::Node *GenContents::Grab(GenContents::Node *Top,const char *Name, // Collision! if (Res == 0) { - // See if this the the same package (multi-version dup) + // See if this is the same package (multi-version dup) if (Top->Package == Package || strcasecmp(Top->Package,Package) == 0) return Top; diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index eb17521eb..cac1d943d 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -364,7 +364,7 @@ PackagesWriter::PackagesWriter(FileFd * const GivenOutput, TranslationWriter * c string const &Arch, bool const IncludeArchAll) : FTWScanner(GivenOutput, Arch, IncludeArchAll), Db(DB), Stats(Db.Stats), TransWriter(transWriter) { - SetExts(".deb .udeb"); + SetExts(".deb .ddeb .udeb"); DeLinkLimit = 0; // Process the command line options @@ -411,7 +411,7 @@ bool PackagesWriter::DoPackage(string FileName) if (Delink(FileName,OriginalPath,Stats.DeLinkBytes,FileSize) == false) return false; - // Lookup the overide information + // Lookup the override information pkgTagSection &Tags = Db.Control.Section; string Package = Tags.FindS("Package"); string Architecture; @@ -659,7 +659,7 @@ bool SourcesWriter::DoPackage(string FileName) return _error->Error("Could not find a Source entry in the DSC '%s'",FileName.c_str()); Tags.Trim(); - // Lookup the overide information, finding first the best priority. + // Lookup the override information, finding first the best priority. string BestPrio; string Bins = Tags.FindS("Binary"); char Buffer[Bins.length() + 1]; |