From 42ab8223d52672cf28c6e2e574bb364c438bd49a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 23 May 2005 21:06:09 +0000 Subject: [PATCH] * merged with my apt--fixes--0 branch Patches applied: * apt@packages.debian.org/apt--misc-abi-changes--0--patch-4 Merge from mainline * apt@packages.debian.org/apt--misc-abi-changes--0--patch-5 Merge from mainline * apt@packages.debian.org/apt--misc-abi-changes--0--patch-6 Collapse both pkgAcquire::Run() methods into one, with a default value * michael.vogt@ubuntu.com--2005/apt--fixes--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-79 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-1 * merged obvious fixes into the tree to make it easy for matt to merge * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-2 * more merges from otavio that looks good/uncritical * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-3 * merged Matts misc-abi-changes tree * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-4 * finalized the changelog for a ubuntu build * otavio@debian.org--2005/apt--fixes--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-71 * otavio@debian.org--2005/apt--fixes--0--patch-1 Fix comments about the need of xmlto * otavio@debian.org--2005/apt--fixes--0--patch-2 Fix a compile warning * otavio@debian.org--2005/apt--fixes--0--patch-3 Sync with apt--main--0--patch-76 * otavio@debian.org--2005/apt--fixes--0--patch-4 Sync with apt--main--0--patch-78 * otavio@debian.org--2005/apt--fixes--0--patch-5 Add fixes that was wrongly included on DDTP changes. * otavio@debian.org--2005/apt--fixes--0--patch-8 Add information about the other fixes include on this branch now. * otavio@debian.org--2005/apt--fixes--0--patch-9 Merge last changes from apt--main--0. * otavio@debian.org--2005/apt--fixes--0--patch-10 Fix warnings about min/max change in gcc-4.0 * otavio@debian.org--2005/apt--fixes--0--patch-11 Fix remaning warnings while compiling gcc-4.0 * otavio@debian.org--2005/apt--fixes--0--patch-12 Add changelog entry about the fixes for warnings while compiling using GCC 4.0 compiler. --- apt-inst/contrib/extracttar.cc | 2 +- apt-inst/contrib/extracttar.h | 4 ++ apt-inst/deb/dpkgdb.cc | 2 +- apt-pkg/acquire.h | 3 +- apt-pkg/clean.h | 1 + apt-pkg/contrib/hashes.cc | 4 +- apt-pkg/contrib/hashes.h | 4 ++ apt-pkg/contrib/md5.cc | 4 +- apt-pkg/contrib/md5.h | 2 + apt-pkg/contrib/sha1.cc | 2 +- apt-pkg/contrib/sha1.h | 2 + apt-pkg/indexcopy.h | 1 + apt-pkg/indexfile.h | 1 + buildlib/xml_manpage.mak | 2 +- cmdline/apt-get.cc | 9 +++ configure.in | 2 +- debian/changelog | 22 ++++++- ftparchive/cachedb.h | 2 +- methods/ftp.cc | 2 +- po/apt-all.pot | 110 ++++++++++++++++----------------- 20 files changed, 111 insertions(+), 70 deletions(-) diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc index 2585986d7..d6da802fe 100644 --- a/apt-inst/contrib/extracttar.cc +++ b/apt-inst/contrib/extracttar.cc @@ -309,7 +309,7 @@ bool ExtractTar::Go(pkgDirStream &Stream) while (Size != 0) { unsigned char Junk[32*1024]; - unsigned long Read = MIN(Size,sizeof(Junk)); + unsigned long Read = min(Size,(unsigned long)sizeof(Junk)); if (InFd.Read(Junk,((Read+511)/512)*512) == false) return false; diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h index ec930ca22..6daf00a27 100644 --- a/apt-inst/contrib/extracttar.h +++ b/apt-inst/contrib/extracttar.h @@ -21,6 +21,10 @@ #include #include +#include + +using std::min; + class ExtractTar { protected: diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc index de781f44c..7b7e90acd 100644 --- a/apt-inst/deb/dpkgdb.cc +++ b/apt-inst/deb/dpkgdb.cc @@ -67,7 +67,7 @@ static bool EraseDir(const char *Dir) if (Pid == 0) { execlp(_config->Find("Dir::Bin::rm","/bin/rm").c_str(), - "rm","-rf","--",Dir,0); + "rm","-rf","--",Dir,(char *)NULL); _exit(100); } return ExecWait(Pid,_config->Find("dir::bin::rm","/bin/rm").c_str()); diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h index 3e338b220..27bb3d363 100644 --- a/apt-pkg/acquire.h +++ b/apt-pkg/acquire.h @@ -100,8 +100,7 @@ class pkgAcquire enum RunResult {Continue,Failed,Cancelled}; - RunResult Run() { return Run(500000); }; // Binary compatibility - RunResult Run(int PulseIntervall); + RunResult Run(int PulseIntervall=500000); void Shutdown(); // Simple iteration mechanism diff --git a/apt-pkg/clean.h b/apt-pkg/clean.h index ee65fcb61..43164e250 100644 --- a/apt-pkg/clean.h +++ b/apt-pkg/clean.h @@ -25,6 +25,7 @@ class pkgArchiveCleaner public: bool Go(string Dir,pkgCache &Cache); + virtual ~pkgArchiveCleaner() {}; }; #endif diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc index af741b672..b17b94319 100644 --- a/apt-pkg/contrib/hashes.cc +++ b/apt-pkg/contrib/hashes.cc @@ -30,8 +30,8 @@ bool Hashes::AddFD(int Fd,unsigned long Size) int Res = 0; while (Size != 0) { - Res = read(Fd,Buf,MIN(Size,sizeof(Buf))); - if (Res < 0 || (unsigned)Res != MIN(Size,sizeof(Buf))) + Res = read(Fd,Buf,min(Size,(unsigned long)sizeof(Buf))); + if (Res < 0 || (unsigned)Res != min(Size,(unsigned long)sizeof(Buf))) return false; Size -= Res; MD5.Add(Buf,Res); diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h index 481ea88f8..40bbe00a0 100644 --- a/apt-pkg/contrib/hashes.h +++ b/apt-pkg/contrib/hashes.h @@ -20,6 +20,10 @@ #include #include +#include + +using std::min; + class Hashes { public: diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc index 2bd745153..fded5c864 100644 --- a/apt-pkg/contrib/md5.cc +++ b/apt-pkg/contrib/md5.cc @@ -299,8 +299,8 @@ bool MD5Summation::AddFD(int Fd,unsigned long Size) int Res = 0; while (Size != 0) { - Res = read(Fd,Buf,MIN(Size,sizeof(Buf))); - if (Res < 0 || (unsigned)Res != MIN(Size,sizeof(Buf))) + Res = read(Fd,Buf,min(Size,(unsigned long)sizeof(Buf))); + if (Res < 0 || (unsigned)Res != min(Size,(unsigned long)sizeof(Buf))) return false; Size -= Res; Add(Buf,Res); diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h index 47c6a7cec..9e20f7cef 100644 --- a/apt-pkg/contrib/md5.h +++ b/apt-pkg/contrib/md5.h @@ -28,8 +28,10 @@ #endif #include +#include using std::string; +using std::min; class MD5Summation; diff --git a/apt-pkg/contrib/sha1.cc b/apt-pkg/contrib/sha1.cc index 9b402c523..72eafd4ca 100644 --- a/apt-pkg/contrib/sha1.cc +++ b/apt-pkg/contrib/sha1.cc @@ -347,7 +347,7 @@ bool SHA1Summation::AddFD(int Fd,unsigned long Size) while (Size != 0 || ToEOF) { unsigned n = sizeof(Buf); - if (!ToEOF) n = MIN(Size,n); + if (!ToEOF) n = min(Size,(unsigned long)n); Res = read(Fd,Buf,n); if (Res < 0 || (!ToEOF && (unsigned) Res != n)) // error, or short read return false; diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h index 7d25ceb0d..db8ca7893 100644 --- a/apt-pkg/contrib/sha1.h +++ b/apt-pkg/contrib/sha1.h @@ -19,8 +19,10 @@ #endif #include +#include using std::string; +using std::min; class SHA1Summation; diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h index fa8e9c156..4dcb2b46d 100644 --- a/apt-pkg/indexcopy.h +++ b/apt-pkg/indexcopy.h @@ -43,6 +43,7 @@ class IndexCopy bool CopyPackages(string CDROM,string Name,vector &List, pkgCdromStatus *log); + virtual ~IndexCopy() {}; }; class PackageCopy : public IndexCopy diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h index be02669fa..61049f4bd 100644 --- a/apt-pkg/indexfile.h +++ b/apt-pkg/indexfile.h @@ -55,6 +55,7 @@ class pkgIndexFile virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator /*File*/) const {return 0;}; Type(); + virtual ~Type() {}; }; virtual const Type *GetType() const = 0; diff --git a/buildlib/xml_manpage.mak b/buildlib/xml_manpage.mak index 57e95f303..c8b155d09 100644 --- a/buildlib/xml_manpage.mak +++ b/buildlib/xml_manpage.mak @@ -2,7 +2,7 @@ # This handles man pages in DocBook XML format. We convert to the respective # output in the source directory then copy over to the final dest. This -# means yodl is only needed if compiling from CVS +# means xmlto is only needed if compiling from Arch # Input # $(SOURCE) - The documents to use, in the form foo.sect, ie apt-cache.8 diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 6268f4953..00e6aaa67 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1380,6 +1380,15 @@ bool DoUpgrade(CommandLine &CmdL) /* Install named packages */ bool DoInstall(CommandLine &CmdL) { + // Lock the list directory + FileFd Lock; + if (_config->FindB("Debug::NoLocking",false) == false) + { + Lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock")); + if (_error->PendingError() == true) + return _error->Error(_("Unable to lock the list directory")); + } + CacheFile Cache; if (Cache.OpenForInstall() == false || Cache.CheckDeps(CmdL.FileSize() != 1) == false) diff --git a/configure.in b/configure.in index 12d3ecae7..767399b52 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.36") +AC_DEFINE_UNQUOTED(VERSION,"0.6.37") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 6296a98e5..d2b896369 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,29 @@ -apt (0.6.36ubuntu1) breezy; urgency=low +apt (0.6.37) breezy; urgency=low * apt-cache show shows the available packages providing the virtual pkg (thanks to otavio) (closes: #202493) * make pinning on the "component" work again (using the section of the archive, we don't use per-section Release files anymore with apt-0.6) (closes ubuntu #9935) + + -- Michael Vogt Mon, 23 May 2005 23:02:50 +0200 + +apt (0.6.36ubuntu1) breezy; urgency=low + * make it possible to write a cache-control: no-cache header even if no proxy is set to support transparent proxies (closes ubuntu: #10773) - -- + * Merge otavio@debian.org--2005/apt--fixes--0.6: + - Fix comment about the need of xmlto while building from Arch; + - Fix StatStore struct on cachedb.h to use time_t and then fix a compile + warning; + - Lock database at start of DoInstall routine to avoid concurrent + runs of install/remove and update commands (Closes: #194467) + - Fix warnings while compiling with GCC 4.0 compiler + + -- Michael Vogt Mon, 23 May 2005 11:57:53 +0200 +>>>>>>> MERGE-SOURCE apt (0.6.36) experimental; urgency=low * Merge apt--mvo--0: @@ -21,7 +35,11 @@ apt (0.6.36) experimental; urgency=low - apt-pkg/cdrom.cc: honor "Acquire::gpgv::Options" when verifying the signature (Ubuntu #8496) +<<<<<<< TREE -- Michael Vogt Fri, 6 May 2005 10:12:20 +0200 +======= + -- Michael Vogt Thu, 31 Mar 2005 20:37:11 +0200 +>>>>>>> MERGE-SOURCE apt (0.6.35) hoary; urgency=low diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h index 1229b98ef..1b043e1aa 100644 --- a/ftparchive/cachedb.h +++ b/ftparchive/cachedb.h @@ -69,7 +69,7 @@ class CacheDB enum FlagList {FlControl = (1<<0),FlMD5=(1<<1),FlContents=(1<<2)}; struct StatStore { - uint32_t mtime; + time_t mtime; uint32_t Flags; } CurStat; struct StatStore OldStat; diff --git a/methods/ftp.cc b/methods/ftp.cc index 8bf8a2ee6..f595e0ca4 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -1102,7 +1102,7 @@ int main(int argc,const char *argv[]) // Run the http method string Path = flNotFile(argv[0]) + "http"; - execl(Path.c_str(),Path.c_str(),0); + execl(Path.c_str(),Path.c_str(),(char *)NULL); cerr << _("Unable to invoke ") << Path << endl; exit(100); } diff --git a/po/apt-all.pot b/po/apt-all.pot index a38db53b9..b1caa6f23 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-05-10 12:37+0200\n" +"POT-Creation-Date: 2005-05-23 23:04+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -157,7 +157,7 @@ msgstr "" #: cmdline/apt-cache.cc:1665 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@ -532,7 +532,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -679,11 +679,11 @@ msgstr "" msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" @@ -737,7 +737,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -746,7 +746,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "" @@ -837,7 +837,7 @@ msgstr "" msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "" @@ -851,27 +851,27 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -879,149 +879,149 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1565,7 +1565,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1692,43 +1692,43 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "" -- 2.45.2