tag of apt@packages.debian.org/apt--ubuntu--0--patch-17

[apt.git] / apt-pkg / pkgcachegen.cc

diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 075af3eec2ab89cef855fcba67133ecd41967bb3..2340f97fd7e6cd90ff5d83551d6d662c8e734d52 100644 (file)
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -114,7 +114,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
       
       pkgCache::PkgIterator Pkg;
       if (NewPackage(Pkg,PackageName) == false)
       
       pkgCache::PkgIterator Pkg;
       if (NewPackage(Pkg,PackageName) == false)

-        return _error->Error(_("Error occured while processing %s (NewPackage)"),PackageName.c_str());
+        return _error->Error(_("Error occurred while processing %s (NewPackage)"),PackageName.c_str());

       Counter++;
       if (Counter % 100 == 0 && Progress != 0)
         Progress->Progress(List.Offset());
       Counter++;
       if (Counter % 100 == 0 && Progress != 0)
         Progress->Progress(List.Offset());


@@ -126,7 +126,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
       if (Version.empty() == true)
       {
         if (List.UsePackage(Pkg,pkgCache::VerIterator(Cache)) == false)
       if (Version.empty() == true)
       {
         if (List.UsePackage(Pkg,pkgCache::VerIterator(Cache)) == false)

-           return _error->Error(_("Error occured while processing %s (UsePackage1)"),
+           return _error->Error(_("Error occurred while processing %s (UsePackage1)"),

                                 PackageName.c_str());
         continue;
       }
                                 PackageName.c_str());
         continue;
       }


@@ -147,11 +147,11 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
       if (Res == 0 && Ver->Hash == Hash)
       {
         if (List.UsePackage(Pkg,Ver) == false)
       if (Res == 0 && Ver->Hash == Hash)
       {
         if (List.UsePackage(Pkg,Ver) == false)

-           return _error->Error(_("Error occured while processing %s (UsePackage2)"),
+           return _error->Error(_("Error occurred while processing %s (UsePackage2)"),

                                 PackageName.c_str());
 
         if (NewFileVer(Ver,List) == false)
                                 PackageName.c_str());
 
         if (NewFileVer(Ver,List) == false)

-           return _error->Error(_("Error occured while processing %s (NewFileVer1)"),
+           return _error->Error(_("Error occurred while processing %s (NewFileVer1)"),

                                 PackageName.c_str());
         
         // Read only a single record and return
                                 PackageName.c_str());
         
         // Read only a single record and return


@@ -181,15 +181,15 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
       Ver->ParentPkg = Pkg.Index();
       Ver->Hash = Hash;
       if (List.NewVersion(Ver) == false)
       Ver->ParentPkg = Pkg.Index();
       Ver->Hash = Hash;
       if (List.NewVersion(Ver) == false)

-        return _error->Error(_("Error occured while processing %s (NewVersion1)"),
+        return _error->Error(_("Error occurred while processing %s (NewVersion1)"),

                              PackageName.c_str());
 
       if (List.UsePackage(Pkg,Ver) == false)
                              PackageName.c_str());
 
       if (List.UsePackage(Pkg,Ver) == false)

-        return _error->Error(_("Error occured while processing %s (UsePackage3)"),
+        return _error->Error(_("Error occurred while processing %s (UsePackage3)"),

                              PackageName.c_str());
       
       if (NewFileVer(Ver,List) == false)
                              PackageName.c_str());
       
       if (NewFileVer(Ver,List) == false)

-        return _error->Error(_("Error occured while processing %s (NewVersion2)"),
+        return _error->Error(_("Error occurred while processing %s (NewVersion2)"),

                              PackageName.c_str());
 
       // Read only a single record and return
                              PackageName.c_str());
 
       // Read only a single record and return


@@ -238,7 +238,7 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List)
       
       pkgCache::PkgIterator Pkg = Cache.FindPkg(PackageName);
       if (Pkg.end() == true)
       
       pkgCache::PkgIterator Pkg = Cache.FindPkg(PackageName);
       if (Pkg.end() == true)

-        return _error->Error(_("Error occured while processing %s (FindPkg)"),
+        return _error->Error(_("Error occurred while processing %s (FindPkg)"),

                                PackageName.c_str());
       Counter++;
       if (Counter % 100 == 0 && Progress != 0)
                                PackageName.c_str());
       Counter++;
       if (Counter % 100 == 0 && Progress != 0)


@@ -251,7 +251,7 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List)
         if (Ver->Hash == Hash && Version.c_str() == Ver.VerStr())
         {
            if (List.CollectFileProvides(Cache,Ver) == false)
         if (Ver->Hash == Hash && Version.c_str() == Ver.VerStr())
         {
            if (List.CollectFileProvides(Cache,Ver) == false)

-              return _error->Error(_("Error occured while processing %s (CollectFileProvides)"),PackageName.c_str());
+              return _error->Error(_("Error occurred while processing %s (CollectFileProvides)"),PackageName.c_str());

            break;
         }
       }
            break;
         }
       }