From 2a7497704e9dee1f1d987e7a2cd59e939d991909 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 13 Sep 2005 14:09:50 +0000 Subject: * merged from apt--cdrom-fallback--0 Patches applied: * michael.vogt@ubuntu.com--2005/apt--cdrom-fallback--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-110 * michael.vogt@ubuntu.com--2005/apt--cdrom-fallback--0--patch-1 * initial patch to make falling back from cdrom possible * michael.vogt@ubuntu.com--2005/apt--cdrom-fallback--0--patch-2 * fix in methods/cdrom.cc: don't call Fail() but return false so that apt can fallback to a differencent source --- methods/cdrom.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'methods') diff --git a/methods/cdrom.cc b/methods/cdrom.cc index 41eb8a0ee..d6b8eae75 100644 --- a/methods/cdrom.cc +++ b/methods/cdrom.cc @@ -166,8 +166,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm) if (MediaFail(Get.Host,CDROM) == false) { CurrentID = "FAIL"; - Fail(_("Wrong CD-ROM"),true); - return true; + return _error->Error(_("Disk not found.")); } } -- cgit v1.2.3-70-g09d2 From 927c393f1305925c1456c931e1e7b45afd6f051d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sun, 23 Oct 2005 11:12:54 +0000 Subject: * added http data corruption fix patch (#280844) --- configure.in | 2 +- debian/changelog | 5 ++++- methods/http.cc | 13 ++++--------- 3 files changed, 9 insertions(+), 11 deletions(-) (limited to 'methods') diff --git a/configure.in b/configure.in index 758727f2f..5ac3b0d8a 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.42.1") +AC_DEFINE_UNQUOTED(VERSION,"0.6.42.1exp1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index b854d1741..67195fc7e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,10 @@ apt (0.6.42.1exp1) experimental; urgency=low * synced with the apt--debian-sid--0 branch * build from mvo@debian.org--2005/apt--debian-experimental--0 (from http://people.debian.org/~mvo/arch) - + * fix bug in apt-cache when displaying the record (closes: #334887) + * add patch to fix http download corruption problem (thanks to + Petr Vandrovec, closes: #280844, #290694) + -- Michael Vogt Wed, 19 Oct 2005 22:12:13 +0200 apt (0.6.42.1) unstable; urgency=low diff --git a/methods/http.cc b/methods/http.cc index e2337a9ba..dbf2d1b43 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -205,28 +205,23 @@ bool CircleBuf::WriteTillEl(string &Data,bool Single) if (Buf[I%Size] != '\n') continue; ++I; - if (I < InP && Buf[I%Size] == '\r') - ++I; if (Single == false) { - if (Buf[I%Size] != '\n') - continue; - ++I; if (I < InP && Buf[I%Size] == '\r') ++I; + if (I >= InP || Buf[I%Size] != '\n') + continue; + ++I; } - if (I > InP) - I = InP; - Data = ""; while (OutP < I) { unsigned long Sz = LeftWrite(); if (Sz == 0) return false; - if (I - OutP < LeftWrite()) + if (I - OutP < Sz) Sz = I - OutP; Data += string((char *)(Buf + (OutP%Size)),Sz); OutP += Sz; -- cgit v1.2.3-70-g09d2 From 46e00f9d71300f3a80a4a311e369e64a48ce396f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 22 Nov 2005 19:34:02 +0000 Subject: * ABI change: merged more flexible pkgAcquireFile code --- apt-pkg/acquire-item.cc | 27 +++++++++++++++------------ apt-pkg/acquire-item.h | 11 ++++++++--- apt-pkg/init.h | 2 +- apt-pkg/makefile | 2 +- debian/changelog | 1 + methods/makefile | 2 +- 6 files changed, 27 insertions(+), 18 deletions(-) (limited to 'methods') diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index debd1face..88c25de43 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -184,7 +184,7 @@ string pkgAcqIndex::Custom600Headers() void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) { // no .bz2 found, retry with .gz - if(Desc.URI.substr(Desc.URI.size()-3,Desc.URI.size()-1) == "bz2") { + if(Desc.URI.substr(Desc.URI.size()-3) == "bz2") { Desc.URI = Desc.URI.substr(0,Desc.URI.size()-3) + "gz"; // retry with a gzip one @@ -290,7 +290,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string MD5, else Local = true; - string compExt = Desc.URI.substr(Desc.URI.size()-3,Desc.URI.size()-1); + string compExt = Desc.URI.substr(Desc.URI.size()-3); char *decompProg; if(compExt == "bz2") decompProg = "bzip2"; @@ -315,10 +315,9 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner, const vector* IndexTargets, indexRecords* MetaIndexParser) : Item(Owner), RealURI(URI), MetaIndexURI(MetaIndexURI), - MetaIndexURIDesc(MetaIndexURIDesc), MetaIndexShortDesc(MetaIndexShortDesc) + MetaIndexURIDesc(MetaIndexURIDesc), MetaIndexShortDesc(MetaIndexShortDesc), + MetaIndexParser(MetaIndexParser), IndexTargets(IndexTargets) { - this->MetaIndexParser = MetaIndexParser; - this->IndexTargets = IndexTargets; DestFile = _config->FindDir("Dir::State::lists") + "partial/"; DestFile += URItoFileName(URI); @@ -430,11 +429,9 @@ pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire *Owner, string SigFile, const vector* IndexTargets, indexRecords* MetaIndexParser) : - Item(Owner), RealURI(URI), SigFile(SigFile) + Item(Owner), RealURI(URI), SigFile(SigFile), AuthPass(false), + MetaIndexParser(MetaIndexParser), IndexTargets(IndexTargets) { - this->AuthPass = false; - this->MetaIndexParser = MetaIndexParser; - this->IndexTargets = IndexTargets; DestFile = _config->FindDir("Dir::State::lists") + "partial/"; DestFile += URItoFileName(URI); @@ -1008,13 +1005,19 @@ void pkgAcqArchive::Finished() // --------------------------------------------------------------------- /* The file is added to the queue */ pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string MD5, - unsigned long Size,string Dsc,string ShortDesc) : + unsigned long Size,string Dsc,string ShortDesc, + const string &DestDir, const string &DestFilename) : Item(Owner), Md5Hash(MD5) { Retries = _config->FindI("Acquire::Retries",0); - DestFile = flNotDir(URI); - + if(!DestFilename.empty()) + DestFile = DestFilename; + else if(!DestDir.empty()) + DestFile = DestDir + "/" + flNotDir(URI); + else + DestFile = flNotDir(URI); + // Create the item Desc.URI = URI; Desc.Description = Dsc; diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index 90f80368b..c34b5ef69 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -224,9 +224,14 @@ class pkgAcqFile : public pkgAcquire::Item pkgAcquire::MethodConfig *Cnf); virtual string MD5Sum() {return Md5Hash;}; virtual string DescURI() {return Desc.URI;}; - - pkgAcqFile(pkgAcquire *Owner,string URI,string MD5,unsigned long Size, - string Desc,string ShortDesc); + + // If DestFilename is empty, download to DestDir/ if + // DestDir is non-empty, $CWD/ otherwise. If + // DestFilename is NOT empty, DestDir is ignored and DestFilename + // is the absolute name to which the file should be downloaded. + pkgAcqFile(pkgAcquire *Owner, string URI, string MD5, unsigned long Size, + string Desc, string ShortDesc, + const string &DestDir="", const string &DestFilename=""); }; #endif diff --git a/apt-pkg/init.h b/apt-pkg/init.h index e21351797..8255b406a 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -18,7 +18,7 @@ // See the makefile #define APT_PKG_MAJOR 3 -#define APT_PKG_MINOR 10 +#define APT_PKG_MINOR 11 #define APT_PKG_RELEASE 0 extern const char *pkgVersion; diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 8de7d945e..0e6aecc65 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -13,7 +13,7 @@ include ../buildlib/defaults.mak # methods/makefile - FIXME LIBRARY=apt-pkg LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER) -MAJOR=3.10 +MAJOR=3.11 MINOR=0 SLIBS=$(PTHREADLIB) $(INTLLIBS) APT_DOMAIN:=libapt-pkg$(MAJOR) diff --git a/debian/changelog b/debian/changelog index bca8a14b1..2022448a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ apt (0.6.42.4) unstable; urgency=low * make pkgDirStream (a bit) more complete * fix bug in pkgCache::VerIterator::end() (thanks to Daniel Burrows) (closes: #339533) + * pkgAcqFile is more flexible now (closes: #57091) -- diff --git a/methods/makefile b/methods/makefile index 06fd2a6fc..1e3b1ef85 100644 --- a/methods/makefile +++ b/methods/makefile @@ -7,7 +7,7 @@ include ../buildlib/defaults.mak BIN := $(BIN)/methods # FIXME.. -LIB_APT_PKG_MAJOR = 3.10 +LIB_APT_PKG_MAJOR = 3.11 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR) # The file method -- cgit v1.2.3-70-g09d2 From 7c6e2dc761f736bf203f7770f7a1c4a63f7063d4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 22 Nov 2005 22:11:06 +0000 Subject: * merged http download limit for apt (#146877) --- apt-pkg/acquire.cc | 6 +++++- debian/changelog | 5 +++-- doc/examples/configure-index | 1 + methods/http.cc | 41 +++++++++++++++++++++++++++++++++++++++-- methods/http.h | 5 +++++ 5 files changed, 53 insertions(+), 5 deletions(-) (limited to 'methods') diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 62209e65b..57cf60bfe 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -266,7 +266,11 @@ pkgAcquire::MethodConfig *pkgAcquire::GetConfig(string Access) Worker Work(Conf); if (Work.Start() == false) return 0; - + + /* if a method uses DownloadLimit, we switch to SingleInstance mode */ + if(_config->FindI("Acquire::"+Access+"::DlLimit",0) > 0) + Conf->SingleInstance = true; + return Conf; } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 2022448a0..34f8cec03 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.6.42.4) unstable; urgency=low +apt (0.6.43) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-132: * zh_CN.po: Completed to 510 strings(Closes: #338267) @@ -9,8 +9,9 @@ apt (0.6.42.4) unstable; urgency=low * fix bug in pkgCache::VerIterator::end() (thanks to Daniel Burrows) (closes: #339533) * pkgAcqFile is more flexible now (closes: #57091) + * support a download rate limit for http (closes: #146877) - -- + -- apt (0.6.42.3) unstable; urgency=low diff --git a/doc/examples/configure-index b/doc/examples/configure-index index a93b74349..9e851d753 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -117,6 +117,7 @@ Acquire No-Cache "false"; Max-Age "86400"; // 1 Day age on index files No-Store "false"; // Prevent the cache from storing archives + Dl-Limit "7"; // 7Kb/sec maximum download rate }; ftp diff --git a/methods/http.cc b/methods/http.cc index ba86aa6b6..a5c9601e7 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -58,6 +58,12 @@ unsigned long PipelineDepth = 10; unsigned long TimeOut = 120; bool Debug = false; + +unsigned long CircleBuf::BwReadLimit=0; +unsigned long CircleBuf::BwTickReadData=0; +struct timeval CircleBuf::BwReadTick={0,0}; +const unsigned int CircleBuf::BW_HZ=10; + // CircleBuf::CircleBuf - Circular input buffer /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -65,6 +71,8 @@ CircleBuf::CircleBuf(unsigned long Size) : Size(Size), Hash(0) { Buf = new unsigned char[Size]; Reset(); + + CircleBuf::BwReadLimit = _config->FindI("Acquire::http::Dl-Limit",0)*1024; } /*}}}*/ // CircleBuf::Reset - Reset to the default state /*{{{*/ @@ -90,16 +98,45 @@ void CircleBuf::Reset() is non-blocking.. */ bool CircleBuf::Read(int Fd) { + unsigned long BwReadMax; + while (1) { // Woops, buffer is full if (InP - OutP == Size) return true; - + + // what's left to read in this tick + BwReadMax = CircleBuf::BwReadLimit/BW_HZ; + + if(CircleBuf::BwReadLimit) { + struct timeval now; + gettimeofday(&now,0); + + unsigned long d = (now.tv_sec-CircleBuf::BwReadTick.tv_sec)*1000000 + + now.tv_usec-CircleBuf::BwReadTick.tv_usec; + if(d > 1000000/BW_HZ) { + CircleBuf::BwReadTick = now; + CircleBuf::BwTickReadData = 0; + } + + if(CircleBuf::BwTickReadData >= BwReadMax) { + usleep(1000000/BW_HZ); + return true; + } + } + // Write the buffer segment int Res; - Res = read(Fd,Buf + (InP%Size),LeftRead()); + if(CircleBuf::BwReadLimit) { + Res = read(Fd,Buf + (InP%Size), + BwReadMax > LeftRead() ? LeftRead() : BwReadMax); + } else + Res = read(Fd,Buf + (InP%Size),LeftRead()); + if(Res > 0 && BwReadLimit > 0) + CircleBuf::BwTickReadData += Res; + if (Res == 0) return false; if (Res < 0) diff --git a/methods/http.h b/methods/http.h index c5a4d0e86..541e2952c 100644 --- a/methods/http.h +++ b/methods/http.h @@ -31,6 +31,11 @@ class CircleBuf unsigned long MaxGet; struct timeval Start; + static unsigned long BwReadLimit; + static unsigned long BwTickReadData; + static struct timeval BwReadTick; + static const unsigned int BW_HZ; + unsigned long LeftRead() { unsigned long Sz = Size - (InP - OutP); -- cgit v1.2.3-70-g09d2 From b57c8bb4085634c3fbe219ae1fd005d6bd62987a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 28 Nov 2005 22:27:06 +0000 Subject: * build-depend on libdb4.3 now, fix for kFreeBSD (#317718) --- debian/changelog | 2 ++ debian/control | 2 +- methods/http.cc | 10 ++++++++-- po/apt-all.pot | 18 +++++++++--------- po/bs.po | 18 +++++++++--------- po/ca.po | 18 +++++++++--------- po/cs.po | 18 +++++++++--------- po/da.po | 18 +++++++++--------- po/de.po | 18 +++++++++--------- po/el.po | 18 +++++++++--------- po/en_GB.po | 18 +++++++++--------- po/es.po | 18 +++++++++--------- po/eu.po | 18 +++++++++--------- po/fi.po | 18 +++++++++--------- po/fr.po | 18 +++++++++--------- po/he.po | 18 +++++++++--------- po/hu.po | 18 +++++++++--------- po/it.po | 18 +++++++++--------- po/ja.po | 18 +++++++++--------- po/ko.po | 18 +++++++++--------- po/nb.po | 18 +++++++++--------- po/nl.po | 18 +++++++++--------- po/nn.po | 18 +++++++++--------- po/pl.po | 18 +++++++++--------- po/pt.po | 18 +++++++++--------- po/pt_BR.po | 18 +++++++++--------- po/ro.po | 18 +++++++++--------- po/ru.po | 18 +++++++++--------- po/sk.po | 18 +++++++++--------- po/sl.po | 18 +++++++++--------- po/sv.po | 18 +++++++++--------- po/tl.po | 18 +++++++++--------- po/zh_CN.po | 18 +++++++++--------- po/zh_TW.po | 18 +++++++++--------- 34 files changed, 290 insertions(+), 282 deletions(-) (limited to 'methods') diff --git a/debian/changelog b/debian/changelog index f7788534e..7745add68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ apt (0.6.43) unstable; urgency=medium * included lots of the speedup changes from #319377 * add stdint.h to contrib/md5.h (closes: #340448) * ABI change, library name changed (closes: #339147) + * Fix GNU/kFreeBSD crash on non-existing server file (closes: #317718) + * switch to libdb4.3 in build-depends -- Michael Vogt Fri, 25 Nov 2005 11:22:31 +0100 diff --git a/debian/control b/debian/control index 4aa7b5aa2..5c76a90eb 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: important Maintainer: APT Development Team Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt Standards-Version: 3.6.1 -Build-Depends: debhelper (>= 4.1.62), libdb4.2-dev, gettext (>= 0.12) +Build-Depends: debhelper (>= 4.1.62), libdb4.3-dev, gettext (>= 0.12) Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) Package: apt diff --git a/methods/http.cc b/methods/http.cc index a5c9601e7..dc3f0b763 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -824,7 +824,10 @@ bool HttpMethod::Flush(ServerState *Srv) { if (File != 0) { - SetNonBlock(File->Fd(),false); + // on GNU/kFreeBSD, apt dies on /dev/null because non-blocking + // can't be set + if (File->Name() != "/dev/null") + SetNonBlock(File->Fd(),false); if (Srv->In.WriteSpace() == false) return true; @@ -852,7 +855,10 @@ bool HttpMethod::ServerDie(ServerState *Srv) // Dump the buffer to the file if (Srv->State == ServerState::Data) { - SetNonBlock(File->Fd(),false); + // on GNU/kFreeBSD, apt dies on /dev/null because non-blocking + // can't be set + if (File->Name() != "/dev/null") + SetNonBlock(File->Fd(),false); while (Srv->In.WriteSpace() == true) { if (Srv->In.Write(File->Fd()) == false) diff --git a/po/apt-all.pot b/po/apt-all.pot index f474c6a41..b57c99349 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-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1609,7 +1609,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1784,31 +1784,31 @@ msgstr "" msgid "Error writing to output file" msgstr "" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "" diff --git a/po/bs.po b/po/bs.po index b928190a8..d0f5d5cc8 100644 --- a/po/bs.po +++ b/po/bs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović \n" "Language-Team: Bosnian \n" @@ -1627,7 +1627,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1803,31 +1803,31 @@ msgstr "" msgid "Error writing to output file" msgstr "" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Povezivanje neuspješno" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Unutrašnja greška" diff --git a/po/ca.po b/po/ca.po index bd1f47988..985864a3e 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-07-19 01:31+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -1817,7 +1817,7 @@ msgstr "S'ha esgotat el temps de connexió al sòcol de dades" msgid "Unable to accept connection" msgstr "No es pot acceptar la connexió" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema escollint el fitxer" @@ -1998,31 +1998,31 @@ msgstr "Connexió finalitzada" msgid "Error writing to output file" msgstr "Error escrivint en el fitxer d'eixida" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Error escrivint en el fitxer" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Error escrivint en el fitxer" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Error llegint, el servidor remot ha tancat la connexió" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Error llegint des del servidor" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Capçalera de dades no vàlida" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Ha fallat la connexió" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Error intern" diff --git a/po/cs.po b/po/cs.po index d7ccea80c..d8cbc05e9 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-02-11 16:14+0100\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -1793,7 +1793,7 @@ msgstr "Spojení datového socketu vypršelo" msgid "Unable to accept connection" msgstr "Nemohu přijmout spojení" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problém s hashováním souboru" @@ -1970,31 +1970,31 @@ msgstr "Čas spojení vypršel" msgid "Error writing to output file" msgstr "Chyba zápisu do výstupního souboru" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Chyba čtení ze serveru" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Špatné datové záhlaví" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Spojení selhalo" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Vnitřní chyba" diff --git a/po/da.po b/po/da.po index 54fbdc88b..8fbc6da85 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-da\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-11-07 15:28+0100\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -1799,7 +1799,7 @@ msgstr "Tidsudl msgid "Unable to accept connection" msgstr "Kunne ikke acceptere forbindelse" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved \"hashing\" af fil" @@ -1978,31 +1978,31 @@ msgstr "Tidsudl msgid "Error writing to output file" msgstr "Fejl ved skrivning af uddatafil" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Fejl ved skrivning til fil" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Fejl ved skrivning til filen" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Fejl ved lsning fra serveren. Den fjerne ende lukkede forbindelsen" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Fejl ved lsning fra server" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Ugyldige hoved-data" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Forbindelsen mislykkedes" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Intern fejl" diff --git a/po/de.po b/po/de.po index a28e3d9ca..2f66c7232 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-06-15 18:22+0200\n" "Last-Translator: Michael Piefel \n" "Language-Team: \n" @@ -1837,7 +1837,7 @@ msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung" msgid "Unable to accept connection" msgstr "Kann Verbindung nicht annehmen" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf" @@ -2015,33 +2015,33 @@ msgstr "Verbindung erlitt Zeitüberschreitung" msgid "Error writing to output file" msgstr "Fehler beim Schreiben einer Ausgabedatei" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Fehler beim Schreiben einer Datei" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Fehler beim Schreiben der Datei" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fehler beim Lesen vom Server: Das entfernte Ende hat die Verbindung " "geschlossen" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Fehler beim Lesen vom Server" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Fehlerhafte Kopfzeilendaten" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Verbindung fehlgeschlagen" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Interner Fehler" diff --git a/po/el.po b/po/el.po index 91b6a09f5..8f0ef4262 100644 --- a/po/el.po +++ b/po/el.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-07-14 14:25EEST\n" "Last-Translator: Greek Translation Team \n" @@ -1832,7 +1832,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο msgid "Unable to accept connection" msgstr "Αδύνατη η αποδοχή συνδέσεων" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Πρόβλημα κατά το hashing του αρχείου" @@ -2009,32 +2009,32 @@ msgstr "Λήξη χρόνου σύνδεσης" msgid "Error writing to output file" msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "" "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Σφάλμα στην ανάγνωση από το διακομιστή" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Ελαττωματικά δεδομένα επικεφαλίδας" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Η σύνδεση απέτυχε" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Εσωτερικό Σφάλμα" diff --git a/po/en_GB.po b/po/en_GB.po index a8fee4742..0eb77e1ac 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2002-11-10 20:56+0100\n" "Last-Translator: Michael Piefel \n" "Language-Team: en_GB \n" @@ -1663,7 +1663,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1839,31 +1839,31 @@ msgstr "" msgid "Error writing to output file" msgstr "" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "" diff --git a/po/es.po b/po/es.po index fcc69804c..0e68bde46 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-02-08 20:36+0100\n" "Last-Translator: Rubn Porras Campo \n" "Language-Team: Spanish \n" @@ -1822,7 +1822,7 @@ msgstr "Expir msgid "Unable to accept connection" msgstr "No pude aceptar la conexin" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Hay problemas enlazando fichero" @@ -1999,31 +1999,31 @@ msgstr "Expir msgid "Error writing to output file" msgstr "Error escribiendo al archivo de salida" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Error escribiendo a archivo" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Error escribiendo al archivo" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Error leyendo del servidor, el lado remoto cerr la conexin." -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Error leyendo del servidor" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Mala cabecera Data" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Fallo la conexin" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Error interno" diff --git a/po/eu.po b/po/eu.po index 42fcecc3b..1ffcde824 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-11-07 22:37+0100\n" "Last-Translator: Piarres Beobide \n" "Language-Team: librezale.org \n" @@ -1802,7 +1802,7 @@ msgstr "Datu-socket konexioak denbora-muga gainditu du" msgid "Unable to accept connection" msgstr "Ezin da konexioa onartu" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Arazoa fitxategiaren hash egitean" @@ -1980,31 +1980,31 @@ msgstr "Konexioaren denbora-muga gainditu da" msgid "Error writing to output file" msgstr "Errorea irteerako fitxategian idaztean" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Errorea zerbitzaritik irakurtzean" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Goiburu data gaizki dago" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Konexioak huts egin du" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Barne-errorea" diff --git a/po/fi.po b/po/fi.po index 2388bf637..a26cbe97e 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-02-15 14:09+0200\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" @@ -1804,7 +1804,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin" msgid "Unable to accept connection" msgstr "Yhteyttä ei voitu hyväksyä" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Pulmia tiedoston hajautuksessa" @@ -1981,31 +1981,31 @@ msgstr "Yhteys aikakatkaistiin" msgid "Error writing to output file" msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Tapahtui virhe luettaessa palvelimelta" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Virheellinen otsikkotieto" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Yhteys ei toiminut" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Sisäinen virhe" diff --git a/po/fr.po b/po/fr.po index f37e66292..0df9cfcd3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-11-01 18:16+0100\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" @@ -1836,7 +1836,7 @@ msgstr "D msgid "Unable to accept connection" msgstr "Impossible d'accepter une connexion" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problme de hachage du fichier" @@ -2018,31 +2018,31 @@ msgstr "D msgid "Error writing to output file" msgstr "Erreur d'criture du fichier de sortie" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Erreur d'criture sur un fichier" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Erreur d'criture sur le fichier" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Erreur de lecture depuis le serveur distant et clture de la connexion" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Erreur de lecture du serveur" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Mauvais en-tte de donne" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "chec de la connexion" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Erreur interne" diff --git a/po/he.po b/po/he.po index 07848e46a..da106c60a 100644 --- a/po/he.po +++ b/po/he.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.25\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2004-06-10 19:58+0300\n" "Last-Translator: Lior Kaplan \n" "Language-Team: Hebrew\n" @@ -1616,7 +1616,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1792,31 +1792,31 @@ msgstr "" msgid "Error writing to output file" msgstr "" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "" diff --git a/po/hu.po b/po/hu.po index 731863ed4..093de2885 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-02-15 18:03+0100\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -1811,7 +1811,7 @@ msgstr "Az adat sockethez kapcsolódás túllépte az időkeretet" msgid "Unable to accept connection" msgstr "Nem lehet elfogadni a kapcsolatot" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probléma a fájl hash értékének meghatározásakor" @@ -1988,31 +1988,31 @@ msgstr "Időtúllépés a kapcsolatban" msgid "Error writing to output file" msgstr "Hiba a kimeneti fájl írásakor" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Hiba fájl írásakor" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Hiba a kiszolgálóról olvasáskor" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Rossz fejlécadat" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Kapcsolódás sikertelen" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Belső hiba" diff --git a/po/it.po b/po/it.po index 7aeeec87b..49a3a580a 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-10-05 17:38+0200\n" "Last-Translator: Samuele Giovanni Tonon \n" "Language-Team: Italian \n" @@ -1818,7 +1818,7 @@ msgstr "Tempo limite di connessione esaurito per il socket dati" msgid "Unable to accept connection" msgstr "Impossibile accettare connessioni" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problemi nella creazione dell'hash del file" @@ -1999,32 +1999,32 @@ msgstr "Tempo limite per la connessione esaurito" msgid "Error writing to output file" msgstr "Errore nella scrittura del file di output" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Errore nella scrittura nel file" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Errore nella scrittura nel file" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "" "Errore nella lettura dal server. Il lato remoto ha chiuso la connessione" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Errore nella lettura dal server" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Header dei dati malformato" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Connessione fallita" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Errore interno" diff --git a/po/ja.po b/po/ja.po index 2feec2ce8..69a69cb40 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-02-09 12:54+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" @@ -1814,7 +1814,7 @@ msgstr " msgid "Unable to accept connection" msgstr "³ accept Ǥޤ" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "եΥϥåǤ" @@ -1991,31 +1991,31 @@ msgstr " msgid "Error writing to output file" msgstr "ϥեؤν񤭹ߤǥ顼ȯޤ" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "եؤν񤭹ߤǥ顼ȯޤ" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "եؤν񤭹ߤǥ顼ȯޤ" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "⡼¦³ƥФɤ߹ߤ˼Ԥޤ" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Фɤ߹ߤ˼Ԥޤ" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "ʥإåǤ" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "³" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "顼" diff --git a/po/ko.po b/po/ko.po index 23827460b..1691812bf 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-02-10 21:56+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -1802,7 +1802,7 @@ msgstr "데이터 소켓 연결 시간 초과" msgid "Unable to accept connection" msgstr "연결을 받을 수 없습니다" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "파일 해싱에 문제가 있습니다" @@ -1979,31 +1979,31 @@ msgstr "연결 시간이 초과했습니다" msgid "Error writing to output file" msgstr "출력 파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "해당 파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "서버에서 읽는 데 오류가 발생했습니다" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "헤더 데이터가 잘못되었습니다" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "연결이 실패했습니다" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "내부 오류" diff --git a/po/nb.po b/po/nb.po index 34cfc1d6e..11eb54798 100644 --- a/po/nb.po +++ b/po/nb.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-02-09 10:45+0100\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokml \n" @@ -1823,7 +1823,7 @@ msgstr "Tidsavbrudd p msgid "Unable to accept connection" msgstr "Klarte ikke godta tilkoblingen" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nkkel for fil" @@ -2000,31 +2000,31 @@ msgstr "Tidsavbrudd p msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Feil ved lesing fra tjeneren" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "delagte hodedata" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Forbindelsen mislykkes" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Intern feil" diff --git a/po/nl.po b/po/nl.po index 3dc814ea2..501c3e42c 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-02-10 17:35+0100\n" "Last-Translator: Bart Cornelis \n" "Language-Team: debian-l10n-dutch \n" @@ -1831,7 +1831,7 @@ msgstr "Datasocket verbinding is verlopen" msgid "Unable to accept connection" msgstr "Kan de verbinding niet aanvaarden" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probleem bij het hashen van het bestand" @@ -2010,32 +2010,32 @@ msgstr "Verbinding verliep" msgid "Error writing to output file" msgstr "Fout bij het schrijven naar het uitvoerbestand" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Fout bij het schrijven naar bestand" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Fout bij het schrijven naar het bestand" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fout bij het lezen van de server, andere kant heeft de verbinding gesloten" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Fout bij het lezen van de server" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Foute koptekstdata" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Verbinding mislukt" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Interne fout" diff --git a/po/nn.po b/po/nn.po index f57bba2af..7bc37dc01 100644 --- a/po/nn.po +++ b/po/nn.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Hvard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" @@ -1806,7 +1806,7 @@ msgstr "Tidsavbrot p msgid "Unable to accept connection" msgstr "Klarte ikkje godta tilkoplinga" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nkkel for fil" @@ -1983,31 +1983,31 @@ msgstr "Tidsavbrot p msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Feil ved lesing fr tenaren" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "ydelagde hovuddata" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Sambandet mislukkast" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Intern feil" diff --git a/po/pl.po b/po/pl.po index 54e94c641..47bce476b 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-02-11 11:47+0100\n" "Last-Translator: Bartosz Fenski \n" "Language-Team: Polish \n" @@ -1816,7 +1816,7 @@ msgstr "Przekroczony czas po msgid "Unable to accept connection" msgstr "Nie udao si przyj poczenia" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Nie udao si obliczy skrtu pliku" @@ -1993,31 +1993,31 @@ msgstr "Przekroczenie czasu po msgid "Error writing to output file" msgstr "Bd przy pisaniu do pliku wyjciowego" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Bd przy pisaniu do pliku" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Bd przy pisaniu do pliku" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Bd czytania z serwera: Zdalna strona zamkna poczenie" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Bd czytania z serwera" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Bdne dane nagwka" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Poczenie nie udao si" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Bd wewntrzny" diff --git a/po/pt.po b/po/pt.po index af44e7f15..0557a71fd 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-03-07 22:20+0000\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@ -1813,7 +1813,7 @@ msgstr "Ligação de socket de dados expirou" msgid "Unable to accept connection" msgstr "Impossível aceitar ligação" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema fazendo o hash do ficheiro" @@ -1990,31 +1990,31 @@ msgstr "A ligação expirou" msgid "Error writing to output file" msgstr "Erro gravando para ficheiro de saída" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Erro gravando para ficheiro" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Erro gravando para o ficheiro" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor. O Remoto fechou a ligação" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Dados de cabeçalho errados" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Falhou a ligação" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Erro interno" diff --git a/po/pt_BR.po b/po/pt_BR.po index 54946a2c4..f50f8a176 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-06-16 10:24-0300\n" "Last-Translator: Andr Lus Lopes \n" "Language-Team: Debian-BR Project \n" @@ -1813,7 +1813,7 @@ msgstr "Conex msgid "Unable to accept connection" msgstr "Impossvel aceitar conexo" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema fazendo o hash do arquivo" @@ -1990,31 +1990,31 @@ msgstr "Conex msgid "Error writing to output file" msgstr "Erro gravando para arquivo de sada" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Erro gravando para arquivo" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Erro gravando para o arquivo" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor Ponto remoto fechou a conexo" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Dados de cabealho ruins" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Conexo falhou." -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Erro interno" diff --git a/po/ro.po b/po/ro.po index 9497f70b2..cd2884b6a 100644 --- a/po/ro.po +++ b/po/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_ro\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-08-25 17:43+0300\n" "Last-Translator: Sorin Batariuc \n" "Language-Team: Romanian \n" @@ -1821,7 +1821,7 @@ msgstr "Timp de conectare data socket expirat" msgid "Unable to accept connection" msgstr "Nu pot accepta conexiune" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problemă la indexarea fişierului" @@ -1998,32 +1998,32 @@ msgstr "Timp de conectare expirat" msgid "Error writing to output file" msgstr "Eroare la scrierea fişierului de rezultat" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Eroare la scrierea în fişier" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Eroare la scrierea în fişierul" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "" "Eroare la citirea de pe server, conexiunea a fost închisă de la distanţă" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Eroare la citirea de pe server" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Antet de date necorespunzător" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Conectare eşuată" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Eroare internă" diff --git a/po/ru.po b/po/ru.po index a9921de46..82c158edf 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-10-22 12:24+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -1833,7 +1833,7 @@ msgstr "Время установления соединения для соке msgid "Unable to accept connection" msgstr "Невозможно принять соединение" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Проблема при хэшировании файла" @@ -2014,31 +2014,31 @@ msgstr "Время ожидания для соединения истекло" msgid "Error writing to output file" msgstr "Ошибка записи в выходной файл" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Ошибка записи в файл" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Ошибка записи в файл" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Ошибка чтения, удалённый сервер прервал соединение" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Ошибка чтения с сервера" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Неверный заголовок данных" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Соединение разорвано" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Внутренняя ошибка" diff --git a/po/sk.po b/po/sk.po index 451d2379e..4c5c03fbf 100644 --- a/po/sk.po +++ b/po/sk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-07-01 09:34+0200\n" "Last-Translator: Peter Mann \n" "Language-Team: Slovak \n" @@ -1797,7 +1797,7 @@ msgstr "Uplynulo spojenie dátového socketu" msgid "Unable to accept connection" msgstr "Spojenie sa nedá prijať" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problém s hashovaním súboru" @@ -1974,31 +1974,31 @@ msgstr "Uplynul čas spojenia" msgid "Error writing to output file" msgstr "Chyba zápisu do výstupného súboru" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Chyba pri čítaní zo servera" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Zlé dátové záhlavie" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Spojenie zlyhalo" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Vnútorná chyba" diff --git a/po/sl.po b/po/sl.po index 92fbaaa4a..92bfd0f71 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-02-16 22:18+0100\n" "Last-Translator: Jure uhalev \n" "Language-Team: Slovenian \n" @@ -1796,7 +1796,7 @@ msgstr "Povezava podatkovne vti msgid "Unable to accept connection" msgstr "Ni mogoe sprejeti povezave" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Teava pri razprevanju datoteke" @@ -1973,31 +1973,31 @@ msgstr " msgid "Error writing to output file" msgstr "Napaka pri pisanju v izhodno datoteko" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Napaka pri branju oddaljene in zaprte povezave s strenika " -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Napaka pri branju s strenika" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Napani podatki glave" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Povezava ni uspela" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Notranja napaka" diff --git a/po/sv.po b/po/sv.po index b0d1e03ac..56770b066 100644 --- a/po/sv.po +++ b/po/sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-11-02 23:56+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -1809,7 +1809,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgr msgid "Unable to accept connection" msgstr "Kunde inte ta emot anslutning" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem med att lgga filen till hashtabellen" @@ -1992,31 +1992,31 @@ msgstr "Tidsgr msgid "Error writing to output file" msgstr "Fel vid skrivning till utdatafil" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Fel vid skrivning till fil" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Fel vid skrivning till filen" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Fel vid lsning frn server: Andra nden stngde frbindelsen" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Fel vid lsning frn server" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Trasigt data i huvud" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Anslutning misslyckades" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Internt fel" diff --git a/po/tl.po b/po/tl.po index 18f664faf..55d8106d1 100644 --- a/po/tl.po +++ b/po/tl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-11-03 03:35+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" @@ -1814,7 +1814,7 @@ msgstr "Nag-timeout ang socket ng datos" msgid "Unable to accept connection" msgstr "Hindi makatanggap ng koneksyon" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema sa pag-hash ng talaksan" @@ -1995,31 +1995,31 @@ msgstr "Nag-timeout ang koneksyon" msgid "Error writing to output file" msgstr "Error sa pagsulat ng talaksang output" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Error sa pagsulat sa talaksan" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Error sa pagsusulat sa talaksan" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Error sa pagbasa mula sa server" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Maling datos sa header" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Bigo ang koneksyon" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Internal na error" diff --git a/po/zh_CN.po b/po/zh_CN.po index 6501190a1..24569e23e 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.23\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-11-15 00:05+0800\n" "Last-Translator: Tchaikov \n" "Language-Team: Debian Chinese [GB] \n" @@ -1778,7 +1778,7 @@ msgstr "数据套接字连接超时" msgid "Unable to accept connection" msgstr "无法接受连接" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "把文件加入散列表时出错" @@ -1953,31 +1953,31 @@ msgstr "连接服务器超时" msgid "Error writing to output file" msgstr "写输出文件时出错" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "写文件时出错" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "写文件时出错" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "从服务器读取数据时出错，对方关闭了连接" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "从服务器读取数据出错" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "错误的报头数据" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "连接失败" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "内部错误" diff --git a/po/zh_TW.po b/po/zh_TW.po index f405147f8..739c14d3e 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-02-19 22:24+0800\n" "Last-Translator: Asho Yeh \n" "Language-Team: Chinese/Traditional \n" @@ -1789,7 +1789,7 @@ msgstr "Data socket 連線逾時" msgid "Unable to accept connection" msgstr "無法允許連線" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "問題雜湊表" @@ -1966,31 +1966,31 @@ msgstr "連線逾時" msgid "Error writing to output file" msgstr "寫入輸出檔時發生錯誤" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "寫入檔案時發生錯誤" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "寫入檔案時發生錯誤" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "從遠端主機讀取錯誤，關閉連線" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "從伺服器讀取發生錯誤" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "壞的標頭資料" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "連線失敗" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "內部錯誤" -- cgit v1.2.3-70-g09d2 From ce424cd4464ce46706046d581e05fbf292a54881 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 6 Jan 2006 00:02:14 +0000 Subject: * support multiple signatures --- apt-pkg/acquire-item.cc | 22 +++++++++++++++++++--- apt-pkg/acquire-item.h | 5 +++-- debian/changelog | 3 ++- methods/gpgv.cc | 6 +++++- 4 files changed, 29 insertions(+), 7 deletions(-) (limited to 'methods') diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index b9fc74456..11a449e91 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -554,7 +554,7 @@ void pkgAcqMetaIndex::AuthDone(string Message) return; } - if (!VerifyVendor()) + if (!VerifyVendor(Message)) { return; } @@ -612,7 +612,7 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify) } } -bool pkgAcqMetaIndex::VerifyVendor() +bool pkgAcqMetaIndex::VerifyVendor(string Message) { // // Maybe this should be made available from above so we don't have // // to read and parse it every time? @@ -637,6 +637,22 @@ bool pkgAcqMetaIndex::VerifyVendor() // break; // } // } + string::size_type pos; + + // check for missing sigs (that where not fatal because otherwise we had + // bombed earlier) + string missingkeys; + string msg = _("There was no public key available for the " + "following key IDs:\n"); + pos = Message.find("NO_PUBKEY "); + if (pos != std::string::npos) + { + string::size_type start = pos+strlen("NO_PUBKEY "); + string Fingerprint = Message.substr(start, Message.find("\n")-start); + missingkeys += (Fingerprint); + } + if(!missingkeys.empty()) + _error->Warning("%s", string(msg+missingkeys).c_str()); string Transformed = MetaIndexParser->GetExpectedDist(); @@ -645,7 +661,7 @@ bool pkgAcqMetaIndex::VerifyVendor() Transformed = "experimental"; } - string::size_type pos = Transformed.rfind('/'); + pos = Transformed.rfind('/'); if (pos != string::npos) { Transformed = Transformed.substr(0, pos); diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index e6fc7fc47..da1bea801 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -151,9 +151,10 @@ class pkgAcqMetaIndex : public pkgAcquire::Item const vector* IndexTargets; indexRecords* MetaIndexParser; bool AuthPass; - bool IMSHit; // required to fail gracefully on failures + // required to deal gracefully with problems caused by incorrect ims hits + bool IMSHit; - bool VerifyVendor(); + bool VerifyVendor(string Message); void RetrievalDone(string Message); void AuthDone(string Message); void QueueIndexes(bool verify); diff --git a/debian/changelog b/debian/changelog index 5c1b1347e..8bcb42566 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,8 +16,9 @@ apt (0.6.43.1) unstable; urgency=low (closes: #79277) * share/debian-archive.gpg: new 2006 ftp-archive signing key added * redownload the Release file if IMS-Hit and gpg failure + * deal with multiple signatures - -- + -- Michael Vogt Thu, 5 Jan 2006 23:47:40 +0100 apt (0.6.43) unstable; urgency=medium diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 5cb154f66..a114ad797 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -247,7 +247,11 @@ bool GPGVMethod::Fetch(FetchItem *Itm) errmsg += (*I + "\n"); } } - return _error->Error(errmsg.c_str()); + // this is only fatal if we have no good sigs or if we have at + // least one bad signature. good signatures and NoPubKey signatures + // happen easily when a file is signed with multiple signatures + if(GoodSigners.empty() or !BadSigners.empty()) + return _error->Error(errmsg.c_str()); } // Transfer the modification times -- cgit v1.2.3-70-g09d2 From 75dd8af14b76bb84a69a927ecae93f60600b9667 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 20 Feb 2006 20:38:11 +0000 Subject: * only remove the sigfile if pkgAcqMetaSig::Failed() didn't fail for a network error --- apt-pkg/acquire-item.cc | 19 +++++++------------ methods/connect.cc | 2 ++ 2 files changed, 9 insertions(+), 12 deletions(-) (limited to 'methods') diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 86f61dd00..0daca55c9 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -340,12 +340,6 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner, // File was already in place. It needs to be re-verified // because Release might have changed, so Move it into partial Rename(Final,DestFile); - // unlink the file and do not try to use I-M-S and Last-Modified - // if the users proxy is broken - if(_config->FindB("Acquire::BrokenProxy", false) == true) { - std::cerr << "forcing re-get of the signature file as requested" << std::endl; - unlink(DestFile.c_str()); - } } QueueURI(Desc); @@ -395,18 +389,19 @@ void pkgAcqMetaSig::Done(string Message,unsigned long Size,string MD5, /*}}}*/ void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf) { - // Delete any existing sigfile, so that this source isn't - // mistakenly trusted - string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI); - unlink(Final.c_str()); - // if we get a timeout if fail + // if we get a network error we fail gracefully if(LookupTag(Message,"FailReason") == "Timeout" || - LookupTag(Message,"FailReason") == "TmpResolveFailure") { + LookupTag(Message,"FailReason") == "TmpResolveFailure") || + LookupTag(Message,"FailReason") == "ConnectionRefused") { Item::Failed(Message,Cnf); return; } + // Delete any existing sigfile when the acquire failed + string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI); + unlink(Final.c_str()); + // queue a pkgAcqMetaIndex with no sigfile new pkgAcqMetaIndex(Owner, MetaIndexURI, MetaIndexURIDesc, MetaIndexShortDesc, "", IndexTargets, MetaIndexParser); diff --git a/methods/connect.cc b/methods/connect.cc index 4e48927ed..8c2ac6d56 100644 --- a/methods/connect.cc +++ b/methods/connect.cc @@ -103,6 +103,8 @@ static bool DoConnect(struct addrinfo *Addr,string Host, if (Err != 0) { errno = Err; + if(errno == ECONNREFUSED) + Owner->SetFailExtraMsg("\nFailReason: ConnectionRefused"); return _error->Errno("connect",_("Could not connect to %s:%s (%s)."),Host.c_str(), Service,Name); } -- cgit v1.2.3-70-g09d2 From da9ed163ca5ebe6dd33fda2679107bcbd3ffaa71 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sun, 30 Apr 2006 10:58:28 +0200 Subject: * string i18n handling fixes (debian bug #349298) --- apt-inst/deb/dpkgdb.cc | 2 +- methods/gpgv.cc | 30 ++++++++++++++++++------------ 2 files changed, 19 insertions(+), 13 deletions(-) (limited to 'methods') diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc index c6a0e80e6..718e1ab98 100644 --- a/apt-inst/deb/dpkgdb.cc +++ b/apt-inst/deb/dpkgdb.cc @@ -383,7 +383,7 @@ bool debDpkgDB::ReadyFileList(OpProgress &Progress) return _error->Error(_("The pkg cache must be initialized first")); if (FList != 0) { - Progress.OverallProgress(1,1,1,_("Reading file list")); + Progress.OverallProgress(1,1,1,_("Reading file listing")); return true; } diff --git a/methods/gpgv.cc b/methods/gpgv.cc index a114ad797..75335b9b8 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -11,6 +11,7 @@ #include #include #include +#include #define GNUPGPREFIX "[GNUPG:]" #define GNUPGBADSIG "[GNUPG:] BADSIG" @@ -20,7 +21,7 @@ class GPGVMethod : public pkgAcqMethod { private: - const char *VerifyGetSigners(const char *file, const char *outfile, + string VerifyGetSigners(const char *file, const char *outfile, vector &GoodSigners, vector &BadSigners, vector &NoPubKeySigners); @@ -32,11 +33,15 @@ class GPGVMethod : public pkgAcqMethod GPGVMethod() : pkgAcqMethod("1.0",SingleInstance | SendConfig) {}; }; -const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, +string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, vector &GoodSigners, vector &BadSigners, vector &NoPubKeySigners) { + // setup a (empty) stringstream for formating the return value + std::stringstream ret; + res.str(""); + if (_config->FindB("Debug::Acquire::gpgv", false)) { std::cerr << "inside VerifyGetSigners" << std::endl; @@ -54,9 +59,11 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, std::cerr << "Keyring path: " << pubringpath << std::endl; } - if (stat(pubringpath.c_str(), &buff) != 0) - return (string("Couldn't access keyring: ") + strerror(errno)).c_str(); - + if (stat(pubringpath.c_str(), &buff) != 0) + { + ioprintf(ret, _("Couldn't access keyring: '%s'"), strerror(errno)); + return ret.str(); + } if (pipe(fd) < 0) { return "Couldn't create pipe"; @@ -65,7 +72,7 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, pid = fork(); if (pid < 0) { - return (string("Couldn't spawn new process") + strerror(errno)).c_str(); + return string("Couldn't spawn new process") + strerror(errno); } else if (pid == 0) { @@ -189,7 +196,7 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, { if (GoodSigners.empty()) return _("Internal error: Good signature, but could not determine key fingerprint?!"); - return NULL; + return ""; } else if (WEXITSTATUS(status) == 1) { @@ -197,9 +204,8 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, } else if (WEXITSTATUS(status) == 111) { - // FIXME String concatenation considered harmful. - return (string(_("Could not execute ")) + gpgvpath + - string(_(" to verify signature (is gnupg installed?)"))).c_str(); + ioprintf(ret, _("Could not execute '%s' to verify signature (is gnupg installed?)"), gpgvpath.c_str()); + return ret.str(); } else { @@ -221,8 +227,8 @@ bool GPGVMethod::Fetch(FetchItem *Itm) URIStart(Res); // Run gpgv on file, extract contents and get the key ID of the signer - const char *msg = VerifyGetSigners(Path.c_str(), Itm->DestFile.c_str(), - GoodSigners, BadSigners, NoPubKeySigners); + string msg = VerifyGetSigners(Path.c_str(), Itm->DestFile.c_str(), + GoodSigners, BadSigners, NoPubKeySigners); if (GoodSigners.empty() || !BadSigners.empty() || !NoPubKeySigners.empty()) { string errmsg; -- cgit v1.2.3-70-g09d2 From b2c220756c2c571595765ca23da48c611b88d057 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 1 May 2006 16:17:08 +0200 Subject: * methods/gpgv.cc: typo --- methods/gpgv.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'methods') diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 75335b9b8..ba7389cba 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -40,7 +40,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, { // setup a (empty) stringstream for formating the return value std::stringstream ret; - res.str(""); + ret.str(""); if (_config->FindB("Debug::Acquire::gpgv", false)) { -- cgit v1.2.3-70-g09d2 From fc5f54175a514c31c9400d9f9d08e6496cf63823 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 8 May 2006 18:31:47 +0200 Subject: * methods/ftp.cc: remove a tried-to-downloaded file if the file is missing on the sever --- debian/changelog | 3 +++ methods/ftp.cc | 7 +++++-- po/apt-all.pot | 47 ++++++++++++++++++++++------------------------- 3 files changed, 30 insertions(+), 27 deletions(-) (limited to 'methods') diff --git a/debian/changelog b/debian/changelog index b104e9666..034702090 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,9 @@ apt (0.6.44) unstable; urgency=low - i18n fixes (closes: #349298) * debian/postinst: dont fail on not available /usr/share/doc/apt/examples/sources.list (closes: #361130) + * methods/ftp.cc: + - unlink empty file in partial if the download failed because + the file is missing on the server (closes: #316337) -- diff --git a/methods/ftp.cc b/methods/ftp.cc index f595e0ca4..0c2aa00a7 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -1055,9 +1055,12 @@ bool FtpMethod::Fetch(FetchItem *Itm) UBuf.modtime = FailTime; utime(FailFile.c_str(),&UBuf); - // If the file is missing we hard fail otherwise transient fail - if (Missing == true) + // If the file is missing we hard fail and delete the destfile + // otherwise transient fail + if (Missing == true) { + unlink(FailFile.c_str()); return false; + } Fail(true); return true; } diff --git a/po/apt-all.pot b/po/apt-all.pot index dc455c7af..d2209487a 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: 2006-04-20 12:50+0200\n" +"POT-Creation-Date: 2006-05-08 11:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -417,7 +417,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr "" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 #, c-format msgid "Failed to stat %s" msgstr "" @@ -1365,7 +1365,7 @@ msgstr "" msgid "Internal error getting a package name" msgstr "" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "" @@ -1409,10 +1409,6 @@ msgstr "" msgid "The pkg cache must be initialized first" msgstr "" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1483,12 +1479,12 @@ msgstr "" msgid "File not found" msgstr "" -#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "" @@ -1637,7 +1633,7 @@ msgstr "" msgid "Query" msgstr "" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "" @@ -1698,37 +1694,38 @@ msgstr "" msgid "Unable to connect to %s %s:" msgstr "" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." msgstr "" -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -msgid "Could not execute " -msgstr "" - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" +#: methods/gpgv.cc:207 +#, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" msgstr "" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2104,12 +2101,12 @@ msgstr "" msgid "Dependency generation" msgstr "" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" -- cgit v1.2.3-70-g09d2 From 2abb68b77d4be00173c0aaab7d05277a053d3c5f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 25 Jul 2006 11:55:17 +0200 Subject: * methods/gpgv.cc: - deal with gpgs NODATA message --- debian/changelog | 3 +++ methods/gpgv.cc | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'methods') diff --git a/debian/changelog b/debian/changelog index ae12ac8d1..8a0093dcb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,9 @@ apt (0.6.45) unstable; urgency=low messages (first half of a fix for #374195) * doc/examples/configure-index: - document Debug::pkgAcquire::Auth + * methods/gpgv.cc: + - deal with gpg error "NODATA". Closes: #296103, Thanks to + Luis Rodrigo Gallardo Cruz for the patch * Merged from Christian Perrier bzr branch: * ko.po: Updated to 512t. Closes: #378901 * hu.po: Updated to 512t. Closes: #376330 diff --git a/methods/gpgv.cc b/methods/gpgv.cc index ba7389cba..227e08d63 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -17,6 +17,7 @@ #define GNUPGBADSIG "[GNUPG:] BADSIG" #define GNUPGNOPUBKEY "[GNUPG:] NO_PUBKEY" #define GNUPGVALIDSIG "[GNUPG:] VALIDSIG" +#define GNUPGNODATA "[GNUPG:] NODATA" class GPGVMethod : public pkgAcqMethod { @@ -171,7 +172,12 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, std::cerr << "Got NO_PUBKEY " << std::endl; NoPubKeySigners.push_back(string(buffer+sizeof(GNUPGPREFIX))); } - + if (strncmp(buffer, GNUPGNODATA, sizeof(GNUPGBADSIG)-1) == 0) + { + if (_config->FindB("Debug::Acquire::gpgv", false)) + std::cerr << "Got NODATA! " << std::endl; + BadSigners.push_back(string(buffer+sizeof(GNUPGPREFIX))); + } if (strncmp(buffer, GNUPGVALIDSIG, sizeof(GNUPGVALIDSIG)-1) == 0) { char *sig = buffer + sizeof(GNUPGPREFIX); -- cgit v1.2.3-70-g09d2 From 02b7ddb1404fa3969bceb03a5f35107884027ba6 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 16 Aug 2006 12:16:46 +0200 Subject: * methods/http.cc: - check for incorrect proxy settings more carefully --- debian/changelog | 2 ++ methods/http.cc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'methods') diff --git a/debian/changelog b/debian/changelog index a84146d20..e69c5091f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ apt (0.6.45.1) unstable; urgency=low versions of the package (closes: #257054) - properly handle recommends/suggests or-groups when printing the list of suggested/recommends packages (closes: #311619) + * methods/http.cc: + - check more careful for incorrect proxy settings (closes: #378868) -- diff --git a/methods/http.cc b/methods/http.cc index 341de94e3..c6623c46f 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -657,7 +657,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out) will glitch HTTP/1.0 proxies because they do not filter it out and pass it on, HTTP/1.1 says the connection should default to keep alive and we expect the proxy to do this */ - if (Proxy.empty() == true) + if (Proxy.empty() == true || Proxy.Host.empty()) sprintf(Buf,"GET %s HTTP/1.1\r\nHost: %s\r\nConnection: keep-alive\r\n", QuoteString(Uri.Path,"~").c_str(),ProperHost.c_str()); else -- cgit v1.2.3-70-g09d2 From 504bbe47e634f07c3de7a4868f63ee2ec142b9e4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 12 Sep 2006 11:19:35 +0200 Subject: * methods/gzip.cc: - if it can't write (because var is full), close the FromGz stream to not hang in ExecWait() later --- debian/changelog | 3 +++ methods/gzip.cc | 1 + po/apt-all.pot | 80 ++++++++++++++++++++++++++++---------------------------- 3 files changed, 44 insertions(+), 40 deletions(-) (limited to 'methods') diff --git a/debian/changelog b/debian/changelog index e69c5091f..05d29662c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ apt (0.6.45.1) unstable; urgency=low suggested/recommends packages (closes: #311619) * methods/http.cc: - check more careful for incorrect proxy settings (closes: #378868) + * methods/gzip.cc: + - don't hang when /var is full (closes: #341537), thanks to + Luis Rodrigo Gallardo Cruz for the patch -- diff --git a/methods/gzip.cc b/methods/gzip.cc index 809afc0fc..55ff33270 100644 --- a/methods/gzip.cc +++ b/methods/gzip.cc @@ -111,6 +111,7 @@ bool GzipMethod::Fetch(FetchItem *Itm) if (To.Write(Buffer,Count) == false) { Failed = true; + FromGz.Close(); break; } } diff --git a/po/apt-all.pot b/po/apt-all.pot index 095de7f6d..352f2f5a6 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: 2006-08-09 16:17+0200\n" +"POT-Creation-Date: 2006-09-12 11:18+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -148,7 +148,7 @@ msgstr "" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2380 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@ -705,11 +705,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2128 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" @@ -738,7 +738,7 @@ msgstr "" msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -772,7 +772,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2025 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -781,7 +781,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "" @@ -938,144 +938,144 @@ msgstr "" msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1917 cmdline/apt-get.cc:2146 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1968 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1985 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1990 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1999 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2030 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2058 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2070 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2071 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2088 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2123 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2151 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2171 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2223 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2275 +#: cmdline/apt-get.cc:2282 #, 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:2310 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2353 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2426 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1490,12 +1490,12 @@ msgstr "" msgid "File not found" msgstr "" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:134 +#: methods/gzip.cc:143 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:140 msgid "Failed to set modification time" msgstr "" -- cgit v1.2.3-70-g09d2 From 84cc6f7364d31321698ab3182bcd10d575710a49 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 30 Sep 2006 14:14:04 +0200 Subject: * methods/gzip.cc: - just stop on empty files, don't call the extractor * debian/changelog: - merged the last debian upload - added entry for extractor --- debian/changelog | 9 ++++++++- methods/gzip.cc | 7 +++++++ 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'methods') diff --git a/debian/changelog b/debian/changelog index 385c8ca23..a828d02c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.6.46.1) unstable; urgency=low + + * methods/gzip.cc: + - deal with empty files + + -- + apt (0.6.46) unstable; urgency=low * debian/control: @@ -32,7 +39,7 @@ apt (0.6.46) unstable; urgency=low - reverted MMap use in the tagfile because it does not work across pipes (closes: #383487) - -- + -- Michael Vogt Thu, 21 Sep 2006 10:25:03 +0200 apt (0.6.45) unstable; urgency=low diff --git a/methods/gzip.cc b/methods/gzip.cc index 55ff33270..a8e816bf3 100644 --- a/methods/gzip.cc +++ b/methods/gzip.cc @@ -52,6 +52,13 @@ bool GzipMethod::Fetch(FetchItem *Itm) // Open the source and destination files FileFd From(Path,FileFd::ReadOnly); + // if the file is empty, just rename it and return + if(From.Size() == 0) + { + Rename(Path, Itm->DestFile); + return true; + } + int GzOut[2]; if (pipe(GzOut) < 0) return _error->Errno("pipe",_("Couldn't open pipe for %s"),Prog); -- cgit v1.2.3-70-g09d2 From 60a9e375317c42f6682704e2769b7b2776c7ec12 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 30 Sep 2006 16:30:42 +0200 Subject: * methods/gzip.cc: - fix invalid reanem --- methods/gzip.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'methods') diff --git a/methods/gzip.cc b/methods/gzip.cc index a8e816bf3..f732c0b86 100644 --- a/methods/gzip.cc +++ b/methods/gzip.cc @@ -55,7 +55,7 @@ bool GzipMethod::Fetch(FetchItem *Itm) // if the file is empty, just rename it and return if(From.Size() == 0) { - Rename(Path, Itm->DestFile); + rename(Path.c_str(), Itm->DestFile.c_str()); return true; } -- cgit v1.2.3-70-g09d2