From c262653cc21b4302c3fc5f724d254f68bfca84b7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 4 Nov 2009 23:44:15 +0100 Subject: add a debug test mode to the rred method for easier testing --- methods/rred.cc | 74 ++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 58 insertions(+), 16 deletions(-) diff --git a/methods/rred.cc b/methods/rred.cc index 27d95bdde..3d4b37e83 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -37,6 +37,8 @@ class RredMethod : public pkgAcqMethod char *buffer, unsigned int bufsize, Hashes *hash); // apply a patch file int ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file, Hashes *hash); + +protected: // the methods main method virtual bool Fetch(FetchItem *Itm); @@ -186,17 +188,19 @@ int RredMethod::ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file, return ED_OK; } - bool RredMethod::Fetch(FetchItem *Itm) { - Debug = _config->FindB("Debug::pkgAcquire::RRed",false); + Debug = _config->FindB("Debug::pkgAcquire::RRed", false); URI Get = Itm->Uri; string Path = Get.Host + Get.Path; // To account for relative paths - // Path contains the filename to patch + FetchResult Res; Res.Filename = Itm->DestFile; - URIStart(Res); - // Res.Filename the destination filename + if (Itm->Uri.empty() == true) { + Path = Itm->DestFile; + Itm->DestFile.append(".result"); + } else + URIStart(Res); if (Debug == true) std::clog << "Patching " << Path << " with " << Path @@ -243,20 +247,58 @@ bool RredMethod::Fetch(FetchItem *Itm) return _error->Errno("stat",_("Failed to stat")); // return done - Res.LastModified = Buf.st_mtime; - Res.Size = Buf.st_size; - Res.TakeHashes(Hash); - URIDone(Res); + if (Itm->Uri.empty() == true) { + Res.LastModified = Buf.st_mtime; + Res.Size = Buf.st_size; + Res.TakeHashes(Hash); + URIDone(Res); + } return true; } -int main(int argc, char *argv[]) -{ - RredMethod Mth; +/** + * \brief Wrapper class for testing rred + */ +class TestRredMethod : public RredMethod { +public: + /** \brief Run rred in debug test mode + * + * This method can be used to run the rred method outside + * of the "normal" acquire environment for easier testing. + * + * \param base basename of all files involved in this rred test + */ + bool Run(char const *base) { + _config->CndSet("Debug::pkgAcquire::RRed", "true"); + FetchItem *test = new FetchItem; + test->DestFile = base; + return Fetch(test); + } +}; - Prog = strrchr(argv[0],'/'); - Prog++; - - return Mth.Run(); +/** + * \brief Starter for the rred method (or its test method) + * + * Used without parameters is the normal behavior for methods for + * the APT acquire system. While this works great for the acquire system + * it is very hard to test the method and therefore the method also + * accepts one parameter which will switch it directly to debug test mode: + * The test mode expects that if "Testfile" is given as parameter + * the file "Testfile" should be ed-style patched with "Testfile.ed" + * and will write the result to "Testfile.result". + */ +int main(int argc, char *argv[]) { + Prog = strrchr(argv[0],'/'); + Prog++; + + if (argc == 0) { + RredMethod Mth; + return Mth.Run(); + } else { + TestRredMethod Mth; + bool result = Mth.Run(argv[1]); + _error->DumpErrors(); + return result; + } } -- cgit v1.2.3 From c7139d8c8c04e69150ab975c0e2698d05ed6a298 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 5 Nov 2009 02:05:21 +0100 Subject: rewrite and refactor rred method to be able to handle even big (>30 MB) patches (Closes: #554349) and hardening the method itself by using more constants and a return value which can't be misinterpreted as linenumber --- methods/rred.cc | 358 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 187 insertions(+), 171 deletions(-) diff --git a/methods/rred.cc b/methods/rred.cc index 3d4b37e83..2d4dd768b 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -1,3 +1,4 @@ +// Includes /*{{{*/ #include #include #include @@ -10,185 +11,205 @@ #include #include #include - -/* this method implements a patch functionality similar to "patch --ed" that is - * used by the "tiffany" incremental packages download stuff. it differs from - * "ed" insofar that it is way more restricted (and therefore secure). in the - * moment only the "c", "a" and "d" commands of ed are implemented (diff - * doesn't output any other). additionally the records must be reverse sorted - * by line number and may not overlap (diff *seems* to produce this kind of - * output). + /*}}}*/ +/** \brief RredMethod - ed-style incremential patch method {{{ + * + * This method implements a patch functionality similar to "patch --ed" that is + * used by the "tiffany" incremental packages download stuff. It differs from + * "ed" insofar that it is way more restricted (and therefore secure). + * The currently supported ed commands are "change", "add" and + * "delete" (diff doesn't output any other). + * Additionally the records must be reverse sorted by line number and + * may not overlap (diff *seems* to produce this kind of output). * */ +class RredMethod : public pkgAcqMethod { + bool Debug; + // the size of this doesn't really matter (except for performance) + const static int BUF_SIZE = 1024; + // the supported ed commands + enum Mode {MODE_CHANGED='c', MODE_DELETED='d', MODE_ADDED='a'}; + // return values + enum State {ED_OK=0, ED_ORDERING=1, ED_PARSER=2, ED_FAILURE=3}; -const char *Prog; + State applyFile(FILE *ed_cmds, FILE *in_file, FILE *out_file, + unsigned long &line, char *buffer, Hashes *hash) const; + void ignoreLineInFile(FILE *fin, char *buffer) const; + void copyLineFromFileToFile(FILE *fin, FILE *fout, + Hashes *hash, char *buffer) const; -class RredMethod : public pkgAcqMethod -{ - bool Debug; - // the size of this doesn't really matter (except for performance) - const static int BUF_SIZE = 1024; - // the ed commands - enum Mode {MODE_CHANGED, MODE_DELETED, MODE_ADDED}; - // return values - enum State {ED_OK, ED_ORDERING, ED_PARSER, ED_FAILURE}; - // this applies a single hunk, it uses a tail recursion to - // reverse the hunks in the file - int ed_rec(FILE *ed_cmds, FILE *in_file, FILE *out_file, int line, - char *buffer, unsigned int bufsize, Hashes *hash); - // apply a patch file - int ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file, Hashes *hash); + State patchFile(FILE *ed_cmds, FILE *in_file, FILE *out_file, Hashes *hash) const; protected: - // the methods main method - virtual bool Fetch(FetchItem *Itm); - - public: - - RredMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {}; + // the methods main method + virtual bool Fetch(FetchItem *Itm); + +public: + RredMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {}; }; + /*}}}*/ +/** \brief applyFile - in reverse order with a tail recursion {{{ + * + * As it is expected that the commands are in reversed order in the patch file + * we check in the first half if the command is valid, but doesn't execute it + * and move a step deeper. After reaching the end of the file we apply the + * patches in the correct order: last found command first. + * + * \param ed_cmds patch file to apply + * \param in_file base file we want to patch + * \param out_file file to write the patched result to + * \param line of command operation + * \param buffer internal used read/write buffer + * \param hash the created file for correctness + * \return the success State of the ed command executor + */ +RredMethod::State RredMethod::applyFile(FILE *ed_cmds, FILE *in_file, FILE *out_file, + unsigned long &line, char *buffer, Hashes *hash) const { + // get the current command and parse it + if (fgets(buffer, BUF_SIZE, ed_cmds) == NULL) { + if (Debug == true) + std::clog << "rred: encounter end of file - we can start patching now."; + line = 0; + return ED_OK; + } -int RredMethod::ed_rec(FILE *ed_cmds, FILE *in_file, FILE *out_file, int line, - char *buffer, unsigned int bufsize, Hashes *hash) { - int pos; - int startline; - int stopline; - int mode; - int written; - char *idx; + // parse in the effected linenumbers + char* idx; + errno=0; + unsigned long const startline = strtol(buffer, &idx, 10); + if (errno == ERANGE || errno == EINVAL) { + _error->Errno("rred", "startline is an invalid number"); + return ED_PARSER; + } + if (startline > line) { + _error->Error("rred: The start line (%lu) of the next command is higher than the last line (%lu). This is not allowed.", startline, line); + return ED_ORDERING; + } + unsigned long stopline; + if (*idx == ',') { + idx++; + errno=0; + stopline = strtol(idx, &idx, 10); + if (errno == ERANGE || errno == EINVAL) { + _error->Errno("rred", "stopline is an invalid number"); + return ED_PARSER; + } + } + else { + stopline = startline; + } + line = startline; - /* get the current command and parse it*/ - if (fgets(buffer, bufsize, ed_cmds) == NULL) { - return line; - } - startline = strtol(buffer, &idx, 10); - if (startline < line) { - return ED_ORDERING; - } - if (*idx == ',') { - idx++; - stopline = strtol(idx, &idx, 10); - } - else { - stopline = startline; - } - if (*idx == 'c') { - mode = MODE_CHANGED; - if (Debug == true) { - std::clog << "changing from line " << startline - << " to " << stopline << std::endl; - } - } - else if (*idx == 'a') { - mode = MODE_ADDED; - if (Debug == true) { - std::clog << "adding after line " << startline << std::endl; - } - } - else if (*idx == 'd') { - mode = MODE_DELETED; - if (Debug == true) { - std::clog << "deleting from line " << startline - << " to " << stopline << std::endl; - } - } - else { - return ED_PARSER; - } - /* get the current position */ - pos = ftell(ed_cmds); - /* if this is add or change then go to the next full stop */ - if ((mode == MODE_CHANGED) || (mode == MODE_ADDED)) { - do { - fgets(buffer, bufsize, ed_cmds); - while ((strlen(buffer) == (bufsize - 1)) - && (buffer[bufsize - 2] != '\n')) { - fgets(buffer, bufsize, ed_cmds); - buffer[0] = ' '; - } - } while (strncmp(buffer, ".", 1) != 0); - } - /* do the recursive call */ - line = ed_rec(ed_cmds, in_file, out_file, line, buffer, bufsize, - hash); - /* pass on errors */ - if (line < 0) { - return line; - } - /* apply our hunk */ - fseek(ed_cmds, pos, SEEK_SET); - /* first wind to the current position */ - if (mode != MODE_ADDED) { - startline -= 1; - } - while (line < startline) { - fgets(buffer, bufsize, in_file); - written = fwrite(buffer, 1, strlen(buffer), out_file); - hash->Add((unsigned char*)buffer, written); - while ((strlen(buffer) == (bufsize - 1)) - && (buffer[bufsize - 2] != '\n')) { - fgets(buffer, bufsize, in_file); - written = fwrite(buffer, 1, strlen(buffer), out_file); - hash->Add((unsigned char*)buffer, written); - } - line++; - } - /* include from ed script */ - if ((mode == MODE_ADDED) || (mode == MODE_CHANGED)) { - do { - fgets(buffer, bufsize, ed_cmds); - if (strncmp(buffer, ".", 1) != 0) { - written = fwrite(buffer, 1, strlen(buffer), out_file); - hash->Add((unsigned char*)buffer, written); - while ((strlen(buffer) == (bufsize - 1)) - && (buffer[bufsize - 2] != '\n')) { - fgets(buffer, bufsize, ed_cmds); - written = fwrite(buffer, 1, strlen(buffer), out_file); - hash->Add((unsigned char*)buffer, written); - } - } - else { - break; - } - } while (1); - } - /* ignore the corresponding number of lines from input */ - if ((mode == MODE_DELETED) || (mode == MODE_CHANGED)) { - while (line < stopline) { - fgets(buffer, bufsize, in_file); - while ((strlen(buffer) == (bufsize - 1)) - && (buffer[bufsize - 2] != '\n')) { - fgets(buffer, bufsize, in_file); - } - line++; - } - } - return line; -} + // which command to execute on this line(s)? + switch (*idx) { + case MODE_CHANGED: + if (Debug == true) + std::clog << "Change from line " << startline << " to " << stopline << std::endl; + break; + case MODE_ADDED: + if (Debug == true) + std::clog << "Insert after line " << startline << std::endl; + break; + case MODE_DELETED: + if (Debug == true) + std::clog << "Delete from line " << startline << " to " << stopline << std::endl; + break; + default: + _error->Error("rred: Unknown ed command '%c'. Abort.", *idx); + return ED_PARSER; + } + unsigned char mode = *idx; + + // save the current position + unsigned const long pos = ftell(ed_cmds); + + // if this is add or change then go to the next full stop + if (mode == MODE_CHANGED || mode == MODE_ADDED) { + do + ignoreLineInFile(ed_cmds, buffer); + while (strncmp(buffer, ".", 1) != 0); + } + + // do the recursive call - the last command is the one we need to execute at first + const State child = applyFile(ed_cmds, in_file, out_file, line, buffer, hash); + if (child != ED_OK) { + return child; + } + + // change and delete are working on "line" - add is done after "line" + if (mode != MODE_ADDED) + line++; + + // first wind to the current position and copy over all unchanged lines + while (line < startline) { + fgets(buffer, BUF_SIZE, in_file); + copyLineFromFileToFile(in_file, out_file, hash, buffer); + line++; + } + + if (mode != MODE_ADDED) + line--; -int RredMethod::ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file, - Hashes *hash) { + // include data from ed script + if (mode == MODE_CHANGED || mode == MODE_ADDED) { + fseek(ed_cmds, pos, SEEK_SET); + while(fgets(buffer, BUF_SIZE, ed_cmds) != NULL) { + if (strncmp(buffer, ".", 1) != 0) + copyLineFromFileToFile(ed_cmds, out_file, hash, buffer); + else + break; + } + } + + // ignore the corresponding number of lines from input + if (mode == MODE_CHANGED || mode == MODE_DELETED) { + while (line < stopline) { + ignoreLineInFile(in_file, buffer); + line++; + } + } + return ED_OK; +} + /*}}}*/ +void RredMethod::copyLineFromFileToFile(FILE *fin, FILE *fout, /*{{{*/ + Hashes *hash, char *buffer) const { + size_t written = fwrite(buffer, 1, strlen(buffer), fout); + hash->Add((unsigned char*)buffer, written); + while (strlen(buffer) == (BUF_SIZE - 1) && + buffer[BUF_SIZE - 2] != '\n') { + fgets(buffer, BUF_SIZE, fin); + written = fwrite(buffer, 1, strlen(buffer), fout); + hash->Add((unsigned char*)buffer, written); + } +} + /*}}}*/ +void RredMethod::ignoreLineInFile(FILE *fin, char *buffer) const { /*{{{*/ + fgets(buffer, BUF_SIZE, fin); + while (strlen(buffer) == (BUF_SIZE - 1) && + buffer[BUF_SIZE - 2] != '\n') { + fgets(buffer, BUF_SIZE, fin); + buffer[0] = ' '; + } +} + /*}}}*/ +RredMethod::State RredMethod::patchFile(FILE *ed_cmds, FILE *in_file, FILE *out_file, /*{{{*/ + Hashes *hash) const { char buffer[BUF_SIZE]; - int result; - int written; /* we do a tail recursion to read the commands in the right order */ - result = ed_rec(ed_cmds, in_file, out_file, 0, buffer, BUF_SIZE, - hash); + unsigned long line = -1; // assign highest possible value + State result = applyFile(ed_cmds, in_file, out_file, line, buffer, hash); /* read the rest from infile */ - if (result >= 0) { + if (result == ED_OK) { while (fgets(buffer, BUF_SIZE, in_file) != NULL) { - written = fwrite(buffer, 1, strlen(buffer), out_file); + size_t const written = fwrite(buffer, 1, strlen(buffer), out_file); hash->Add((unsigned char*)buffer, written); } } - else { - return ED_FAILURE; - } - return ED_OK; + return result; } - -bool RredMethod::Fetch(FetchItem *Itm) + /*}}}*/ +bool RredMethod::Fetch(FetchItem *Itm) /*{{{*/ { Debug = _config->FindB("Debug::pkgAcquire::RRed", false); URI Get = Itm->Uri; @@ -219,7 +240,7 @@ bool RredMethod::Fetch(FetchItem *Itm) FILE* fPatch = fdopen(Patch.Fd(), "r"); FILE* fTo = fdopen(To.Fd(), "w"); // now do the actual patching - if (ed_file(fPatch, fFrom, fTo, &Hash) != ED_OK) { + if (patchFile(fPatch, fFrom, fTo, &Hash) != ED_OK) { _error->Errno("rred", _("Could not patch file")); return false; } @@ -256,10 +277,8 @@ bool RredMethod::Fetch(FetchItem *Itm) return true; } - -/** - * \brief Wrapper class for testing rred - */ + /*}}}*/ +/** \brief Wrapper class for testing rred */ /*{{{*/ class TestRredMethod : public RredMethod { public: /** \brief Run rred in debug test mode @@ -276,9 +295,8 @@ public: return Fetch(test); } }; - -/** - * \brief Starter for the rred method (or its test method) + /*}}}*/ +/** \brief Starter for the rred method (or its test method) {{{ * * Used without parameters is the normal behavior for methods for * the APT acquire system. While this works great for the acquire system @@ -289,9 +307,6 @@ public: * and will write the result to "Testfile.result". */ int main(int argc, char *argv[]) { - Prog = strrchr(argv[0],'/'); - Prog++; - if (argc == 0) { RredMethod Mth; return Mth.Run(); @@ -302,3 +317,4 @@ int main(int argc, char *argv[]) { return result; } } + /*}}}*/ -- cgit v1.2.3 From 66093f029b4dd94e109c8cc7d9d4bfbc6f0f4e90 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 5 Nov 2009 11:53:01 +0100 Subject: copyLinesFromFileToFile instead of a single Line in the rred method by saving the length of the data we need to copy into the out file --- methods/rred.cc | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/methods/rred.cc b/methods/rred.cc index 2d4dd768b..9abb1b89c 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -34,7 +34,7 @@ class RredMethod : public pkgAcqMethod { State applyFile(FILE *ed_cmds, FILE *in_file, FILE *out_file, unsigned long &line, char *buffer, Hashes *hash) const; void ignoreLineInFile(FILE *fin, char *buffer) const; - void copyLineFromFileToFile(FILE *fin, FILE *fout, + void copyLinesFromFileToFile(FILE *fin, FILE *fout, unsigned int lines, Hashes *hash, char *buffer) const; State patchFile(FILE *ed_cmds, FILE *in_file, FILE *out_file, Hashes *hash) const; @@ -123,10 +123,14 @@ RredMethod::State RredMethod::applyFile(FILE *ed_cmds, FILE *in_file, FILE *out_ unsigned const long pos = ftell(ed_cmds); // if this is add or change then go to the next full stop + unsigned int data_length = 0; if (mode == MODE_CHANGED || mode == MODE_ADDED) { - do + do { ignoreLineInFile(ed_cmds, buffer); + data_length++; + } while (strncmp(buffer, ".", 1) != 0); + data_length--; // the dot should not be copied } // do the recursive call - the last command is the one we need to execute at first @@ -140,10 +144,9 @@ RredMethod::State RredMethod::applyFile(FILE *ed_cmds, FILE *in_file, FILE *out_ line++; // first wind to the current position and copy over all unchanged lines - while (line < startline) { - fgets(buffer, BUF_SIZE, in_file); - copyLineFromFileToFile(in_file, out_file, hash, buffer); - line++; + if (line < startline) { + copyLinesFromFileToFile(in_file, out_file, (startline - line), hash, buffer); + line = startline; } if (mode != MODE_ADDED) @@ -152,12 +155,7 @@ RredMethod::State RredMethod::applyFile(FILE *ed_cmds, FILE *in_file, FILE *out_ // include data from ed script if (mode == MODE_CHANGED || mode == MODE_ADDED) { fseek(ed_cmds, pos, SEEK_SET); - while(fgets(buffer, BUF_SIZE, ed_cmds) != NULL) { - if (strncmp(buffer, ".", 1) != 0) - copyLineFromFileToFile(ed_cmds, out_file, hash, buffer); - else - break; - } + copyLinesFromFileToFile(ed_cmds, out_file, data_length, hash, buffer); } // ignore the corresponding number of lines from input @@ -170,15 +168,15 @@ RredMethod::State RredMethod::applyFile(FILE *ed_cmds, FILE *in_file, FILE *out_ return ED_OK; } /*}}}*/ -void RredMethod::copyLineFromFileToFile(FILE *fin, FILE *fout, /*{{{*/ +void RredMethod::copyLinesFromFileToFile(FILE *fin, FILE *fout, unsigned int lines,/*{{{*/ Hashes *hash, char *buffer) const { - size_t written = fwrite(buffer, 1, strlen(buffer), fout); - hash->Add((unsigned char*)buffer, written); - while (strlen(buffer) == (BUF_SIZE - 1) && - buffer[BUF_SIZE - 2] != '\n') { - fgets(buffer, BUF_SIZE, fin); - written = fwrite(buffer, 1, strlen(buffer), fout); - hash->Add((unsigned char*)buffer, written); + while (0 < lines--) { + do { + fgets(buffer, BUF_SIZE, fin); + size_t const written = fwrite(buffer, 1, strlen(buffer), fout); + hash->Add((unsigned char*)buffer, written); + } while (strlen(buffer) == (BUF_SIZE - 1) && + buffer[BUF_SIZE - 2] != '\n'); } } /*}}}*/ -- cgit v1.2.3 From 1a37c619614a9260968f1703d7c6aae5a9a139f7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 6 Nov 2009 09:43:31 +0100 Subject: Finally adope the patch from Morten Hustveit to be able to optional use mmaps and iovec to increase patch speed - but as this increase memory usage we can always fall back to the "old" method which doesn't relay on mmaps. --- methods/rred.cc | 261 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 243 insertions(+), 18 deletions(-) diff --git a/methods/rred.cc b/methods/rred.cc index 9abb1b89c..7236efd03 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -1,11 +1,13 @@ // Includes /*{{{*/ #include +#include #include #include #include #include #include +#include #include #include #include @@ -29,7 +31,7 @@ class RredMethod : public pkgAcqMethod { // the supported ed commands enum Mode {MODE_CHANGED='c', MODE_DELETED='d', MODE_ADDED='a'}; // return values - enum State {ED_OK=0, ED_ORDERING=1, ED_PARSER=2, ED_FAILURE=3}; + enum State {ED_OK, ED_ORDERING, ED_PARSER, ED_FAILURE, MMAP_FAILED}; State applyFile(FILE *ed_cmds, FILE *in_file, FILE *out_file, unsigned long &line, char *buffer, Hashes *hash) const; @@ -37,7 +39,8 @@ class RredMethod : public pkgAcqMethod { void copyLinesFromFileToFile(FILE *fin, FILE *fout, unsigned int lines, Hashes *hash, char *buffer) const; - State patchFile(FILE *ed_cmds, FILE *in_file, FILE *out_file, Hashes *hash) const; + State patchFile(FileFd &Patch, FileFd &From, FileFd &out_file, Hashes *hash) const; + State patchMMap(FileFd &Patch, FileFd &From, FileFd &out_file, Hashes *hash) const; protected: // the methods main method @@ -67,7 +70,7 @@ RredMethod::State RredMethod::applyFile(FILE *ed_cmds, FILE *in_file, FILE *out_ // get the current command and parse it if (fgets(buffer, BUF_SIZE, ed_cmds) == NULL) { if (Debug == true) - std::clog << "rred: encounter end of file - we can start patching now."; + std::clog << "rred: encounter end of file - we can start patching now." << std::endl; line = 0; return ED_OK; } @@ -189,22 +192,240 @@ void RredMethod::ignoreLineInFile(FILE *fin, char *buffer) const { /*{{{*/ } } /*}}}*/ -RredMethod::State RredMethod::patchFile(FILE *ed_cmds, FILE *in_file, FILE *out_file, /*{{{*/ - Hashes *hash) const { +RredMethod::State RredMethod::patchFile(FileFd &Patch, FileFd &From, /*{{{*/ + FileFd &out_file, Hashes *hash) const { char buffer[BUF_SIZE]; - + FILE* fFrom = fdopen(From.Fd(), "r"); + FILE* fPatch = fdopen(Patch.Fd(), "r"); + FILE* fTo = fdopen(out_file.Fd(), "w"); + /* we do a tail recursion to read the commands in the right order */ unsigned long line = -1; // assign highest possible value - State result = applyFile(ed_cmds, in_file, out_file, line, buffer, hash); + State const result = applyFile(fPatch, fFrom, fTo, line, buffer, hash); /* read the rest from infile */ if (result == ED_OK) { - while (fgets(buffer, BUF_SIZE, in_file) != NULL) { - size_t const written = fwrite(buffer, 1, strlen(buffer), out_file); + while (fgets(buffer, BUF_SIZE, fFrom) != NULL) { + size_t const written = fwrite(buffer, 1, strlen(buffer), fTo); hash->Add((unsigned char*)buffer, written); } + fflush(fTo); } return result; +} + /*}}}*/ +struct EdCommand { /*{{{*/ + size_t data_start; + size_t data_end; + size_t data_lines; + size_t first_line; + size_t last_line; + char type; +}; +#define IOV_COUNT 1024 /* Don't really want IOV_MAX since it can be arbitrarily large */ + /*}}}*/ +RredMethod::State RredMethod::patchMMap(FileFd &Patch, FileFd &From, /*{{{*/ + FileFd &out_file, Hashes *hash) const { +#ifdef _POSIX_MAPPED_FILES + MMap ed_cmds(Patch, MMap::ReadOnly); + MMap in_file(From, MMap::ReadOnly); + FILE* fTo = fdopen(out_file.Fd(), "w"); + + if (ed_cmds.Size() == 0 || in_file.Size() == 0) + return MMAP_FAILED; + + EdCommand* commands = 0; + size_t command_count = 0; + size_t command_alloc = 0; + + const char* begin = (char*) ed_cmds.Data(); + const char* end = begin; + const char* ed_end = (char*) ed_cmds.Data() + ed_cmds.Size(); + + const char* input = (char*) in_file.Data(); + const char* input_end = (char*) in_file.Data() + in_file.Size(); + + size_t i; + + /* 1. Parse entire script. It is executed in reverse order, so we cather it + * in the `commands' buffer first + */ + + for(;;) { + EdCommand cmd; + cmd.data_start = 0; + cmd.data_end = 0; + + while(begin != ed_end && *begin == '\n') + ++begin; + while(end != ed_end && *end != '\n') + ++end; + if(end == ed_end && begin == end) + break; + + /* Determine command range */ + const char* tmp = begin; + + for(;;) { + /* atoll is safe despite lacking NUL-termination; we know there's an + * alphabetic character at end[-1] + */ + if(tmp == end) { + cmd.first_line = atol(begin); + cmd.last_line = cmd.first_line; + break; + } + if(*tmp == ',') { + cmd.first_line = atol(begin); + cmd.last_line = atol(tmp + 1); + break; + } + ++tmp; + } + + // which command to execute on this line(s)? + switch (end[-1]) { + case MODE_CHANGED: + if (Debug == true) + std::clog << "Change from line " << cmd.first_line << " to " << cmd.last_line << std::endl; + break; + case MODE_ADDED: + if (Debug == true) + std::clog << "Insert after line " << cmd.first_line << std::endl; + break; + case MODE_DELETED: + if (Debug == true) + std::clog << "Delete from line " << cmd.first_line << " to " << cmd.last_line << std::endl; + break; + default: + _error->Error("rred: Unknown ed command '%c'. Abort.", end[-1]); + free(commands); + return ED_PARSER; + } + cmd.type = end[-1]; + + /* Determine the size of the inserted text, so we don't have to scan this + * text again later. + */ + begin = end + 1; + end = begin; + cmd.data_lines = 0; + + if(cmd.type == MODE_ADDED || cmd.type == MODE_CHANGED) { + cmd.data_start = begin - (char*) ed_cmds.Data(); + while(end != ed_end) { + if(*end == '\n') { + if(end[-1] == '.' && end[-2] == '\n') + break; + ++cmd.data_lines; + } + ++end; + } + cmd.data_end = end - (char*) ed_cmds.Data() - 1; + begin = end + 1; + end = begin; + } + if(command_count == command_alloc) { + command_alloc = (command_alloc + 64) * 3 / 2; + commands = (EdCommand*) realloc(commands, command_alloc * sizeof(EdCommand)); + } + commands[command_count++] = cmd; + } + + struct iovec* iov = new struct iovec[IOV_COUNT]; + size_t iov_size = 0; + + size_t amount, remaining; + size_t line = 1; + EdCommand* cmd; + + /* 2. Execute script. We gather writes in a `struct iov' array, and flush + * using writev to minimize the number of system calls. Data is read + * directly from the memory mappings of the input file and the script. + */ + + for(i = command_count; i-- > 0; ) { + cmd = &commands[i]; + if(cmd->type == MODE_ADDED) + amount = cmd->first_line + 1; + else + amount = cmd->first_line; + + if(line < amount) { + begin = input; + while(line != amount) { + input = (const char*) memchr(input, '\n', input_end - input); + if(!input) + break; + ++line; + ++input; + } + + iov[iov_size].iov_base = (void*) begin; + iov[iov_size].iov_len = input - begin; + hash->Add((const unsigned char*) begin, input - begin); + + if(++iov_size == IOV_COUNT) { + writev(out_file.Fd(), iov, IOV_COUNT); + iov_size = 0; + } + } + + if(cmd->type == MODE_DELETED || cmd->type == MODE_CHANGED) { + remaining = (cmd->last_line - cmd->first_line) + 1; + line += remaining; + while(remaining) { + input = (const char*) memchr(input, '\n', input_end - input); + if(!input) + break; + --remaining; + ++input; + } + } + + if(cmd->type == MODE_CHANGED || cmd->type == MODE_ADDED) { + if(cmd->data_end != cmd->data_start) { + iov[iov_size].iov_base = (void*) ((char*)ed_cmds.Data() + cmd->data_start); + iov[iov_size].iov_len = cmd->data_end - cmd->data_start; + hash->Add((const unsigned char*) ((char*)ed_cmds.Data() + cmd->data_start), + iov[iov_size].iov_len); + + if(++iov_size == IOV_COUNT) { + writev(out_file.Fd(), iov, IOV_COUNT); + iov_size = 0; + } + } + } + } + + if(input != input_end) { + iov[iov_size].iov_base = (void*) input; + iov[iov_size].iov_len = input_end - input; + hash->Add((const unsigned char*) input, input_end - input); + ++iov_size; + } + + if(iov_size) { + writev(out_file.Fd(), iov, iov_size); + iov_size = 0; + } + + for(i = 0; i < iov_size; i += IOV_COUNT) { + if(iov_size - i < IOV_COUNT) + writev(out_file.Fd(), iov + i, iov_size - i); + else + writev(out_file.Fd(), iov + i, IOV_COUNT); + } + + delete [] iov; + free(commands); + + fflush(fTo); + + return ED_OK; +#else + return MMAP_FAILED; +#endif } /*}}}*/ bool RredMethod::Fetch(FetchItem *Itm) /*{{{*/ @@ -234,19 +455,23 @@ bool RredMethod::Fetch(FetchItem *Itm) /*{{{*/ return false; Hashes Hash; - FILE* fFrom = fdopen(From.Fd(), "r"); - FILE* fPatch = fdopen(Patch.Fd(), "r"); - FILE* fTo = fdopen(To.Fd(), "w"); // now do the actual patching - if (patchFile(fPatch, fFrom, fTo, &Hash) != ED_OK) { - _error->Errno("rred", _("Could not patch file")); - return false; + State const result = patchMMap(Patch, From, To, &Hash); + if (result == MMAP_FAILED) { + // retry with patchFile + lseek(Patch.Fd(), 0, SEEK_SET); + lseek(From.Fd(), 0, SEEK_SET); + To.Open(Itm->DestFile,FileFd::WriteEmpty); + if (_error->PendingError() == true) + return false; + if (patchFile(Patch, From, To, &Hash) != ED_OK) { + return _error->Errno("rred", _("Could not patch file %s"), Path.append(" (1)").c_str()); + } + } else if (result != ED_OK) { + return _error->Errno("rred", _("Could not patch file %s"), Path.append(" (2)").c_str()); } // write out the result - fflush(fFrom); - fflush(fPatch); - fflush(fTo); From.Close(); Patch.Close(); To.Close(); -- cgit v1.2.3 From d6c4a9764d052c9755ab934c97c7a84c48ebd618 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 9 Nov 2009 10:17:19 +0100 Subject: extent the mmap to be able to handle currently not implemented (but planed) growable mmaps --- apt-pkg/contrib/mmap.cc | 127 ++++++++++++++++++++++++++++++++---------------- apt-pkg/contrib/mmap.h | 10 ++-- 2 files changed, 92 insertions(+), 45 deletions(-) diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index 4d5fcf71e..f440f9489 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -140,8 +140,10 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop) // DynamicMMap::DynamicMMap - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -DynamicMMap::DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace) : - MMap(F,Flags | NoImmMap), Fd(&F), WorkSpace(WorkSpace) +DynamicMMap::DynamicMMap(FileFd &F,unsigned long Flags,unsigned long const &Workspace, + unsigned long const &Grow, unsigned long const &Limit) : + MMap(F,Flags | NoImmMap), Fd(&F), WorkSpace(Workspace), + GrowFactor(Grow), Limit(Limit) { if (_error->PendingError() == true) return; @@ -165,32 +167,48 @@ DynamicMMap::DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace) /* We try here to use mmap to reserve some space - this is much more cooler than the fallback solution to simply allocate a char array and could come in handy later than we are able to grow such an mmap */ -DynamicMMap::DynamicMMap(unsigned long Flags,unsigned long WorkSpace) : - MMap(Flags | NoImmMap | UnMapped), Fd(0), WorkSpace(WorkSpace) +DynamicMMap::DynamicMMap(unsigned long Flags,unsigned long const &WorkSpace, + unsigned long const &Grow, unsigned long const &Limit) : + MMap(Flags | NoImmMap | UnMapped), Fd(0), WorkSpace(WorkSpace), + GrowFactor(Grow), Limit(Limit) { - if (_error->PendingError() == true) - return; + if (_error->PendingError() == true) + return; + + // disable Moveable if we don't grow + if (Grow == 0) + Flags &= ~Moveable; + +#ifndef __linux__ + // kfreebsd doesn't have mremap, so we use the fallback + if ((Flags & Moveable) == Moveable) + Flags |= Fallback; +#endif #ifdef _POSIX_MAPPED_FILES - // Set the permissions. - int Prot = PROT_READ; - int Map = MAP_PRIVATE | MAP_ANONYMOUS; - if ((Flags & ReadOnly) != ReadOnly) - Prot |= PROT_WRITE; - if ((Flags & Public) == Public) - Map = MAP_SHARED | MAP_ANONYMOUS; + if ((Flags & Fallback) != Fallback) { + // Set the permissions. + int Prot = PROT_READ; + int Map = MAP_PRIVATE | MAP_ANONYMOUS; + if ((Flags & ReadOnly) != ReadOnly) + Prot |= PROT_WRITE; + if ((Flags & Public) == Public) + Map = MAP_SHARED | MAP_ANONYMOUS; - // use anonymous mmap() to get the memory - Base = (unsigned char*) mmap(0, WorkSpace, Prot, Map, -1, 0); + // use anonymous mmap() to get the memory + Base = (unsigned char*) mmap(0, WorkSpace, Prot, Map, -1, 0); - if(Base == MAP_FAILED) - _error->Errno("DynamicMMap",_("Couldn't make mmap of %lu bytes"),WorkSpace); -#else - // fallback to a static allocated space - Base = new unsigned char[WorkSpace]; - memset(Base,0,WorkSpace); + if(Base == MAP_FAILED) + _error->Errno("DynamicMMap",_("Couldn't make mmap of %lu bytes"),WorkSpace); + + iSize = 0; + return; + } #endif - iSize = 0; + // fallback to a static allocated space + Base = new unsigned char[WorkSpace]; + memset(Base,0,WorkSpace); + iSize = 0; } /*}}}*/ // DynamicMMap::~DynamicMMap - Destructor /*{{{*/ @@ -311,30 +329,55 @@ unsigned long DynamicMMap::WriteString(const char *String, /*}}}*/ // DynamicMMap::Grow - Grow the mmap /*{{{*/ // --------------------------------------------------------------------- -/* This method will try to grow the mmap we currently use. This doesn't - work most of the time because we can't move the mmap around in the - memory for now as this would require to adjust quite a lot of pointers - but why we should not at least try to grow it before we give up? */ -bool DynamicMMap::Grow() -{ -#if defined(_POSIX_MAPPED_FILES) && defined(__linux__) - unsigned long newSize = WorkSpace + 1024*1024; +/* This method is a wrapper around different methods to (try to) grow + a mmap (or our char[]-fallback). Encounterable environments: + 1. Moveable + !Fallback + linux -> mremap with MREMAP_MAYMOVE + 2. Moveable + !Fallback + !linux -> not possible (forbidden by constructor) + 3. Moveable + Fallback -> realloc + 4. !Moveable + !Fallback + linux -> mremap alone - which will fail in 99,9% + 5. !Moveable + !Fallback + !linux -> not possible (forbidden by constructor) + 6. !Moveable + Fallback -> not possible + [ While Moveable and Fallback stands for the equally named flags and + "linux" indicates a linux kernel instead of a freebsd kernel. ] + So what you can see here is, that a MMAP which want to be growable need + to be moveable to have a real chance but that this method will at least try + the nearly impossible 4 to grow it before it finally give up: Never say never. */ +bool DynamicMMap::Grow() { + if (Limit != 0 && WorkSpace >= Limit) + return _error->Error(_("The size of a MMap has already reached the defined limit of %lu bytes," + "abort the try to grow the MMap."), Limit); - if(Fd != 0) - { - Fd->Seek(newSize - 1); - char C = 0; - Fd->Write(&C,sizeof(C)); - } + unsigned long const newSize = WorkSpace + 1024*1024; - Base = mremap(Base, WorkSpace, newSize, 0); - if(Base == MAP_FAILED) - return false; + if(Fd != 0) { + Fd->Seek(newSize - 1); + char C = 0; + Fd->Write(&C,sizeof(C)); + } + if ((Flags & Fallback) != Fallback) { +#if defined(_POSIX_MAPPED_FILES) && defined(__linux__) + #ifdef MREMAP_MAYMOVE + if ((Flags & Moveable) == Moveable) + Base = mremap(Base, WorkSpace, newSize, MREMAP_MAYMOVE); + else + #endif + Base = mremap(Base, WorkSpace, newSize, 0); - WorkSpace = newSize; - return true; + if(Base == MAP_FAILED) + return false; #else - return false; + return false; #endif + } else { + if ((Flags & Moveable) != Moveable) + return false; + + Base = realloc(Base, newSize); + if (Base == NULL) + return false; + } + + WorkSpace = newSize; + return true; } /*}}}*/ diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h index bde62217d..cd2b15ba2 100644 --- a/apt-pkg/contrib/mmap.h +++ b/apt-pkg/contrib/mmap.h @@ -50,7 +50,7 @@ class MMap public: enum OpenFlags {NoImmMap = (1<<0),Public = (1<<1),ReadOnly = (1<<2), - UnMapped = (1<<3)}; + UnMapped = (1<<3), Moveable = (1<<4), Fallback = (1 << 5)}; // Simple accessors inline operator void *() {return Base;}; @@ -82,6 +82,8 @@ class DynamicMMap : public MMap FileFd *Fd; unsigned long WorkSpace; + unsigned long const GrowFactor; + unsigned long const Limit; Pool *Pools; unsigned int PoolCount; @@ -96,8 +98,10 @@ class DynamicMMap : public MMap inline unsigned long WriteString(const string &S) {return WriteString(S.c_str(),S.length());}; void UsePools(Pool &P,unsigned int Count) {Pools = &P; PoolCount = Count;}; - DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace = 2*1024*1024); - DynamicMMap(unsigned long Flags,unsigned long WorkSpace = 2*1024*1024); + DynamicMMap(FileFd &F,unsigned long Flags,unsigned long const &WorkSpace = 2*1024*1024, + unsigned long const &Grow = 1024*1024, unsigned long const &Limit = 0); + DynamicMMap(unsigned long Flags,unsigned long const &WorkSpace = 2*1024*1024, + unsigned long const &Grow = 1024*1024, unsigned long const &Limit = 0); virtual ~DynamicMMap(); }; -- cgit v1.2.3 From cc0f9c8e1044335f167b6b87d71dc91dd2f3501b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 19 Nov 2009 23:55:33 +0100 Subject: fix argument check for the rred method --- methods/rred.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/methods/rred.cc b/methods/rred.cc index 7236efd03..c2d8eb5cf 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -530,7 +530,7 @@ public: * and will write the result to "Testfile.result". */ int main(int argc, char *argv[]) { - if (argc == 0) { + if (argc <= 1) { RredMethod Mth; return Mth.Run(); } else { -- cgit v1.2.3 From baef9c95ed1b03e13ab6f61fc2e166169d7710a8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 25 Nov 2009 16:42:10 +0100 Subject: cleanup code a bit more and expand error messages --- methods/rred.cc | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/methods/rred.cc b/methods/rred.cc index c2d8eb5cf..262c78cab 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -229,7 +229,6 @@ RredMethod::State RredMethod::patchMMap(FileFd &Patch, FileFd &From, /*{{{*/ #ifdef _POSIX_MAPPED_FILES MMap ed_cmds(Patch, MMap::ReadOnly); MMap in_file(From, MMap::ReadOnly); - FILE* fTo = fdopen(out_file.Fd(), "w"); if (ed_cmds.Size() == 0 || in_file.Size() == 0) return MMAP_FAILED; @@ -420,8 +419,6 @@ RredMethod::State RredMethod::patchMMap(FileFd &Patch, FileFd &From, /*{{{*/ delete [] iov; free(commands); - fflush(fTo); - return ED_OK; #else return MMAP_FAILED; @@ -465,10 +462,14 @@ bool RredMethod::Fetch(FetchItem *Itm) /*{{{*/ if (_error->PendingError() == true) return false; if (patchFile(Patch, From, To, &Hash) != ED_OK) { - return _error->Errno("rred", _("Could not patch file %s"), Path.append(" (1)").c_str()); + return _error->WarningE("rred", _("Could not patch %s with mmap and with file operation usage - the patch seems to be corrupt."), Path.c_str()); + } else if (Debug == true) { + std::clog << "rred: finished file patching of " << Path << " after mmap failed." << std::endl; } } else if (result != ED_OK) { - return _error->Errno("rred", _("Could not patch file %s"), Path.append(" (2)").c_str()); + return _error->Errno("rred", _("Could not patch %s with mmap (but no mmap specific fail) - the patch seems to be corrupt."), Path.c_str()); + } else if (Debug == true) { + std::clog << "rred: finished mmap patching of " << Path << std::endl; } // write out the result @@ -491,12 +492,10 @@ bool RredMethod::Fetch(FetchItem *Itm) /*{{{*/ return _error->Errno("stat",_("Failed to stat")); // return done - if (Itm->Uri.empty() == true) { - Res.LastModified = Buf.st_mtime; - Res.Size = Buf.st_size; - Res.TakeHashes(Hash); - URIDone(Res); - } + Res.LastModified = Buf.st_mtime; + Res.Size = Buf.st_size; + Res.TakeHashes(Hash); + URIDone(Res); return true; } -- cgit v1.2.3 From 6d3176fbe8483df9995e639a49aaf5f6f6fd52ee Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 25 Nov 2009 20:22:36 +0100 Subject: =?UTF-8?q?use=20long=20instead=20of=20short=20for=20{Ver,Desc}Fil?= =?UTF-8?q?e=20size=20in=20pkgcache.h=20patch=20from=20V=C3=ADctor=20Manue?= =?UTF-8?q?l=20J=C3=A1quez=20Leal,=20thanks!=20(Closes:=20#538917)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apt-pkg/pkgcache.h | 4 ++-- debian/changelog | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 38733713f..e8a3e1064 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -245,7 +245,7 @@ struct pkgCache::VerFile /*{{{*/ map_ptrloc File; // PackageFile map_ptrloc NextFile; // PkgVerFile map_ptrloc Offset; // File offset - unsigned short Size; + unsigned long Size; }; /*}}}*/ struct pkgCache::DescFile /*{{{*/ @@ -253,7 +253,7 @@ struct pkgCache::DescFile /*{{{*/ map_ptrloc File; // PackageFile map_ptrloc NextFile; // PkgVerFile map_ptrloc Offset; // File offset - unsigned short Size; + unsigned long Size; }; /*}}}*/ struct pkgCache::Version /*{{{*/ diff --git a/debian/changelog b/debian/changelog index fb82eedd4..3e637bcef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -54,6 +54,9 @@ apt (0.7.25) UNRELEASED; urgency=low (Closes: #463354) which should speed up a bit. Thanks! * apt-pkg/contrib/mmap.{cc,h}: - extend it to have a growable flag - unused now but maybe... + * apt-pkg/pkgcache.h: + - use long instead of short for {Ver,Desc}File size, + patch from Víctor Manuel Jáquez Leal, thanks! (Closes: #538917) [ Chris Leick ] * doc/ various manpages: -- cgit v1.2.3 From 8a3207f42741ce9ccf68f9a0e6528622f8f6e6c2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 25 Nov 2009 21:57:51 +0100 Subject: allow also to skip the last patch if target is reached in acquire-item.cc, thanks Bernhard R. Link! (Closes: #545699) --- apt-pkg/acquire-item.cc | 14 +++++++++++--- apt-pkg/acquire-item.h | 5 +++++ debian/changelog | 3 +++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index afb3daad3..10e80eb56 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -274,7 +274,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/ if(last_space != string::npos) Description.erase(last_space, Description.size()-last_space); new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc, - ExpectedHash, available_patches); + ExpectedHash, ServerSha1, available_patches); Complete = false; Status = StatDone; Dequeue(); @@ -342,9 +342,10 @@ void pkgAcqDiffIndex::Done(string Message,unsigned long Size,string Md5Hash, /*{ pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner, string URI,string URIDesc,string ShortDesc, HashString ExpectedHash, + string ServerSha1, vector diffs) : Item(Owner), RealURI(URI), ExpectedHash(ExpectedHash), - available_patches(diffs) + available_patches(diffs), ServerSha1(ServerSha1) { DestFile = _config->FindDir("Dir::State::lists") + "partial/"; @@ -430,6 +431,13 @@ bool pkgAcqIndexDiffs::QueueNextDiff() /*{{{*/ std::clog << "QueueNextDiff: " << FinalFile << " (" << local_sha1 << ")"<::iterator I=available_patches.begin(); @@ -527,7 +535,7 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash, /* // see if there is more to download if(available_patches.size() > 0) { new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc, - ExpectedHash, available_patches); + ExpectedHash, ServerSha1, available_patches); return Finish(); } else return Finish(true); diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index 3f073de5b..d862d0fdd 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -422,6 +422,10 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item * off the front? */ vector available_patches; + + /** Stop applying patches when reaching that sha1 */ + string ServerSha1; + /** The current status of this patch. */ enum DiffState { @@ -475,6 +479,7 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item */ pkgAcqIndexDiffs(pkgAcquire *Owner,string URI,string URIDesc, string ShortDesc, HashString ExpectedHash, + string ServerSha1, vector diffs=vector()); }; /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 3e637bcef..4ac6eed27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -57,6 +57,9 @@ apt (0.7.25) UNRELEASED; urgency=low * apt-pkg/pkgcache.h: - use long instead of short for {Ver,Desc}File size, patch from Víctor Manuel Jáquez Leal, thanks! (Closes: #538917) + * apt-pkg/acquire-item.cc: + - allow also to skip the last patch if target is reached, + thanks Bernhard R. Link! (Closes: #545699) [ Chris Leick ] * doc/ various manpages: -- cgit v1.2.3 From d8c6a87aef1f76647d424c6b05641ac0ff53a6a8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 25 Nov 2009 22:47:45 +0100 Subject: print an error if a new state file can't be created in apt-mark, thanks Carl Chenet! (Closes: #521289) --- cmdline/apt-mark | 8 ++++++-- debian/changelog | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cmdline/apt-mark b/cmdline/apt-mark index 226d2079b..c44ce7038 100755 --- a/cmdline/apt-mark +++ b/cmdline/apt-mark @@ -31,8 +31,12 @@ def mark_unmark_automatic(filename, action, pkgs): " mark or unmark automatic flag" # open the statefile if os.path.exists(STATE_FILE): - tagfile = apt_pkg.ParseTagFile(open(STATE_FILE)) - outfile = open(STATE_FILE+".tmp","w") + try: + tagfile = apt_pkg.ParseTagFile(open(STATE_FILE)) + outfile = open(STATE_FILE+".tmp","w") + except IOError, msg: + print "%s, are you root?" % (msg) + sys.exit(1) while tagfile.Step(): pkgname = tagfile.Section.get("Package") autoInst = tagfile.Section.get("Auto-Installed") diff --git a/debian/changelog b/debian/changelog index 4ac6eed27..51f6cdfa1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -60,6 +60,9 @@ apt (0.7.25) UNRELEASED; urgency=low * apt-pkg/acquire-item.cc: - allow also to skip the last patch if target is reached, thanks Bernhard R. Link! (Closes: #545699) + * cmdline/apt-mark: + - print an error if a new state file can't be created, + thanks Carl Chenet! (Closes: #521289) [ Chris Leick ] * doc/ various manpages: -- cgit v1.2.3 From 4494239cc6d519b0b6219387ecd684b42b5c2d79 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 25 Nov 2009 23:20:12 +0100 Subject: add config setting for User-Agent in http and https to the Acquire group, thanks Timothy J. Miller! (Closes: #355782) --- debian/changelog | 3 +++ doc/apt.conf.5.xml | 7 ++++++- doc/examples/configure-index | 3 +++ methods/http.cc | 3 ++- methods/https.cc | 5 ++++- 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 51f6cdfa1..ed67aaac2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -63,6 +63,9 @@ apt (0.7.25) UNRELEASED; urgency=low * cmdline/apt-mark: - print an error if a new state file can't be created, thanks Carl Chenet! (Closes: #521289) + * methods/http{,s}.cc + - add config setting for User-Agent to the Acquire group, + thanks Timothy J. Miller! (Closes: #355782) [ Chris Leick ] * doc/ various manpages: diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index e2db9defb..726bca2cc 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -275,7 +275,12 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; The used bandwidth can be limited with Acquire::http::Dl-Limit which accepts integer values in kilobyte. The default value is 0 which deactivates the limit and tries uses as much as possible of the bandwidth (Note that this option implicit - deactivates the download from multiple servers at the same time.) + deactivates the download from multiple servers at the same time.) + + Acquire::http::User-Agent can be used to set a different + User-Agent for the http download method as some proxies allow access for clients + only if the client uses a known identifier. + https diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 27118fb7e..16e864d89 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -191,6 +191,7 @@ Acquire 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 + User-Agent "Debian APT-HTTP/1.3"; }; // HTTPS method configuration: @@ -204,6 +205,8 @@ Acquire CaPath "/etc/ssl/certs"; Verify-Host" "true"; AllowRedirect "true"; + + User-Agent "Debian APT-CURL/1.0"; }; ftp diff --git a/methods/http.cc b/methods/http.cc index 461a98406..8fcff0b5d 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -728,7 +728,8 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out) Req += string("Authorization: Basic ") + Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n"; - Req += "User-Agent: Debian APT-HTTP/1.3 ("VERSION")\r\n\r\n"; + Req += "User-Agent: " + _config->Find("Acquire::http::User-Agent", + "Debian APT-HTTP/1.3 ("VERSION")") + "\r\n\r\n"; if (Debug == true) cerr << Req << endl; diff --git a/methods/https.cc b/methods/https.cc index 79e6fea3f..e8d7bb5c6 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -209,7 +209,10 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, dlLimit); // set header - curl_easy_setopt(curl, CURLOPT_USERAGENT,"Debian APT-CURL/1.0 ("VERSION")"); + curl_easy_setopt(curl, CURLOPT_USERAGENT, + _config->Find("Acquire::https::User-Agent", + _config->Find("Acquire::http::User-Agent", + "Debian APT-CURL/1.0 ("VERSION")"))); // set timeout int timeout = _config->FindI("Acquire::http::Timeout",120); -- cgit v1.2.3 From ce857f32cf3c73ee67147ea0eafadb5a1c5da952 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 25 Nov 2009 23:24:43 +0100 Subject: another round of method hardening with const& in Configuration --- apt-pkg/contrib/configuration.cc | 24 ++++++++++++------------ apt-pkg/contrib/configuration.h | 37 +++++++++++++++++++------------------ 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 4e8586e83..ff49ce857 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -85,7 +85,7 @@ Configuration::~Configuration() /* This will lookup a single item by name below another item. It is a helper function for the main lookup function */ Configuration::Item *Configuration::Lookup(Item *Head,const char *S, - unsigned long Len,bool Create) + unsigned long const &Len,bool const &Create) { int Res = 1; Item *I = Head->Child; @@ -118,7 +118,7 @@ Configuration::Item *Configuration::Lookup(Item *Head,const char *S, // --------------------------------------------------------------------- /* This performs a fully scoped lookup of a given name, possibly creating new items */ -Configuration::Item *Configuration::Lookup(const char *Name,bool Create) +Configuration::Item *Configuration::Lookup(const char *Name,bool const &Create) { if (Name == 0) return Root->Child; @@ -245,7 +245,7 @@ vector Configuration::FindVector(const char *Name) const // Configuration::FindI - Find an integer value /*{{{*/ // --------------------------------------------------------------------- /* */ -int Configuration::FindI(const char *Name,int Default) const +int Configuration::FindI(const char *Name,int const &Default) const { const Item *Itm = Lookup(Name); if (Itm == 0 || Itm->Value.empty() == true) @@ -262,7 +262,7 @@ int Configuration::FindI(const char *Name,int Default) const // Configuration::FindB - Find a boolean type /*{{{*/ // --------------------------------------------------------------------- /* */ -bool Configuration::FindB(const char *Name,bool Default) const +bool Configuration::FindB(const char *Name,bool const &Default) const { const Item *Itm = Lookup(Name); if (Itm == 0 || Itm->Value.empty() == true) @@ -338,7 +338,7 @@ void Configuration::Set(const char *Name,const string &Value) // Configuration::Set - Set an integer value /*{{{*/ // --------------------------------------------------------------------- /* */ -void Configuration::Set(const char *Name,int Value) +void Configuration::Set(const char *Name,int const &Value) { Item *Itm = Lookup(Name,true); if (Itm == 0) @@ -351,7 +351,7 @@ void Configuration::Set(const char *Name,int Value) // Configuration::Clear - Clear an single value from a list /*{{{*/ // --------------------------------------------------------------------- /* */ -void Configuration::Clear(const string Name, int Value) +void Configuration::Clear(string const &Name, int const &Value) { char S[300]; snprintf(S,sizeof(S),"%i",Value); @@ -361,7 +361,7 @@ void Configuration::Clear(const string Name, int Value) // Configuration::Clear - Clear an single value from a list /*{{{*/ // --------------------------------------------------------------------- /* */ -void Configuration::Clear(const string Name, string Value) +void Configuration::Clear(string const &Name, string const &Value) { Item *Top = Lookup(Name.c_str(),false); if (Top == 0 || Top->Child == 0) @@ -392,7 +392,7 @@ void Configuration::Clear(const string Name, string Value) // Configuration::Clear - Clear an entire tree /*{{{*/ // --------------------------------------------------------------------- /* */ -void Configuration::Clear(string Name) +void Configuration::Clear(string const &Name) { Item *Top = Lookup(Name.c_str(),false); if (Top == 0) @@ -507,8 +507,8 @@ string Configuration::Item::FullTag(const Item *Stop) const sections like 'zone "foo.org" { .. };' This causes each section to be added in with a tag like "zone::foo.org" instead of being split tag/value. AsSectional enables Sectional parsing.*/ -bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional, - unsigned Depth) +bool ReadConfigFile(Configuration &Conf,const string &FName,bool const &AsSectional, + unsigned const &Depth) { // Open the stream for reading ifstream F(FName.c_str(),ios::in); @@ -835,8 +835,8 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional, // ReadConfigDir - Read a directory of config files /*{{{*/ // --------------------------------------------------------------------- /* */ -bool ReadConfigDir(Configuration &Conf,const string &Dir,bool AsSectional, - unsigned Depth) +bool ReadConfigDir(Configuration &Conf,const string &Dir,bool const &AsSectional, + unsigned const &Depth) { DIR *D = opendir(Dir.c_str()); if (D == 0) diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h index e2da83f5b..2494c1d7c 100644 --- a/apt-pkg/contrib/configuration.h +++ b/apt-pkg/contrib/configuration.h @@ -58,8 +58,8 @@ class Configuration Item *Root; bool ToFree; - Item *Lookup(Item *Head,const char *S,unsigned long Len,bool Create); - Item *Lookup(const char *Name,bool Create); + Item *Lookup(Item *Head,const char *S,unsigned long const &Len,bool const &Create); + Item *Lookup(const char *Name,const bool &Create); inline const Item *Lookup(const char *Name) const { return ((Configuration *)this)->Lookup(Name,false); @@ -68,32 +68,33 @@ class Configuration public: string Find(const char *Name,const char *Default = 0) const; - string Find(const string Name,const char *Default = 0) const {return Find(Name.c_str(),Default);}; + string Find(string const &Name,const char *Default = 0) const {return Find(Name.c_str(),Default);}; + string Find(string const &Name, string const &Default) const {return Find(Name.c_str(),Default.c_str());}; string FindFile(const char *Name,const char *Default = 0) const; string FindDir(const char *Name,const char *Default = 0) const; - std::vector FindVector(const string &Name) const; + std::vector FindVector(string const &Name) const; std::vector FindVector(const char *Name) const; - int FindI(const char *Name,int Default = 0) const; - int FindI(const string Name,int Default = 0) const {return FindI(Name.c_str(),Default);}; - bool FindB(const char *Name,bool Default = false) const; - bool FindB(const string Name,bool Default = false) const {return FindB(Name.c_str(),Default);}; + int FindI(const char *Name,int const &Default = 0) const; + int FindI(string const &Name,int const &Default = 0) const {return FindI(Name.c_str(),Default);}; + bool FindB(const char *Name,bool const &Default = false) const; + bool FindB(string const &Name,bool const &Default = false) const {return FindB(Name.c_str(),Default);}; string FindAny(const char *Name,const char *Default = 0) const; - inline void Set(const string Name,string Value) {Set(Name.c_str(),Value);}; + inline void Set(const string &Name,const string &Value) {Set(Name.c_str(),Value);}; void CndSet(const char *Name,const string &Value); void Set(const char *Name,const string &Value); - void Set(const char *Name,int Value); + void Set(const char *Name,const int &Value); - inline bool Exists(const string Name) const {return Exists(Name.c_str());}; + inline bool Exists(const string &Name) const {return Exists(Name.c_str());}; bool Exists(const char *Name) const; bool ExistsAny(const char *Name) const; // clear a whole tree - void Clear(const string Name); + void Clear(const string &Name); // remove a certain value from a list (e.g. the list of "APT::Keep-Fds") - void Clear(const string List, string Value); - void Clear(const string List, int Value); + void Clear(string const &List, string const &Value); + void Clear(string const &List, int const &Value); inline const Item *Tree(const char *Name) const {return Lookup(Name);}; @@ -108,11 +109,11 @@ class Configuration extern Configuration *_config; bool ReadConfigFile(Configuration &Conf,const string &FName, - bool AsSectional = false, - unsigned Depth = 0); + bool const &AsSectional = false, + unsigned const &Depth = 0); bool ReadConfigDir(Configuration &Conf,const string &Dir, - bool AsSectional = false, - unsigned Depth = 0); + bool const &AsSectional = false, + unsigned const &Depth = 0); #endif -- cgit v1.2.3 From c0d438474bac961897f9e9472356222f79350c39 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 25 Nov 2009 23:29:57 +0100 Subject: add https options which default to the ones from http for the https method as this is more sane than using only the http options without a possibility to override these for https. --- debian/changelog | 2 + doc/apt.conf.5.xml | 8 ++-- doc/examples/configure-index | 33 ++++++++++---- methods/https.cc | 100 +++++++++++++++++++------------------------ 4 files changed, 76 insertions(+), 67 deletions(-) diff --git a/debian/changelog b/debian/changelog index ed67aaac2..1bd34e522 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ apt (0.7.25) UNRELEASED; urgency=low * doc/po4a.conf: activate translation of guide.sgml and offline.sgml * doc/apt.conf.5.xml: - provide a few more details about APT::Immediate-Configure + - briefly document the behaviour of the new https options * doc/sources.list.5.xml: - add note about additional apt-transport-methods * doc/apt-mark.8.xml: @@ -66,6 +67,7 @@ apt (0.7.25) UNRELEASED; urgency=low * methods/http{,s}.cc - add config setting for User-Agent to the Acquire group, thanks Timothy J. Miller! (Closes: #355782) + - add https options which default to http ones (Closes: #557085) [ Chris Leick ] * doc/ various manpages: diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 726bca2cc..d7ad51cfb 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -284,9 +284,11 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; https - HTTPS URIs. Cache-control and proxy options are the same as for - http method. - Pipeline-Depth option is not supported yet. + HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and + proxy options are the same as for http method and will also + default to the options from the http method if they are not + explicitly set for https. Pipeline-Depth option is not + supported yet. CaInfo suboption specifies place of file that holds info about trusted certificates. diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 16e864d89..7e86b3d4a 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -194,19 +194,34 @@ Acquire User-Agent "Debian APT-HTTP/1.3"; }; - // HTTPS method configuration: - // - uses the http proxy config - // - uses the http cache-control values - // - uses the http Dl-Limit values - https + + + // HTTPS method configuration: uses the http + // - proxy config + // - cache-control values + // - Dl-Limit, Timout, ... values + // if not set explicit for https + // + // see /usr/share/doc/apt/examples/apt-https-method-example.conf.gz + // for more examples + https { Verify-Peer "false"; SslCert "/etc/apt/some.pem"; - CaPath "/etc/ssl/certs"; - Verify-Host" "true"; - AllowRedirect "true"; + CaPath "/etc/ssl/certs"; + Verify-Host" "true"; + AllowRedirect "true"; + + Timeout "120"; + AllowRedirect "true"; + + // Cache Control. Note these do not work with Squid 2.0.2 + 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 - User-Agent "Debian APT-CURL/1.0"; + User-Agent "Debian APT-CURL/1.0"; }; ftp diff --git a/methods/https.cc b/methods/https.cc index e8d7bb5c6..18ecfd3d2 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -1,4 +1,4 @@ -// -*- mode: cpp; mode: fold -*- +//-*- mode: cpp; mode: fold -*- // Description /*{{{*/ // $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $ /* ###################################################################### @@ -56,54 +56,38 @@ HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow, return 0; } -void HttpsMethod::SetupProxy() -{ - URI ServerName = Queue->Uri; - - // Determine the proxy setting - string SpecificProxy = _config->Find("Acquire::http::Proxy::" + ServerName.Host); - if (!SpecificProxy.empty()) - { - if (SpecificProxy == "DIRECT") - Proxy = ""; - else - Proxy = SpecificProxy; - } - else - { - string DefProxy = _config->Find("Acquire::http::Proxy"); - if (!DefProxy.empty()) - { - Proxy = DefProxy; - } - else - { - char* result = getenv("http_proxy"); - Proxy = result ? result : ""; - } - } - - // Parse no_proxy, a , separated list of domains - if (getenv("no_proxy") != 0) - { - if (CheckDomainList(ServerName.Host,getenv("no_proxy")) == true) - Proxy = ""; - } - - // Determine what host and port to use based on the proxy settings - string Host; - if (Proxy.empty() == true || Proxy.Host.empty() == true) - { - } - else - { - if (Proxy.Port != 0) - curl_easy_setopt(curl, CURLOPT_PROXYPORT, Proxy.Port); - curl_easy_setopt(curl, CURLOPT_PROXY, Proxy.Host.c_str()); - } -} - - +void HttpsMethod::SetupProxy() { /*{{{*/ + URI ServerName = Queue->Uri; + + // Determine the proxy setting - try https first, fallback to http and use env at last + string UseProxy = _config->Find("Acquire::https::Proxy::" + ServerName.Host, + _config->Find("Acquire::http::Proxy::" + ServerName.Host)); + + if (UseProxy.empty() == true) + UseProxy = _config->Find("Acquire::https::Proxy", _config->Find("Acquire::http::Proxy")); + + // User want to use NO proxy, so nothing to setup + if (UseProxy == "DIRECT") + return; + + if (UseProxy.empty() == false) { + // Parse no_proxy, a comma (,) separated list of domains we don't want to use + // a proxy for so we stop right here if it is in the list + if (getenv("no_proxy") != 0 && CheckDomainList(ServerName.Host,getenv("no_proxy")) == true) + return; + } else { + const char* result = getenv("http_proxy"); + UseProxy = result == NULL ? "" : result; + } + + // Determine what host and port to use based on the proxy settings + if (UseProxy.empty() == false) { + Proxy = UseProxy; + if (Proxy.Port != 1) + curl_easy_setopt(curl, CURLOPT_PROXYPORT, Proxy.Port); + curl_easy_setopt(curl, CURLOPT_PROXY, Proxy.Host.c_str()); + } +} /*}}}*/ // HttpsMethod::Fetch - Fetch an item /*{{{*/ // --------------------------------------------------------------------- /* This adds an item to the pipeline. We keep the pipeline at a fixed @@ -189,12 +173,15 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_SSLVERSION, final_version); // cache-control - if(_config->FindB("Acquire::http::No-Cache",false) == false) + if(_config->FindB("Acquire::https::No-Cache", + _config->FindB("Acquire::http::No-Cache",false)) == false) { // cache enabled - if (_config->FindB("Acquire::http::No-Store",false) == true) + if (_config->FindB("Acquire::https::No-Store", + _config->FindB("Acquire::http::No-Store",false)) == true) headers = curl_slist_append(headers,"Cache-Control: no-store"); - ioprintf(ss, "Cache-Control: max-age=%u", _config->FindI("Acquire::http::Max-Age",0)); + ioprintf(ss, "Cache-Control: max-age=%u", _config->FindI("Acquire::https::Max-Age", + _config->FindI("Acquire::http::Max-Age",0))); headers = curl_slist_append(headers, ss.str().c_str()); } else { // cache disabled by user @@ -204,7 +191,8 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers); // speed limit - int dlLimit = _config->FindI("Acquire::http::Dl-Limit",0)*1024; + int dlLimit = _config->FindI("Acquire::https::Dl-Limit", + _config->FindI("Acquire::http::Dl-Limit",0))*1024; if (dlLimit > 0) curl_easy_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, dlLimit); @@ -215,12 +203,14 @@ bool HttpsMethod::Fetch(FetchItem *Itm) "Debian APT-CURL/1.0 ("VERSION")"))); // set timeout - int timeout = _config->FindI("Acquire::http::Timeout",120); + int timeout = _config->FindI("Acquire::https::Timeout", + _config->FindI("Acquire::http::Timeout",120)); curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout); curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, timeout); // set redirect options and default to 10 redirects - bool AllowRedirect = _config->FindI("Acquire::https::AllowRedirect", true); + bool AllowRedirect = _config->FindB("Acquire::https::AllowRedirect", + _config->FindB("Acquire::http::AllowRedirect",true)); curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, AllowRedirect); curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 10); -- cgit v1.2.3 From 32e994d9c891ba379af7b292eeb81b4402d3f2af Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 25 Nov 2009 23:40:36 +0100 Subject: print an error and exit if python-apt is not installed for apt-mark, thanks Carl Chenet! (Closes: #521284) --- cmdline/apt-mark | 7 ++++--- debian/changelog | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmdline/apt-mark b/cmdline/apt-mark index c44ce7038..3a818a3db 100755 --- a/cmdline/apt-mark +++ b/cmdline/apt-mark @@ -2,13 +2,14 @@ from optparse import OptionParser +import sys +import os.path + try: import apt_pkg except ImportError: print "Error importing apt_pkg, is python-apt installed?" - -import sys -import os.path + sys.exit(1) actions = { "markauto" : 1, "unmarkauto": 0 diff --git a/debian/changelog b/debian/changelog index 1bd34e522..0cfb5ff30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -64,6 +64,8 @@ apt (0.7.25) UNRELEASED; urgency=low * cmdline/apt-mark: - print an error if a new state file can't be created, thanks Carl Chenet! (Closes: #521289) + - print an error and exit if python-apt is not installed, + thanks Carl Chenet! (Closes: #521284) * methods/http{,s}.cc - add config setting for User-Agent to the Acquire group, thanks Timothy J. Miller! (Closes: #355782) -- cgit v1.2.3 From 45df0ad2aab7d019cec855ba2cfe7ecdd0f8c7c8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 26 Nov 2009 22:23:08 +0100 Subject: [BREAK] add possibility to download and use multiply Translation files, configurable with Acquire::Languages accessable with APT::Configuration::getLanguages() and as always with documentation in apt.conf. The commit also includes a very very simple testapp. --- apt-pkg/aptconfiguration.cc | 136 +++++++++++++++++++++++++++++++++++++++ apt-pkg/aptconfiguration.h | 27 ++++++++ apt-pkg/deb/debindexfile.cc | 29 +++++---- apt-pkg/deb/debindexfile.h | 5 +- apt-pkg/deb/deblistparser.cc | 17 ++++- apt-pkg/deb/debmetaindex.cc | 17 ++++- apt-pkg/deb/debrecords.cc | 12 +++- apt-pkg/indexfile.cc | 61 ++++++------------ apt-pkg/pkgcache.cc | 26 +++++--- debian/changelog | 2 + doc/apt.conf.5.xml | 24 ++++++- doc/examples/configure-index | 9 +++ test/libapt/getlanguages_test.cc | 91 ++++++++++++++++++++++++++ test/libapt/makefile | 13 ++++ 14 files changed, 391 insertions(+), 78 deletions(-) create mode 100644 test/libapt/getlanguages_test.cc create mode 100644 test/libapt/makefile diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 45ae9bed5..899004d9f 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -87,4 +87,140 @@ const Configuration::getCompressionTypes(bool const &Cached) { return types; } /*}}}*/ +// GetLanguages - Return Vector of Language Codes /*{{{*/ +// --------------------------------------------------------------------- +/* return a vector of language codes in the prefered order. + the special word "environment" will be replaced with the long and the short + code of the local settings and it will be insured that this will not add + duplicates. So in an german local the setting "environment, de_DE, en, de" + will result in "de_DE, de, en". + The special word "none" is the stopcode for the not-All code vector */ +std::vector const Configuration::getLanguages(bool const &All, + bool const &Cached, char const * const Locale) { + using std::string; + + // The detection is boring and has a lot of cornercases, + // so we cache the results to calculated it only once. + std::vector static allCodes; + std::vector static codes; + + // we have something in the cache + if (codes.empty() == false || allCodes.empty() == false) { + if (Cached == true) { + if(All == true && allCodes.empty() == false) + return allCodes; + else + return codes; + } else { + allCodes.clear(); + codes.clear(); + } + } + + // get the environment language code + // we extract both, a long and a short code and then we will + // check if we actually need both (rare) or if the short is enough + string const envMsg = string(Locale == 0 ? std::setlocale(LC_MESSAGES, NULL) : Locale); + size_t const lenShort = (envMsg.find('_') != string::npos) ? envMsg.find('_') : 2; + size_t const lenLong = (envMsg.find('.') != string::npos) ? envMsg.find('.') : (lenShort + 3); + + string envLong = envMsg.substr(0,lenLong); + string const envShort = envLong.substr(0,lenShort); + bool envLongIncluded = true, envShortIncluded = false; + + // first cornercase: LANG=C, so we use only "en" Translation + if (envLong == "C") { + codes.push_back("en"); + return codes; + } + + if (envLong != envShort) { + // to save the servers from unneeded queries, we only try also long codes + // for languages it is realistic to have a long code translation file... + char const *needLong[] = { "cs", "en", "pt", "sv", "zh", NULL }; + for (char const **l = needLong; *l != NULL; l++) + if (envShort.compare(*l) == 0) { + envLongIncluded = false; + break; + } + } + + // we don't add the long code, but we allow the user to do so + if (envLongIncluded == true) + envLong.clear(); + + // FIXME: Remove support for the old APT::Acquire::Translation + // it was undocumented and so it should be not very widthly used + string const oldAcquire = _config->Find("APT::Acquire::Translation",""); + if (oldAcquire.empty() == false && oldAcquire != "environment") { + if (oldAcquire != "none") + codes.push_back(oldAcquire); + return codes; + } + + // Support settings like Acquire::Translation=none on the command line to + // override the configuration settings vector of languages. + string const forceLang = _config->Find("Acquire::Languages",""); + if (forceLang.empty() == false) { + if (forceLang == "environment") { + if (envLongIncluded == false) + codes.push_back(envLong); + if (envShortIncluded == false) + codes.push_back(envShort); + return codes; + } else if (forceLang != "none") + codes.push_back(forceLang); + return codes; + } + + std::vector const lang = _config->FindVector("Acquire::Languages"); + // the default setting -> "environment, en" + if (lang.empty() == true) { + if (envLongIncluded == false) + codes.push_back(envLong); + if (envShortIncluded == false) + codes.push_back(envShort); + if (envShort != "en") + codes.push_back("en"); + return codes; + } + + // the configs define the order, so add the environment + // then needed and ensure the codes are not listed twice. + bool noneSeen = false; + for (std::vector::const_iterator l = lang.begin(); + l != lang.end(); l++) { + if (*l == "environment") { + if (envLongIncluded == true && envShortIncluded == true) + continue; + if (envLongIncluded == false) { + envLongIncluded = true; + if (noneSeen == false) + codes.push_back(envLong); + allCodes.push_back(envLong); + } + if (envShortIncluded == false) { + envShortIncluded = true; + if (noneSeen == false) + codes.push_back(envShort); + allCodes.push_back(envShort); + } + continue; + } else if (*l == "none") { + noneSeen = true; + continue; + } else if ((envLongIncluded == true && *l == envLong) || + (envShortIncluded == true && *l == envShort)) + continue; + + if (noneSeen == false) + codes.push_back(*l); + allCodes.push_back(*l); + } + if (All == true) + return allCodes; + else + return codes; +} + /*}}}*/ } diff --git a/apt-pkg/aptconfiguration.h b/apt-pkg/aptconfiguration.h index 6a123adce..f2f04a39b 100644 --- a/apt-pkg/aptconfiguration.h +++ b/apt-pkg/aptconfiguration.h @@ -39,6 +39,33 @@ public: /*{{{*/ * \return a vector of (all) Language Codes in the prefered usage order */ std::vector static const getCompressionTypes(bool const &Cached = true); + + /** \brief Returns a vector of Language Codes + * + * Languages can be defined with their two or five chars long code. + * This methods handles the various ways to set the prefered codes, + * honors the environment and ensures that the codes are not listed twice. + * + * The special word "environment" will be replaced with the long and the short + * code of the local settings and it will be insured that this will not add + * duplicates. So in an german local the setting "environment, de_DE, en, de" + * will result in "de_DE, de, en". + * + * Another special word is "none" which separates the prefered from all codes + * in this setting. So setting and method can be used to get codes the user want + * to see or to get all language codes APT (should) have Translations available. + * + * \param All return all codes or only codes for languages we want to use + * \param Cached saves the result so we need to calculated it only once + * this parameter should ony be used for testing purposes. + * \param Locale don't get the locale from the system but use this one instead + * this parameter should ony be used for testing purposes. + * + * \return a vector of (all) Language Codes in the prefered usage order + */ + std::vector static const getLanguages(bool const &All = false, + bool const &Cached = true, char const * const Locale = 0); + /*}}}*/ }; /*}}}*/ diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index ed7633803..5beb83665 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -319,10 +319,11 @@ pkgCache::PkgFileIterator debPackagesIndex::FindInCache(pkgCache &Cache) const // TranslationsIndex::debTranslationsIndex - Contructor /*{{{*/ // --------------------------------------------------------------------- /* */ -debTranslationsIndex::debTranslationsIndex(string URI,string Dist,string Section) : - pkgIndexFile(true), URI(URI), Dist(Dist), Section(Section) -{ -} +debTranslationsIndex::debTranslationsIndex(string URI,string Dist,string Section, + char const * const Translation) : + pkgIndexFile(true), URI(URI), Dist(Dist), Section(Section), + Language(Translation) +{} /*}}}*/ // TranslationIndex::Trans* - Return the URI to the translation files /*{{{*/ // --------------------------------------------------------------------- @@ -355,8 +356,8 @@ string debTranslationsIndex::IndexURI(const char *Type) const bool debTranslationsIndex::GetIndexes(pkgAcquire *Owner) const { if (TranslationsAvailable()) { - string TranslationFile = "Translation-" + LanguageCode(); - new pkgAcqIndexTrans(Owner, IndexURI(LanguageCode().c_str()), + string const TranslationFile = string("Translation-").append(Language); + new pkgAcqIndexTrans(Owner, IndexURI(Language), Info(TranslationFile.c_str()), TranslationFile); } @@ -375,7 +376,7 @@ string debTranslationsIndex::Describe(bool Short) const snprintf(S,sizeof(S),"%s",Info(TranslationFile().c_str()).c_str()); else snprintf(S,sizeof(S),"%s (%s)",Info(TranslationFile().c_str()).c_str(), - IndexFile(LanguageCode().c_str()).c_str()); + IndexFile(Language).c_str()); return S; } /*}}}*/ @@ -397,20 +398,20 @@ string debTranslationsIndex::Info(const char *Type) const return Info; } /*}}}*/ -bool debTranslationsIndex::HasPackages() const +bool debTranslationsIndex::HasPackages() const /*{{{*/ { if(!TranslationsAvailable()) return false; - return FileExists(IndexFile(LanguageCode().c_str())); + return FileExists(IndexFile(Language)); } - + /*}}}*/ // TranslationsIndex::Exists - Check if the index is available /*{{{*/ // --------------------------------------------------------------------- /* */ bool debTranslationsIndex::Exists() const { - return FileExists(IndexFile(LanguageCode().c_str())); + return FileExists(IndexFile(Language)); } /*}}}*/ // TranslationsIndex::Size - Return the size of the index /*{{{*/ @@ -419,7 +420,7 @@ bool debTranslationsIndex::Exists() const unsigned long debTranslationsIndex::Size() const { struct stat S; - if (stat(IndexFile(LanguageCode().c_str()).c_str(),&S) != 0) + if (stat(IndexFile(Language).c_str(),&S) != 0) return 0; return S.st_size; } @@ -430,7 +431,7 @@ unsigned long debTranslationsIndex::Size() const bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const { // Check the translation file, if in use - string TranslationFile = IndexFile(LanguageCode().c_str()); + string TranslationFile = IndexFile(Language); if (TranslationsAvailable() && FileExists(TranslationFile)) { FileFd Trans(TranslationFile,FileFd::ReadOnly); @@ -462,7 +463,7 @@ bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const /* */ pkgCache::PkgFileIterator debTranslationsIndex::FindInCache(pkgCache &Cache) const { - string FileName = IndexFile(LanguageCode().c_str()); + string FileName = IndexFile(Language); pkgCache::PkgFileIterator File = Cache.FileBegin(); for (; File.end() == false; File++) diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h index b0012c96b..c0e8d7d8e 100644 --- a/apt-pkg/deb/debindexfile.h +++ b/apt-pkg/deb/debindexfile.h @@ -77,12 +77,13 @@ class debTranslationsIndex : public pkgIndexFile string URI; string Dist; string Section; + const char * const Language; string Info(const char *Type) const; string IndexFile(const char *Type) const; string IndexURI(const char *Type) const; - inline string TranslationFile() const {return "Translation-" + LanguageCode();}; + inline string TranslationFile() const {return string("Translation-").append(Language);}; public: @@ -99,7 +100,7 @@ class debTranslationsIndex : public pkgIndexFile virtual bool Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const; virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const; - debTranslationsIndex(string URI,string Dist,string Section); + debTranslationsIndex(string URI,string Dist,string Section, char const * const Language); }; class debSourcesIndex : public pkgIndexFile diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 517b771a5..16e6ee332 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -129,10 +130,11 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver) only describe package properties */ string debListParser::Description() { - if (DescriptionLanguage().empty()) + string const lang = DescriptionLanguage(); + if (lang.empty()) return Section.FindS("Description"); else - return Section.FindS(("Description-" + pkgIndexFile::LanguageCode()).c_str()); + return Section.FindS(string("Description-").append(lang).c_str()); } /*}}}*/ // ListParser::DescriptionLanguage - Return the description lang string /*{{{*/ @@ -142,7 +144,16 @@ string debListParser::Description() assumed to describe original description. */ string debListParser::DescriptionLanguage() { - return Section.FindS("Description").empty() ? pkgIndexFile::LanguageCode() : ""; + if (Section.FindS("Description").empty() == false) + return ""; + + std::vector const lang = APT::Configuration::getLanguages(); + for (std::vector::const_iterator l = lang.begin(); + l != lang.end(); l++) + if (Section.FindS(string("Description-").append(*l).c_str()).empty() == false) + return *l; + + return ""; } /*}}}*/ // ListParser::Description - Return the description_md5 MD5SumValue /*{{{*/ diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index f3ab6960c..8f28f053b 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -5,6 +5,7 @@ #include #include #include +#include #include using namespace std; @@ -170,13 +171,19 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool GetAll) const new indexRecords (Dist)); // Queue the translations + std::vector const lang = APT::Configuration::getLanguages(true); for (vector::const_iterator I = SectionEntries.begin(); I != SectionEntries.end(); I++) { if((*I)->IsSrc) continue; - debTranslationsIndex i = debTranslationsIndex(URI,Dist,(*I)->Section); - i.GetIndexes(Owner); + + for (vector::const_iterator l = lang.begin(); + l != lang.end(); l++) + { + debTranslationsIndex i = debTranslationsIndex(URI,Dist,(*I)->Section,(*l).c_str()); + i.GetIndexes(Owner); + } } return true; @@ -202,6 +209,7 @@ vector *debReleaseIndex::GetIndexFiles() return Indexes; Indexes = new vector ; + std::vector const lang = APT::Configuration::getLanguages(true); for (vector::const_iterator I = SectionEntries.begin(); I != SectionEntries.end(); I++) { if ((*I)->IsSrc) @@ -209,7 +217,10 @@ vector *debReleaseIndex::GetIndexFiles() else { Indexes->push_back(new debPackagesIndex (URI, Dist, (*I)->Section, IsTrusted())); - Indexes->push_back(new debTranslationsIndex(URI, Dist, (*I)->Section)); + + for (vector::const_iterator l = lang.begin(); + l != lang.end(); l++) + Indexes->push_back(new debTranslationsIndex(URI,Dist,(*I)->Section,(*l).c_str())); } } diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc index 8ed0bb7eb..5b8538a46 100644 --- a/apt-pkg/deb/debrecords.cc +++ b/apt-pkg/deb/debrecords.cc @@ -11,6 +11,7 @@ #include #include #include +#include #include /*}}}*/ @@ -109,13 +110,18 @@ string debRecordParser::ShortDesc() string debRecordParser::LongDesc() { string orig, dest; - char *codeset = nl_langinfo(CODESET); if (!Section.FindS("Description").empty()) orig = Section.FindS("Description").c_str(); - else - orig = Section.FindS(("Description-" + pkgIndexFile::LanguageCode()).c_str()).c_str(); + else + { + vector const lang = APT::Configuration::getLanguages(); + for (vector::const_iterator l = lang.begin(); + orig.empty() && l != lang.end(); l++) + orig = Section.FindS(string("Description-").append(*l).c_str()); + } + char const * const codeset = nl_langinfo(CODESET); if (strcmp(codeset,"UTF-8") != 0) { UTF8ToCodeset(codeset, orig, &dest); orig = dest; diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc index 08f71feb0..37be87055 100644 --- a/apt-pkg/indexfile.cc +++ b/apt-pkg/indexfile.cc @@ -8,9 +8,9 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#include #include #include +#include #include #include @@ -66,28 +66,20 @@ string pkgIndexFile::SourceInfo(pkgSrcRecords::Parser const &Record, return string(); } /*}}}*/ -// IndexFile::TranslationsAvailable - Check if will use Translation /*{{{*/ +// IndexFile::TranslationsAvailable - Check if will use Translation /*{{{*/ // --------------------------------------------------------------------- /* */ -bool pkgIndexFile::TranslationsAvailable() -{ - const string Translation = _config->Find("APT::Acquire::Translation"); - - if (Translation.compare("none") != 0) - return CheckLanguageCode(LanguageCode().c_str()); - else - return false; +bool pkgIndexFile::TranslationsAvailable() { + return (APT::Configuration::getLanguages().empty() != true); } /*}}}*/ -// IndexFile::CheckLanguageCode - Check the Language Code /*{{{*/ +// IndexFile::CheckLanguageCode - Check the Language Code /*{{{*/ // --------------------------------------------------------------------- -/* */ -/* common cases: de_DE, de_DE@euro, de_DE.UTF-8, de_DE.UTF-8@euro, - de_DE.ISO8859-1, tig_ER - more in /etc/gdm/locale.conf -*/ - -bool pkgIndexFile::CheckLanguageCode(const char *Lang) +/* No intern need for this method anymore as the check for correctness + is already done in getLanguages(). Note also that this check is + rather bad (doesn't take three character like ast into account). + TODO: Remove method with next API break */ +__attribute__ ((deprecated)) bool pkgIndexFile::CheckLanguageCode(const char *Lang) { if (strlen(Lang) == 2 || (strlen(Lang) == 5 && Lang[2] == '_')) return true; @@ -98,31 +90,14 @@ bool pkgIndexFile::CheckLanguageCode(const char *Lang) return false; } /*}}}*/ -// IndexFile::LanguageCode - Return the Language Code /*{{{*/ +// IndexFile::LanguageCode - Return the Language Code /*{{{*/ // --------------------------------------------------------------------- -/* return the language code */ -string pkgIndexFile::LanguageCode() -{ - const string Translation = _config->Find("APT::Acquire::Translation"); - - if (Translation.compare("environment") == 0) - { - string lang = std::setlocale(LC_MESSAGES,NULL); - - // we have a mapping of the language codes that contains all the language - // codes that need the country code as well - // (like pt_BR, pt_PT, sv_SE, zh_*, en_*) - const char *need_full_langcode[] = { "pt","sv","zh","en", NULL }; - for(const char **s = need_full_langcode;*s != NULL; s++) - if(lang.find(*s) == 0) - return lang.substr(0,5); - - if(lang.size() > 2) - return lang.substr(0,2); - else - return lang; - } - else - return Translation; +/* As we have now possibly more than one LanguageCode this method is + supersided by a) private classmembers or b) getLanguages(). + TODO: Remove method with next API break */ +__attribute__ ((deprecated)) string pkgIndexFile::LanguageCode() { + if (TranslationsAvailable() == false) + return ""; + return APT::Configuration::getLanguages()[0]; } /*}}}*/ diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index b0ce6e598..997ff51fe 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -22,11 +22,11 @@ // Include Files /*{{{*/ #include #include -#include #include #include #include #include +#include #include @@ -674,14 +674,22 @@ string pkgCache::PkgFileIterator::RelStr() */ pkgCache::DescIterator pkgCache::VerIterator::TranslatedDescription() const { - pkgCache::DescIterator DescDefault = DescriptionList(); - pkgCache::DescIterator Desc = DescDefault; - for (; Desc.end() == false; Desc++) - if (pkgIndexFile::LanguageCode() == Desc.LanguageCode()) - break; - if (Desc.end() == true) - Desc = DescDefault; - return Desc; + std::vector const lang = APT::Configuration::getLanguages(); + for (std::vector::const_iterator l = lang.begin(); + l != lang.end(); l++) + { + pkgCache::DescIterator DescDefault = DescriptionList(); + pkgCache::DescIterator Desc = DescDefault; + + for (; Desc.end() == false; Desc++) + if (*l == Desc.LanguageCode()) + break; + if (Desc.end() == true) + Desc = DescDefault; + return Desc; + } + + return DescriptionList(); }; /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 0cfb5ff30..07d9c0303 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ apt (0.7.25) UNRELEASED; urgency=low Closes: #552606 [ David Kalnischkies ] + * [BREAK] add possibility to download and use multiply + Translation files, configurable with Acquire::Translation * apt-pkg/packagemanager.cc: - better debug output for ImmediateAdd with depth and why - improve the message shown for failing immediate configuration diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index d7ad51cfb..777630e14 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -142,7 +142,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; Default release to install packages from if more than one version available. Contains release name, codename or release version. Examples: 'stable', 'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See also &apt-preferences;. - + Ignore-Hold Ignore Held packages; This global option causes the problem resolver to ignore held packages in its decision making. @@ -392,6 +392,27 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; these warnings are most of the time false negatives. Future versions will maybe include a way to really prefer uncompressed files to support the usage of local mirrors. + + Languages + The Languages subsection controls which Translation files are downloaded + and in which order APT tries to display the Description-Translations. APT will try to display the first + available Description for the Language which is listed at first. Languages can be defined with their + short or long Languagecodes. Note that not all archives provide Translation + files for every Language - especially the long Languagecodes are rare, so please + inform you which ones are available before you set here impossible values. + The default list includes "environment" and "en". "environment" has a special meaning here: + It will be replaced at runtime with the languagecodes extracted from the LC_MESSAGES enviroment variable. + It will also ensure that these codes are not included twice in the list. If LC_MESSAGES + is set to "C" only the Translation-en file (if available) will be used. + To force apt to use no Translation file use the setting Acquire::Languages=none. "none" + is another special meaning code which will stop the search for a fitting Translation file. + This can be used by the system administrator to let APT know that it should download also this files without + actually use them if not the environment specifies this languages. So the following example configuration will + result in the order "en, de" in an english and in "de, en" in a german localization. Note that "fr" is downloaded, + but not used if APT is not used in a french localization, in such an environment the order would be "fr, de, en". + Acquire::Languages { "environment"; "de"; "en"; "none"; "fr"; }; + + @@ -983,6 +1004,7 @@ is commented. --> + diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 7e86b3d4a..05826feaa 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -273,6 +273,15 @@ Acquire Order { "gz"; "lzma"; "bz2"; }; }; + + Languages + { + "environment"; + "de"; + "en"; + "none"; + "fr"; + }; }; // Directory layout diff --git a/test/libapt/getlanguages_test.cc b/test/libapt/getlanguages_test.cc new file mode 100644 index 000000000..f3629df68 --- /dev/null +++ b/test/libapt/getlanguages_test.cc @@ -0,0 +1,91 @@ +#include +#include + +#include +#include +#include + +#include + +// simple helper to quickly output a vector of strings +void dumpVector(std::vector vec) { + for (std::vector::const_iterator v = vec.begin(); + v != vec.end(); v++) + std::cout << *v << std::endl; +} + +int main(int argc,char *argv[]) +{ + std::vector vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); + assert(vec.size() == 2); + assert(vec[0] == "de"); + assert(vec[1] == "en"); + + // Special: Check if the cache is actually in use + vec = APT::Configuration::getLanguages(false, true, "en_GB.UTF-8"); + assert(vec.size() == 2); + assert(vec[0] == "de"); + assert(vec[1] == "en"); + + vec = APT::Configuration::getLanguages(false, false, "en_GB.UTF-8"); + assert(vec.size() == 2); + assert(vec[0] == "en_GB"); + assert(vec[1] == "en"); + + vec = APT::Configuration::getLanguages(false, false, "pt_PR.UTF-8"); + assert(vec.size() == 3); + assert(vec[0] == "pt_PR"); + assert(vec[1] == "pt"); + assert(vec[2] == "en"); + + vec = APT::Configuration::getLanguages(false, false, "ast_DE.UTF-8"); // bogus, but syntactical correct + assert(vec.size() == 2); + assert(vec[0] == "ast"); + assert(vec[1] == "en"); + + vec = APT::Configuration::getLanguages(false, false, "C"); + assert(vec.size() == 1); + assert(vec[0] == "en"); + + _config->Set("Acquire::Languages::1", "environment"); + _config->Set("Acquire::Languages::2", "en"); + vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); + assert(vec.size() == 2); + assert(vec[0] == "de"); + assert(vec[1] == "en"); + + _config->Set("Acquire::Languages::3", "de"); + vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); + assert(vec.size() == 2); + assert(vec[0] == "de"); + assert(vec[1] == "en"); + + _config->Set("Acquire::Languages::1", "none"); + vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); + assert(vec.size() == 0); + vec = APT::Configuration::getLanguages(true, false, "de_DE.UTF-8"); + assert(vec[0] == "en"); + assert(vec[1] == "de"); + + _config->Set("Acquire::Languages::1", "fr"); + _config->Set("Acquire::Languages", "de_DE"); + vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); + assert(vec.size() == 1); + assert(vec[0] == "de_DE"); + + _config->Set("Acquire::Languages", "none"); + vec = APT::Configuration::getLanguages(true, false, "de_DE.UTF-8"); + assert(vec.size() == 0); + + _config->Set("Acquire::Languages", ""); + //FIXME: Remove support for this deprecated setting + _config->Set("APT::Acquire::Translation", "ast_DE"); + vec = APT::Configuration::getLanguages(true, false, "de_DE.UTF-8"); + assert(vec.size() == 1); + assert(vec[0] == "ast_DE"); + _config->Set("APT::Acquire::Translation", "none"); + vec = APT::Configuration::getLanguages(true, false, "de_DE.UTF-8"); + assert(vec.size() == 0); + + return 0; +} diff --git a/test/libapt/makefile b/test/libapt/makefile new file mode 100644 index 000000000..f61a95f3d --- /dev/null +++ b/test/libapt/makefile @@ -0,0 +1,13 @@ +# -*- make -*- +BASE=../.. +SUBDIR=test/libapt +BASENAME=_libapt_test + +# Bring in the default rules +include ../../buildlib/defaults.mak + +# Program for testing getLanguageCode +PROGRAM = getLanguages${BASENAME} +SLIBS = -lapt-pkg +SOURCE = getlanguages_test.cc +include $(PROGRAM_H) -- cgit v1.2.3 From e4a30974d7b3fa092d962682e22c5a8171cf3407 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 26 Nov 2009 22:24:03 +0100 Subject: Add a very simple test runner --- test/libapt/run-tests.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100755 test/libapt/run-tests.sh diff --git a/test/libapt/run-tests.sh b/test/libapt/run-tests.sh new file mode 100755 index 000000000..365bbe215 --- /dev/null +++ b/test/libapt/run-tests.sh @@ -0,0 +1,10 @@ +#!/bin/sh +echo "Compiling the tests ..." +make +echo "Running all testcases ..." +PATH=$(pwd)/../../build/bin +for testapp in $(/bin/ls ${PATH}/*_libapt_test) +do + echo -n "Testing with \033[1;35m$(/usr/bin/basename ${testapp})\033[0m ... " + LD_LIBRARY_PATH=${PATH} ${testapp} && echo "\033[1;32mOKAY\033[0m" || echo "\033[1;31mFAILED\033[0m" +done -- cgit v1.2.3 From 9c24493fabefe1a2549eaab81770dbe6f24916d9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 26 Nov 2009 23:46:49 +0100 Subject: Add APT::FTPArchive::LongDescription to disable the inclusion of the LongDescriptions in the generated Packages file. --- debian/changelog | 2 ++ doc/apt-ftparchive.1.xml | 13 +++++++++++-- ftparchive/writer.cc | 21 +++++++++++++++++++-- ftparchive/writer.h | 1 + 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 07d9c0303..7315dc571 100644 --- a/debian/changelog +++ b/debian/changelog @@ -72,6 +72,8 @@ apt (0.7.25) UNRELEASED; urgency=low - add config setting for User-Agent to the Acquire group, thanks Timothy J. Miller! (Closes: #355782) - add https options which default to http ones (Closes: #557085) + * ftparchive/writer.{cc,h}: + - add APT::FTPArchive::LongDescription to be able to disable them [ Chris Leick ] * doc/ various manpages: diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index d4d77c68e..d47df957a 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -15,7 +15,7 @@ &apt-email; &apt-product; - 29 February 2004 + 17 August 2009 @@ -543,7 +543,16 @@ for i in Sections do Make the caching databases read only. Configuration Item: APT::FTPArchive::ReadOnlyDB. - + + + + This configuration option defaults to "true" and should only be set to + "false" if the Archive generated with &apt-ftparchive; also provides + Translation files. Note that it is currently not possible to create these + files with apt-ftparchive. + + + &apt-commonoptions; diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 293e851f5..b2ebdca8a 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -308,6 +308,7 @@ PackagesWriter::PackagesWriter(string DB,string Overrides,string ExtOverrides, DoSHA256 = _config->FindB("APT::FTPArchive::SHA256",true); DoContents = _config->FindB("APT::FTPArchive::Contents",true); NoOverride = _config->FindB("APT::FTPArchive::NoOverrideMsg",false); + LongDescription = _config->FindB("APT::FTPArchive::LongDescription",true); if (Db.Loaded() == false) DoContents = false; @@ -414,10 +415,18 @@ bool PackagesWriter::DoPackage(string FileName) NewFileName = FileName; if (PathPrefix.empty() == false) NewFileName = flCombine(PathPrefix,NewFileName); - + + /* Configuration says we don't want to include the long Description + in the package file - instead we want to ship a separated file */ + string desc; + if (LongDescription == false) { + desc = Tags.FindS("Description").append("\n"); + OverItem->FieldOverride["Description"] = desc.substr(0, desc.find('\n')).c_str(); + } + // This lists all the changes to the fields we are going to make. // (7 hardcoded + maintainer + suggests + end marker) - TFRewriteData Changes[6+2+OverItem->FieldOverride.size()+1]; + TFRewriteData Changes[6+2+OverItem->FieldOverride.size()+1+1]; unsigned int End = 0; SetTFRewriteData(Changes[End++], "Size", Size); @@ -429,6 +438,14 @@ bool PackagesWriter::DoPackage(string FileName) SetTFRewriteData(Changes[End++], "Status", 0); SetTFRewriteData(Changes[End++], "Optional", 0); + string DescriptionMd5; + if (LongDescription == false) { + MD5Summation descmd5; + descmd5.Add(desc.c_str()); + DescriptionMd5 = descmd5.Result().Value(); + SetTFRewriteData(Changes[End++], "Description-md5", DescriptionMd5.c_str()); + } + // Rewrite the maintainer field if necessary bool MaintFailed; string NewMaint = OverItem->SwapMaint(Tags.FindS("Maintainer"),MaintFailed); diff --git a/ftparchive/writer.h b/ftparchive/writer.h index 6e161c752..e76438900 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -86,6 +86,7 @@ class PackagesWriter : public FTWScanner bool DoSHA256; bool NoOverride; bool DoContents; + bool LongDescription; // General options string PathPrefix; -- cgit v1.2.3 From 4647b1b3e5f94faae48c8b78b2d85124929b9362 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 26 Nov 2009 23:59:41 +0100 Subject: add a few closes tags to Acquire::Translation changelog --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 7315dc571..30da07d93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ apt (0.7.25) UNRELEASED; urgency=low [ David Kalnischkies ] * [BREAK] add possibility to download and use multiply Translation files, configurable with Acquire::Translation + (Closes: #444222, #448216, #550564) * apt-pkg/packagemanager.cc: - better debug output for ImmediateAdd with depth and why - improve the message shown for failing immediate configuration -- cgit v1.2.3 From fb1e7ecf359510b263bc4acd23659024b54c17c9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 27 Nov 2009 10:02:27 +0100 Subject: add --debian-only as alias for --diff-only for all source v3 lovers --- cmdline/apt-get.cc | 1 + debian/changelog | 1 + po/apt-all.pot | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 49fde7466..7325bbf22 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2799,6 +2799,7 @@ int main(int argc,const char *argv[]) /*{{{*/ {0,"force-yes","APT::Get::force-yes",0}, {0,"print-uris","APT::Get::Print-URIs",0}, {0,"diff-only","APT::Get::Diff-Only",0}, + {0,"debian-only","APT::Get::Diff-Only",0}, {0,"tar-only","APT::Get::Tar-Only",0}, {0,"dsc-only","APT::Get::Dsc-Only",0}, {0,"purge","APT::Get::Purge",0}, diff --git a/debian/changelog b/debian/changelog index 8d7461b95..1de0193cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,7 @@ apt (0.7.25) UNRELEASED; urgency=low - source doesn't need the complete version for match (Closes: #245250) - source ignores versions/releases if not available (Closes: #377424) - only warn if (free) space overflows (Closes: #522238) + - add --debian-only as alias for --diff-only * methods/connect.cc: - display also strerror of "wicked" getaddrinfo errors * buildlib/configure.mak, buildlib/config.{sub,guess}: diff --git a/po/apt-all.pot b/po/apt-all.pot index 9b731cfcd..3cb5ba379 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: 2009-11-27 00:15+0100\n" +"POT-Creation-Date: 2009-11-27 09:49+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1175,7 +1175,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:2866 +#: cmdline/apt-get.cc:2867 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" -- cgit v1.2.3 From 164994f54fbb2283a0ad320fe34009ee9cd06f8e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 27 Nov 2009 10:10:55 +0100 Subject: use "diff" filetype for .debian.tar.* files (Closes: #554898) in apt-pkg/deb/debsrcrecords.cc as source format v3 uses this name scheme for their "diff" files. --- apt-pkg/deb/debsrcrecords.cc | 8 +++++++- debian/changelog | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc index 2f87c767b..bde10aa6d 100644 --- a/apt-pkg/deb/debsrcrecords.cc +++ b/apt-pkg/deb/debsrcrecords.cc @@ -135,9 +135,15 @@ bool debSrcRecordParser::Files(vector &List) string::size_type Tmp = F.Path.rfind('.',Pos); if (Tmp == string::npos) break; + if (F.Type == "tar") { + // source v3 has extension 'debian.tar.*' instead of 'diff.*' + if (string(F.Path, Tmp+1, Pos-Tmp) == "debian") + F.Type = "diff"; + break; + } F.Type = string(F.Path,Tmp+1,Pos-Tmp); - if (F.Type == "gz" || F.Type == "bz2" || F.Type == "lzma") + if (F.Type == "gz" || F.Type == "bz2" || F.Type == "lzma" || F.Type == "tar") { Pos = Tmp-1; continue; diff --git a/debian/changelog b/debian/changelog index 1de0193cf..e865671f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -78,6 +78,8 @@ apt (0.7.25) UNRELEASED; urgency=low - add https options which default to http ones (Closes: #557085) * ftparchive/writer.{cc,h}: - add APT::FTPArchive::LongDescription to be able to disable them + * apt-pkg/deb/debsrcrecords.cc: + - use "diff" filetype for .debian.tar.* files (Closes: #554898) [ Chris Leick ] * doc/ various manpages: -- cgit v1.2.3 From 1df14bc5a7011c2da0ecd1e89911c64627119883 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 28 Nov 2009 00:53:53 +0100 Subject: add AI_ADDRCONFIG to ai_flags in connect.cc as suggested by Aurelien Jarno in his response to Bernhard R. Link's patch, thanks! (Closes: #505020) --- debian/changelog | 2 ++ methods/connect.cc | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index e865671f1..fdd7bd24b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -42,6 +42,8 @@ apt (0.7.25) UNRELEASED; urgency=low - add --debian-only as alias for --diff-only * methods/connect.cc: - display also strerror of "wicked" getaddrinfo errors + - add AI_ADDRCONFIG to ai_flags as suggested by Aurelien Jarno + in response to Bernhard R. Link, thanks! (Closes: #505020) * buildlib/configure.mak, buildlib/config.{sub,guess}: - remove (outdated) config.{sub,guess} and use the ones provided by the new added build-dependency autotools-dev instead diff --git a/methods/connect.cc b/methods/connect.cc index 74e670ebd..adb16a199 100644 --- a/methods/connect.cc +++ b/methods/connect.cc @@ -158,6 +158,7 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd, struct addrinfo Hints; memset(&Hints,0,sizeof(Hints)); Hints.ai_socktype = SOCK_STREAM; + Hints.ai_flags = AI_ADDRCONFIG; Hints.ai_protocol = 0; // if we couldn't resolve the host before, we don't try now -- cgit v1.2.3 From ff574e76beb97c101924c2d4746b5a2dbb862f19 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 28 Nov 2009 02:12:36 +0100 Subject: add APT::FTPArchive::AlwaysStat to disable the too aggressive caching if versions are build multiply times (not recommend) Patch by Christoph Goehre, thanks! (Closes: #463260) --- debian/changelog | 3 +++ doc/apt-ftparchive.1.xml | 12 ++++++++++++ doc/po/apt-doc.pot | 39 +++++++++++++++++++++++++++++---------- ftparchive/cachedb.cc | 14 +++++++++----- ftparchive/cachedb.h | 4 ++-- ftparchive/writer.cc | 5 +++-- ftparchive/writer.h | 1 + po/apt-all.pot | 24 ++++++++++++------------ 8 files changed, 71 insertions(+), 31 deletions(-) diff --git a/debian/changelog b/debian/changelog index fdd7bd24b..85ee97713 100644 --- a/debian/changelog +++ b/debian/changelog @@ -80,6 +80,9 @@ apt (0.7.25) UNRELEASED; urgency=low - add https options which default to http ones (Closes: #557085) * ftparchive/writer.{cc,h}: - add APT::FTPArchive::LongDescription to be able to disable them + - add APT::FTPArchive::AlwaysStat to disable the too aggressive + caching if versions are build multiply times (not recommend) + Patch by Christoph Goehre, thanks! (Closes: #463260) * apt-pkg/deb/debsrcrecords.cc: - use "diff" filetype for .debian.tar.* files (Closes: #554898) diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index d47df957a..e2eab0fb2 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -544,6 +544,18 @@ for i in Sections do Configuration Item: APT::FTPArchive::ReadOnlyDB. + + + &apt-ftparchive; caches as much as possible of metadata in it is cachedb. If packages + are recompiled and/or republished with the same version again, this will lead to problems + as the now outdated cached metadata like size and checksums will be used. With this option + enabled this will no longer happen as it will be checked if the file was changed. + Note that this option is set to "false" by default as it is not recommend + to upload multiply versions/builds of a package with the same versionnumber, so in theory + nobody will have these problems and therefore all these extra checks are useless. + + + This configuration option defaults to "true" and should only be set to diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 46febf8ca..5172f7f84 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2009-11-27 00:18+0100\n" +"POT-Creation-Date: 2009-11-28 02:08+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1411,7 +1411,7 @@ msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554 apt-sortpkgs.1.xml:64 +#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "" @@ -1426,7 +1426,7 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: -#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 sources.list.5.xml:233 +#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 sources.list.5.xml:233 msgid "See Also" msgstr "" @@ -1436,7 +1436,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 +#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "" @@ -1735,7 +1735,7 @@ msgid "Just show the contents of the configuration space." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573 apt-sortpkgs.1.xml:70 +#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 apt-sortpkgs.1.xml:70 msgid "&apt-conf;" msgstr "" @@ -2690,12 +2690,31 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:547 -msgid "<option>APT::FTPArchive::LongDescription</option>" +msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 msgid "" +"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " +"packages are recompiled and/or republished with the same version again, this " +"will lead to problems as the now outdated cached metadata like size and " +"checksums will be used. With this option enabled this will no longer happen " +"as it will be checked if the file was changed. Note that this option is set " +"to \"<literal>false</literal>\" by default as it is not recommend to upload " +"multiply versions/builds of a package with the same versionnumber, so in " +"theory nobody will have these problems and therefore all these extra checks " +"are useless." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:559 +msgid "<option>APT::FTPArchive::LongDescription</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:561 +msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " "&apt-ftparchive; also provides <filename>Translation</filename> files. Note " @@ -2704,12 +2723,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 sources.list.5.xml:193 +#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1011 apt_preferences.5.xml:462 sources.list.5.xml:193 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:567 +#: apt-ftparchive.1.xml:579 #, no-wrap msgid "" "<command>apt-ftparchive</command> packages " @@ -2718,14 +2737,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:563 +#: apt-ftparchive.1.xml:575 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:577 +#: apt-ftparchive.1.xml:589 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc index dfda827b6..c352aa53c 100644 --- a/ftparchive/cachedb.cc +++ b/ftparchive/cachedb.cc @@ -102,9 +102,9 @@ bool CacheDB::OpenFile() // --------------------------------------------------------------------- /* This gets the size from the database if it's there. If we need * to look at the file, also get the mtime from the file. */ -bool CacheDB::GetFileStat() +bool CacheDB::GetFileStat(bool const &doStat) { - if ((CurStat.Flags & FlSize) == FlSize) + if ((CurStat.Flags & FlSize) == FlSize && doStat == false) { /* Already worked out the file size */ } @@ -162,7 +162,7 @@ bool CacheDB::GetCurStat() // --------------------------------------------------------------------- bool CacheDB::GetFileInfo(string FileName, bool DoControl, bool DoContents, bool GenContentsOnly, - bool DoMD5, bool DoSHA1, bool DoSHA256) + bool DoMD5, bool DoSHA1, bool DoSHA256, bool const &checkMtime) { this->FileName = FileName; @@ -171,14 +171,18 @@ bool CacheDB::GetFileInfo(string FileName, bool DoControl, bool DoContents, return false; } OldStat = CurStat; - - if (GetFileStat() == false) + + if (GetFileStat(checkMtime) == false) { delete Fd; Fd = NULL; return false; } + /* if mtime changed, update CurStat from disk */ + if (checkMtime == true && OldStat.mtime != CurStat.mtime) + CurStat.Flags = FlSize; + Stats.Bytes += CurStat.FileSize; Stats.Packages++; diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h index c10f41ecc..15add459c 100644 --- a/ftparchive/cachedb.h +++ b/ftparchive/cachedb.h @@ -63,7 +63,7 @@ class CacheDB return true; } bool OpenFile(); - bool GetFileStat(); + bool GetFileStat(bool const &doStat = false); bool GetCurStat(); bool LoadControl(); bool LoadContents(bool GenOnly); @@ -125,7 +125,7 @@ class CacheDB bool SetFile(string FileName,struct stat St,FileFd *Fd); bool GetFileInfo(string FileName, bool DoControl, bool DoContents, - bool GenContentsOnly, bool DoMD5, bool DoSHA1, bool DoSHA256); + bool GenContentsOnly, bool DoMD5, bool DoSHA1, bool DoSHA256, bool const &checkMtime = false); bool Finish(); bool Clean(); diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index b2ebdca8a..6756021f8 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -306,6 +306,7 @@ PackagesWriter::PackagesWriter(string DB,string Overrides,string ExtOverrides, DoMD5 = _config->FindB("APT::FTPArchive::MD5",true); DoSHA1 = _config->FindB("APT::FTPArchive::SHA1",true); DoSHA256 = _config->FindB("APT::FTPArchive::SHA256",true); + DoAlwaysStat = _config->FindB("APT::FTPArchive::AlwaysStat", false); DoContents = _config->FindB("APT::FTPArchive::Contents",true); NoOverride = _config->FindB("APT::FTPArchive::NoOverrideMsg",false); LongDescription = _config->FindB("APT::FTPArchive::LongDescription",true); @@ -360,7 +361,7 @@ bool FTWScanner::SetExts(string Vals) bool PackagesWriter::DoPackage(string FileName) { // Pull all the data we need form the DB - if (Db.GetFileInfo(FileName, true, DoContents, true, DoMD5, DoSHA1, DoSHA256) + if (Db.GetFileInfo(FileName, true, DoContents, true, DoMD5, DoSHA1, DoSHA256, DoAlwaysStat) == false) { return false; @@ -753,7 +754,7 @@ ContentsWriter::ContentsWriter(string DB) : determine what the package name is. */ bool ContentsWriter::DoPackage(string FileName,string Package) { - if (!Db.GetFileInfo(FileName, Package.empty(), true, false, false, false, false)) + if (!Db.GetFileInfo(FileName, Package.empty(), true, false, false, false, false, false)) { return false; } diff --git a/ftparchive/writer.h b/ftparchive/writer.h index e76438900..8864461d5 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -84,6 +84,7 @@ class PackagesWriter : public FTWScanner bool DoMD5; bool DoSHA1; bool DoSHA256; + bool DoAlwaysStat; bool NoOverride; bool DoContents; bool LongDescription; diff --git a/po/apt-all.pot b/po/apt-all.pot index 3cb5ba379..b6610a191 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: 2009-11-27 09:49+0100\n" +"POT-Creation-Date: 2009-11-28 02:10+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -357,11 +357,11 @@ msgstr "" msgid "Failed to stat %s" msgstr "" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "" @@ -426,26 +426,26 @@ msgstr "" msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -1764,22 +1764,22 @@ msgstr "" msgid "Connecting to %s" msgstr "" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, c-format msgid "Unable to connect to %s:%s:" msgstr "" -- cgit v1.2.3 From 9209ec4701d9f6c21d4ae9ebb648d94a1f32665a Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 28 Nov 2009 03:19:52 +0100 Subject: tell every method in ftparchive/ that const& is sexy --- ftparchive/cachedb.cc | 18 +++++++++--------- ftparchive/cachedb.h | 20 ++++++++++---------- ftparchive/contents.cc | 2 +- ftparchive/contents.h | 2 +- ftparchive/multicompress.cc | 14 +++++++------- ftparchive/multicompress.h | 12 ++++++------ ftparchive/override.cc | 16 ++++++++-------- ftparchive/override.h | 10 +++++----- ftparchive/writer.cc | 44 ++++++++++++++++++++++---------------------- ftparchive/writer.h | 34 +++++++++++++++++----------------- 10 files changed, 86 insertions(+), 86 deletions(-) diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc index c352aa53c..64638459a 100644 --- a/ftparchive/cachedb.cc +++ b/ftparchive/cachedb.cc @@ -26,7 +26,7 @@ // CacheDB::ReadyDB - Ready the DB2 /*{{{*/ // --------------------------------------------------------------------- /* This opens the DB2 file for caching package information */ -bool CacheDB::ReadyDB(string DB) +bool CacheDB::ReadyDB(string const &DB) { int err; @@ -160,9 +160,9 @@ bool CacheDB::GetCurStat() /*}}}*/ // CacheDB::GetFileInfo - Get all the info about the file /*{{{*/ // --------------------------------------------------------------------- -bool CacheDB::GetFileInfo(string FileName, bool DoControl, bool DoContents, - bool GenContentsOnly, - bool DoMD5, bool DoSHA1, bool DoSHA256, bool const &checkMtime) +bool CacheDB::GetFileInfo(string const &FileName, bool const &DoControl, bool const &DoContents, + bool const &GenContentsOnly, bool const &DoMD5, bool const &DoSHA1, + bool const &DoSHA256, bool const &checkMtime) { this->FileName = FileName; @@ -251,7 +251,7 @@ bool CacheDB::LoadControl() // CacheDB::LoadContents - Load the File Listing /*{{{*/ // --------------------------------------------------------------------- /* */ -bool CacheDB::LoadContents(bool GenOnly) +bool CacheDB::LoadContents(bool const &GenOnly) { // Try to read the control information out of the DB. if ((CurStat.Flags & FlContents) == FlContents) @@ -301,7 +301,7 @@ static string bytes2hex(uint8_t *bytes, size_t length) { return string(space); } -static inline unsigned char xdig2num(char dig) { +static inline unsigned char xdig2num(char const &dig) { if (isdigit(dig)) return dig - '0'; if ('a' <= dig && dig <= 'f') return dig - 'a' + 10; if ('A' <= dig && dig <= 'F') return dig - 'A' + 10; @@ -322,7 +322,7 @@ static void hex2bytes(uint8_t *bytes, const char *hex, int length) { // CacheDB::GetMD5 - Get the MD5 hash /*{{{*/ // --------------------------------------------------------------------- /* */ -bool CacheDB::GetMD5(bool GenOnly) +bool CacheDB::GetMD5(bool const &GenOnly) { // Try to read the control information out of the DB. if ((CurStat.Flags & FlMD5) == FlMD5) @@ -353,7 +353,7 @@ bool CacheDB::GetMD5(bool GenOnly) // CacheDB::GetSHA1 - Get the SHA1 hash /*{{{*/ // --------------------------------------------------------------------- /* */ -bool CacheDB::GetSHA1(bool GenOnly) +bool CacheDB::GetSHA1(bool const &GenOnly) { // Try to read the control information out of the DB. if ((CurStat.Flags & FlSHA1) == FlSHA1) @@ -384,7 +384,7 @@ bool CacheDB::GetSHA1(bool GenOnly) // CacheDB::GetSHA256 - Get the SHA256 hash /*{{{*/ // --------------------------------------------------------------------- /* */ -bool CacheDB::GetSHA256(bool GenOnly) +bool CacheDB::GetSHA256(bool const &GenOnly) { // Try to read the control information out of the DB. if ((CurStat.Flags & FlSHA256) == FlSHA256) diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h index 15add459c..0ba80909a 100644 --- a/ftparchive/cachedb.h +++ b/ftparchive/cachedb.h @@ -49,7 +49,7 @@ class CacheDB { return Dbp->get(Dbp,0,&Key,&Data,0) == 0; }; - inline bool Put(const void *In,unsigned long Length) + inline bool Put(const void *In,unsigned long const &Length) { if (ReadOnly == true) return true; @@ -66,10 +66,10 @@ class CacheDB bool GetFileStat(bool const &doStat = false); bool GetCurStat(); bool LoadControl(); - bool LoadContents(bool GenOnly); - bool GetMD5(bool GenOnly); - bool GetSHA1(bool GenOnly); - bool GetSHA256(bool GenOnly); + bool LoadContents(bool const &GenOnly); + bool GetMD5(bool const &GenOnly); + bool GetSHA1(bool const &GenOnly); + bool GetSHA256(bool const &GenOnly); // Stat info stored in the DB, Fixed types since it is written to disk. enum FlagList {FlControl = (1<<0),FlMD5=(1<<1),FlContents=(1<<2), @@ -117,20 +117,20 @@ class CacheDB Stats() : Bytes(0), MD5Bytes(0), SHA1Bytes(0), SHA256Bytes(0), Packages(0), Misses(0), DeLinkBytes(0) {}; } Stats; - bool ReadyDB(string DB); + bool ReadyDB(string const &DB); inline bool DBFailed() {return Dbp != 0 && DBLoaded == false;}; inline bool Loaded() {return DBLoaded == true;}; inline off_t GetFileSize(void) {return CurStat.FileSize;} - bool SetFile(string FileName,struct stat St,FileFd *Fd); - bool GetFileInfo(string FileName, bool DoControl, bool DoContents, - bool GenContentsOnly, bool DoMD5, bool DoSHA1, bool DoSHA256, bool const &checkMtime = false); + bool SetFile(string const &FileName,struct stat St,FileFd *Fd); + bool GetFileInfo(string const &FileName, bool const &DoControl, bool const &DoContents, bool const &GenContentsOnly, + bool const &DoMD5, bool const &DoSHA1, bool const &DoSHA256, bool const &checkMtime = false); bool Finish(); bool Clean(); - CacheDB(string DB) : Dbp(0), Fd(NULL), DebFile(0) {ReadyDB(DB);}; + CacheDB(string const &DB) : Dbp(0), Fd(NULL), DebFile(0) {ReadyDB(DB);}; ~CacheDB() {ReadyDB(string()); delete DebFile;}; }; diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc index 1f2cbcc3d..693c36f9a 100644 --- a/ftparchive/contents.cc +++ b/ftparchive/contents.cc @@ -399,7 +399,7 @@ bool ContentsExtract::TakeContents(const void *NewData,unsigned long Length) // ContentsExtract::Add - Read the contents data into the sorter /*{{{*/ // --------------------------------------------------------------------- /* */ -void ContentsExtract::Add(GenContents &Contents,string Package) +void ContentsExtract::Add(GenContents &Contents,string const &Package) { const char *Start = Data; char *Pkg = Contents.Mystrdup(Package.c_str()); diff --git a/ftparchive/contents.h b/ftparchive/contents.h index d8457cd45..5b5092b66 100644 --- a/ftparchive/contents.h +++ b/ftparchive/contents.h @@ -80,7 +80,7 @@ class ContentsExtract : public pkgDirStream virtual bool DoItem(Item &Itm,int &Fd); void Reset() {CurSize = 0;}; bool TakeContents(const void *Data,unsigned long Length); - void Add(GenContents &Contents,string Package); + void Add(GenContents &Contents,string const &Package); ContentsExtract() : Data(0), MaxSize(0), CurSize(0) {}; virtual ~ContentsExtract() {delete [] Data;}; diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc index 2fc8efcbf..7c91d34fe 100644 --- a/ftparchive/multicompress.cc +++ b/ftparchive/multicompress.cc @@ -40,14 +40,14 @@ const MultiCompress::CompType MultiCompress::Compressors[] = // MultiCompress::MultiCompress - Constructor /*{{{*/ // --------------------------------------------------------------------- /* Setup the file outputs, compression modes and fork the writer child */ -MultiCompress::MultiCompress(string Output,string Compress, - mode_t Permissions,bool Write) +MultiCompress::MultiCompress(string const &Output,string const &Compress, + mode_t const &Permissions,bool const &Write) : + Permissions(Permissions) { Outputs = 0; Outputter = -1; Input = 0; UpdateMTime = 0; - this->Permissions = Permissions; /* Parse the compression string, a space separated lists of compresison types */ @@ -126,7 +126,7 @@ MultiCompress::~MultiCompress() /* This checks each compressed file to make sure it exists and returns stat information for a random file from the collection. False means one or more of the files is missing. */ -bool MultiCompress::GetStat(string Output,string Compress,struct stat &St) +bool MultiCompress::GetStat(string const &Output,string const &Compress,struct stat &St) { /* Parse the compression string, a space separated lists of compresison types */ @@ -268,8 +268,8 @@ bool MultiCompress::Finalize(unsigned long &OutSize) /* This opens the compressor, either in compress mode or decompress mode. FileFd is always the compressor input/output file, OutFd is the created pipe, Input for Compress, Output for Decompress. */ -bool MultiCompress::OpenCompress(const CompType *Prog,pid_t &Pid,int FileFd, - int &OutFd,bool Comp) +bool MultiCompress::OpenCompress(const CompType *Prog,pid_t &Pid,int const &FileFd, + int &OutFd,bool const &Comp) { Pid = -1; @@ -369,7 +369,7 @@ bool MultiCompress::CloseOld(int Fd,pid_t Proc) computes the MD5 of the raw data. After this the raw data in the original files is compared to see if this data is new. If the data is new then the temp files are renamed, otherwise they are erased. */ -bool MultiCompress::Child(int FD) +bool MultiCompress::Child(int const &FD) { // Start the compression children. for (Files *I = Outputs; I != 0; I = I->Next) diff --git a/ftparchive/multicompress.h b/ftparchive/multicompress.h index a65077e73..3ac3b8fb2 100644 --- a/ftparchive/multicompress.h +++ b/ftparchive/multicompress.h @@ -53,9 +53,9 @@ class MultiCompress mode_t Permissions; static const CompType Compressors[]; - bool OpenCompress(const CompType *Prog,pid_t &Pid,int FileFd, - int &OutFd,bool Comp); - bool Child(int Fd); + bool OpenCompress(const CompType *Prog,pid_t &Pid,int const &FileFd, + int &OutFd,bool const &Comp); + bool Child(int const &Fd); bool Start(); bool Die(); @@ -68,10 +68,10 @@ class MultiCompress bool Finalize(unsigned long &OutSize); bool OpenOld(int &Fd,pid_t &Proc); bool CloseOld(int Fd,pid_t Proc); - static bool GetStat(string Output,string Compress,struct stat &St); + static bool GetStat(string const &Output,string const &Compress,struct stat &St); - MultiCompress(string Output,string Compress,mode_t Permissions, - bool Write = true); + MultiCompress(string const &Output,string const &Compress, + mode_t const &Permissions, bool const &Write = true); ~MultiCompress(); }; diff --git a/ftparchive/override.cc b/ftparchive/override.cc index 6f40bc865..3cf10b89b 100644 --- a/ftparchive/override.cc +++ b/ftparchive/override.cc @@ -24,7 +24,7 @@ // Override::ReadOverride - Read the override file /*{{{*/ // --------------------------------------------------------------------- /* This parses the override file and reads it into the map */ -bool Override::ReadOverride(string File,bool Source) +bool Override::ReadOverride(string const &File,bool const &Source) { if (File.empty() == true) return true; @@ -132,7 +132,7 @@ bool Override::ReadOverride(string File,bool Source) // Override::ReadExtraOverride - Read the extra override file /*{{{*/ // --------------------------------------------------------------------- /* This parses the extra override file and reads it into the map */ -bool Override::ReadExtraOverride(string File,bool Source) +bool Override::ReadExtraOverride(string const &File,bool const &Source) { if (File.empty() == true) return true; @@ -209,9 +209,9 @@ bool Override::ReadExtraOverride(string File,bool Source) /* Returns a override item for the given package and the given architecture. * Treats "all" special */ -Override::Item* Override::GetItem(string Package, string Architecture) +Override::Item* Override::GetItem(string const &Package, string const &Architecture) { - map<string,Item>::iterator I = Mapping.find(Package); + map<string,Item>::const_iterator I = Mapping.find(Package); map<string,Item>::iterator J = Mapping.find(Package + "/" + Architecture); if (I == Mapping.end() && J == Mapping.end()) @@ -230,7 +230,7 @@ Override::Item* Override::GetItem(string Package, string Architecture) if (R->Priority != "") result->Priority = R->Priority; if (R->OldMaint != "") result->OldMaint = R->OldMaint; if (R->NewMaint != "") result->NewMaint = R->NewMaint; - for (map<string,string>::iterator foI = R->FieldOverride.begin(); + for (map<string,string>::const_iterator foI = R->FieldOverride.begin(); foI != R->FieldOverride.end(); foI++) { result->FieldOverride[foI->first] = foI->second; @@ -247,7 +247,7 @@ Override::Item* Override::GetItem(string Package, string Architecture) there is a rule but it does not match then the empty string is returned, also if there was no rewrite rule the empty string is returned. Failed indicates if there was some kind of problem while rewriting. */ -string Override::Item::SwapMaint(string Orig,bool &Failed) +string Override::Item::SwapMaint(string const &Orig,bool &Failed) { Failed = false; @@ -262,10 +262,10 @@ string Override::Item::SwapMaint(string Orig,bool &Failed) override file. Thus it persists.*/ #if 1 // Break OldMaint up into little bits on double slash boundaries. - string::iterator End = OldMaint.begin(); + string::const_iterator End = OldMaint.begin(); while (1) { - string::iterator Start = End; + string::const_iterator Start = End; for (; End < OldMaint.end() && (End + 3 >= OldMaint.end() || End[0] != ' ' || End[1] != '/' || End[2] != '/'); End++); diff --git a/ftparchive/override.h b/ftparchive/override.h index f270556eb..c5cacc2b4 100644 --- a/ftparchive/override.h +++ b/ftparchive/override.h @@ -31,20 +31,20 @@ class Override string NewMaint; map<string,string> FieldOverride; - string SwapMaint(string Orig,bool &Failed); + string SwapMaint(string const &Orig,bool &Failed); ~Item() {}; }; map<string,Item> Mapping; - inline Item *GetItem(string Package) + inline Item *GetItem(string const &Package) { return GetItem(Package, ""); } - Item *GetItem(string Package, string Architecture); + Item *GetItem(string const &Package, string const &Architecture); - bool ReadOverride(string File,bool Source = false); - bool ReadExtraOverride(string File,bool Source = false); + bool ReadOverride(string const &File,bool const &Source = false); + bool ReadExtraOverride(string const &File,bool const &Source = false); }; #endif diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 6756021f8..bf6e9f617 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -89,7 +89,7 @@ int FTWScanner::ScannerFTW(const char *File,const struct stat *sb,int Flag) // FTWScanner::ScannerFile - File Scanner /*{{{*/ // --------------------------------------------------------------------- /* */ -int FTWScanner::ScannerFile(const char *File, bool ReadLink) +int FTWScanner::ScannerFile(const char *File, bool const &ReadLink) { const char *LastComponent = strrchr(File, '/'); if (LastComponent == NULL) @@ -97,7 +97,7 @@ int FTWScanner::ScannerFile(const char *File, bool ReadLink) else LastComponent++; - vector<string>::iterator I; + vector<string>::const_iterator I; for(I = Owner->Patterns.begin(); I != Owner->Patterns.end(); ++I) { if (fnmatch((*I).c_str(), LastComponent, 0) == 0) @@ -127,7 +127,7 @@ int FTWScanner::ScannerFile(const char *File, bool ReadLink) { Owner->NewLine(1); - bool Type = _error->PopMessage(Err); + bool const Type = _error->PopMessage(Err); if (Type == true) cerr << _("E: ") << Err << endl; else @@ -148,7 +148,7 @@ int FTWScanner::ScannerFile(const char *File, bool ReadLink) // FTWScanner::RecursiveScan - Just scan a directory tree /*{{{*/ // --------------------------------------------------------------------- /* */ -bool FTWScanner::RecursiveScan(string Dir) +bool FTWScanner::RecursiveScan(string const &Dir) { /* If noprefix is set then jam the scan root in, so we don't generate link followed paths out of control */ @@ -161,7 +161,7 @@ bool FTWScanner::RecursiveScan(string Dir) // Do recursive directory searching Owner = this; - int Res = ftw(Dir.c_str(),ScannerFTW,30); + int const Res = ftw(Dir.c_str(),ScannerFTW,30); // Error treewalking? if (Res != 0) @@ -178,7 +178,7 @@ bool FTWScanner::RecursiveScan(string Dir) // --------------------------------------------------------------------- /* This is an alternative to using FTW to locate files, it reads the list of files from another file. */ -bool FTWScanner::LoadFileList(string Dir,string File) +bool FTWScanner::LoadFileList(string const &Dir, string const &File) { /* If noprefix is set then jam the scan root in, so we don't generate link followed paths out of control */ @@ -236,7 +236,7 @@ bool FTWScanner::LoadFileList(string Dir,string File) /* */ bool FTWScanner::Delink(string &FileName,const char *OriginalPath, unsigned long &DeLinkBytes, - off_t FileSize) + off_t const &FileSize) { // See if this isn't an internaly prefix'd file name. if (InternalPrefix.empty() == false && @@ -293,8 +293,8 @@ bool FTWScanner::Delink(string &FileName,const char *OriginalPath, // PackagesWriter::PackagesWriter - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -PackagesWriter::PackagesWriter(string DB,string Overrides,string ExtOverrides, - string aArch) : +PackagesWriter::PackagesWriter(string const &DB,string const &Overrides,string const &ExtOverrides, + string const &aArch) : Db(DB),Stats(Db.Stats), Arch(aArch) { Output = stdout; @@ -329,7 +329,7 @@ PackagesWriter::PackagesWriter(string DB,string Overrides,string ExtOverrides, // FTWScanner::SetExts - Set extensions to support /*{{{*/ // --------------------------------------------------------------------- /* */ -bool FTWScanner::SetExts(string Vals) +bool FTWScanner::SetExts(string const &Vals) { ClearPatterns(); string::size_type Start = 0; @@ -476,7 +476,7 @@ bool PackagesWriter::DoPackage(string FileName) SetTFRewriteData(Changes[End++], "Suggests", OptionalStr.c_str()); } - for (map<string,string>::iterator I = OverItem->FieldOverride.begin(); + for (map<string,string>::const_iterator I = OverItem->FieldOverride.begin(); I != OverItem->FieldOverride.end(); I++) SetTFRewriteData(Changes[End++],I->first.c_str(),I->second.c_str()); @@ -494,8 +494,8 @@ bool PackagesWriter::DoPackage(string FileName) // SourcesWriter::SourcesWriter - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -SourcesWriter::SourcesWriter(string BOverrides,string SOverrides, - string ExtOverrides) +SourcesWriter::SourcesWriter(string const &BOverrides,string const &SOverrides, + string const &ExtOverrides) { Output = stdout; AddPattern("*.dsc"); @@ -720,7 +720,7 @@ bool SourcesWriter::DoPackage(string FileName) if (NewMaint.empty() == false) SetTFRewriteData(Changes[End++], "Maintainer", NewMaint.c_str()); - for (map<string,string>::iterator I = SOverItem->FieldOverride.begin(); + for (map<string,string>::const_iterator I = SOverItem->FieldOverride.begin(); I != SOverItem->FieldOverride.end(); I++) SetTFRewriteData(Changes[End++],I->first.c_str(),I->second.c_str()); @@ -740,7 +740,7 @@ bool SourcesWriter::DoPackage(string FileName) // ContentsWriter::ContentsWriter - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -ContentsWriter::ContentsWriter(string DB) : +ContentsWriter::ContentsWriter(string const &DB) : Db(DB), Stats(Db.Stats) { @@ -752,7 +752,7 @@ ContentsWriter::ContentsWriter(string DB) : // --------------------------------------------------------------------- /* If Package is the empty string the control record will be parsed to determine what the package name is. */ -bool ContentsWriter::DoPackage(string FileName,string Package) +bool ContentsWriter::DoPackage(string FileName, string Package) { if (!Db.GetFileInfo(FileName, Package.empty(), true, false, false, false, false, false)) { @@ -773,7 +773,7 @@ bool ContentsWriter::DoPackage(string FileName,string Package) // ContentsWriter::ReadFromPkgs - Read from a packages file /*{{{*/ // --------------------------------------------------------------------- /* */ -bool ContentsWriter::ReadFromPkgs(string PkgFile,string PkgCompress) +bool ContentsWriter::ReadFromPkgs(string const &PkgFile,string const &PkgCompress) { MultiCompress Pkgs(PkgFile,PkgCompress,0,false); if (_error->PendingError() == true) @@ -828,7 +828,7 @@ bool ContentsWriter::ReadFromPkgs(string PkgFile,string PkgCompress) // ReleaseWriter::ReleaseWriter - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -ReleaseWriter::ReleaseWriter(string DB) +ReleaseWriter::ReleaseWriter(string const &DB) { AddPattern("Packages"); AddPattern("Packages.gz"); @@ -842,7 +842,7 @@ ReleaseWriter::ReleaseWriter(string DB) AddPattern("md5sum.txt"); Output = stdout; - time_t now = time(NULL); + time_t const now = time(NULL); char datestr[128]; if (strftime(datestr, sizeof(datestr), "%a, %d %b %Y %H:%M:%S UTC", gmtime(&now)) == 0) @@ -929,7 +929,7 @@ bool ReleaseWriter::DoPackage(string FileName) void ReleaseWriter::Finish() { fprintf(Output, "MD5Sum:\n"); - for(map<string,struct CheckSum>::iterator I = CheckSums.begin(); + for(map<string,struct CheckSum>::const_iterator I = CheckSums.begin(); I != CheckSums.end(); ++I) { @@ -940,7 +940,7 @@ void ReleaseWriter::Finish() } fprintf(Output, "SHA1:\n"); - for(map<string,struct CheckSum>::iterator I = CheckSums.begin(); + for(map<string,struct CheckSum>::const_iterator I = CheckSums.begin(); I != CheckSums.end(); ++I) { @@ -951,7 +951,7 @@ void ReleaseWriter::Finish() } fprintf(Output, "SHA256:\n"); - for(map<string,struct CheckSum>::iterator I = CheckSums.begin(); + for(map<string,struct CheckSum>::const_iterator I = CheckSums.begin(); I != CheckSums.end(); ++I) { diff --git a/ftparchive/writer.h b/ftparchive/writer.h index 8864461d5..ad58dee0a 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -43,12 +43,12 @@ class FTWScanner static FTWScanner *Owner; static int ScannerFTW(const char *File,const struct stat *sb,int Flag); - static int ScannerFile(const char *File, bool ReadLink); + static int ScannerFile(const char *File, bool const &ReadLink); bool Delink(string &FileName,const char *OriginalPath, - unsigned long &Bytes,off_t FileSize); + unsigned long &Bytes,off_t const &FileSize); - inline void NewLine(unsigned Priority) + inline void NewLine(unsigned const &Priority) { if (ErrorPrinted == false && Quiet <= Priority) { @@ -63,11 +63,11 @@ class FTWScanner string InternalPrefix; virtual bool DoPackage(string FileName) = 0; - bool RecursiveScan(string Dir); - bool LoadFileList(string BaseDir,string File); + bool RecursiveScan(string const &Dir); + bool LoadFileList(string const &BaseDir,string const &File); void ClearPatterns() { Patterns.clear(); }; - void AddPattern(string Pattern) { Patterns.push_back(Pattern); }; - bool SetExts(string Vals); + void AddPattern(string const &Pattern) { Patterns.push_back(Pattern); }; + bool SetExts(string const &Vals); FTWScanner(); virtual ~FTWScanner() {delete [] RealPath;}; @@ -96,13 +96,13 @@ class PackagesWriter : public FTWScanner struct CacheDB::Stats &Stats; string Arch; - inline bool ReadOverride(string File) {return Over.ReadOverride(File);}; - inline bool ReadExtraOverride(string File) + inline bool ReadOverride(string const &File) {return Over.ReadOverride(File);}; + inline bool ReadExtraOverride(string const &File) {return Over.ReadExtraOverride(File);}; virtual bool DoPackage(string FileName); - PackagesWriter(string DB,string Overrides,string ExtOverrides=string(), - string Arch=string()); + PackagesWriter(string const &DB,string const &Overrides,string const &ExtOverrides=string(), + string const &Arch=string()); virtual ~PackagesWriter() {}; }; @@ -122,12 +122,12 @@ class ContentsWriter : public FTWScanner bool DoPackage(string FileName,string Package); virtual bool DoPackage(string FileName) {return DoPackage(FileName,string());}; - bool ReadFromPkgs(string PkgFile,string PkgCompress); + bool ReadFromPkgs(string const &PkgFile,string const &PkgCompress); void Finish() {Gen.Print(Output);}; - inline bool ReadyDB(string DB) {return Db.ReadyDB(DB);}; + inline bool ReadyDB(string const &DB) {return Db.ReadyDB(DB);}; - ContentsWriter(string DB); + ContentsWriter(string const &DB); virtual ~ContentsWriter() {}; }; @@ -150,15 +150,15 @@ class SourcesWriter : public FTWScanner virtual bool DoPackage(string FileName); - SourcesWriter(string BOverrides,string SOverrides, - string ExtOverrides=string()); + SourcesWriter(string const &BOverrides,string const &SOverrides, + string const &ExtOverrides=string()); virtual ~SourcesWriter() {free(Buffer);}; }; class ReleaseWriter : public FTWScanner { public: - ReleaseWriter(string DB); + ReleaseWriter(string const &DB); virtual bool DoPackage(string FileName); void Finish(); -- cgit v1.2.3 From 2c4b9b0b9e504a9bdfdcb8080bbc3587c11de299 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 28 Nov 2009 03:46:39 +0100 Subject: check cache size even if we do nothing else otherwise in apt.cron.daily, thanks Francesco Poli for patch(s) and patience! (Closes: #459344) --- debian/apt.cron.daily | 6 +++++- debian/changelog | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index b6099ee75..e59b05ee4 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -401,12 +401,16 @@ eval $(apt-config shell BackupArchiveInterval APT::Periodic::BackupArchiveInterv Debdelta=1 eval $(apt-config shell Debdelta APT::Periodic::Download-Upgradeable-Packages-Debdelta) -# check if we actually have to do anything +# check if we actually have to do anything that requires locking the cache if [ $UpdateInterval -eq 0 ] && [ $DownloadUpgradeableInterval -eq 0 ] && [ $UnattendedUpgradeInterval -eq 0 ] && [ $BackupArchiveInterval -eq 0 ] && [ $AutocleanInterval -eq 0 ]; then + + # check cache size + check_size_constraints + exit 0 fi diff --git a/debian/changelog b/debian/changelog index 85ee97713..03411832c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -85,6 +85,9 @@ apt (0.7.25) UNRELEASED; urgency=low Patch by Christoph Goehre, thanks! (Closes: #463260) * apt-pkg/deb/debsrcrecords.cc: - use "diff" filetype for .debian.tar.* files (Closes: #554898) + * debian/apt.cron.daily: + - check cache size even if we do nothing else otherwise, thanks + Francesco Poli for patch(s) and patience! (Closes: #459344) [ Chris Leick ] * doc/ various manpages: -- cgit v1.2.3 From cefb7c1f24b3b8c12898f1c8c042970b7a429dca Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 28 Nov 2009 23:27:11 +0100 Subject: add our own equals method as assert doesn't really show the offending values which causes the failure. --- test/libapt/assert.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 test/libapt/assert.h diff --git a/test/libapt/assert.h b/test/libapt/assert.h new file mode 100644 index 000000000..5da76ae0a --- /dev/null +++ b/test/libapt/assert.h @@ -0,0 +1,21 @@ +#include <iostream> + +#define equals(x,y) assertEquals(x, y, __LINE__) + +template < typename X, typename Y > +void OutputAssert(X expect, char const* compare, Y get, unsigned long const &line) { + std::cerr << "Test FAILED: »" << expect << "« " << compare << " »" << get << "« at line " << line << std::endl; +} + +template < typename X, typename Y > +void assertEquals(X expect, Y get, unsigned long const &line) { + if (expect == get) + return; + OutputAssert(expect, "==", get, line); +} + +void assertEquals(unsigned int const &expect, int const &get, unsigned long const &line) { + if (get < 0) + OutputAssert(expect, "==", get, line); + assertEquals<unsigned int const&, unsigned int const&>(expect, get, line); +} -- cgit v1.2.3 From 9c562bc9357c1e5bf566110fe30265dcdfd815fd Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 28 Nov 2009 23:30:02 +0100 Subject: convert getlanguages_test to our new equals() --- test/libapt/getlanguages_test.cc | 68 ++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/test/libapt/getlanguages_test.cc b/test/libapt/getlanguages_test.cc index f3629df68..fd3c8269f 100644 --- a/test/libapt/getlanguages_test.cc +++ b/test/libapt/getlanguages_test.cc @@ -1,7 +1,7 @@ #include <apt-pkg/aptconfiguration.h> #include <apt-pkg/configuration.h> -#include <assert.h> +#include "assert.h" #include <string> #include <vector> @@ -17,75 +17,75 @@ void dumpVector(std::vector<std::string> vec) { int main(int argc,char *argv[]) { std::vector<std::string> vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); - assert(vec.size() == 2); - assert(vec[0] == "de"); - assert(vec[1] == "en"); + equals(vec.size(), 2); + equals(vec[0], "de"); + equals(vec[1], "en"); // Special: Check if the cache is actually in use vec = APT::Configuration::getLanguages(false, true, "en_GB.UTF-8"); - assert(vec.size() == 2); - assert(vec[0] == "de"); - assert(vec[1] == "en"); + equals(vec.size(), 2); + equals(vec[0], "de"); + equals(vec[1], "en"); vec = APT::Configuration::getLanguages(false, false, "en_GB.UTF-8"); - assert(vec.size() == 2); - assert(vec[0] == "en_GB"); - assert(vec[1] == "en"); + equals(vec.size(), 2); + equals(vec[0], "en_GB"); + equals(vec[1], "en"); vec = APT::Configuration::getLanguages(false, false, "pt_PR.UTF-8"); - assert(vec.size() == 3); - assert(vec[0] == "pt_PR"); - assert(vec[1] == "pt"); - assert(vec[2] == "en"); + equals(vec.size(), 3); + equals(vec[0], "pt_PR"); + equals(vec[1], "pt"); + equals(vec[2], "en"); vec = APT::Configuration::getLanguages(false, false, "ast_DE.UTF-8"); // bogus, but syntactical correct - assert(vec.size() == 2); - assert(vec[0] == "ast"); - assert(vec[1] == "en"); + equals(vec.size(), 2); + equals(vec[0], "ast"); + equals(vec[1], "en"); vec = APT::Configuration::getLanguages(false, false, "C"); - assert(vec.size() == 1); - assert(vec[0] == "en"); + equals(vec.size(), 1); + equals(vec[0], "en"); _config->Set("Acquire::Languages::1", "environment"); _config->Set("Acquire::Languages::2", "en"); vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); - assert(vec.size() == 2); - assert(vec[0] == "de"); - assert(vec[1] == "en"); + equals(vec.size(), 2); + equals(vec[0], "de"); + equals(vec[1], "en"); _config->Set("Acquire::Languages::3", "de"); vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); - assert(vec.size() == 2); - assert(vec[0] == "de"); - assert(vec[1] == "en"); + equals(vec.size(), 2); + equals(vec[0], "de"); + equals(vec[1], "en"); _config->Set("Acquire::Languages::1", "none"); vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); - assert(vec.size() == 0); + equals(vec.size(), 0); vec = APT::Configuration::getLanguages(true, false, "de_DE.UTF-8"); - assert(vec[0] == "en"); - assert(vec[1] == "de"); + equals(vec[0], "en"); + equals(vec[1], "de"); _config->Set("Acquire::Languages::1", "fr"); _config->Set("Acquire::Languages", "de_DE"); vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); - assert(vec.size() == 1); - assert(vec[0] == "de_DE"); + equals(vec.size(), 1); + equals(vec[0], "de_DE"); _config->Set("Acquire::Languages", "none"); vec = APT::Configuration::getLanguages(true, false, "de_DE.UTF-8"); - assert(vec.size() == 0); + equals(vec.size(), 0); _config->Set("Acquire::Languages", ""); //FIXME: Remove support for this deprecated setting _config->Set("APT::Acquire::Translation", "ast_DE"); vec = APT::Configuration::getLanguages(true, false, "de_DE.UTF-8"); - assert(vec.size() == 1); - assert(vec[0] == "ast_DE"); + equals(vec.size(), 1); + equals(vec[0], "ast_DE"); _config->Set("APT::Acquire::Translation", "none"); vec = APT::Configuration::getLanguages(true, false, "de_DE.UTF-8"); - assert(vec.size() == 0); + equals(vec.size(), 0); return 0; } -- cgit v1.2.3 From 41c81fd85d43ed747375d8f1ee7a9b71fb3c7016 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 29 Nov 2009 00:23:26 +0100 Subject: Ignore :qualifiers after package name in build dependencies for now as long we don't understand them (Closes: #558103) --- apt-pkg/deb/deblistparser.cc | 12 +++- apt-pkg/deb/deblistparser.h | 3 +- apt-pkg/deb/debsrcrecords.cc | 5 +- apt-pkg/deb/debsrcrecords.h | 6 +- apt-pkg/srcrecords.cc | 4 +- apt-pkg/srcrecords.h | 8 +-- debian/changelog | 8 ++- test/libapt/makefile | 6 ++ test/libapt/parsedepends_test.cc | 128 +++++++++++++++++++++++++++++++++++++++ 9 files changed, 163 insertions(+), 17 deletions(-) create mode 100644 test/libapt/parsedepends_test.cc diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 16e6ee332..25a1df3f9 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -395,7 +395,8 @@ const char *debListParser::ConvertRelation(const char *I,unsigned int &Op) bit by bit. */ const char *debListParser::ParseDepends(const char *Start,const char *Stop, string &Package,string &Ver, - unsigned int &Op, bool ParseArchFlags) + unsigned int &Op, bool const &ParseArchFlags, + bool const &StripMultiArch) { // Strip off leading space for (;Start != Stop && isspace(*Start) != 0; Start++); @@ -414,7 +415,14 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop, // Stash the package name Package.assign(Start,I - Start); - + + // We don't want to confuse library users which can't handle MultiArch + if (StripMultiArch == true) { + size_t const found = Package.rfind(':'); + if (found != string::npos) + Package = Package.substr(0,found); + } + // Skip white space to the '(' for (;I != Stop && isspace(*I) != 0 ; I++); diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 34bb29c72..1c709229f 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -64,7 +64,8 @@ class debListParser : public pkgCacheGenerator::ListParser static const char *ParseDepends(const char *Start,const char *Stop, string &Package,string &Ver,unsigned int &Op, - bool ParseArchFlags = false); + bool const &ParseArchFlags = false, + bool const &StripMultiArch = false); static const char *ConvertRelation(const char *I,unsigned int &Op); debListParser(FileFd *File); diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc index bde10aa6d..21336e1af 100644 --- a/apt-pkg/deb/debsrcrecords.cc +++ b/apt-pkg/deb/debsrcrecords.cc @@ -54,7 +54,8 @@ const char **debSrcRecordParser::Binaries() package/version records representing the build dependency. The returned array need not be freed and will be reused by the next call to this function */ -bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec> &BuildDeps, bool ArchOnly) +bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec> &BuildDeps, + bool const &ArchOnly, bool const &StripMultiArch) { unsigned int I; const char *Start, *Stop; @@ -77,7 +78,7 @@ bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec> while (1) { Start = debListParser::ParseDepends(Start, Stop, - rec.Package,rec.Version,rec.Op,true); + rec.Package,rec.Version,rec.Op,true, StripMultiArch); if (Start == 0) return _error->Error("Problem parsing dependency: %s", fields[I]); diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h index a3b5a8286..c39d78bae 100644 --- a/apt-pkg/deb/debsrcrecords.h +++ b/apt-pkg/deb/debsrcrecords.h @@ -30,14 +30,14 @@ class debSrcRecordParser : public pkgSrcRecords::Parser virtual bool Restart() {return Tags.Jump(Sect,0);}; virtual bool Step() {iOffset = Tags.Offset(); return Tags.Step(Sect);}; - virtual bool Jump(unsigned long Off) {iOffset = Off; return Tags.Jump(Sect,Off);}; + virtual bool Jump(unsigned long const &Off) {iOffset = Off; return Tags.Jump(Sect,Off);}; virtual string Package() const {return Sect.FindS("Package");}; virtual string Version() const {return Sect.FindS("Version");}; virtual string Maintainer() const {return Sect.FindS("Maintainer");}; virtual string Section() const {return Sect.FindS("Section");}; virtual const char **Binaries(); - virtual bool BuildDepends(vector<BuildDepRec> &BuildDeps, bool ArchOnly); + virtual bool BuildDepends(vector<BuildDepRec> &BuildDeps, bool const &ArchOnly, bool const &StripMultiArch = true); virtual unsigned long Offset() {return iOffset;}; virtual string AsStr() { @@ -47,7 +47,7 @@ class debSrcRecordParser : public pkgSrcRecords::Parser }; virtual bool Files(vector<pkgSrcRecords::File> &F); - debSrcRecordParser(string File,pkgIndexFile const *Index) + debSrcRecordParser(string const &File,pkgIndexFile const *Index) : Parser(Index), Fd(File,FileFd::ReadOnly), Tags(&Fd,102400), Buffer(0), BufSize(0) {} ~debSrcRecordParser(); diff --git a/apt-pkg/srcrecords.cc b/apt-pkg/srcrecords.cc index 5e40ae624..46a02b55c 100644 --- a/apt-pkg/srcrecords.cc +++ b/apt-pkg/srcrecords.cc @@ -77,7 +77,7 @@ bool pkgSrcRecords::Restart() /* This searches on both source package names and output binary names and returns the first found. A 'cursor' like system is used to allow this function to be called multiple times to get successive entries */ -pkgSrcRecords::Parser *pkgSrcRecords::Find(const char *Package,bool SrcOnly) +pkgSrcRecords::Parser *pkgSrcRecords::Find(const char *Package,bool const &SrcOnly) { if (Current == Files.end()) return 0; @@ -116,7 +116,7 @@ pkgSrcRecords::Parser *pkgSrcRecords::Find(const char *Package,bool SrcOnly) // Parser::BuildDepType - Convert a build dep to a string /*{{{*/ // --------------------------------------------------------------------- /* */ -const char *pkgSrcRecords::Parser::BuildDepType(unsigned char Type) +const char *pkgSrcRecords::Parser::BuildDepType(unsigned char const &Type) { const char *fields[] = {"Build-Depends", "Build-Depends-Indep", diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h index 99cbc6060..a49533864 100644 --- a/apt-pkg/srcrecords.h +++ b/apt-pkg/srcrecords.h @@ -59,7 +59,7 @@ class pkgSrcRecords virtual bool Restart() = 0; virtual bool Step() = 0; - virtual bool Jump(unsigned long Off) = 0; + virtual bool Jump(unsigned long const &Off) = 0; virtual unsigned long Offset() = 0; virtual string AsStr() = 0; @@ -69,8 +69,8 @@ class pkgSrcRecords virtual string Section() const = 0; virtual const char **Binaries() = 0; // Ownership does not transfer - virtual bool BuildDepends(vector<BuildDepRec> &BuildDeps, bool ArchOnly) = 0; - static const char *BuildDepType(unsigned char Type); + virtual bool BuildDepends(vector<BuildDepRec> &BuildDeps, bool const &ArchOnly, bool const &StripMultiArch = true) = 0; + static const char *BuildDepType(unsigned char const &Type); virtual bool Files(vector<pkgSrcRecords::File> &F) = 0; @@ -90,7 +90,7 @@ class pkgSrcRecords bool Restart(); // Locate a package by name - Parser *Find(const char *Package,bool SrcOnly = false); + Parser *Find(const char *Package,bool const &SrcOnly = false); pkgSrcRecords(pkgSourceList &List); ~pkgSrcRecords(); diff --git a/debian/changelog b/debian/changelog index 03411832c..056e5c1f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,9 +19,11 @@ apt (0.7.25) UNRELEASED; urgency=low Closes: #555797 [ David Kalnischkies ] - * [BREAK] add possibility to download and use multiply - Translation files, configurable with Acquire::Translation - (Closes: #444222, #448216, #550564) + * [BREAK] add possibility to download and use multiply + Translation files, configurable with Acquire::Translation + (Closes: #444222, #448216, #550564) + * Ignore :qualifiers after package name in build dependencies + for now as long we don't understand them (Closes: #558103) * apt-pkg/packagemanager.cc: - better debug output for ImmediateAdd with depth and why - improve the message shown for failing immediate configuration diff --git a/test/libapt/makefile b/test/libapt/makefile index f61a95f3d..5712c025a 100644 --- a/test/libapt/makefile +++ b/test/libapt/makefile @@ -11,3 +11,9 @@ PROGRAM = getLanguages${BASENAME} SLIBS = -lapt-pkg SOURCE = getlanguages_test.cc include $(PROGRAM_H) + +# Program for testing ParseDepends +PROGRAM = ParseDepends${BASENAME} +SLIBS = -lapt-pkg +SOURCE = parsedepends_test.cc +include $(PROGRAM_H) diff --git a/test/libapt/parsedepends_test.cc b/test/libapt/parsedepends_test.cc new file mode 100644 index 000000000..b7befa561 --- /dev/null +++ b/test/libapt/parsedepends_test.cc @@ -0,0 +1,128 @@ +#include <apt-pkg/deblistparser.h> +#include <apt-pkg/configuration.h> + +#include "assert.h" + +int main(int argc,char *argv[]) { + string Package; + string Version; + unsigned int Op = 5; + unsigned int Null = 0; + bool StripMultiArch = true; + bool ParseArchFlags = false; + _config->Set("APT::Architecture","dsk"); + + const char* Depends = + "debhelper:any (>= 5.0), " + "libdb-dev:any, " + "gettext:native (<= 0.12), " + "libcurl4-gnutls-dev:native | libcurl3-gnutls-dev (>> 7.15.5), " + "debiandoc-sgml, " + "apt (>= 0.7.25), " + "not-for-me [ !dsk ], " + "only-for-me [ dsk ], " + "overlord-dev:any (= 7.15.3~) | overlord-dev:native (>> 7.15.5), " + ; + + unsigned short runner = 0; +test: +// std::clog << (StripMultiArch ? "NO-Multi" : "Multi") << " " << (ParseArchFlags ? "Flags" : "NO-Flags") << std::endl; + + // Stripping MultiArch is currently the default setting to not confuse + // non-MultiArch capable users of the library with "strange" extensions. + const char* Start = Depends; + const char* End = Depends + strlen(Depends); + + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + if (StripMultiArch == true) + equals("debhelper", Package); + else + equals("debhelper:any", Package); + equals("5.0", Version); + equals(Null | pkgCache::Dep::GreaterEq, Op); + + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + if (StripMultiArch == true) + equals("libdb-dev", Package); + else + equals("libdb-dev:any", Package); + equals("", Version); + equals(Null | pkgCache::Dep::NoOp, Op); + + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + if (StripMultiArch == true) + equals("gettext", Package); + else + equals("gettext:native", Package); + equals("0.12", Version); + equals(Null | pkgCache::Dep::LessEq, Op); + + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + if (StripMultiArch == true) + equals("libcurl4-gnutls-dev", Package); + else + equals("libcurl4-gnutls-dev:native", Package); + equals("", Version); + equals(Null | pkgCache::Dep::Or, Op); + + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + equals("libcurl3-gnutls-dev", Package); + equals("7.15.5", Version); + equals(Null | pkgCache::Dep::Greater, Op); + + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + equals("debiandoc-sgml", Package); + equals("", Version); + equals(Null | pkgCache::Dep::NoOp, Op); + + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + equals("apt", Package); + equals("0.7.25", Version); + equals(Null | pkgCache::Dep::GreaterEq, Op); + + if (ParseArchFlags == true) { + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + equals("", Package); // not-for-me + } else { + equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch)); + Start = strstr(Start, ","); + Start++; + } + + if (ParseArchFlags == true) { + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + equals("only-for-me", Package); + equals("", Version); + equals(Null | pkgCache::Dep::NoOp, Op); + } else { + equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch)); + Start = strstr(Start, ","); + Start++; + } + + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + if (StripMultiArch == true) + equals("overlord-dev", Package); + else + equals("overlord-dev:any", Package); + equals("7.15.3~", Version); + equals(Null | pkgCache::Dep::Equals | pkgCache::Dep::Or, Op); + + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + if (StripMultiArch == true) + equals("overlord-dev", Package); + else + equals("overlord-dev:native", Package); + equals("7.15.5", Version); + equals(Null | pkgCache::Dep::Greater, Op); + + if (StripMultiArch == false) + ParseArchFlags = true; + StripMultiArch = !StripMultiArch; + + runner++; + if (runner < 4) + goto test; // this is the prove: tests are really evil ;) + + return 0; +} -- cgit v1.2.3 From c6474fb6ff482b0457674986a82afab0a3749af2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 1 Dec 2009 00:28:26 +0100 Subject: fix a few typos in strings, comments and manpage of apt-ftparchive thanks Karl Goetz! (Closes: #558757) --- debian/changelog | 3 +++ doc/apt-ftparchive.1.xml | 2 +- ftparchive/apt-ftparchive.cc | 4 ++-- ftparchive/cachedb.cc | 6 +++--- ftparchive/contents.cc | 2 +- ftparchive/multicompress.cc | 2 +- ftparchive/writer.cc | 2 +- 7 files changed, 12 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 056e5c1f7..26b3e8c1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -85,6 +85,9 @@ apt (0.7.25) UNRELEASED; urgency=low - add APT::FTPArchive::AlwaysStat to disable the too aggressive caching if versions are build multiply times (not recommend) Patch by Christoph Goehre, thanks! (Closes: #463260) + * ftparchive/*: + - fix a few typos in strings, comments and manpage, + thanks Karl Goetz! (Closes: #558757) * apt-pkg/deb/debsrcrecords.cc: - use "diff" filetype for .debian.tar.* files (Closes: #554898) * debian/apt.cron.daily: diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index e2eab0fb2..5d538c2c6 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -285,7 +285,7 @@ <varlistentry><term>Sources</term> <listitem><para> - Sets the output Packages file. Defaults to + Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/source/Sources</filename></para></listitem> </varlistentry> diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index d0dea7768..5b6b3940c 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -3,7 +3,7 @@ // $Id: apt-ftparchive.cc,v 1.8.2.3 2004/01/02 22:01:48 mdz Exp $ /* ###################################################################### - apt-scanpackages - Efficient work-alike for dpkg-scanpackages + apt-ftparchive - Efficient work-alike for dpkg-scanpackages Let contents be disabled from the conf @@ -792,7 +792,7 @@ bool Generate(CommandLine &CmdL) if (_config->FindB("APT::FTPArchive::Contents",true) == false) return true; - c1out << "Done Packages, Starting contents." << endl; + c1out << "Packages done, Starting contents." << endl; // Sort the contents file list by date string ArchiveDir = Setup.FindDir("Dir::ArchiveDir"); diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc index 64638459a..b04244347 100644 --- a/ftparchive/cachedb.cc +++ b/ftparchive/cachedb.cc @@ -69,7 +69,7 @@ bool CacheDB::ReadyDB(string const &DB) // apt 0.6.44 if (err == EINVAL) { - _error->Error(_("DB format is invalid. If you upgraded from a older version of apt, please remove and re-create the database.")); + _error->Error(_("DB format is invalid. If you upgraded from an older version of apt, please remove and re-create the database.")); } if (err) { @@ -83,7 +83,7 @@ bool CacheDB::ReadyDB(string const &DB) return true; } /*}}}*/ -// CacheDB::OpenFile - Open the filei /*{{{*/ +// CacheDB::OpenFile - Open the file /*{{{*/ // --------------------------------------------------------------------- /* */ bool CacheDB::OpenFile() @@ -139,7 +139,7 @@ bool CacheDB::GetCurStat() if (DBLoaded) { - /* First see if thre is anything about it + /* First see if there is anything about it in the database */ /* Get the flags (and mtime) */ diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc index 693c36f9a..b761d9204 100644 --- a/ftparchive/contents.cc +++ b/ftparchive/contents.cc @@ -13,7 +13,7 @@ removing the massive sort time overhead. By breaking all the pathnames into components and storing them - separately a space savings is realized by not duplicating the string + separately a space saving is realized by not duplicating the string over and over again. Ultimately this saving is sacrificed to storage of the tree structure itself but the tree structure yields a speed gain in the sorting and processing. Ultimately it takes about 5 seconds to diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc index 7c91d34fe..bb4beedf9 100644 --- a/ftparchive/multicompress.cc +++ b/ftparchive/multicompress.cc @@ -365,7 +365,7 @@ bool MultiCompress::CloseOld(int Fd,pid_t Proc) // MultiCompress::Child - The writer child /*{{{*/ // --------------------------------------------------------------------- /* The child process forks a bunch of compression children and takes - input on FD and passes it to all the compressor childer. On the way it + input on FD and passes it to all the compressor child. On the way it computes the MD5 of the raw data. After this the raw data in the original files is compared to see if this data is new. If the data is new then the temp files are renamed, otherwise they are erased. */ diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index bf6e9f617..5547c6aa5 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -464,7 +464,7 @@ bool PackagesWriter::DoPackage(string FileName) SetTFRewriteData(Changes[End++], "Maintainer", NewMaint.c_str()); /* Get rid of the Optional tag. This is an ugly, ugly, ugly hack that - dpkg-scanpackages does.. Well sort of. dpkg-scanpackages just does renaming + dpkg-scanpackages does. Well sort of. dpkg-scanpackages just does renaming but dpkg does this append bit. So we do the append bit, at least that way the status file and package file will remain similar. There are other transforms but optional is the only legacy one still in use for some lazy reason. */ -- cgit v1.2.3 From 773e2c1fe5fd1a315ffaaf79f2f2e4a9e975649a Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 9 Dec 2009 19:24:03 +0100 Subject: Refactor the cache iterators by using a common base class This should not change the public interface, but it removes the friend connection between the iterators and pkgcache as it is unused. --- apt-pkg/cacheiterators.h | 673 +++++++++++++++++++++-------------------------- apt-pkg/pkgcache.cc | 56 ++-- apt-pkg/pkgcache.h | 9 +- 3 files changed, 320 insertions(+), 418 deletions(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 28466cd40..1da5c6f02 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: cacheiterators.h,v 1.18.2.1 2004/05/08 22:44:27 mdz Exp $ /* ###################################################################### Cache Iterators - Iterators for navigating the cache structure @@ -30,417 +29,333 @@ /*}}}*/ #ifndef PKGLIB_CACHEITERATORS_H #define PKGLIB_CACHEITERATORS_H - - +// abstract Iterator template /*{{{*/ +/* This template provides the very basic iterator methods we + need to have for doing some walk-over-the-cache magic, */ +template<typename Str, typename Itr> class pkgCache::Iterator { + __attribute__ ((deprecated)) void _dummy(); // FIXME: Who on earth uses this method ??? + + protected: + Str *S; + pkgCache *Owner; + + /** \brief Returns the Pointer for this struct in the owner + * The implementation of this method should be pretty short + * as it will only return the Pointer into the mmap stored + * in the owner but the name of this pointer is different for + * each stucture and we want to abstract here at least for the + * basic methods from the actual structure. + * \return Pointer to the first structure of this type + */ + virtual Str* OwnerPointer() const = 0; + + public: + // Iteration + virtual void operator ++(int) = 0; + virtual void operator ++() = 0; // Should be {operator ++(0);}; + inline bool end() const {return Owner == 0 || S == OwnerPointer();}; + + // Comparison + inline bool operator ==(const Itr &B) const {return S == B.S;}; + inline bool operator !=(const Itr &B) const {return S != B.S;}; + + // Accessors + inline Str *operator ->() {return S;}; + inline Str const *operator ->() const {return S;}; + inline operator Str *() {return S == OwnerPointer() ? 0 : S;}; + inline operator Str const *() const {return S == OwnerPointer() ? 0 : S;}; + inline Str const &operator *() const {return *S;}; + inline pkgCache *Cache() {return Owner;}; + + // Mixed stuff + inline void operator =(const Itr &B) {S = B.S; Owner = B.Owner;}; + inline bool IsGood() const { return S && Owner && ! end();}; + inline unsigned long Index() const {return S - OwnerPointer();}; + + // Constructors - look out for the variable assigning + inline Iterator() : S(0), Owner(0) {}; + inline Iterator(pkgCache &Owner,Str *T = 0) : S(T), Owner(&Owner) {}; +}; + /*}}}*/ // Package Iterator /*{{{*/ -class pkgCache::PkgIterator -{ - friend class pkgCache; - Package *Pkg; - pkgCache *Owner; - long HashIndex; - - protected: - - // This constructor is the 'begin' constructor, never use it. - inline PkgIterator(pkgCache &Owner) : Owner(&Owner), HashIndex(-1) - { - Pkg = Owner.PkgP; - operator ++(0); - }; - - public: - - enum OkState {NeedsNothing,NeedsUnpack,NeedsConfigure}; - - // Iteration - void operator ++(int); - inline void operator ++() {operator ++(0);}; - inline bool end() const {return Owner == 0 || Pkg == Owner->PkgP?true:false;}; - - // Comparison - inline bool operator ==(const PkgIterator &B) const {return Pkg == B.Pkg;}; - inline bool operator !=(const PkgIterator &B) const {return Pkg != B.Pkg;}; - - // Accessors - inline Package *operator ->() {return Pkg;}; - inline Package const *operator ->() const {return Pkg;}; - inline Package const &operator *() const {return *Pkg;}; - inline operator Package *() {return Pkg == Owner->PkgP?0:Pkg;}; - inline operator Package const *() const {return Pkg == Owner->PkgP?0:Pkg;}; - inline pkgCache *Cache() {return Owner;}; - - inline const char *Name() const {return Pkg->Name == 0?0:Owner->StrP + Pkg->Name;}; - inline const char *Section() const {return Pkg->Section == 0?0:Owner->StrP + Pkg->Section;}; - inline bool Purge() const {return Pkg->CurrentState == pkgCache::State::Purge || - (Pkg->CurrentVer == 0 && Pkg->CurrentState == pkgCache::State::NotInstalled);}; - inline VerIterator VersionList() const; - inline VerIterator CurrentVer() const; - inline DepIterator RevDependsList() const; - inline PrvIterator ProvidesList() const; - inline unsigned long Index() const {return Pkg - Owner->PkgP;}; - OkState State() const; - - //Nice printable representation - friend std::ostream& operator<<(std::ostream& out, pkgCache::PkgIterator Pkg); - - const char *CandVersion() const; - const char *CurVersion() const; - - // Constructors - inline PkgIterator(pkgCache &Owner,Package *Trg) : Pkg(Trg), Owner(&Owner), - HashIndex(0) - { - if (Pkg == 0) - Pkg = Owner.PkgP; - }; - inline PkgIterator() : Pkg(0), Owner(0), HashIndex(0) {}; +class pkgCache::PkgIterator: public Iterator<Package, PkgIterator> { + long HashIndex; + + protected: + inline Package* OwnerPointer() const { + return Owner->PkgP; + }; + + public: + // This constructor is the 'begin' constructor, never use it. + inline PkgIterator(pkgCache &Owner) : Iterator<Package, PkgIterator>(Owner), HashIndex(-1) { + S = OwnerPointer(); + operator ++(0); + }; + + virtual void operator ++(int); + virtual void operator ++() {operator ++(0);}; + + enum OkState {NeedsNothing,NeedsUnpack,NeedsConfigure}; + + // Accessors + inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;}; + inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;}; + inline bool Purge() const {return S->CurrentState == pkgCache::State::Purge || + (S->CurrentVer == 0 && S->CurrentState == pkgCache::State::NotInstalled);}; + + inline VerIterator VersionList() const; + inline VerIterator CurrentVer() const; + inline DepIterator RevDependsList() const; + inline PrvIterator ProvidesList() const; + OkState State() const; + const char *CandVersion() const; + const char *CurVersion() const; + + //Nice printable representation + friend std::ostream& operator <<(std::ostream& out, PkgIterator i); + + // Constructors + inline PkgIterator(pkgCache &Owner,Package *Trg) : Iterator<Package, PkgIterator>(Owner, Trg), HashIndex(0) { + if (S == 0) + S = OwnerPointer(); + }; + inline PkgIterator() : Iterator<Package, PkgIterator>(), HashIndex(0) {}; }; /*}}}*/ // Version Iterator /*{{{*/ -class pkgCache::VerIterator -{ - Version *Ver; - pkgCache *Owner; - - void _dummy(); - - public: - - // Iteration - void operator ++(int) {if (Ver != Owner->VerP) Ver = Owner->VerP + Ver->NextVer;}; - inline void operator ++() {operator ++(0);}; - inline bool end() const {return Owner == 0 || (Ver == Owner->VerP?true:false);}; - inline void operator =(const VerIterator &B) {Ver = B.Ver; Owner = B.Owner;}; - - // Comparison - inline bool operator ==(const VerIterator &B) const {return Ver == B.Ver;}; - inline bool operator !=(const VerIterator &B) const {return Ver != B.Ver;}; - int CompareVer(const VerIterator &B) const; - - // Testing - inline bool IsGood() const { return Ver && Owner && ! end();}; - - // Accessors - inline Version *operator ->() {return Ver;}; - inline Version const *operator ->() const {return Ver;}; - inline Version &operator *() {return *Ver;}; - inline Version const &operator *() const {return *Ver;}; - inline operator Version *() {return Ver == Owner->VerP?0:Ver;}; - inline operator Version const *() const {return Ver == Owner->VerP?0:Ver;}; - inline pkgCache *Cache() {return Owner;}; - - inline const char *VerStr() const {return Ver->VerStr == 0?0:Owner->StrP + Ver->VerStr;}; - inline const char *Section() const {return Ver->Section == 0?0:Owner->StrP + Ver->Section;}; - inline const char *Arch() const {return Ver->Arch == 0?0:Owner->StrP + Ver->Arch;}; - inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + Ver->ParentPkg);}; - inline DescIterator DescriptionList() const; - DescIterator TranslatedDescription() const; - inline DepIterator DependsList() const; - inline PrvIterator ProvidesList() const; - inline VerFileIterator FileList() const; - inline unsigned long Index() const {return Ver - Owner->VerP;}; - bool Downloadable() const; - inline const char *PriorityType() {return Owner->Priority(Ver->Priority);}; - string RelStr(); - - bool Automatic() const; - VerFileIterator NewestFile() const; - - inline VerIterator() : Ver(0), Owner(0) {}; - inline VerIterator(pkgCache &Owner,Version *Trg = 0) : Ver(Trg), - Owner(&Owner) - { - if (Ver == 0) - Ver = Owner.VerP; - }; +class pkgCache::VerIterator : public Iterator<Version, VerIterator> { + protected: + inline Version* OwnerPointer() const { + return Owner->VerP; + }; + + public: + // Iteration + void operator ++(int) {if (S != Owner->VerP) S = Owner->VerP + S->NextVer;}; + inline void operator ++() {operator ++(0);}; + + // Comparison + int CompareVer(const VerIterator &B) const; + + // Accessors + inline const char *VerStr() const {return S->VerStr == 0?0:Owner->StrP + S->VerStr;}; + inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;}; + inline const char *Arch() const {return S->Arch == 0?0:Owner->StrP + S->Arch;}; + inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);}; + + inline DescIterator DescriptionList() const; + DescIterator TranslatedDescription() const; + inline DepIterator DependsList() const; + inline PrvIterator ProvidesList() const; + inline VerFileIterator FileList() const; + bool Downloadable() const; + inline const char *PriorityType() {return Owner->Priority(S->Priority);}; + string RelStr(); + + bool Automatic() const; + VerFileIterator NewestFile() const; + + inline VerIterator(pkgCache &Owner,Version *Trg = 0) : Iterator<Version, VerIterator>(Owner, Trg) { + if (S == 0) + S = OwnerPointer(); + }; + inline VerIterator() : Iterator<Version, VerIterator>() {}; }; /*}}}*/ // Description Iterator /*{{{*/ -class pkgCache::DescIterator -{ - Description *Desc; - pkgCache *Owner; - - void _dummy(); - - public: - - // Iteration - void operator ++(int) {if (Desc != Owner->DescP) Desc = Owner->DescP + Desc->NextDesc;}; - inline void operator ++() {operator ++(0);}; - inline bool end() const {return Owner == 0 || Desc == Owner->DescP?true:false;}; - inline void operator =(const DescIterator &B) {Desc = B.Desc; Owner = B.Owner;}; - - // Comparison - inline bool operator ==(const DescIterator &B) const {return Desc == B.Desc;}; - inline bool operator !=(const DescIterator &B) const {return Desc != B.Desc;}; - int CompareDesc(const DescIterator &B) const; - - // Accessors - inline Description *operator ->() {return Desc;}; - inline Description const *operator ->() const {return Desc;}; - inline Description &operator *() {return *Desc;}; - inline Description const &operator *() const {return *Desc;}; - inline operator Description *() {return Desc == Owner->DescP?0:Desc;}; - inline operator Description const *() const {return Desc == Owner->DescP?0:Desc;}; - inline pkgCache *Cache() {return Owner;}; - - inline const char *LanguageCode() const {return Owner->StrP + Desc->language_code;}; - inline const char *md5() const {return Owner->StrP + Desc->md5sum;}; - inline DescFileIterator FileList() const; - inline unsigned long Index() const {return Desc - Owner->DescP;}; - - inline DescIterator() : Desc(0), Owner(0) {}; - inline DescIterator(pkgCache &Owner,Description *Trg = 0) : Desc(Trg), - Owner(&Owner) - { - if (Desc == 0) - Desc = Owner.DescP; - }; +class pkgCache::DescIterator : public Iterator<Description, DescIterator> { + protected: + inline Description* OwnerPointer() const { + return Owner->DescP; + }; + + public: + // Iteration + void operator ++(int) {if (S != Owner->DescP) S = Owner->DescP + S->NextDesc;}; + inline void operator ++() {operator ++(0);}; + + // Comparison + int CompareDesc(const DescIterator &B) const; + + // Accessors + inline const char *LanguageCode() const {return Owner->StrP + S->language_code;}; + inline const char *md5() const {return Owner->StrP + S->md5sum;}; + inline DescFileIterator FileList() const; + + inline DescIterator() : Iterator<Description, DescIterator>() {}; + inline DescIterator(pkgCache &Owner,Description *Trg = 0) : Iterator<Description, DescIterator>(Owner, Trg) { + if (S == 0) + S = Owner.DescP; + }; }; /*}}}*/ // Dependency iterator /*{{{*/ -class pkgCache::DepIterator -{ - Dependency *Dep; - enum {DepVer, DepRev} Type; - pkgCache *Owner; - - void _dummy(); - - public: - - // Iteration - void operator ++(int) {if (Dep != Owner->DepP) Dep = Owner->DepP + - (Type == DepVer?Dep->NextDepends:Dep->NextRevDepends);}; - inline void operator ++() {operator ++(0);}; - inline bool end() const {return Owner == 0 || Dep == Owner->DepP?true:false;}; - - // Comparison - inline bool operator ==(const DepIterator &B) const {return Dep == B.Dep;}; - inline bool operator !=(const DepIterator &B) const {return Dep != B.Dep;}; - - // Accessors - inline Dependency *operator ->() {return Dep;}; - inline Dependency const *operator ->() const {return Dep;}; - inline Dependency &operator *() {return *Dep;}; - inline Dependency const &operator *() const {return *Dep;}; - inline operator Dependency *() {return Dep == Owner->DepP?0:Dep;}; - inline operator Dependency const *() const {return Dep == Owner->DepP?0:Dep;}; - inline pkgCache *Cache() {return Owner;}; - - inline const char *TargetVer() const {return Dep->Version == 0?0:Owner->StrP + Dep->Version;}; - inline PkgIterator TargetPkg() {return PkgIterator(*Owner,Owner->PkgP + Dep->Package);}; - inline PkgIterator SmartTargetPkg() {PkgIterator R(*Owner,0);SmartTargetPkg(R);return R;}; - inline VerIterator ParentVer() {return VerIterator(*Owner,Owner->VerP + Dep->ParentVer);}; - inline PkgIterator ParentPkg() {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[Dep->ParentVer].ParentPkg);}; - inline bool Reverse() {return Type == DepRev;}; - inline unsigned long Index() const {return Dep - Owner->DepP;}; - bool IsCritical(); - void GlobOr(DepIterator &Start,DepIterator &End); - Version **AllTargets(); - bool SmartTargetPkg(PkgIterator &Result); - inline const char *CompType() {return Owner->CompType(Dep->CompareOp);}; - inline const char *DepType() {return Owner->DepType(Dep->Type);}; - - inline DepIterator(pkgCache &Owner,Dependency *Trg,Version * = 0) : - Dep(Trg), Type(DepVer), Owner(&Owner) - { - if (Dep == 0) - Dep = Owner.DepP; - }; - inline DepIterator(pkgCache &Owner,Dependency *Trg,Package *) : - Dep(Trg), Type(DepRev), Owner(&Owner) - { - if (Dep == 0) - Dep = Owner.DepP; - }; - inline DepIterator() : Dep(0), Type(DepVer), Owner(0) {}; +class pkgCache::DepIterator : public Iterator<Dependency, DepIterator> { + enum {DepVer, DepRev} Type; + + protected: + inline Dependency* OwnerPointer() const { + return Owner->DepP; + }; + + public: + // Iteration + void operator ++(int) {if (S != Owner->DepP) S = Owner->DepP + + (Type == DepVer ? S->NextDepends : S->NextRevDepends);}; + inline void operator ++() {operator ++(0);}; + + // Accessors + inline const char *TargetVer() const {return S->Version == 0?0:Owner->StrP + S->Version;}; + inline PkgIterator TargetPkg() {return PkgIterator(*Owner,Owner->PkgP + S->Package);}; + inline PkgIterator SmartTargetPkg() {PkgIterator R(*Owner,0);SmartTargetPkg(R);return R;}; + inline VerIterator ParentVer() {return VerIterator(*Owner,Owner->VerP + S->ParentVer);}; + inline PkgIterator ParentPkg() {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->ParentVer].ParentPkg);}; + inline bool Reverse() {return Type == DepRev;}; + bool IsCritical(); + void GlobOr(DepIterator &Start,DepIterator &End); + Version **AllTargets(); + bool SmartTargetPkg(PkgIterator &Result); + inline const char *CompType() {return Owner->CompType(S->CompareOp);}; + inline const char *DepType() {return Owner->DepType(S->Type);}; + + inline DepIterator(pkgCache &Owner, Dependency *Trg, Version* = 0) : + Iterator<Dependency, DepIterator>(Owner, Trg), Type(DepVer) { + if (S == 0) + S = Owner.DepP; + }; + inline DepIterator(pkgCache &Owner, Dependency *Trg, Package*) : + Iterator<Dependency, DepIterator>(Owner, Trg), Type(DepRev) { + if (S == 0) + S = Owner.DepP; + }; + inline DepIterator() : Iterator<Dependency, DepIterator>(), Type(DepVer) {}; }; /*}}}*/ // Provides iterator /*{{{*/ -class pkgCache::PrvIterator -{ - Provides *Prv; - enum {PrvVer, PrvPkg} Type; - pkgCache *Owner; - - void _dummy(); - - public: - - // Iteration - void operator ++(int) {if (Prv != Owner->ProvideP) Prv = Owner->ProvideP + - (Type == PrvVer?Prv->NextPkgProv:Prv->NextProvides);}; - inline void operator ++() {operator ++(0);}; - inline bool end() const {return Owner == 0 || Prv == Owner->ProvideP?true:false;}; - - // Comparison - inline bool operator ==(const PrvIterator &B) const {return Prv == B.Prv;}; - inline bool operator !=(const PrvIterator &B) const {return Prv != B.Prv;}; - - // Accessors - inline Provides *operator ->() {return Prv;}; - inline Provides const *operator ->() const {return Prv;}; - inline Provides &operator *() {return *Prv;}; - inline Provides const &operator *() const {return *Prv;}; - inline operator Provides *() {return Prv == Owner->ProvideP?0:Prv;}; - inline operator Provides const *() const {return Prv == Owner->ProvideP?0:Prv;}; - inline pkgCache *Cache() {return Owner;}; - - inline const char *Name() const {return Owner->StrP + Owner->PkgP[Prv->ParentPkg].Name;}; - inline const char *ProvideVersion() const {return Prv->ProvideVersion == 0?0:Owner->StrP + Prv->ProvideVersion;}; - inline PkgIterator ParentPkg() {return PkgIterator(*Owner,Owner->PkgP + Prv->ParentPkg);}; - inline VerIterator OwnerVer() {return VerIterator(*Owner,Owner->VerP + Prv->Version);}; - inline PkgIterator OwnerPkg() {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[Prv->Version].ParentPkg);}; - inline unsigned long Index() const {return Prv - Owner->ProvideP;}; - - inline PrvIterator() : Prv(0), Type(PrvVer), Owner(0) {}; - - inline PrvIterator(pkgCache &Owner,Provides *Trg,Version *) : - Prv(Trg), Type(PrvVer), Owner(&Owner) - { - if (Prv == 0) - Prv = Owner.ProvideP; - }; - inline PrvIterator(pkgCache &Owner,Provides *Trg,Package *) : - Prv(Trg), Type(PrvPkg), Owner(&Owner) - { - if (Prv == 0) - Prv = Owner.ProvideP; - }; +class pkgCache::PrvIterator : public Iterator<Provides, PrvIterator> { + enum {PrvVer, PrvPkg} Type; + + protected: + inline Provides* OwnerPointer() const { + return Owner->ProvideP; + }; + + public: + // Iteration + void operator ++(int) {if (S != Owner->ProvideP) S = Owner->ProvideP + + (Type == PrvVer?S->NextPkgProv:S->NextProvides);}; + inline void operator ++() {operator ++(0);}; + + // Accessors + inline const char *Name() const {return Owner->StrP + Owner->PkgP[S->ParentPkg].Name;}; + inline const char *ProvideVersion() const {return S->ProvideVersion == 0?0:Owner->StrP + S->ProvideVersion;}; + inline PkgIterator ParentPkg() {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);}; + inline VerIterator OwnerVer() {return VerIterator(*Owner,Owner->VerP + S->Version);}; + inline PkgIterator OwnerPkg() {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->Version].ParentPkg);}; + + inline PrvIterator() : Iterator<Provides, PrvIterator>(), Type(PrvVer) {}; + + inline PrvIterator(pkgCache &Owner, Provides *Trg, Version*) : + Iterator<Provides, PrvIterator>(Owner, Trg), Type(PrvVer) { + if (S == 0) + S = Owner.ProvideP; + }; + inline PrvIterator(pkgCache &Owner, Provides *Trg, Package*) : + Iterator<Provides, PrvIterator>(Owner, Trg), Type(PrvPkg) { + if (S == 0) + S = Owner.ProvideP; + }; }; /*}}}*/ // Package file /*{{{*/ -class pkgCache::PkgFileIterator -{ - pkgCache *Owner; - PackageFile *File; - - public: - - // Iteration - void operator ++(int) {if (File!= Owner->PkgFileP) File = Owner->PkgFileP + File->NextFile;}; - inline void operator ++() {operator ++(0);}; - inline bool end() const {return Owner == 0 || File == Owner->PkgFileP?true:false;}; - - // Comparison - inline bool operator ==(const PkgFileIterator &B) const {return File == B.File;}; - inline bool operator !=(const PkgFileIterator &B) const {return File != B.File;}; - - // Accessors - inline PackageFile *operator ->() {return File;}; - inline PackageFile const *operator ->() const {return File;}; - inline PackageFile const &operator *() const {return *File;}; - inline operator PackageFile *() {return File == Owner->PkgFileP?0:File;}; - inline operator PackageFile const *() const {return File == Owner->PkgFileP?0:File;}; - inline pkgCache *Cache() {return Owner;}; - - inline const char *FileName() const {return File->FileName == 0?0:Owner->StrP + File->FileName;}; - inline const char *Archive() const {return File->Archive == 0?0:Owner->StrP + File->Archive;}; - inline const char *Component() const {return File->Component == 0?0:Owner->StrP + File->Component;}; - inline const char *Version() const {return File->Version == 0?0:Owner->StrP + File->Version;}; - inline const char *Origin() const {return File->Origin == 0?0:Owner->StrP + File->Origin;}; - inline const char *Codename() const {return File->Codename ==0?0:Owner->StrP + File->Codename;}; - inline const char *Label() const {return File->Label == 0?0:Owner->StrP + File->Label;}; - inline const char *Site() const {return File->Site == 0?0:Owner->StrP + File->Site;}; - inline const char *Architecture() const {return File->Architecture == 0?0:Owner->StrP + File->Architecture;}; - inline const char *IndexType() const {return File->IndexType == 0?0:Owner->StrP + File->IndexType;}; - - inline unsigned long Index() const {return File - Owner->PkgFileP;}; - - bool IsOk(); - string RelStr(); - - // Constructors - inline PkgFileIterator() : Owner(0), File(0) {}; - inline PkgFileIterator(pkgCache &Owner) : Owner(&Owner), File(Owner.PkgFileP) {}; - inline PkgFileIterator(pkgCache &Owner,PackageFile *Trg) : Owner(&Owner), File(Trg) {}; +class pkgCache::PkgFileIterator : public Iterator<PackageFile, PkgFileIterator> { + protected: + inline PackageFile* OwnerPointer() const { + return Owner->PkgFileP; + }; + + public: + // Iteration + void operator ++(int) {if (S != Owner->PkgFileP) S = Owner->PkgFileP + S->NextFile;}; + inline void operator ++() {operator ++(0);}; + + // Accessors + inline const char *FileName() const {return S->FileName == 0?0:Owner->StrP + S->FileName;}; + inline const char *Archive() const {return S->Archive == 0?0:Owner->StrP + S->Archive;}; + inline const char *Component() const {return S->Component == 0?0:Owner->StrP + S->Component;}; + inline const char *Version() const {return S->Version == 0?0:Owner->StrP + S->Version;}; + inline const char *Origin() const {return S->Origin == 0?0:Owner->StrP + S->Origin;}; + inline const char *Codename() const {return S->Codename ==0?0:Owner->StrP + S->Codename;}; + inline const char *Label() const {return S->Label == 0?0:Owner->StrP + S->Label;}; + inline const char *Site() const {return S->Site == 0?0:Owner->StrP + S->Site;}; + inline const char *Architecture() const {return S->Architecture == 0?0:Owner->StrP + S->Architecture;}; + inline const char *IndexType() const {return S->IndexType == 0?0:Owner->StrP + S->IndexType;}; + + bool IsOk(); + string RelStr(); + + // Constructors + inline PkgFileIterator() : Iterator<PackageFile, PkgFileIterator>() {}; + inline PkgFileIterator(pkgCache &Owner,PackageFile *Trg = 0) : Iterator<PackageFile, PkgFileIterator>(Owner, Trg) {}; }; /*}}}*/ // Version File /*{{{*/ -class pkgCache::VerFileIterator -{ - pkgCache *Owner; - VerFile *FileP; - - public: - - // Iteration - void operator ++(int) {if (FileP != Owner->VerFileP) FileP = Owner->VerFileP + FileP->NextFile;}; - inline void operator ++() {operator ++(0);}; - inline bool end() const {return Owner == 0 || FileP == Owner->VerFileP?true:false;}; - - // Comparison - inline bool operator ==(const VerFileIterator &B) const {return FileP == B.FileP;}; - inline bool operator !=(const VerFileIterator &B) const {return FileP != B.FileP;}; - - // Accessors - inline VerFile *operator ->() {return FileP;}; - inline VerFile const *operator ->() const {return FileP;}; - inline VerFile const &operator *() const {return *FileP;}; - inline operator VerFile *() {return FileP == Owner->VerFileP?0:FileP;}; - inline operator VerFile const *() const {return FileP == Owner->VerFileP?0:FileP;}; - inline pkgCache *Cache() {return Owner;}; - - inline PkgFileIterator File() const {return PkgFileIterator(*Owner,FileP->File + Owner->PkgFileP);}; - inline unsigned long Index() const {return FileP - Owner->VerFileP;}; - - inline VerFileIterator() : Owner(0), FileP(0) {}; - inline VerFileIterator(pkgCache &Owner,VerFile *Trg) : Owner(&Owner), FileP(Trg) {}; +class pkgCache::VerFileIterator : public pkgCache::Iterator<VerFile, VerFileIterator> { + protected: + inline VerFile* OwnerPointer() const { + return Owner->VerFileP; + }; + + public: + // Iteration + void operator ++(int) {if (S != Owner->VerFileP) S = Owner->VerFileP + S->NextFile;}; + inline void operator ++() {operator ++(0);}; + + // Accessors + inline PkgFileIterator File() const {return PkgFileIterator(*Owner,S->File + Owner->PkgFileP);}; + + inline VerFileIterator() : Iterator<VerFile, VerFileIterator>() {}; + inline VerFileIterator(pkgCache &Owner,VerFile *Trg) : Iterator<VerFile, VerFileIterator>(Owner, Trg) {}; }; /*}}}*/ // Description File /*{{{*/ -class pkgCache::DescFileIterator -{ - pkgCache *Owner; - DescFile *FileP; - - public: - - // Iteration - void operator ++(int) {if (FileP != Owner->DescFileP) FileP = Owner->DescFileP + FileP->NextFile;}; - inline void operator ++() {operator ++(0);}; - inline bool end() const {return Owner == 0 || FileP == Owner->DescFileP?true:false;}; - - // Comparison - inline bool operator ==(const DescFileIterator &B) const {return FileP == B.FileP;}; - inline bool operator !=(const DescFileIterator &B) const {return FileP != B.FileP;}; - - // Accessors - inline DescFile *operator ->() {return FileP;}; - inline DescFile const *operator ->() const {return FileP;}; - inline DescFile const &operator *() const {return *FileP;}; - inline operator DescFile *() {return FileP == Owner->DescFileP?0:FileP;}; - inline operator DescFile const *() const {return FileP == Owner->DescFileP?0:FileP;}; - inline pkgCache *Cache() {return Owner;}; - - inline PkgFileIterator File() const {return PkgFileIterator(*Owner,FileP->File + Owner->PkgFileP);}; - inline unsigned long Index() const {return FileP - Owner->DescFileP;}; - - inline DescFileIterator() : Owner(0), FileP(0) {}; - inline DescFileIterator(pkgCache &Owner,DescFile *Trg) : Owner(&Owner), FileP(Trg) {}; +class pkgCache::DescFileIterator : public Iterator<DescFile, DescFileIterator> { + protected: + inline DescFile* OwnerPointer() const { + return Owner->DescFileP; + }; + + public: + // Iteration + void operator ++(int) {if (S != Owner->DescFileP) S = Owner->DescFileP + S->NextFile;}; + inline void operator ++() {operator ++(0);}; + + // Accessors + inline PkgFileIterator File() const {return PkgFileIterator(*Owner,S->File + Owner->PkgFileP);}; + + inline DescFileIterator() : Iterator<DescFile, DescFileIterator>() {}; + inline DescFileIterator(pkgCache &Owner,DescFile *Trg) : Iterator<DescFile, DescFileIterator>(Owner, Trg) {}; }; /*}}}*/ // Inlined Begin functions cant be in the class because of order problems /*{{{*/ inline pkgCache::VerIterator pkgCache::PkgIterator::VersionList() const - {return VerIterator(*Owner,Owner->VerP + Pkg->VersionList);}; + {return VerIterator(*Owner,Owner->VerP + S->VersionList);}; inline pkgCache::VerIterator pkgCache::PkgIterator::CurrentVer() const - {return VerIterator(*Owner,Owner->VerP + Pkg->CurrentVer);}; + {return VerIterator(*Owner,Owner->VerP + S->CurrentVer);}; inline pkgCache::DepIterator pkgCache::PkgIterator::RevDependsList() const - {return DepIterator(*Owner,Owner->DepP + Pkg->RevDepends,Pkg);}; + {return DepIterator(*Owner,Owner->DepP + S->RevDepends,S);}; inline pkgCache::PrvIterator pkgCache::PkgIterator::ProvidesList() const - {return PrvIterator(*Owner,Owner->ProvideP + Pkg->ProvidesList,Pkg);}; + {return PrvIterator(*Owner,Owner->ProvideP + S->ProvidesList,S);}; inline pkgCache::DescIterator pkgCache::VerIterator::DescriptionList() const - {return DescIterator(*Owner,Owner->DescP + Ver->DescriptionList);}; + {return DescIterator(*Owner,Owner->DescP + S->DescriptionList);}; inline pkgCache::PrvIterator pkgCache::VerIterator::ProvidesList() const - {return PrvIterator(*Owner,Owner->ProvideP + Ver->ProvidesList,Ver);}; + {return PrvIterator(*Owner,Owner->ProvideP + S->ProvidesList,S);}; inline pkgCache::DepIterator pkgCache::VerIterator::DependsList() const - {return DepIterator(*Owner,Owner->DepP + Ver->DependsList,Ver);}; + {return DepIterator(*Owner,Owner->DepP + S->DependsList,S);}; inline pkgCache::VerFileIterator pkgCache::VerIterator::FileList() const - {return VerFileIterator(*Owner,Owner->VerFileP + Ver->FileList);}; + {return VerFileIterator(*Owner,Owner->VerFileP + S->FileList);}; inline pkgCache::DescFileIterator pkgCache::DescIterator::FileList() const - {return DescFileIterator(*Owner,Owner->DescFileP + Desc->FileList);}; + {return DescFileIterator(*Owner,Owner->DescFileP + S->FileList);}; /*}}}*/ #endif diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 997ff51fe..2f8bde6f7 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -242,26 +242,20 @@ const char *pkgCache::Priority(unsigned char Prio) return 0; } /*}}}*/ -// Bases for iterator classes /*{{{*/ -void pkgCache::VerIterator::_dummy() {} -void pkgCache::DepIterator::_dummy() {} -void pkgCache::PrvIterator::_dummy() {} -void pkgCache::DescIterator::_dummy() {} - /*}}}*/ // PkgIterator::operator ++ - Postfix incr /*{{{*/ // --------------------------------------------------------------------- /* This will advance to the next logical package in the hash table. */ void pkgCache::PkgIterator::operator ++(int) { // Follow the current links - if (Pkg != Owner->PkgP) - Pkg = Owner->PkgP + Pkg->NextPackage; + if (S != Owner->PkgP) + S = Owner->PkgP + S->NextPackage; // Follow the hash table - while (Pkg == Owner->PkgP && (HashIndex+1) < (signed)_count(Owner->HeaderP->HashTable)) + while (S == Owner->PkgP && (HashIndex+1) < (signed)_count(Owner->HeaderP->HashTable)) { HashIndex++; - Pkg = Owner->PkgP + Owner->HeaderP->HashTable[HashIndex]; + S = Owner->PkgP + Owner->HeaderP->HashTable[HashIndex]; } }; /*}}}*/ @@ -270,12 +264,12 @@ void pkgCache::PkgIterator::operator ++(int) /* By this we mean if it is either cleanly installed or cleanly removed. */ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const { - if (Pkg->InstState == pkgCache::State::ReInstReq || - Pkg->InstState == pkgCache::State::HoldReInstReq) + if (S->InstState == pkgCache::State::ReInstReq || + S->InstState == pkgCache::State::HoldReInstReq) return NeedsUnpack; - if (Pkg->CurrentState == pkgCache::State::UnPacked || - Pkg->CurrentState == pkgCache::State::HalfConfigured) + if (S->CurrentState == pkgCache::State::UnPacked || + S->CurrentState == pkgCache::State::HalfConfigured) // we leave triggers alone complettely. dpkg deals with // them in a hard-to-predict manner and if they get // resolved by dpkg before apt run dpkg --configure on @@ -284,8 +278,8 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const //Pkg->CurrentState == pkgCache::State::TriggersPending) return NeedsConfigure; - if (Pkg->CurrentState == pkgCache::State::HalfInstalled || - Pkg->InstState != pkgCache::State::Ok) + if (S->CurrentState == pkgCache::State::HalfInstalled || + S->InstState != pkgCache::State::Ok) return NeedsUnpack; return NeedsNothing; @@ -347,11 +341,11 @@ operator<<(ostream& out, pkgCache::PkgIterator Pkg) conflicts (including dpkg's Breaks fields). */ bool pkgCache::DepIterator::IsCritical() { - if (Dep->Type == pkgCache::Dep::Conflicts || - Dep->Type == pkgCache::Dep::DpkgBreaks || - Dep->Type == pkgCache::Dep::Obsoletes || - Dep->Type == pkgCache::Dep::Depends || - Dep->Type == pkgCache::Dep::PreDepends) + if (S->Type == pkgCache::Dep::Conflicts || + S->Type == pkgCache::Dep::DpkgBreaks || + S->Type == pkgCache::Dep::Obsoletes || + S->Type == pkgCache::Dep::Depends || + S->Type == pkgCache::Dep::PreDepends) return true; return false; } @@ -430,12 +424,12 @@ pkgCache::Version **pkgCache::DepIterator::AllTargets() // Walk along the actual package providing versions for (VerIterator I = DPkg.VersionList(); I.end() == false; I++) { - if (Owner->VS->CheckDep(I.VerStr(),Dep->CompareOp,TargetVer()) == false) + if (Owner->VS->CheckDep(I.VerStr(),S->CompareOp,TargetVer()) == false) continue; - if ((Dep->Type == pkgCache::Dep::Conflicts || - Dep->Type == pkgCache::Dep::DpkgBreaks || - Dep->Type == pkgCache::Dep::Obsoletes) && + if ((S->Type == pkgCache::Dep::Conflicts || + S->Type == pkgCache::Dep::DpkgBreaks || + S->Type == pkgCache::Dep::Obsoletes) && ParentPkg() == I.ParentPkg()) continue; @@ -447,12 +441,12 @@ pkgCache::Version **pkgCache::DepIterator::AllTargets() // Follow all provides for (PrvIterator I = DPkg.ProvidesList(); I.end() == false; I++) { - if (Owner->VS->CheckDep(I.ProvideVersion(),Dep->CompareOp,TargetVer()) == false) + if (Owner->VS->CheckDep(I.ProvideVersion(),S->CompareOp,TargetVer()) == false) continue; - if ((Dep->Type == pkgCache::Dep::Conflicts || - Dep->Type == pkgCache::Dep::DpkgBreaks || - Dep->Type == pkgCache::Dep::Obsoletes) && + if ((S->Type == pkgCache::Dep::Conflicts || + S->Type == pkgCache::Dep::DpkgBreaks || + S->Type == pkgCache::Dep::Obsoletes) && ParentPkg() == I.OwnerPkg()) continue; @@ -490,7 +484,7 @@ void pkgCache::DepIterator::GlobOr(DepIterator &Start,DepIterator &End) End = *this; for (bool LastOR = true; end() == false && LastOR == true;) { - LastOR = (Dep->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or; + LastOR = (S->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or; (*this)++; if (LastOR == true) End = (*this); @@ -640,7 +634,7 @@ bool pkgCache::PkgFileIterator::IsOk() if (stat(FileName(),&Buf) != 0) return false; - if (Buf.st_size != (signed)File->Size || Buf.st_mtime != File->mtime) + if (Buf.st_size != (signed)S->Size || Buf.st_mtime != S->mtime) return false; return true; diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index e8a3e1064..359f8a590 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -43,6 +43,7 @@ class pkgCache /*{{{*/ struct DescFile; // Iterators + template<typename Str, typename Itr> class Iterator; class PkgIterator; class VerIterator; class DescIterator; @@ -51,14 +52,6 @@ class pkgCache /*{{{*/ class PkgFileIterator; class VerFileIterator; class DescFileIterator; - friend class PkgIterator; - friend class VerIterator; - friend class DescInterator; - friend class DepIterator; - friend class PrvIterator; - friend class PkgFileIterator; - friend class VerFileIterator; - friend class DescFileIterator; class Namespace; -- cgit v1.2.3 From 7d15572bc3124b15c043e38bdc3d90bcc94f108a Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 19 Dec 2009 14:25:20 +0100 Subject: add optional gcc features as deprecated, unused and (un)likely --- apt-pkg/contrib/system.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/apt-pkg/contrib/system.h b/apt-pkg/contrib/system.h index 7ec3d7feb..f68df6265 100644 --- a/apt-pkg/contrib/system.h +++ b/apt-pkg/contrib/system.h @@ -55,4 +55,26 @@ #define CLRFLAG(v,f) ((v) &=~FLAG(f)) #define CHKFLAG(v,f) ((v) & FLAG(f) ? true : false) +// some nice optional GNUC features +#if __GNUC__ >= 3 + #define __must_check __attribute__ ((warn_unused_result)) + #define __deprecated __attribute__ ((deprecated)) + /* likely() and unlikely() can be used to mark boolean expressions + as (not) likely true which will help the compiler to optimise */ + #define likely(x) __builtin_expect (!!(x), 1) + #define unlikely(x) __builtin_expect (!!(x), 0) +#else + #define __must_check /* no warn_unused_result */ + #define __deprecated /* no deprecated */ + #define likely(x) (x) + #define unlikely(x) (x) +#endif + +// cold functions are unlikely() to be called +#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4 + #define __cold __attribute__ ((__cold__)) +#else + #define __cold /* no cold marker */ +#endif + #endif -- cgit v1.2.3 From 201d1fa0d25deeda77c2570ee5342eaf18499699 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 19 Dec 2009 14:27:21 +0100 Subject: mark the Error/Warning method as __cold --- apt-pkg/contrib/error.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index a3be6a575..d92e40e9c 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -52,6 +52,7 @@ #endif #include <string> +#include <system.h> using std::string; @@ -71,13 +72,13 @@ class GlobalError public: // Call to generate an error from a library call. - bool Errno(const char *Function,const char *Description,...) APT_MFORMAT2; - bool WarningE(const char *Function,const char *Description,...) APT_MFORMAT2; + bool Errno(const char *Function,const char *Description,...) APT_MFORMAT2 __cold; + bool WarningE(const char *Function,const char *Description,...) APT_MFORMAT2 __cold; /* A warning should be considered less severe than an error, and may be ignored by the client. */ - bool Error(const char *Description,...) APT_MFORMAT1; - bool Warning(const char *Description,...) APT_MFORMAT1; + bool Error(const char *Description,...) APT_MFORMAT1 __cold; + bool Warning(const char *Description,...) APT_MFORMAT1 __cold; // Simple accessors inline bool PendingError() {return PendingFlag;}; -- cgit v1.2.3 From 5bf15716398fdb767ca6249a0155219b88d7ae60 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 19 Dec 2009 16:25:56 +0100 Subject: Implement the first step toward Multi-Arch by setting up a Group infrastructor for packages. APT is now aware of the fact that a package A in architecture X can't satisfy a dependency on package A in architecture Y - to handle these packages are now identified by name and architecture, so different architectures of the same package are handled internally as completly different packages. This is great for pinning, dependency checking and in many other situations, but sometimes we need to know which archs are available for a given package: Here Groups come to our rescue! --- apt-pkg/cacheiterators.h | 37 ++++++++++++-- apt-pkg/deb/deblistparser.cc | 40 +++++++++++----- apt-pkg/deb/deblistparser.h | 1 + apt-pkg/pkgcache.cc | 112 ++++++++++++++++++++++++++++++++++++------- apt-pkg/pkgcache.h | 30 ++++++++++-- apt-pkg/pkgcachegen.cc | 111 +++++++++++++++++++++++++++++------------- apt-pkg/pkgcachegen.h | 6 ++- 7 files changed, 267 insertions(+), 70 deletions(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 1da5c6f02..35d3aa228 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -31,10 +31,8 @@ #define PKGLIB_CACHEITERATORS_H // abstract Iterator template /*{{{*/ /* This template provides the very basic iterator methods we - need to have for doing some walk-over-the-cache magic, */ + need to have for doing some walk-over-the-cache magic */ template<typename Str, typename Itr> class pkgCache::Iterator { - __attribute__ ((deprecated)) void _dummy(); // FIXME: Who on earth uses this method ??? - protected: Str *S; pkgCache *Owner; @@ -75,6 +73,35 @@ template<typename Str, typename Itr> class pkgCache::Iterator { // Constructors - look out for the variable assigning inline Iterator() : S(0), Owner(0) {}; inline Iterator(pkgCache &Owner,Str *T = 0) : S(T), Owner(&Owner) {}; +}; + /*}}}*/ +// Group Iterator /*{{{*/ +/* Packages with the same name are collected in a Group so someone only + interest in package names can iterate easily over the names, so the + different architectures can be treated as of the "same" package + (apt internally treat them as totally different packages) */ +class pkgCache::GrpIterator: public Iterator<Group, GrpIterator> { + protected: + inline Group* OwnerPointer() const { + return Owner->GrpP; + }; + + public: + void operator ++(int) {if (S != Owner->GrpP) S = Owner->GrpP + S->Next;}; + virtual void operator ++() {operator ++(0);}; + + inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;}; + inline PkgIterator PackageList() const; + PkgIterator FindPkg(string Arch = "any"); + PkgIterator NextPkg(PkgIterator const &Pkg); + + // Constructors + inline GrpIterator(pkgCache &Owner, Group *Trg) : Iterator<Group, GrpIterator>(Owner, Trg) { + if (S == 0) + S = OwnerPointer(); + }; + inline GrpIterator() : Iterator<Group, GrpIterator>() {}; + }; /*}}}*/ // Package Iterator /*{{{*/ @@ -103,6 +130,8 @@ class pkgCache::PkgIterator: public Iterator<Package, PkgIterator> { inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;}; inline bool Purge() const {return S->CurrentState == pkgCache::State::Purge || (S->CurrentVer == 0 && S->CurrentState == pkgCache::State::NotInstalled);}; + inline const char *Arch() const {return S->Arch == 0?0:Owner->StrP + S->Arch;}; + inline GrpIterator Group() const { return GrpIterator(*Owner, Owner->GrpP + S->Group);}; inline VerIterator VersionList() const; inline VerIterator CurrentVer() const; @@ -339,6 +368,8 @@ class pkgCache::DescFileIterator : public Iterator<DescFile, DescFileIterator> { }; /*}}}*/ // Inlined Begin functions cant be in the class because of order problems /*{{{*/ +inline pkgCache::PkgIterator pkgCache::GrpIterator::PackageList() const + {return PkgIterator(*Owner,Owner->PkgP + S->FirstPackage);}; inline pkgCache::VerIterator pkgCache::PkgIterator::VersionList() const {return VerIterator(*Owner,Owner->VerP + S->VersionList);}; inline pkgCache::VerIterator pkgCache::PkgIterator::CurrentVer() const diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 25a1df3f9..fe68aec0b 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -53,12 +53,25 @@ unsigned long debListParser::UniqFindTagWrite(const char *Tag) // ListParser::Package - Return the package name /*{{{*/ // --------------------------------------------------------------------- /* This is to return the name of the package this section describes */ -string debListParser::Package() -{ - string Result = Section.FindS("Package"); - if (Result.empty() == true) - _error->Error("Encountered a section with no Package: header"); - return Result; +string debListParser::Package() { + string const Result = Section.FindS("Package"); + if(unlikely(Result.empty() == true)) + _error->Error("Encountered a section with no Package: header"); + return Result; +} + /*}}}*/ +// ListParser::Architecture - Return the package arch /*{{{*/ +// --------------------------------------------------------------------- +/* This will return the Architecture of the package this section describes + Note that architecture "all" packages will get the architecture of the + Packages file parsed here */ +string debListParser::Architecture() { + string const Result = Section.FindS("Architecture"); + if (Result.empty() == true) + return Arch; + if (Result == "all") + return Arch; + return Result; } /*}}}*/ // ListParser::Version - Return the version string /*{{{*/ @@ -78,8 +91,10 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver) { // Parse the section Ver->Section = UniqFindTagWrite("Section"); - Ver->Arch = UniqFindTagWrite("Architecture"); - + + // Parse the architecture + Ver->Arch = WriteUniqString(Architecture()); + // Archive Size Ver->Size = (unsigned)Section.FindI("Size"); @@ -537,6 +552,7 @@ bool debListParser::ParseDepends(pkgCache::VerIterator Ver, return true; string Package; + string const pkgArch = Ver.Arch(); string Version; unsigned int Op; @@ -546,7 +562,7 @@ bool debListParser::ParseDepends(pkgCache::VerIterator Ver, if (Start == 0) return _error->Error("Problem parsing dependency %s",Tag); - if (NewDepends(Ver,Package,Version,Op,Type) == false) + if (NewDepends(Ver,Package,pkgArch,Version,Op,Type) == false) return false; if (Start == Stop) break; @@ -619,6 +635,7 @@ bool debListParser::Step() if (Section.Find("Architecture",Start,Stop) == false) return true; + //FIXME: Accept different Architectures here if (stringcmp(Arch,Start,Stop) == 0) return true; @@ -641,8 +658,9 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator FileI, if (Tags.Step(Section) == false) return false; - //mvo: I don't think we need to fill that in (it's unused since apt-0.6) - //FileI->Architecture = WriteUniqString(Arch); + // FIXME: Do we need it now for multi-arch? + // mvo: I don't think we need to fill that in (it's unused since apt-0.6) +// FileI->Architecture = WriteUniqString(Arch); // apt-secure does no longer download individual (per-section) Release // file. to provide Component pinning we use the section name now diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 1c709229f..5f91e073e 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -46,6 +46,7 @@ class debListParser : public pkgCacheGenerator::ListParser // These all operate against the current section virtual string Package(); + virtual string Architecture(); virtual string Version(); virtual bool NewVersion(pkgCache::VerIterator Ver); virtual string Description(); diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 2f8bde6f7..2b5f53f6f 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -79,7 +79,8 @@ pkgCache::Header::Header() StringList = 0; VerSysName = 0; Architecture = 0; - memset(HashTable,0,sizeof(HashTable)); + memset(PkgHashTable,0,sizeof(PkgHashTable)); + memset(GrpHashTable,0,sizeof(GrpHashTable)); memset(Pools,0,sizeof(Pools)); } /*}}}*/ @@ -118,6 +119,7 @@ bool pkgCache::ReMap() { // Apply the typecasts. HeaderP = (Header *)Map.Data(); + GrpP = (Group *)Map.Data(); PkgP = (Package *)Map.Data(); VerFileP = (VerFile *)Map.Data(); DescFileP = (DescFile *)Map.Data(); @@ -165,7 +167,7 @@ unsigned long pkgCache::sHash(const string &Str) const unsigned long Hash = 0; for (string::const_iterator I = Str.begin(); I != Str.end(); I++) Hash = 5*Hash + tolower_ascii(*I); - return Hash % _count(HeaderP->HashTable); + return Hash % _count(HeaderP->PkgHashTable); } unsigned long pkgCache::sHash(const char *Str) const @@ -173,24 +175,40 @@ unsigned long pkgCache::sHash(const char *Str) const unsigned long Hash = 0; for (const char *I = Str; *I != 0; I++) Hash = 5*Hash + tolower_ascii(*I); - return Hash % _count(HeaderP->HashTable); + return Hash % _count(HeaderP->PkgHashTable); } /*}}}*/ // Cache::FindPkg - Locate a package by name /*{{{*/ // --------------------------------------------------------------------- /* Returns 0 on error, pointer to the package otherwise */ -pkgCache::PkgIterator pkgCache::FindPkg(const string &Name) -{ - // Look at the hash bucket - Package *Pkg = PkgP + HeaderP->HashTable[Hash(Name)]; - for (; Pkg != PkgP; Pkg = PkgP + Pkg->NextPackage) - { - if (Pkg->Name != 0 && StrP[Pkg->Name] == Name[0] && - stringcasecmp(Name,StrP + Pkg->Name) == 0) - return PkgIterator(*this,Pkg); - } - return PkgIterator(*this,0); +pkgCache::PkgIterator pkgCache::FindPkg(const string &Name, string Arch) { + /* We make a detour via the GrpIterator here as + on a multi-arch environment a group is easier to + find than a package (less entries in the buckets) */ + pkgCache::GrpIterator Grp = FindGrp(Name); + if (Grp.end() == true) + return PkgIterator(*this,0); + + return Grp.FindPkg(Arch); +} + /*}}}*/ +// Cache::FindGrp - Locate a group by name /*{{{*/ +// --------------------------------------------------------------------- +/* Returns End-Pointer on error, pointer to the group otherwise */ +pkgCache::GrpIterator pkgCache::FindGrp(const string &Name) { + if (unlikely(Name.empty() == true)) + return GrpIterator(*this,0); + + // Look at the hash bucket for the group + Group *Grp = GrpP + HeaderP->GrpHashTable[sHash(Name)]; + for (; Grp != GrpP; Grp = GrpP + Grp->Next) { + if (Grp->Name != 0 && StrP[Grp->Name] == Name[0] && + stringcasecmp(Name, StrP + Grp->Name) == 0) + return GrpIterator(*this, Grp); + } + + return GrpIterator(*this,0); } /*}}}*/ // Cache::CompTypeDeb - Return a string describing the compare type /*{{{*/ @@ -242,6 +260,68 @@ const char *pkgCache::Priority(unsigned char Prio) return 0; } /*}}}*/ +// GrpIterator::FindPkg - Locate a package by arch /*{{{*/ +// --------------------------------------------------------------------- +/* Returns an End-Pointer on error, pointer to the package otherwise */ +pkgCache::PkgIterator pkgCache::GrpIterator::FindPkg(string Arch) { + if (unlikely(IsGood() == false || S->FirstPackage == 0)) + return PkgIterator(*Owner, 0); + + static string const myArch = _config->Find("APT::Architecture"); + /* Most of the time the package for our native architecture is + the one we add at first to the cache, but this would be the + last one we check, so we do it now. */ + if (Arch == "native" || Arch == myArch) { + Arch = myArch; + pkgCache::Package *Pkg = Owner->PkgP + S->LastPackage; + if (stringcasecmp(Arch, Owner->StrP + Pkg->Arch) == 0) + return PkgIterator(*Owner, Pkg); + } + + /* If we accept any package we simply return the "first" + package in this group (the last one added). */ + if (Arch == "any") + return PkgIterator(*Owner, Owner->PkgP + S->FirstPackage); + + /* Iterate over the list to find the matching arch + unfortunately this list includes "package noise" + (= different packages with same calculated hash), + so we need to check the name also */ + for (pkgCache::Package *Pkg = PackageList(); Pkg != Owner->PkgP; + Pkg = Owner->PkgP + Pkg->NextPackage) { + if (S->Name == Pkg->Name && + stringcasecmp(Arch, Owner->StrP + Pkg->Arch) == 0) + return PkgIterator(*Owner, Pkg); + if ((Owner->PkgP + S->LastPackage) == Pkg) + break; + } + + return PkgIterator(*Owner, 0); +} + /*}}}*/ +// GrpIterator::NextPkg - Locate the next package in the group /*{{{*/ +// --------------------------------------------------------------------- +/* Returns an End-Pointer on error, pointer to the package otherwise. + We can't simply ++ to the next as the list of packages includes + "package noise" (= packages with the same hash value but different name) */ +pkgCache::PkgIterator pkgCache::GrpIterator::NextPkg(pkgCache::PkgIterator const &LastPkg) { + if (unlikely(IsGood() == false || S->FirstPackage == 0 || + LastPkg.end() == true)) + return PkgIterator(*Owner, 0); + + // Iterate over the list to find the next package + pkgCache::Package *Pkg = Owner->PkgP + LastPkg.Index(); + Pkg = Owner->PkgP + Pkg->NextPackage; + for (; Pkg != Owner->PkgP; Pkg = Owner->PkgP + Pkg->NextPackage) { + if (S->Name == Pkg->Name) + return PkgIterator(*Owner, Pkg); + if ((Owner->PkgP + S->LastPackage) == Pkg) + break; + } + + return PkgIterator(*Owner, 0); +} + /*}}}*/ // PkgIterator::operator ++ - Postfix incr /*{{{*/ // --------------------------------------------------------------------- /* This will advance to the next logical package in the hash table. */ @@ -252,10 +332,10 @@ void pkgCache::PkgIterator::operator ++(int) S = Owner->PkgP + S->NextPackage; // Follow the hash table - while (S == Owner->PkgP && (HashIndex+1) < (signed)_count(Owner->HeaderP->HashTable)) + while (S == Owner->PkgP && (HashIndex+1) < (signed)_count(Owner->HeaderP->PkgHashTable)) { HashIndex++; - S = Owner->PkgP + Owner->HeaderP->HashTable[HashIndex]; + S = Owner->PkgP + Owner->HeaderP->PkgHashTable[HashIndex]; } }; /*}}}*/ diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 359f8a590..b3d2752d2 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -32,6 +32,7 @@ class pkgCache /*{{{*/ public: // Cache element predeclarations struct Header; + struct Group; struct Package; struct PackageFile; struct Version; @@ -44,6 +45,7 @@ class pkgCache /*{{{*/ // Iterators template<typename Str, typename Itr> class Iterator; + class GrpIterator; class PkgIterator; class VerIterator; class DescIterator; @@ -97,6 +99,7 @@ class pkgCache /*{{{*/ // Pointers to the arrays of items Header *HeaderP; + Group *GrpP; Package *PkgP; VerFile *VerFileP; DescFile *DescFileP; @@ -121,7 +124,9 @@ class pkgCache /*{{{*/ const char *Priority(unsigned char Priority); // Accessors - PkgIterator FindPkg(const string &Name); + GrpIterator FindGrp(const string &Name); + PkgIterator FindPkg(const string &Name, string Arch = "native"); + Header &Head() {return *HeaderP;}; inline PkgIterator PkgBegin(); inline PkgIterator PkgEnd(); @@ -161,6 +166,7 @@ struct pkgCache::Header unsigned short DescFileSz; // Structure counts + unsigned long GroupCount; unsigned long PackageCount; unsigned long VersionCount; unsigned long DescriptionCount; @@ -180,22 +186,36 @@ struct pkgCache::Header /* Allocation pools, there should be one of these for each structure excluding the header */ - DynamicMMap::Pool Pools[8]; + DynamicMMap::Pool Pools[9]; - // Rapid package name lookup - map_ptrloc HashTable[2*1048]; + // Rapid package and group name lookup + // Notice: Increase only both table sizes as the + // hashmethod assume the size of the Pkg one + map_ptrloc PkgHashTable[2*1048]; + map_ptrloc GrpHashTable[2*1048]; bool CheckSizes(Header &Against) const; Header(); }; /*}}}*/ +struct pkgCache::Group { /*{{{*/ + map_ptrloc Name; // Stringtable + + // Linked List + map_ptrloc FirstPackage;// Package + map_ptrloc LastPackage; // Package + map_ptrloc Next; // Group +}; + /*}}}*/ struct pkgCache::Package /*{{{*/ { // Pointers map_ptrloc Name; // Stringtable + map_ptrloc Arch; // StringTable (StringItem) map_ptrloc VersionList; // Version map_ptrloc CurrentVer; // Version map_ptrloc Section; // StringTable (StringItem) + map_ptrloc Group; // Group the Package belongs to // Linked list map_ptrloc NextPackage; // Package @@ -254,7 +274,7 @@ struct pkgCache::Version /*{{{*/ map_ptrloc VerStr; // Stringtable map_ptrloc Section; // StringTable (StringItem) map_ptrloc Arch; // StringTable - + // Lists map_ptrloc FileList; // VerFile map_ptrloc NextVer; // Version diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 68180c702..c37f6f48e 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -108,12 +108,12 @@ bool pkgCacheGenerator::MergeList(ListParser &List, while (List.Step() == true) { // Get a pointer to the package structure - string PackageName = List.Package(); + string const PackageName = List.Package(); if (PackageName.empty() == true) return false; - + pkgCache::PkgIterator Pkg; - if (NewPackage(Pkg,PackageName) == false) + if (NewPackage(Pkg, PackageName, List.Architecture()) == false) return _error->Error(_("Error occurred while processing %s (NewPackage)"),PackageName.c_str()); Counter++; if (Counter % 100 == 0 && Progress != 0) @@ -323,33 +323,71 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List) return true; } /*}}}*/ +// CacheGenerator::NewGroup - Add a new group /*{{{*/ +// --------------------------------------------------------------------- +/* This creates a new group structure and adds it to the hash table */ +bool pkgCacheGenerator::NewGroup(pkgCache::GrpIterator &Grp, const string &Name) { + Grp = Cache.FindGrp(Name); + if (Grp.end() == false) + return true; + + // Get a structure + unsigned long const Group = Map.Allocate(sizeof(pkgCache::Group)); + if (unlikely(Group == 0)) + return false; + + Grp = pkgCache::GrpIterator(Cache, Cache.GrpP + Group); + Grp->Name = Map.WriteString(Name); + if (unlikely(Grp->Name == 0)) + return false; + + // Insert it into the hash table + unsigned long const Hash = Cache.Hash(Name); + Grp->Next = Cache.HeaderP->GrpHashTable[Hash]; + Cache.HeaderP->GrpHashTable[Hash] = Group; + + Cache.HeaderP->GroupCount++; + + return true; +} + /*}}}*/ // CacheGenerator::NewPackage - Add a new package /*{{{*/ // --------------------------------------------------------------------- /* This creates a new package structure and adds it to the hash table */ -bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name) -{ - Pkg = Cache.FindPkg(Name); - if (Pkg.end() == false) - return true; +bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name, + const string &Arch) { + pkgCache::GrpIterator Grp; + if (unlikely(NewGroup(Grp, Name) == false)) + return false; + + Pkg = Grp.FindPkg(Arch); + if (Pkg.end() == false) + return true; // Get a structure - unsigned long Package = Map.Allocate(sizeof(pkgCache::Package)); - if (Package == 0) + unsigned long const Package = Map.Allocate(sizeof(pkgCache::Package)); + if (unlikely(Package == 0)) return false; - Pkg = pkgCache::PkgIterator(Cache,Cache.PkgP + Package); - + // Insert it into the hash table - unsigned long Hash = Cache.Hash(Name); - Pkg->NextPackage = Cache.HeaderP->HashTable[Hash]; - Cache.HeaderP->HashTable[Hash] = Package; - - // Set the name and the ID - Pkg->Name = Map.WriteString(Name); - if (Pkg->Name == 0) + unsigned long const Hash = Cache.Hash(Name); + Pkg->NextPackage = Cache.HeaderP->PkgHashTable[Hash]; + Cache.HeaderP->PkgHashTable[Hash] = Package; + + // remember the packages in the group + Grp->FirstPackage = Package; + if (Grp->LastPackage == 0) + Grp->LastPackage = Package; + + // Set the name, arch and the ID + Pkg->Name = Grp->Name; + Pkg->Group = Grp.Index(); + Pkg->Arch = WriteUniqString(Arch.c_str()); + if (unlikely(Pkg->Arch == 0)) return false; Pkg->ID = Cache.HeaderP->PackageCount++; - + return true; } /*}}}*/ @@ -474,6 +512,7 @@ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc, version and to the package that it is pointing to. */ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, const string &PackageName, + const string &Arch, const string &Version, unsigned int Op, unsigned int Type) @@ -481,8 +520,8 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, pkgCache &Cache = Owner->Cache; // Get a structure - unsigned long Dependency = Owner->Map.Allocate(sizeof(pkgCache::Dependency)); - if (Dependency == 0) + unsigned long const Dependency = Owner->Map.Allocate(sizeof(pkgCache::Dependency)); + if (unlikely(Dependency == 0)) return false; // Fill it in @@ -492,11 +531,17 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, Dep->CompareOp = Op; Dep->ID = Cache.HeaderP->DependsCount++; - // Locate the target package - pkgCache::PkgIterator Pkg; - if (Owner->NewPackage(Pkg,PackageName) == false) + pkgCache::GrpIterator Grp; + if (unlikely(Owner->NewGroup(Grp, PackageName) == false)) return false; - + + // Locate the target package + pkgCache::PkgIterator Pkg = Grp.FindPkg(Arch); + if (Pkg.end() == true) { + if (unlikely(Owner->NewPackage(Pkg, PackageName, Arch) == false)) + return false; + } + // Probe the reverse dependency list for a version string that matches if (Version.empty() == false) { @@ -504,7 +549,7 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, if (I->Version != 0 && I.TargetVer() == Version) Dep->Version = I->Version;*/ if (Dep->Version == 0) - if ((Dep->Version = WriteString(Version)) == 0) + if (unlikely((Dep->Version = WriteString(Version)) == 0)) return false; } @@ -524,7 +569,7 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, } // Is it a file dependency? - if (PackageName[0] == '/') + if (unlikely(PackageName[0] == '/')) FoundFileDeps = true; Dep->NextDepends = *OldDepLast; @@ -544,12 +589,12 @@ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver, pkgCache &Cache = Owner->Cache; // We do not add self referencing provides - if (Ver.ParentPkg().Name() == PackageName) + if (unlikely(Ver.ParentPkg().Name() == PackageName)) return true; // Get a structure - unsigned long Provides = Owner->Map.Allocate(sizeof(pkgCache::Provides)); - if (Provides == 0) + unsigned long const Provides = Owner->Map.Allocate(sizeof(pkgCache::Provides)); + if (unlikely(Provides == 0)) return false; Cache.HeaderP->ProvidesCount++; @@ -558,12 +603,12 @@ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver, Prv->Version = Ver.Index(); Prv->NextPkgProv = Ver->ProvidesList; Ver->ProvidesList = Prv.Index(); - if (Version.empty() == false && (Prv->ProvideVersion = WriteString(Version)) == 0) + if (Version.empty() == false && unlikely((Prv->ProvideVersion = WriteString(Version)) == 0)) return false; // Locate the target package pkgCache::PkgIterator Pkg; - if (Owner->NewPackage(Pkg,PackageName) == false) + if (unlikely(Owner->NewPackage(Pkg,PackageName,string(Ver.Arch())) == false)) return false; // Link it to the package diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 108b34207..4a2419b24 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -51,7 +51,8 @@ class pkgCacheGenerator /*{{{*/ // Flag file dependencies bool FoundFileDeps; - bool NewPackage(pkgCache::PkgIterator &Pkg,const string &PkgName); + bool NewGroup(pkgCache::GrpIterator &Grp,const string &Name); + bool NewPackage(pkgCache::PkgIterator &Pkg,const string &Name, const string &Arch); bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List); bool NewFileDesc(pkgCache::DescIterator &Desc,ListParser &List); unsigned long NewVersion(pkgCache::VerIterator &Ver,const string &VerStr,unsigned long Next); @@ -96,7 +97,7 @@ class pkgCacheGenerator::ListParser inline unsigned long WriteUniqString(const char *S,unsigned int Size) {return Owner->WriteUniqString(S,Size);}; inline unsigned long WriteString(const string &S) {return Owner->Map.WriteString(S);}; inline unsigned long WriteString(const char *S,unsigned int Size) {return Owner->Map.WriteString(S,Size);}; - bool NewDepends(pkgCache::VerIterator Ver,const string &Package, + bool NewDepends(pkgCache::VerIterator Ver,const string &Package, const string &Arch, const string &Version,unsigned int Op, unsigned int Type); bool NewProvides(pkgCache::VerIterator Ver,const string &Package, @@ -106,6 +107,7 @@ class pkgCacheGenerator::ListParser // These all operate against the current section virtual string Package() = 0; + virtual string Architecture() = 0; virtual string Version() = 0; virtual bool NewVersion(pkgCache::VerIterator Ver) = 0; virtual string Description() = 0; -- cgit v1.2.3 From 5dd4c8b811d9c7bc33e50254811f5bc0fc37f872 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 23 Dec 2009 12:38:19 +0100 Subject: merge Goswin Brederlow "support download of index files for different archs" patch which includes the following big changes: - Declare the unused [vendor] field in sources.list as option field, e.g. deb [arch=amd64,i386 lang=en_GB have=fun] http://example.org - When fetching index files download them for all APT::Architectures (overrideable with the options field above) - Allow all architectures of APT::Architectures to be in the Cache - Add the architecture to status and progress informations - Add b= (Binary architecture) to policy This commit doesn't incude the "pin-hack" as the Group structure will take care of this (and does it already to some extend). --- apt-pkg/aptconfiguration.cc | 25 ++++ apt-pkg/aptconfiguration.h | 16 +++ apt-pkg/cdrom.cc | 34 ++--- apt-pkg/clean.cc | 6 +- apt-pkg/contrib/strutl.cc | 17 +++ apt-pkg/contrib/strutl.h | 1 + apt-pkg/deb/debindexfile.cc | 15 ++- apt-pkg/deb/debindexfile.h | 4 +- apt-pkg/deb/deblistparser.cc | 57 ++++++--- apt-pkg/deb/deblistparser.h | 2 +- apt-pkg/deb/debmetaindex.cc | 292 +++++++++++++++++++++++++++---------------- apt-pkg/deb/debmetaindex.h | 28 +++-- apt-pkg/metaindex.h | 4 +- apt-pkg/pkgcache.cc | 8 +- apt-pkg/sourcelist.cc | 81 ++++++------ apt-pkg/sourcelist.h | 8 +- apt-pkg/versionmatch.cc | 8 +- apt-pkg/versionmatch.h | 2 + 18 files changed, 394 insertions(+), 214 deletions(-) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 899004d9f..1ec526646 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -11,6 +11,7 @@ #include <apt-pkg/fileutl.h> #include <apt-pkg/aptconfiguration.h> #include <apt-pkg/configuration.h> +#include <system.h> #include <vector> #include <string> @@ -223,4 +224,28 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All, return codes; } /*}}}*/ +// getArchitectures - Return Vector of prefered Architectures /*{{{*/ +std::vector<std::string> const Configuration::getArchitectures(bool const &Cached) { + using std::string; + + std::vector<string> static archs; + if (likely(Cached == true) && archs.empty() == false) + return archs; + + string const arch = _config->Find("APT::Architecture"); + archs = _config->FindVector("APT::Architectures"); + if (archs.empty() == true || + std::find(archs.begin(), archs.end(), arch) == archs.end()) + archs.push_back(arch); + return archs; +} + /*}}}*/ +// checkArchitecture - are we interested in the given Architecture? /*{{{*/ +bool const Configuration::checkArchitecture(std::string const &Arch) { + if (Arch == "all") + return true; + std::vector<std::string> const archs = getArchitectures(true); + return (std::find(archs.begin(), archs.end(), Arch) != archs.end()); +} + /*}}}*/ } diff --git a/apt-pkg/aptconfiguration.h b/apt-pkg/aptconfiguration.h index f2f04a39b..b6650e20c 100644 --- a/apt-pkg/aptconfiguration.h +++ b/apt-pkg/aptconfiguration.h @@ -66,6 +66,22 @@ public: /*{{{*/ std::vector<std::string> static const getLanguages(bool const &All = false, bool const &Cached = true, char const * const Locale = 0); + /** \brief Returns a vector of Architectures we support + * + * \param Cached saves the result so we need to calculated it only once + * this parameter should ony be used for testing purposes. + * + * \return a vector of Architectures in prefered order + */ + std::vector<std::string> static const getArchitectures(bool const &Cached = true); + + /** \brief Are we interested in the given Architecture? + * + * \param Arch we want to check + * \return true if we are interested, false otherwise + */ + bool static const checkArchitecture(std::string const &Arch); + /*}}}*/ }; /*}}}*/ diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 72d8e4d41..271bca409 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -6,6 +6,8 @@ #include<apt-pkg/cdromutl.h> #include<apt-pkg/strutl.h> #include<apt-pkg/cdrom.h> +#include<apt-pkg/aptconfiguration.h> + #include<sstream> #include<fstream> #include<config.h> @@ -216,33 +218,23 @@ int pkgCdrom::Score(string Path) /* Here we drop everything that is not this machines arch */ bool pkgCdrom::DropBinaryArch(vector<string> &List) { - char S[300]; - snprintf(S,sizeof(S),"/binary-%s/", - _config->Find("Apt::Architecture").c_str()); - + for (unsigned int I = 0; I < List.size(); I++) { const char *Str = List[I].c_str(); - - const char *Res; - if ((Res = strstr(Str,"/binary-")) == 0) + const char *Start, *End; + if ((Start = strstr(Str,"/binary-")) == 0) continue; - // Weird, remove it. - if (strlen(Res) < strlen(S)) - { - List.erase(List.begin() + I); - I--; - continue; - } - - // See if it is our arch - if (stringcmp(Res,Res + strlen(S),S) == 0) - continue; - - // Erase it + // Between Start and End is the architecture + Start += 8; + if ((End = strstr(Start,"/")) != 0 && Start != End && + APT::Configuration::checkArchitecture(string(Start, --End)) == true) + continue; // okay, architecture is accepted + + // not accepted -> Erase it List.erase(List.begin() + I); - I--; + --I; // the next entry is at the same index after the erase } return true; diff --git a/apt-pkg/clean.cc b/apt-pkg/clean.cc index 0d1dfbf74..629afd7cf 100644 --- a/apt-pkg/clean.cc +++ b/apt-pkg/clean.cc @@ -12,6 +12,7 @@ #include <apt-pkg/strutl.h> #include <apt-pkg/error.h> #include <apt-pkg/configuration.h> +#include <apt-pkg/aptconfiguration.h> #include <apti18n.h> @@ -26,7 +27,6 @@ bool pkgArchiveCleaner::Go(string Dir,pkgCache &Cache) { bool CleanInstalled = _config->FindB("APT::Clean-Installed",true); - string MyArch = _config->Find("APT::Architecture"); DIR *D = opendir(Dir.c_str()); if (D == 0) @@ -75,9 +75,9 @@ bool pkgArchiveCleaner::Go(string Dir,pkgCache &Cache) for (I = Start; *I != 0 && *I != '.' ;I++); if (*I != '.') continue; - string Arch = DeQuoteString(string(Start,I-Start)); + string const Arch = DeQuoteString(string(Start,I-Start)); - if (Arch != "all" && Arch != MyArch) + if (APT::Configuration::checkArchitecture(Arch) == false) continue; // Lookup the package diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 4c05f2df8..bed51881f 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -983,6 +983,23 @@ bool TokSplitString(char Tok,char *Input,char **List, return true; } /*}}}*/ +// ExplodeString - Split a string up into a vector /*{{{*/ +// --------------------------------------------------------------------- +/* This can be used to split a given string up into a vector, so the + propose is the same as in the method above and this one is a bit slower + also, but the advantage is that we an iteratable vector */ +vector<string> ExplodeString(string const &haystack, char const &split) { + string::const_iterator start = haystack.begin(); + string::const_iterator end = start; + vector<string> exploded; + do { + for (; end != haystack.end() && *end != split; ++end); + exploded.push_back(string(start, end)); + start = end; + } while (end != haystack.end() && (++end) != haystack.end()); + return exploded; +} + /*}}}*/ // RegexChoice - Simple regex list/list matcher /*{{{*/ // --------------------------------------------------------------------- /* */ diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index 2b2e147fb..3bdb65b4d 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -59,6 +59,7 @@ bool StrToNum(const char *Str,unsigned long &Res,unsigned Len,unsigned Base = 0) bool Hex2Num(const string &Str,unsigned char *Num,unsigned int Length); bool TokSplitString(char Tok,char *Input,char **List, unsigned long ListMax); +vector<string> ExplodeString(string const &haystack, char const &split=','); void ioprintf(ostream &out,const char *format,...) APT_FORMAT2; void strprintf(string &out,const char *format,...) APT_FORMAT2; char *safe_snprintf(char *Buffer,char *End,const char *Format,...) APT_FORMAT3; diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 5beb83665..73d72c729 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -149,9 +149,12 @@ unsigned long debSourcesIndex::Size() const // PackagesIndex::debPackagesIndex - Contructor /*{{{*/ // --------------------------------------------------------------------- /* */ -debPackagesIndex::debPackagesIndex(string URI,string Dist,string Section,bool Trusted) : - pkgIndexFile(Trusted), URI(URI), Dist(Dist), Section(Section) +debPackagesIndex::debPackagesIndex(string const &URI, string const &Dist, string const &Section, + bool const &Trusted, string const &Arch) : + pkgIndexFile(Trusted), URI(URI), Dist(Dist), Section(Section), Architecture(Arch) { + if (Architecture == "native") + Architecture = _config->Find("APT::Architecture"); } /*}}}*/ // PackagesIndex::ArchiveInfo - Short version of the archive url /*{{{*/ @@ -171,6 +174,8 @@ string debPackagesIndex::ArchiveInfo(pkgCache::VerIterator Ver) const Res += " "; Res += Ver.ParentPkg().Name(); Res += " "; + Res += Ver.Arch(); + Res += " "; Res += Ver.VerStr(); return Res; } @@ -204,6 +209,8 @@ string debPackagesIndex::Info(const char *Type) const else Info += Dist + '/' + Section; Info += " "; + Info += Architecture; + Info += " "; Info += Type; return Info; } @@ -227,7 +234,7 @@ string debPackagesIndex::IndexURI(const char *Type) const } else Res = URI + "dists/" + Dist + '/' + Section + - "/binary-" + _config->Find("APT::Architecture") + '/'; + "/binary-" + Architecture + '/'; Res += Type; return Res; @@ -259,7 +266,7 @@ bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const { string PackageFile = IndexFile("Packages"); FileFd Pkg(PackageFile,FileFd::ReadOnly); - debListParser Parser(&Pkg); + debListParser Parser(&Pkg, Architecture); if (_error->PendingError() == true) return _error->Error("Problem opening %s",PackageFile.c_str()); diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h index c0e8d7d8e..766e8b214 100644 --- a/apt-pkg/deb/debindexfile.h +++ b/apt-pkg/deb/debindexfile.h @@ -46,6 +46,7 @@ class debPackagesIndex : public pkgIndexFile string URI; string Dist; string Section; + string Architecture; string Info(const char *Type) const; string IndexFile(const char *Type) const; @@ -69,7 +70,8 @@ class debPackagesIndex : public pkgIndexFile virtual bool Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const; virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const; - debPackagesIndex(string URI,string Dist,string Section,bool Trusted); + debPackagesIndex(string const &URI, string const &Dist, string const &Section, + bool const &Trusted, string const &Arch = "native"); }; class debTranslationsIndex : public pkgIndexFile diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index fe68aec0b..b57eca813 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -32,10 +32,13 @@ static debListParser::WordList PrioList[] = {{"important",pkgCache::State::Impor // ListParser::debListParser - Constructor /*{{{*/ // --------------------------------------------------------------------- -/* */ -debListParser::debListParser(FileFd *File) : Tags(File) -{ - Arch = _config->Find("APT::architecture"); +/* Provide an architecture and only this one and "all" will be accepted + in Step(), if no Architecture is given we will accept every arch + we would accept in general with checkArchitecture() */ +debListParser::debListParser(FileFd *File, string const &Arch) : Tags(File), + Arch(Arch) { + if (Arch == "native") + this->Arch = _config->Find("APT::Architecture"); } /*}}}*/ // ListParser::UniqFindTagWrite - Find the tag and write a unq string /*{{{*/ @@ -64,13 +67,19 @@ string debListParser::Package() { // --------------------------------------------------------------------- /* This will return the Architecture of the package this section describes Note that architecture "all" packages will get the architecture of the - Packages file parsed here */ + Packages file parsed here. */ string debListParser::Architecture() { string const Result = Section.FindS("Architecture"); - if (Result.empty() == true) - return Arch; - if (Result == "all") - return Arch; + if (Result.empty() == true || Result == "all") { + if (Arch.empty() == true) + /* FIXME: this is a problem for installed arch all + packages as we don't know from which arch this + package was installed - and therefore which + dependency this package resolves. */ + return _config->Find("APT::Architecture"); + else + return Arch; + } return Result; } /*}}}*/ @@ -199,8 +208,12 @@ bool debListParser::UsePackage(pkgCache::PkgIterator Pkg, { if (Pkg->Section == 0) Pkg->Section = UniqFindTagWrite("Section"); - if (Section.FindFlag("Essential",Pkg->Flags,pkgCache::Flag::Essential) == false) - return false; + + // Packages which are not from "our" arch doesn't get the essential flag + string const static myArch = _config->Find("APT::Architecture"); + if (Pkg->Arch != 0 && myArch == Pkg.Arch()) + if (Section.FindFlag("Essential",Pkg->Flags,pkgCache::Flag::Essential) == false) + return false; if (Section.FindFlag("Important",Pkg->Flags,pkgCache::Flag::Important) == false) return false; @@ -630,17 +643,23 @@ bool debListParser::Step() /* See if this is the correct Architecture, if it isn't then we drop the whole section. A missing arch tag only happens (in theory) inside the Status file, so that is a positive return */ - const char *Start; - const char *Stop; - if (Section.Find("Architecture",Start,Stop) == false) + string const Architecture = Section.FindS("Architecture"); + if (Architecture.empty() == true) return true; - //FIXME: Accept different Architectures here - if (stringcmp(Arch,Start,Stop) == 0) - return true; + if (Arch.empty() == true) + { + if (APT::Configuration::checkArchitecture(Architecture) == true) + return true; + } + else + { + if (Architecture == Arch) + return true; - if (stringcmp(Start,Stop,"all") == 0) - return true; + if (Architecture == "all") + return true; + } iOffset = Tags.Offset(); } diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 5f91e073e..cba4f8e5d 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -69,7 +69,7 @@ class debListParser : public pkgCacheGenerator::ListParser bool const &StripMultiArch = false); static const char *ConvertRelation(const char *I,unsigned int &Op); - debListParser(FileFd *File); + debListParser(FileFd *File, string const &Arch = ""); }; #endif diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 8f28f053b..eb01a0156 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -8,9 +8,11 @@ #include <apt-pkg/aptconfiguration.h> #include <apt-pkg/error.h> +#include <set> + using namespace std; -string debReleaseIndex::Info(const char *Type, const string Section) const +string debReleaseIndex::Info(const char *Type, string const &Section, string const &Arch) const { string Info = ::URI::SiteOnly(URI) + ' '; if (Dist[Dist.size() - 1] == '/') @@ -19,7 +21,11 @@ string debReleaseIndex::Info(const char *Type, const string Section) const Info += Dist; } else - Info += Dist + '/' + Section; + { + Info += Dist + '/' + Section; + if (Arch.empty() == true) + Info += " " + Arch; + } Info += " "; Info += Type; return Info; @@ -61,16 +67,21 @@ string debReleaseIndex::MetaIndexURI(const char *Type) const return Res; } -string debReleaseIndex::IndexURISuffix(const char *Type, const string Section) const +string debReleaseIndex::IndexURISuffix(const char *Type, string const &Section, string const &Arch) const { string Res =""; if (Dist[Dist.size() - 1] != '/') - Res += Section + "/binary-" + _config->Find("APT::Architecture") + '/'; + { + if (Arch == "native") + Res += Section + "/binary-" + _config->Find("APT::Architecture") + '/'; + else + Res += Section + "/binary-" + Arch + '/'; + } return Res + Type; } -string debReleaseIndex::IndexURI(const char *Type, const string Section) const +string debReleaseIndex::IndexURI(const char *Type, string const &Section, string const &Arch) const { if (Dist[Dist.size() - 1] == '/') { @@ -82,10 +93,10 @@ string debReleaseIndex::IndexURI(const char *Type, const string Section) const return Res + Type; } else - return URI + "dists/" + Dist + '/' + IndexURISuffix(Type, Section); + return URI + "dists/" + Dist + '/' + IndexURISuffix(Type, Section, Arch); } -string debReleaseIndex::SourceIndexURISuffix(const char *Type, const string Section) const +string debReleaseIndex::SourceIndexURISuffix(const char *Type, const string &Section) const { string Res =""; if (Dist[Dist.size() - 1] != '/') @@ -93,7 +104,7 @@ string debReleaseIndex::SourceIndexURISuffix(const char *Type, const string Sect return Res + Type; } -string debReleaseIndex::SourceIndexURI(const char *Type, const string Section) const +string debReleaseIndex::SourceIndexURI(const char *Type, const string &Section) const { string Res; if (Dist[Dist.size() - 1] == '/') @@ -108,44 +119,61 @@ string debReleaseIndex::SourceIndexURI(const char *Type, const string Section) c return URI + "dists/" + Dist + "/" + SourceIndexURISuffix(Type, Section); } -debReleaseIndex::debReleaseIndex(string URI,string Dist) -{ - this->URI = URI; - this->Dist = Dist; - this->Indexes = NULL; - this->Type = "deb"; +debReleaseIndex::debReleaseIndex(string const &URI, string const &Dist) { + this->URI = URI; + this->Dist = Dist; + this->Indexes = NULL; + this->Type = "deb"; } -debReleaseIndex::~debReleaseIndex() -{ - for (vector<const debSectionEntry *>::const_iterator I = SectionEntries.begin(); - I != SectionEntries.end(); I++) - delete *I; +debReleaseIndex::~debReleaseIndex() { + for (map<string, vector<debSectionEntry const*> >::const_iterator A = ArchEntries.begin(); + A != ArchEntries.end(); ++A) + for (vector<const debSectionEntry *>::const_iterator S = A->second.begin(); + S != A->second.end(); ++S) + delete *S; } -vector <struct IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const -{ - vector <struct IndexTarget *>* IndexTargets = new vector <IndexTarget *>; - for (vector <const debSectionEntry *>::const_iterator I = SectionEntries.begin(); - I != SectionEntries.end(); - I++) - { - IndexTarget * Target = new IndexTarget(); - Target->ShortDesc = (*I)->IsSrc ? "Sources" : "Packages"; - Target->MetaKey - = (*I)->IsSrc ? SourceIndexURISuffix(Target->ShortDesc.c_str(), (*I)->Section) - : IndexURISuffix(Target->ShortDesc.c_str(), (*I)->Section); - Target->URI - = (*I)->IsSrc ? SourceIndexURI(Target->ShortDesc.c_str(), (*I)->Section) - : IndexURI(Target->ShortDesc.c_str(), (*I)->Section); - - Target->Description = Info (Target->ShortDesc.c_str(), (*I)->Section); - IndexTargets->push_back (Target); - } - return IndexTargets; +vector <struct IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const { + vector <struct IndexTarget *>* IndexTargets = new vector <IndexTarget *>; + + map<string, vector<debSectionEntry const*> >::const_iterator const src = ArchEntries.find("source"); + if (src != ArchEntries.end()) { + vector<debSectionEntry const*> const SectionEntries = src->second; + for (vector<debSectionEntry const*>::const_iterator I = SectionEntries.begin(); + I != SectionEntries.end(); ++I) { + IndexTarget * Target = new IndexTarget(); + Target->ShortDesc = "Sources"; + Target->MetaKey = SourceIndexURISuffix(Target->ShortDesc.c_str(), (*I)->Section); + Target->URI = SourceIndexURI(Target->ShortDesc.c_str(), (*I)->Section); + Target->Description = Info (Target->ShortDesc.c_str(), (*I)->Section); + IndexTargets->push_back (Target); + } + } + + // Only source release + if (IndexTargets->empty() == false && ArchEntries.size() == 1) + return IndexTargets; + + for (map<string, vector<debSectionEntry const*> >::const_iterator a = ArchEntries.begin(); + a != ArchEntries.end(); ++a) { + if (a->first == "source") + continue; + for (vector <const debSectionEntry *>::const_iterator I = a->second.begin(); + I != a->second.end(); ++I) { + IndexTarget * Target = new IndexTarget(); + Target->ShortDesc = "Packages"; + Target->MetaKey = IndexURISuffix(Target->ShortDesc.c_str(), (*I)->Section, a->first); + Target->URI = IndexURI(Target->ShortDesc.c_str(), (*I)->Section, a->first); + Target->Description = Info (Target->ShortDesc.c_str(), (*I)->Section, a->first); + IndexTargets->push_back (Target); + } + } + + return IndexTargets; } /*}}}*/ -bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool GetAll) const +bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const { // special case for --print-uris if (GetAll) { @@ -170,23 +198,27 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool GetAll) const ComputeIndexTargets(), new indexRecords (Dist)); - // Queue the translations - std::vector<std::string> const lang = APT::Configuration::getLanguages(true); - for (vector<const debSectionEntry *>::const_iterator I = SectionEntries.begin(); - I != SectionEntries.end(); I++) { - - if((*I)->IsSrc) - continue; - - for (vector<string>::const_iterator l = lang.begin(); - l != lang.end(); l++) - { - debTranslationsIndex i = debTranslationsIndex(URI,Dist,(*I)->Section,(*l).c_str()); - i.GetIndexes(Owner); - } - } - - return true; + // Queue the translations + std::vector<std::string> const lang = APT::Configuration::getLanguages(true); + map<string, set<string> > sections; + for (map<string, vector<debSectionEntry const*> >::const_iterator a = ArchEntries.begin(); + a != ArchEntries.end(); ++a) { + if (a->first == "source") + continue; + for (vector<debSectionEntry const*>::const_iterator I = a->second.begin(); + I != a->second.end(); I++) + sections[(*I)->Section].insert(lang.begin(), lang.end()); + } + + for (map<string, set<string> >::const_iterator s = sections.begin(); + s != sections.end(); ++s) + for (set<string>::const_iterator l = s->second.begin(); + l != s->second.end(); l++) { + debTranslationsIndex i = debTranslationsIndex(URI,Dist,s->first,(*l).c_str()); + i.GetIndexes(Owner); + } + + return true; } bool debReleaseIndex::IsTrusted() const @@ -203,71 +235,111 @@ bool debReleaseIndex::IsTrusted() const return false; } -vector <pkgIndexFile *> *debReleaseIndex::GetIndexFiles() -{ - if (Indexes != NULL) - return Indexes; - - Indexes = new vector <pkgIndexFile*>; - std::vector<std::string> const lang = APT::Configuration::getLanguages(true); - for (vector<const debSectionEntry *>::const_iterator I = SectionEntries.begin(); - I != SectionEntries.end(); I++) { - if ((*I)->IsSrc) - Indexes->push_back(new debSourcesIndex (URI, Dist, (*I)->Section, IsTrusted())); - else - { - Indexes->push_back(new debPackagesIndex (URI, Dist, (*I)->Section, IsTrusted())); - - for (vector<string>::const_iterator l = lang.begin(); - l != lang.end(); l++) - Indexes->push_back(new debTranslationsIndex(URI,Dist,(*I)->Section,(*l).c_str())); - } - } +vector <pkgIndexFile *> *debReleaseIndex::GetIndexFiles() { + if (Indexes != NULL) + return Indexes; + + Indexes = new vector <pkgIndexFile*>; + map<string, vector<debSectionEntry const*> >::const_iterator const src = ArchEntries.find("source"); + if (src != ArchEntries.end()) { + vector<debSectionEntry const*> const SectionEntries = src->second; + for (vector<debSectionEntry const*>::const_iterator I = SectionEntries.begin(); + I != SectionEntries.end(); I++) + Indexes->push_back(new debSourcesIndex (URI, Dist, (*I)->Section, IsTrusted())); + } + + // Only source release + if (Indexes->empty() == false && ArchEntries.size() == 1) + return Indexes; + + std::vector<std::string> const lang = APT::Configuration::getLanguages(true); + map<string, set<string> > sections; + for (map<string, vector<debSectionEntry const*> >::const_iterator a = ArchEntries.begin(); + a != ArchEntries.end(); ++a) { + if (a->first == "source") + continue; + for (vector<debSectionEntry const*>::const_iterator I = a->second.begin(); + I != a->second.end(); I++) { + Indexes->push_back(new debPackagesIndex (URI, Dist, (*I)->Section, IsTrusted(), a->first)); + sections[(*I)->Section].insert(lang.begin(), lang.end()); + } + } + + for (map<string, set<string> >::const_iterator s = sections.begin(); + s != sections.end(); ++s) + for (set<string>::const_iterator l = s->second.begin(); + l != s->second.end(); l++) + Indexes->push_back(new debTranslationsIndex(URI,Dist,s->first,(*l).c_str())); + + return Indexes; +} - return Indexes; +void debReleaseIndex::PushSectionEntry(vector<string> const &Archs, const debSectionEntry *Entry) { + for (vector<string>::const_iterator a = Archs.begin(); + a != Archs.end(); ++a) + ArchEntries[*a].push_back(new debSectionEntry(Entry->Section, Entry->IsSrc)); + delete Entry; } -void debReleaseIndex::PushSectionEntry(const debSectionEntry *Entry) -{ - SectionEntries.push_back(Entry); +void debReleaseIndex::PushSectionEntry(string const &Arch, const debSectionEntry *Entry) { + ArchEntries[Arch].push_back(Entry); } -debReleaseIndex::debSectionEntry::debSectionEntry (string Section, bool IsSrc): Section(Section) -{ - this->IsSrc = IsSrc; +void debReleaseIndex::PushSectionEntry(const debSectionEntry *Entry) { + if (Entry->IsSrc == true) + PushSectionEntry("source", Entry); + else { + for (map<string, vector<const debSectionEntry *> >::iterator a = ArchEntries.begin(); + a != ArchEntries.end(); ++a) { + a->second.push_back(Entry); + } + } } +debReleaseIndex::debSectionEntry::debSectionEntry (string const &Section, + bool const &IsSrc): Section(Section), IsSrc(IsSrc) +{} + class debSLTypeDebian : public pkgSourceList::Type { protected: - bool CreateItemInternal(vector<metaIndex *> &List,string URI, - string Dist,string Section, - bool IsSrc) const + bool CreateItemInternal(vector<metaIndex *> &List, string const &URI, + string const &Dist, string const &Section, + bool const &IsSrc, map<string, string> const &Options) const { - for (vector<metaIndex *>::const_iterator I = List.begin(); + map<string, string>::const_iterator const arch = Options.find("arch"); + vector<string> const Archs = + (arch != Options.end()) ? ExplodeString(arch->second) : + APT::Configuration::getArchitectures(); + + for (vector<metaIndex *>::const_iterator I = List.begin(); I != List.end(); I++) { - // This check insures that there will be only one Release file - // queued for all the Packages files and Sources files it - // corresponds to. - if (strcmp((*I)->GetType(), "deb") == 0) + // We only worry about debian entries here + if (strcmp((*I)->GetType(), "deb") != 0) + continue; + + debReleaseIndex *Deb = (debReleaseIndex *) (*I); + /* This check insures that there will be only one Release file + queued for all the Packages files and Sources files it + corresponds to. */ + if (Deb->GetURI() == URI && Deb->GetDist() == Dist) { - debReleaseIndex *Deb = (debReleaseIndex *) (*I); - // This check insures that there will be only one Release file - // queued for all the Packages files and Sources files it - // corresponds to. - if (Deb->GetURI() == URI && Deb->GetDist() == Dist) - { - Deb->PushSectionEntry(new debReleaseIndex::debSectionEntry(Section, IsSrc)); - return true; - } + if (IsSrc == true) + Deb->PushSectionEntry("source", new debReleaseIndex::debSectionEntry(Section, IsSrc)); + else + Deb->PushSectionEntry(Archs, new debReleaseIndex::debSectionEntry(Section, IsSrc)); + return true; } } // No currently created Release file indexes this entry, so we create a new one. // XXX determine whether this release is trusted or not - debReleaseIndex *Deb = new debReleaseIndex(URI,Dist); - Deb->PushSectionEntry (new debReleaseIndex::debSectionEntry(Section, IsSrc)); + debReleaseIndex *Deb = new debReleaseIndex(URI, Dist); + if (IsSrc == true) + Deb->PushSectionEntry ("source", new debReleaseIndex::debSectionEntry(Section, IsSrc)); + else + Deb->PushSectionEntry (Archs, new debReleaseIndex::debSectionEntry(Section, IsSrc)); List.push_back(Deb); return true; } @@ -277,10 +349,11 @@ class debSLTypeDeb : public debSLTypeDebian { public: - bool CreateItem(vector<metaIndex *> &List,string URI, - string Dist,string Section) const + bool CreateItem(vector<metaIndex *> &List, string const &URI, + string const &Dist, string const &Section, + std::map<string, string> const &Options) const { - return CreateItemInternal(List, URI, Dist, Section, false); + return CreateItemInternal(List, URI, Dist, Section, false, Options); } debSLTypeDeb() @@ -294,10 +367,11 @@ class debSLTypeDebSrc : public debSLTypeDebian { public: - bool CreateItem(vector<metaIndex *> &List,string URI, - string Dist,string Section) const + bool CreateItem(vector<metaIndex *> &List, string const &URI, + string const &Dist, string const &Section, + std::map<string, string> const &Options) const { - return CreateItemInternal(List, URI, Dist, Section, true); + return CreateItemInternal(List, URI, Dist, Section, true, Options); } debSLTypeDebSrc() diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h index 8e6a1463b..360fa5419 100644 --- a/apt-pkg/deb/debmetaindex.h +++ b/apt-pkg/deb/debmetaindex.h @@ -5,40 +5,44 @@ #include <apt-pkg/metaindex.h> #include <apt-pkg/sourcelist.h> +#include <map> + class debReleaseIndex : public metaIndex { public: class debSectionEntry { public: - debSectionEntry (string Section, bool IsSrc); - bool IsSrc; - string Section; + debSectionEntry (string const &Section, bool const &IsSrc); + string const Section; + bool const IsSrc; }; private: - vector <const debSectionEntry *> SectionEntries; + std::map<string, vector<debSectionEntry const*> > ArchEntries; public: - debReleaseIndex(string URI, string Dist); + debReleaseIndex(string const &URI, string const &Dist); ~debReleaseIndex(); - virtual string ArchiveURI(string File) const {return URI + File;}; - virtual bool GetIndexes(pkgAcquire *Owner, bool GetAll=false) const; + virtual string ArchiveURI(string const &File) const {return URI + File;}; + virtual bool GetIndexes(pkgAcquire *Owner, bool const &GetAll=false) const; vector <struct IndexTarget *>* ComputeIndexTargets() const; - string Info(const char *Type, const string Section) const; + string Info(const char *Type, string const &Section, string const &Arch="") const; string MetaIndexInfo(const char *Type) const; string MetaIndexFile(const char *Types) const; string MetaIndexURI(const char *Type) const; - string IndexURI(const char *Type, const string Section) const; - string IndexURISuffix(const char *Type, const string Section) const; - string SourceIndexURI(const char *Type, const string Section) const; - string SourceIndexURISuffix(const char *Type, const string Section) const; + string IndexURI(const char *Type, string const &Section, string const &Arch="native") const; + string IndexURISuffix(const char *Type, string const &Section, string const &Arch="native") const; + string SourceIndexURI(const char *Type, const string &Section) const; + string SourceIndexURISuffix(const char *Type, const string &Section) const; virtual vector <pkgIndexFile *> *GetIndexFiles(); virtual bool IsTrusted() const; + void PushSectionEntry(vector<string> const &Archs, const debSectionEntry *Entry); + void PushSectionEntry(string const &Arch, const debSectionEntry *Entry); void PushSectionEntry(const debSectionEntry *Entry); }; diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h index 779b6ab14..1d2140799 100644 --- a/apt-pkg/metaindex.h +++ b/apt-pkg/metaindex.h @@ -33,8 +33,8 @@ class metaIndex virtual const char* GetType() const {return Type;} // Interface for acquire - virtual string ArchiveURI(string /*File*/) const = 0; - virtual bool GetIndexes(pkgAcquire *Owner, bool GetAll=false) const = 0; + virtual string ArchiveURI(string const& /*File*/) const = 0; + virtual bool GetIndexes(pkgAcquire *Owner, bool const &GetAll=false) const = 0; virtual vector<pkgIndexFile *> *GetIndexFiles() = 0; virtual bool IsTrusted() const = 0; diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 2b5f53f6f..c945c59bf 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -406,7 +406,7 @@ operator<<(ostream& out, pkgCache::PkgIterator Pkg) string candidate = string(Pkg.CandVersion() == 0 ? "none" : Pkg.CandVersion()); string newest = string(Pkg.VersionList().end() ? "none" : Pkg.VersionList().VerStr()); - out << Pkg.Name() << " < " << current; + out << Pkg.Name() << " [ " << Pkg.Arch() << " ] < " << current; if (current != candidate) out << " -> " << candidate; if ( newest != "none" && candidate != newest) @@ -699,7 +699,9 @@ string pkgCache::VerIterator::RelStr() else Res += File.Site(); } - } + } + if (S->Arch != 0) + Res.append(" [").append(Arch()).append("]"); return Res; } /*}}}*/ @@ -738,6 +740,8 @@ string pkgCache::PkgFileIterator::RelStr() Res = Res + (Res.empty() == true?"l=":",l=") + Label(); if (Component() != 0) Res = Res + (Res.empty() == true?"c=":",c=") + Component(); + if (Architecture() != 0) + Res = Res + (Res.empty() == true?"b=":",b=") + Architecture(); return Res; } /*}}}*/ diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 4b3abe918..6b7a299d6 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -79,13 +79,51 @@ bool pkgSourceList::Type::FixupURI(string &URI) const Weird types may override this. */ bool pkgSourceList::Type::ParseLine(vector<metaIndex *> &List, const char *Buffer, - unsigned long CurLine, - string File) const + unsigned long const &CurLine, + string const &File) const { + for (;Buffer != 0 && isspace(*Buffer); ++Buffer); // Skip whitespaces + + // Parse option field if it exists + // e.g.: [ option1=value1 option2=value2 ] + map<string, string> Options; + if (Buffer != 0 && Buffer[0] == '[') + { + ++Buffer; // ignore the [ + for (;Buffer != 0 && isspace(*Buffer); ++Buffer); // Skip whitespaces + while (*Buffer != ']') + { + // get one option, e.g. option1=value1 + string option; + if (ParseQuoteWord(Buffer,option) == false) + return _error->Error(_("Malformed line %lu in source list %s ([option] unparseable)"),CurLine,File.c_str()); + + if (option.length() < 3) + return _error->Error(_("Malformed line %lu in source list %s ([option] too short)"),CurLine,File.c_str()); + + size_t const needle = option.find('='); + if (needle == string::npos) + return _error->Error(_("Malformed line %lu in source list %s ([%s] is not an assignment)"),CurLine,File.c_str(), option.c_str()); + + string const key = string(option, 0, needle); + string const value = string(option, needle + 1, option.length()); + + if (key.empty() == true) + return _error->Error(_("Malformed line %lu in source list %s ([%s] has no key)"),CurLine,File.c_str(), option.c_str()); + + if (value.empty() == true) + return _error->Error(_("Malformed line %lu in source list %s ([%s] key %s has no value)"),CurLine,File.c_str(),option.c_str(),key.c_str()); + + Options[key] = value; + } + ++Buffer; // ignore the ] + for (;Buffer != 0 && isspace(*Buffer); ++Buffer); // Skip whitespaces + } + string URI; string Dist; - string Section; - + string Section; + if (ParseQuoteWord(Buffer,URI) == false) return _error->Error(_("Malformed line %lu in source list %s (URI)"),CurLine,File.c_str()); if (ParseQuoteWord(Buffer,Dist) == false) @@ -100,7 +138,7 @@ bool pkgSourceList::Type::ParseLine(vector<metaIndex *> &List, if (ParseQuoteWord(Buffer,Section) == true) return _error->Error(_("Malformed line %lu in source list %s (absolute dist)"),CurLine,File.c_str()); Dist = SubstVar(Dist,"$(ARCH)",_config->Find("APT::Architecture")); - return CreateItem(List,URI,Dist,Section); + return CreateItem(List, URI, Dist, Section, Options); } // Grab the rest of the dists @@ -109,7 +147,7 @@ bool pkgSourceList::Type::ParseLine(vector<metaIndex *> &List, do { - if (CreateItem(List,URI,Dist,Section) == false) + if (CreateItem(List, URI, Dist, Section, Options) == false) return false; } while (ParseQuoteWord(Buffer,Section) == true); @@ -246,36 +284,7 @@ bool pkgSourceList::ReadAppend(string File) if (Parse == 0) return _error->Error(_("Type '%s' is not known on line %u in source list %s"),LineType.c_str(),CurLine,File.c_str()); - // Vendor name specified - if (C[0] == '[') - { - string VendorID; - - if (ParseQuoteWord(C,VendorID) == false) - return _error->Error(_("Malformed line %u in source list %s (vendor id)"),CurLine,File.c_str()); - - if (VendorID.length() < 2 || VendorID.end()[-1] != ']') - return _error->Error(_("Malformed line %u in source list %s (vendor id)"),CurLine,File.c_str()); - VendorID = string(VendorID,1,VendorID.size()-2); - -// for (vector<const Vendor *>::const_iterator iter = VendorList.begin(); -// iter != VendorList.end(); iter++) -// { -// if ((*iter)->GetVendorID() == VendorID) -// { -// if (_config->FindB("Debug::sourceList", false)) -// std::cerr << "Comparing VendorID \"" << VendorID << "\" with \"" << (*iter)->GetVendorID() << '"' << std::endl; -// Verifier = *iter; -// break; -// } -// } - -// if (Verifier == 0) -// return _error->Error(_("Unknown vendor ID '%s' in line %u of source list %s"), -// VendorID.c_str(),CurLine,File.c_str()); - } - - if (Parse->ParseLine(SrcList,C,CurLine,File) == false) + if (Parse->ParseLine(SrcList, C, CurLine, File) == false) return false; } return true; diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h index b9e4389ed..e15314a5e 100644 --- a/apt-pkg/sourcelist.h +++ b/apt-pkg/sourcelist.h @@ -29,6 +29,7 @@ #include <string> #include <vector> +#include <map> #include <apt-pkg/pkgcache.h> #include <apt-pkg/metaindex.h> @@ -57,9 +58,10 @@ class pkgSourceList bool FixupURI(string &URI) const; virtual bool ParseLine(vector<metaIndex *> &List, const char *Buffer, - unsigned long CurLine,string File) const; - virtual bool CreateItem(vector<metaIndex *> &List,string URI, - string Dist,string Section) const = 0; + unsigned long const &CurLine,string const &File) const; + virtual bool CreateItem(vector<metaIndex *> &List,string const &URI, + string const &Dist,string const &Section, + std::map<string, string> const &Options) const = 0; Type(); virtual ~Type() {}; }; diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc index b4d1d4696..e5f0fafd2 100644 --- a/apt-pkg/versionmatch.cc +++ b/apt-pkg/versionmatch.cc @@ -100,6 +100,8 @@ pkgVersionMatch::pkgVersionMatch(string Data,MatchType Type) : Type(Type) RelLabel = Fragments[J]+2; else if (stringcasecmp(Fragments[J],Fragments[J]+2,"c=") == 0) RelComponent = Fragments[J]+2; + else if (stringcasecmp(Fragments[J],Fragments[J]+2,"b=") == 0) + RelArchitecture = Fragments[J]+2; } if (RelVerStr.end()[-1] == '*') @@ -178,7 +180,7 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File) if (RelVerStr.empty() == true && RelOrigin.empty() == true && RelArchive.empty() == true && RelLabel.empty() == true && RelRelease.empty() == true && RelCodename.empty() == true && - RelComponent.empty() == true) + RelComponent.empty() == true && RelArchitecture.empty() == true) return false; if (RelVerStr.empty() == false) @@ -211,6 +213,10 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File) if (File->Component == 0 || stringcasecmp(RelComponent,File.Component()) != 0) return false; + if (RelArchitecture.empty() == false) + if (File->Architecture == 0 || + stringcasecmp(RelArchitecture,File.Architecture()) != 0) + return false; return true; } diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h index a8f3c84ac..a8da072ae 100644 --- a/apt-pkg/versionmatch.h +++ b/apt-pkg/versionmatch.h @@ -23,6 +23,7 @@ Codename (n=) e.g. etch, lenny, squeeze, sid Label (l=) Component (c=) + Binary Architecture (b=) If there are no equals signs in the string then it is scanned in short form - if it starts with a number it is Version otherwise it is an Archive or a Codename. @@ -55,6 +56,7 @@ class pkgVersionMatch string RelArchive; string RelLabel; string RelComponent; + string RelArchitecture; bool MatchAll; // Origin Matching -- cgit v1.2.3 From 25396fb06350344996a20d05423562f08a4165db Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 27 Dec 2009 19:39:47 +0100 Subject: Split ListParser::NewDepends into two methods to use these new method for creating the dependencies needed for our groups: For now for all groups only one package can be installed at the same time which conflicts with each other packages in the group. The exceptions are architecture all package. Also, the Multi-Arch field is now parsed, but not used for now. --- apt-pkg/cacheiterators.h | 14 ++++- apt-pkg/deb/deblistparser.cc | 24 ++++++++ apt-pkg/pkgcache.cc | 27 +++++++++ apt-pkg/pkgcache.h | 12 +++- apt-pkg/pkgcachegen.cc | 133 ++++++++++++++++++++++++++++++++----------- apt-pkg/pkgcachegen.h | 6 +- 6 files changed, 176 insertions(+), 40 deletions(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 35d3aa228..33d2ed6be 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -81,13 +81,21 @@ template<typename Str, typename Itr> class pkgCache::Iterator { different architectures can be treated as of the "same" package (apt internally treat them as totally different packages) */ class pkgCache::GrpIterator: public Iterator<Group, GrpIterator> { + long HashIndex; + protected: inline Group* OwnerPointer() const { return Owner->GrpP; }; public: - void operator ++(int) {if (S != Owner->GrpP) S = Owner->GrpP + S->Next;}; + // This constructor is the 'begin' constructor, never use it. + inline GrpIterator(pkgCache &Owner) : Iterator<Group, GrpIterator>(Owner), HashIndex(-1) { + S = OwnerPointer(); + operator ++(0); + }; + + virtual void operator ++(int); virtual void operator ++() {operator ++(0);}; inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;}; @@ -96,11 +104,11 @@ class pkgCache::GrpIterator: public Iterator<Group, GrpIterator> { PkgIterator NextPkg(PkgIterator const &Pkg); // Constructors - inline GrpIterator(pkgCache &Owner, Group *Trg) : Iterator<Group, GrpIterator>(Owner, Trg) { + inline GrpIterator(pkgCache &Owner, Group *Trg) : Iterator<Group, GrpIterator>(Owner, Trg), HashIndex(0) { if (S == 0) S = OwnerPointer(); }; - inline GrpIterator() : Iterator<Group, GrpIterator>() {}; + inline GrpIterator() : Iterator<Group, GrpIterator>(), HashIndex(0) {}; }; /*}}}*/ diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index b57eca813..f683de423 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -104,6 +104,30 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver) // Parse the architecture Ver->Arch = WriteUniqString(Architecture()); + // Parse multi-arch + if (Section.FindS("Architecture") == "all") + /* Arch all packages can't have a Multi-Arch field, + but we need a special treatment for them nonetheless */ + Ver->MultiArch = pkgCache::Version::All; + else + { + string const MultiArch = Section.FindS("Multi-Arch"); + if (MultiArch.empty() == true) + Ver->MultiArch = pkgCache::Version::None; + else if (MultiArch == "same") + Ver->MultiArch = pkgCache::Version::Same; + else if (MultiArch == "foreign") + Ver->MultiArch = pkgCache::Version::Foreign; + else if (MultiArch == "allowed") + Ver->MultiArch = pkgCache::Version::Allowed; + else + { + _error->Warning("Unknown Multi-Arch type »%s« for package »%s«", + MultiArch.c_str(), Section.FindS("Package").c_str()); + Ver->MultiArch = pkgCache::Version::None; + } + } + // Archive Size Ver->Size = (unsigned)Section.FindI("Size"); diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index c945c59bf..1e4c7edb3 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -182,6 +182,16 @@ unsigned long pkgCache::sHash(const char *Str) const // Cache::FindPkg - Locate a package by name /*{{{*/ // --------------------------------------------------------------------- /* Returns 0 on error, pointer to the package otherwise */ +pkgCache::PkgIterator pkgCache::FindPkg(const string &Name) { + size_t const found = Name.find(':'); + if (found == string::npos) + return FindPkg(Name, "native"); + return FindPkg(Name.substr(0, found), Name.substr(found+1, string::npos)); +} + /*}}}*/ +// Cache::FindPkg - Locate a package by name /*{{{*/ +// --------------------------------------------------------------------- +/* Returns 0 on error, pointer to the package otherwise */ pkgCache::PkgIterator pkgCache::FindPkg(const string &Name, string Arch) { /* We make a detour via the GrpIterator here as on a multi-arch environment a group is easier to @@ -322,6 +332,23 @@ pkgCache::PkgIterator pkgCache::GrpIterator::NextPkg(pkgCache::PkgIterator const return PkgIterator(*Owner, 0); } /*}}}*/ +// GrpIterator::operator ++ - Postfix incr /*{{{*/ +// --------------------------------------------------------------------- +/* This will advance to the next logical group in the hash table. */ +void pkgCache::GrpIterator::operator ++(int) +{ + // Follow the current links + if (S != Owner->GrpP) + S = Owner->GrpP + S->Next; + + // Follow the hash table + while (S == Owner->GrpP && (HashIndex+1) < (signed)_count(Owner->HeaderP->GrpHashTable)) + { + HashIndex++; + S = Owner->GrpP + Owner->HeaderP->GrpHashTable[HashIndex]; + } +}; + /*}}}*/ // PkgIterator::operator ++ - Postfix incr /*{{{*/ // --------------------------------------------------------------------- /* This will advance to the next logical package in the hash table. */ diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index b3d2752d2..5f50001d0 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -125,9 +125,12 @@ class pkgCache /*{{{*/ // Accessors GrpIterator FindGrp(const string &Name); - PkgIterator FindPkg(const string &Name, string Arch = "native"); + PkgIterator FindPkg(const string &Name); + PkgIterator FindPkg(const string &Name, string Arch); Header &Head() {return *HeaderP;}; + inline GrpIterator GrpBegin(); + inline GrpIterator GrpEnd(); inline PkgIterator PkgBegin(); inline PkgIterator PkgEnd(); inline PkgFileIterator FileBegin(); @@ -274,7 +277,8 @@ struct pkgCache::Version /*{{{*/ map_ptrloc VerStr; // Stringtable map_ptrloc Section; // StringTable (StringItem) map_ptrloc Arch; // StringTable - + enum {None, All, Foreign, Same, Allowed} MultiArch; + // Lists map_ptrloc FileList; // VerFile map_ptrloc NextVer; // Version @@ -337,6 +341,10 @@ struct pkgCache::StringItem /*{{{*/ /*}}}*/ #include <apt-pkg/cacheiterators.h> +inline pkgCache::GrpIterator pkgCache::GrpBegin() + {return GrpIterator(*this);}; +inline pkgCache::GrpIterator pkgCache::GrpEnd() + {return GrpIterator(*this,GrpP);}; inline pkgCache::PkgIterator pkgCache::PkgBegin() {return PkgIterator(*this);}; inline pkgCache::PkgIterator pkgCache::PkgEnd() diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index c37f6f48e..2a4a30349 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -18,6 +18,7 @@ #include <apt-pkg/progress.h> #include <apt-pkg/sourcelist.h> #include <apt-pkg/configuration.h> +#include <apt-pkg/aptconfiguration.h> #include <apt-pkg/strutl.h> #include <apt-pkg/sptr.h> #include <apt-pkg/pkgsystem.h> @@ -38,7 +39,7 @@ typedef vector<pkgIndexFile *>::iterator FileIterator; // CacheGenerator::pkgCacheGenerator - Constructor /*{{{*/ // --------------------------------------------------------------------- -/* We set the diry flag and make sure that is written to the disk */ +/* We set the dirty flag and make sure that is written to the disk */ pkgCacheGenerator::pkgCacheGenerator(DynamicMMap *pMap,OpProgress *Prog) : Map(*pMap), Cache(pMap,false), Progress(Prog), FoundFileDeps(0) @@ -506,21 +507,58 @@ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc, return Description; } /*}}}*/ -// ListParser::NewDepends - Create a dependency element /*{{{*/ +// CacheGenerator::FinishCache - do various finish operations /*{{{*/ +// --------------------------------------------------------------------- +/* This prepares the Cache for delivery */ +bool pkgCacheGenerator::FinishCache(OpProgress &Progress) { + // FIXME: add progress reporting for this operation + // Do we have different architectures in your groups ? + vector<string> archs = APT::Configuration::getArchitectures(); + if (archs.size() > 1) { + // Create Conflicts in between the group + for (pkgCache::GrpIterator G = GetCache().GrpBegin(); G.end() != true; G++) { + string const PkgName = G.Name(); + for (pkgCache::PkgIterator P = G.PackageList(); P.end() != true; P = G.NextPkg(P)) { + for (pkgCache::VerIterator V = P.VersionList(); V.end() != true; V++) { + // Arch all packages are "co-installable" + if (V->MultiArch == pkgCache::Version::All) + continue; + string const Arch = V.Arch(); + map_ptrloc *OldDepLast = NULL; + for (vector<string>::const_iterator A = archs.begin(); A != archs.end(); ++A) { + if (*A == Arch) + continue; + /* We allow only one installed arch at the time + per group, therefore each group member conflicts + with all other group members */ + pkgCache::PkgIterator D = G.FindPkg(*A); + if (D.end() == true) + continue; + // Conflicts: ${self}:other + NewDepends(D, V, "", + pkgCache::Dep::NoOp, pkgCache::Dep::Conflicts, + OldDepLast); + } + } + } + } + } + return true; +} + /*}}}*/ +// CacheGenerator::NewDepends - Create a dependency element /*{{{*/ // --------------------------------------------------------------------- /* This creates a dependency element in the tree. It is linked to the version and to the package that it is pointing to. */ -bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, - const string &PackageName, - const string &Arch, - const string &Version, - unsigned int Op, - unsigned int Type) +bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg, + pkgCache::VerIterator &Ver, + string const &Version, + unsigned int const &Op, + unsigned int const &Type, + map_ptrloc *OldDepLast) { - pkgCache &Cache = Owner->Cache; - // Get a structure - unsigned long const Dependency = Owner->Map.Allocate(sizeof(pkgCache::Dependency)); + unsigned long const Dependency = Map.Allocate(sizeof(pkgCache::Dependency)); if (unlikely(Dependency == 0)) return false; @@ -530,17 +568,6 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, Dep->Type = Type; Dep->CompareOp = Op; Dep->ID = Cache.HeaderP->DependsCount++; - - pkgCache::GrpIterator Grp; - if (unlikely(Owner->NewGroup(Grp, PackageName) == false)) - return false; - - // Locate the target package - pkgCache::PkgIterator Pkg = Grp.FindPkg(Arch); - if (Pkg.end() == true) { - if (unlikely(Owner->NewPackage(Pkg, PackageName, Arch) == false)) - return false; - } // Probe the reverse dependency list for a version string that matches if (Version.empty() == false) @@ -549,29 +576,23 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, if (I->Version != 0 && I.TargetVer() == Version) Dep->Version = I->Version;*/ if (Dep->Version == 0) - if (unlikely((Dep->Version = WriteString(Version)) == 0)) + if (unlikely((Dep->Version = Map.WriteString(Version)) == 0)) return false; } - + // Link it to the package Dep->Package = Pkg.Index(); Dep->NextRevDepends = Pkg->RevDepends; Pkg->RevDepends = Dep.Index(); - - /* Link it to the version (at the end of the list) - Caching the old end point speeds up generation substantially */ - if (OldDepVer != Ver) + + // Do we know where to link the Dependency to? + if (OldDepLast == NULL) { OldDepLast = &Ver->DependsList; for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++) OldDepLast = &D->NextDepends; - OldDepVer = Ver; } - // Is it a file dependency? - if (unlikely(PackageName[0] == '/')) - FoundFileDeps = true; - Dep->NextDepends = *OldDepLast; *OldDepLast = Dep.Index(); OldDepLast = &Dep->NextDepends; @@ -579,6 +600,41 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, return true; } /*}}}*/ +// ListParser::NewDepends - Create the environment for a new dependency /*{{{*/ +// --------------------------------------------------------------------- +/* This creates a Group and the Package to link this dependency to if + needed and handles also the caching of the old endpoint */ +bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, + const string &PackageName, + const string &Arch, + const string &Version, + unsigned int Op, + unsigned int Type) +{ + pkgCache::GrpIterator Grp; + if (unlikely(Owner->NewGroup(Grp, PackageName) == false)) + return false; + + // Locate the target package + pkgCache::PkgIterator Pkg = Grp.FindPkg(Arch); + if (Pkg.end() == true) { + if (unlikely(Owner->NewPackage(Pkg, PackageName, Arch) == false)) + return false; + } + + // Is it a file dependency? + if (unlikely(PackageName[0] == '/')) + FoundFileDeps = true; + + /* Caching the old end point speeds up generation substantially */ + if (OldDepVer != Ver) { + OldDepLast = NULL; + OldDepVer = Ver; + } + + return Owner->NewDepends(Pkg, Ver, Version, Op, Type, OldDepLast); +} + /*}}}*/ // ListParser::NewProvides - Create a Provides element /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -925,6 +981,9 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, if (BuildCache(Gen,Progress,CurrentSize,TotalSize, Files.begin()+EndOfSource,Files.end()) == false) return false; + + // FIXME: move me to a better place + Gen.FinishCache(Progress); } else { @@ -965,6 +1024,9 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, if (BuildCache(Gen,Progress,CurrentSize,TotalSize, Files.begin()+EndOfSource,Files.end()) == false) return false; + + // FIXME: move me to a better place + Gen.FinishCache(Progress); } if (_error->PendingError() == true) @@ -1010,7 +1072,10 @@ bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap) if (BuildCache(Gen,Progress,CurrentSize,TotalSize, Files.begin()+EndOfSource,Files.end()) == false) return false; - + + // FIXME: move me to a better place + Gen.FinishCache(Progress); + if (_error->PendingError() == true) return false; *OutMap = Map.UnGuard(); diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 4a2419b24..53f09b991 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -55,6 +55,9 @@ class pkgCacheGenerator /*{{{*/ bool NewPackage(pkgCache::PkgIterator &Pkg,const string &Name, const string &Arch); bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List); bool NewFileDesc(pkgCache::DescIterator &Desc,ListParser &List); + bool NewDepends(pkgCache::PkgIterator &Pkg, pkgCache::VerIterator &Ver, + string const &Version, unsigned int const &Op, + unsigned int const &Type, map_ptrloc *OldDepLast); unsigned long NewVersion(pkgCache::VerIterator &Ver,const string &VerStr,unsigned long Next); map_ptrloc NewDescription(pkgCache::DescIterator &Desc,const string &Lang,const MD5SumValue &md5sum,map_ptrloc Next); @@ -73,7 +76,8 @@ class pkgCacheGenerator /*{{{*/ bool HasFileDeps() {return FoundFileDeps;}; bool MergeFileProvides(ListParser &List); - + bool FinishCache(OpProgress &Progress); + pkgCacheGenerator(DynamicMMap *Map,OpProgress *Progress); ~pkgCacheGenerator(); }; -- cgit v1.2.3 From d456bf5a0a30402b7c1aaf13d220f2319f879fe5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 1 Jan 2010 12:54:13 +0100 Subject: Chris Leick spot & fix various typos in all manpages --- debian/changelog | 3 +++ doc/apt.conf.5.xml | 10 +++++----- doc/guide.sgml | 6 +++--- doc/offline.sgml | 8 ++++---- doc/sources.list.5.xml | 2 +- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9f5f25d8e..648d7ed3e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ apt (0.7.26) UNRELEASED; urgency=low [ Christian Perrier ] * French manpage translation update + [Chris Leick] + * spot & fix various typos in all manpages + [ David Kalnischkies ] * [BREAK] add possibility to download and use multiply Translation files, configurable with Acquire::Translation diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 777630e14..734ae1fe7 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -166,10 +166,10 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; longer guaranteed to work as their dependency on A is not longer satisfied. The immediate configuration marker is also applied to all dependencies which can generate a problem if the dependencies e.g. form a circle as a dependency with the immediate flag is comparable with a Pre-Dependency. So in theory it is possible - that APT encounters a situation in which it is unable to perform immediate configuration, error out and - refers to this option so the user can deactivate the immediate configuration temporary to be able to perform + that APT encounters a situation in which it is unable to perform immediate configuration, errors out and + refers to this option so the user can deactivate the immediate configuration temporarily to be able to perform an install/upgrade again. Note the use of the word "theory" here as this problem was only encountered by now - in real world a few times in non-stable distribution versions and caused by wrong dependencies of the package + in real world a few times in non-stable distribution versions and was caused by wrong dependencies of the package in question or by a system in an already broken state, so you should not blindly disable this option as the mentioned scenario above is not the only problem immediate configuration can help to prevent in the first place. Before a big operation like <literal>dist-upgrade</literal> is run with this option disabled it should be tried to @@ -396,7 +396,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; <varlistentry><term>Languages</term> <listitem><para>The Languages subsection controls which <filename>Translation</filename> files are downloaded and in which order APT tries to display the Description-Translations. APT will try to display the first - available Description for the Language which is listed at first. Languages can be defined with their + available Description in the Language which is listed at first. Languages can be defined with their short or long Languagecodes. Note that not all archives provide <filename>Translation</filename> files for every Language - especially the long Languagecodes are rare, so please inform you which ones are available before you set here impossible values.</para> @@ -407,7 +407,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; To force apt to use no Translation file use the setting <literal>Acquire::Languages=none</literal>. "<literal>none</literal>" is another special meaning code which will stop the search for a fitting <filename>Translation</filename> file. This can be used by the system administrator to let APT know that it should download also this files without - actually use them if not the environment specifies this languages. So the following example configuration will + actually use them if the environment doesn't specify this languages. So the following example configuration will result in the order "en, de" in an english and in "de, en" in a german localization. Note that "fr" is downloaded, but not used if APT is not used in a french localization, in such an environment the order would be "fr, de, en". <programlisting>Acquire::Languages { "environment"; "de"; "en"; "none"; "fr"; };</programlisting></para></listitem> diff --git a/doc/guide.sgml b/doc/guide.sgml index 1b7e1d8f3..ff727f6ca 100644 --- a/doc/guide.sgml +++ b/doc/guide.sgml @@ -56,7 +56,7 @@ requires another package to be installed at the same time to work properly. <p> For instance, mailcrypt is an emacs extension that aids in encrypting email -with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a +with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a simple dependency on GPG. Also, because it is an emacs extension it has a simple dependency on emacs, without emacs it is completely useless. @@ -171,7 +171,7 @@ the <prgn>dselect</> package selection GUI. <prgn>dselect</> is used to select the packages to be installed or removed and APT actually installs them. <p> -To enable the APT method you need to to select [A]ccess in <prgn>dselect</> +To enable the APT method you need to select [A]ccess in <prgn>dselect</> and then choose the APT method. You will be prompted for a set of <em>Sources</> which are places to fetch archives from. These can be remote Internet sites, local Debian mirrors or CDROMs. Each source can provide @@ -239,7 +239,7 @@ prompt until you have specified all that you want. <p> Before starting to use <prgn>dselect</> it is necessary to update the -available list by selecting [U]pdate from the menu. This is a super-set of +available list by selecting [U]pdate from the menu. This is a superset of <tt>apt-get update</> that makes the fetched information available to <prgn>dselect</>. [U]pdate must be performed even if <tt>apt-get update</> has been run before. diff --git a/doc/offline.sgml b/doc/offline.sgml index 99e260bc3..e7ede14de 100644 --- a/doc/offline.sgml +++ b/doc/offline.sgml @@ -50,7 +50,7 @@ no connection. <p> This is achieved by creatively manipulating the APT configuration file. The -essential premis to tell APT to look on a disc for it's archive files. Note +essential premise to tell APT to look on a disc for it's archive files. Note that the disc should be formated with a filesystem that can handle long file names such as ext2, fat32 or vfat. @@ -129,7 +129,7 @@ configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>. <p> On the target machine the first thing to do is mount the disc and copy <em>/var/lib/dpkg/status</em> to it. You will also need to create the directories -outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</em> +outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</em>. Then take the disc to the remote machine and configure the sources.list. On the remote machine execute the following: @@ -141,9 +141,9 @@ On the remote machine execute the following: [ APT fetches all the packages needed to upgrade the target machine ] </example> -The dist-upgrade command can be replaced with any-other standard APT commands, +The dist-upgrade command can be replaced with any other standard APT commands, particularly dselect-upgrade. You can even use an APT front end such as -<em>dselect</em> However this presents a problem in communicating your +<em>dselect</em>. However this presents a problem in communicating your selections back to the local computer. <p> diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index e2993db2c..c71ae6bdd 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -180,7 +180,7 @@ deb http://http.us.debian.org/debian dists/stable-updates/ APT can be extended with more methods shipped in other optional packages which should follow the nameing scheme <literal>apt-transport-<replaceable>method</replaceable></literal>. The APT team e.g. maintains also the <literal>apt-transport-https</literal> package which - provides access methods for https-URIs with features similiar to the http method, but other + provides access methods for https-URIs with features similar to the http method, but other methods for using e.g. debtorrent are also available, see <citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></refentrytitle> <manvolnum>1</manvolnum></citerefentry>. -- cgit v1.2.3 From 739f45cd83e22d9f5713218f0cd5b0dedba5a4a5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 1 Jan 2010 19:10:14 +0100 Subject: update german manpage translation by Chris Leick --- debian/changelog | 1 + doc/po/de.po | 1147 +++++++++++++++++++++++++++++++++++------------------- 2 files changed, 747 insertions(+), 401 deletions(-) diff --git a/debian/changelog b/debian/changelog index 648d7ed3e..acc53b037 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ apt (0.7.26) UNRELEASED; urgency=low [Chris Leick] * spot & fix various typos in all manpages + * German manpage translation update [ David Kalnischkies ] * [BREAK] add possibility to download and use multiply diff --git a/doc/po/de.po b/doc/po/de.po index 3ec7c4a5b..00ebf7b3d 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: apt-doc 0.7.24\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" "POT-Creation-Date: 2009-11-27 00:05+0100\n" -"PO-Revision-Date: 2009-10-28 23:51+GMT\n" +"PO-Revision-Date: 2009-12-31 17:41+GMT\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -42,7 +42,7 @@ msgstr "NAME" #. type: Plain text #: apt.8:20 msgid "apt - Advanced Package Tool" -msgstr "apt - Fortschrittliches Paketierungswerkzeug (Advanced Package Tool)" +msgstr "apt - Fortschrittliches Paketwerkzeug (Advanced Package Tool)" #. type: SH #: apt.8:20 @@ -350,13 +350,7 @@ msgstr "" #. type: Plain text #: apt.ent:84 -#, fuzzy, no-wrap -#| msgid "" -#| "<!ENTITY dpkg \"<citerefentry>\n" -#| " <refentrytitle><command>dpkg</command></refentrytitle>\n" -#| " <manvolnum>8</manvolnum>\n" -#| " </citerefentry>\"\n" -#| ">\n" +#, no-wrap msgid "" "<!ENTITY dpkg \"<citerefentry>\n" " <refentrytitle><command>dpkg</command></refentrytitle>\n" @@ -366,7 +360,7 @@ msgid "" msgstr "" "<!ENTITY dpkg \"<citerefentry>\n" " <refentrytitle><command>dpkg</command></refentrytitle>\n" -" <manvolnum>8</manvolnum>\n" +" <manvolnum>1</manvolnum>\n" " </citerefentry>\"\n" ">\n" @@ -404,13 +398,7 @@ msgstr "" #. type: Plain text #: apt.ent:102 -#, fuzzy, no-wrap -#| msgid "" -#| "<!ENTITY dpkg-scanpackages \"<citerefentry>\n" -#| " <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n" -#| " <manvolnum>8</manvolnum>\n" -#| " </citerefentry>\"\n" -#| ">\n" +#, no-wrap msgid "" "<!ENTITY dpkg-scanpackages \"<citerefentry>\n" " <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n" @@ -420,19 +408,13 @@ msgid "" msgstr "" "<!ENTITY dpkg-scanpackages \"<citerefentry>\n" " <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n" -" <manvolnum>8</manvolnum>\n" +" <manvolnum>1</manvolnum>\n" " </citerefentry>\"\n" ">\n" #. type: Plain text #: apt.ent:108 -#, fuzzy, no-wrap -#| msgid "" -#| "<!ENTITY dpkg-scansources \"<citerefentry>\n" -#| " <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n" -#| " <manvolnum>8</manvolnum>\n" -#| " </citerefentry>\"\n" -#| ">\n" +#, no-wrap msgid "" "<!ENTITY dpkg-scansources \"<citerefentry>\n" " <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n" @@ -442,19 +424,13 @@ msgid "" msgstr "" "<!ENTITY dpkg-scansources \"<citerefentry>\n" " <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n" -" <manvolnum>8</manvolnum>\n" +" <manvolnum>1</manvolnum>\n" " </citerefentry>\"\n" ">\n" #. type: Plain text #: apt.ent:114 -#, fuzzy, no-wrap -#| msgid "" -#| "<!ENTITY dselect \"<citerefentry>\n" -#| " <refentrytitle><command>dselect</command></refentrytitle>\n" -#| " <manvolnum>8</manvolnum>\n" -#| " </citerefentry>\"\n" -#| ">\n" +#, no-wrap msgid "" "<!ENTITY dselect \"<citerefentry>\n" " <refentrytitle><command>dselect</command></refentrytitle>\n" @@ -464,7 +440,7 @@ msgid "" msgstr "" "<!ENTITY dselect \"<citerefentry>\n" " <refentrytitle><command>dselect</command></refentrytitle>\n" -" <manvolnum>8</manvolnum>\n" +" <manvolnum>1</manvolnum>\n" " </citerefentry>\"\n" ">\n" @@ -1375,13 +1351,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:152 -#, fuzzy -#| msgid "" -#| "<literal>Missing</literal> is the number of package names that were " -#| "referenced in a dependency but were not provided by any package. Missing " -#| "packages may be in evidence if a full distribution is not accessed, or if " -#| "a package (real or virtual) has been dropped from the distribution. " -#| "Usually they are referenced from Conflicts or Breaks statements." msgid "" "<literal>Missing</literal> is the number of package names that were " "referenced in a dependency but were not provided by any package. Missing " @@ -1408,8 +1377,9 @@ msgstr "" "<literal>Total distinct</literal> Versionen ist die Anzahl der im " "Zwischenspeicher gefundenen Paketversionen. Dieser Wert ist daher meistens " "gleich der Anzahl der gesamten Paketnamen. Wenn auf mehr als eine " -"Distribution (zum Beispiel »stable« und »unstable« zusammen) zugegriffen wird, " -"kann dieser Wert deutlich größer als die gesamte Anzahl der Paketnamen sein." +"Distribution (zum Beispiel »stable« und »unstable« zusammen) zugegriffen " +"wird, kann dieser Wert deutlich größer als die gesamte Anzahl der " +"Paketnamen sein." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:166 @@ -1584,11 +1554,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:234 -#, fuzzy -#| msgid "" -#| "Note that a package which APT knows of is not nessasarily available to " -#| "download, installable or installed, e.g. virtual packages are also listed " -#| "in the generated list." msgid "" "Note that a package which APT knows of is not necessarily available to " "download, installable or installed, e.g. virtual packages are also listed in " @@ -2017,7 +1982,7 @@ msgid "" "<arg>add</arg> <arg>ident</arg> </group>" msgstr "" "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> " -"<arg><option>-d=<replaceable>CDROM-Einhängepunkt</replaceable></option></" +"<arg><option>-d=<replaceable>CD-ROM-Einhängepunkt</replaceable></option></" "arg><arg><option>-o=<replaceable>Konfigurationszeichenkette</replaceable></" "option></arg><arg><option>-c=<replaceable>Datei</replaceable></option></" "arg><group><arg>hinzufügen</arg><arg>Identifikation</arg></group>" @@ -2030,7 +1995,7 @@ msgid "" "the structure of the disc as well as correcting for several possible mis-" "burns and verifying the index files." msgstr "" -"<command>apt-cdrom</command> wird benutzt, um eine neue CDROM zu APTs Liste " +"<command>apt-cdrom</command> wird benutzt, um eine neue CD-ROM zu APTs Liste " "der verfügbaren Quellen hinzuzufügen. <command>apt-cdrom</command> kümmert " "sich um die festgestellte Struktur des Mediums, sowie die Korrektur für " "mehrere mögliche Fehlbrennungen und prüft die Indexdateien." @@ -2062,7 +2027,7 @@ msgid "" "title." msgstr "" "<literal>add</literal> wird benutzt, um ein neues Medium zur Quellenliste " -"hinzuzufügen. Es wird das CDROM-Gerät aushängen, verlangen, dass ein Medium " +"hinzuzufügen. Es wird das CD-ROM-Gerät aushängen, verlangen, dass ein Medium " "eingelegt wird und dann mit den Einlesen und Kopieren der Indexdateien " "fortfahren. Wenn das Medium kein angemessenes <filename>disk</filename>-" "Verzeichnis hat, werden Sie nach einem aussagekräftigen Titel gefragt." @@ -2074,7 +2039,7 @@ msgid "" "maintains a database of these IDs in <filename>&statedir;/cdroms.list</" "filename>" msgstr "" -"APT benutzt eine CDROM-ID, um nachzuverfolgen, welches Medium gerade im " +"APT benutzt eine CD-ROM-ID, um nachzuverfolgen, welches Medium gerade im " "Laufwerk ist und verwaltet eine Datenbank mit diesen IDs in " "<filename>&statedir;/cdroms.list</filename>" @@ -2341,9 +2306,9 @@ msgid "" "names, d returns directories, b returns true or false and i returns an " "integer. Each of the returns is normalized and verified internally." msgstr "" -"An das Konfigurationselement kann /[fdbi] angehängt werden. f gibt " -"Dateinamen zurück, d gibt Verzeichnisse zurück, b gibt true oder false " -"zurück und i gibt eine Ganzzahl zurück. Jede Rückgabe ist normiert und " +"An das Konfigurationselement kann /[fdbi] angehängt werden. »f« gibt " +"Dateinamen zurück, »d« gibt Verzeichnisse zurück, »b« gibt true oder false " +"zurück und »i« gibt eine Ganzzahl zurück. Jede Rückgabe ist normiert und " "intern geprüft." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -2426,10 +2391,10 @@ msgid "" "XXXX</filename> and <filename>package.config.XXXX</filename>" msgstr "" "Schablonendatei und Konfigurationsskript werden in das temporäre Verzeichnis " -"geschrieben, das durch -t oder --tempdir (<literal>APT::ExtractTemplates::" -"TempDir</literal>) Verzeichnis mit Dateinamen der Form <filename>package." -"template.XXXX</filename> und <filename>package.config.XXXX</filename> " -"angegeben wurde" +"geschrieben, das durch »-t« oder »--tempdir« " +"(<literal>APT::ExtractTemplates::TempDir</literal>) Verzeichnis mit " +"Dateinamen der Form <filename>package. template.XXXX</filename> und " +"<filename>package.config.XXXX</filename> angegeben wurde" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-extracttemplates.1.xml:60 apt-get.8.xml:488 @@ -2443,11 +2408,6 @@ msgstr "<option>--tempdir</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-extracttemplates.1.xml:62 -#, fuzzy -#| msgid "" -#| "Temporary directory in which to write extracted debconf template files " -#| "and config scripts Configuration Item: <literal>APT::ExtractTemplates::" -#| "TempDir</literal>" msgid "" "Temporary directory in which to write extracted debconf template files and " "config scripts. Configuration Item: <literal>APT::ExtractTemplates::" @@ -2469,15 +2429,11 @@ msgstr "" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-ftparchive.1.xml:13 -#, fuzzy -#| msgid "" -#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " -#| "August 2009</date>" msgid "" "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 " "August 2009</date>" msgstr "" -"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9. " +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17. " "August 2009</date>" #. type: Content of: <refentry><refnamediv><refname> @@ -2567,9 +2523,9 @@ msgid "" "automatically performs file-change checks and builds the desired compressed " "output files." msgstr "" -"Intern kann <command>apt-ftparchive</command> von Programmdatenbänken " +"Intern kann <command>apt-ftparchive</command> von Programmdatenbanken " "Gebrauch machen, um die Inhalte einer .deb-Datei zwischenzuspeichern und es " -"verlässt sich nicht auf irgendwelche externen Programme, abgesehen von " +"verlasst sich nicht auf irgendwelche externen Programme, abgesehen von " "&gzip;. Wenn eine vollständige Generierung erfolgt, werden automatisch " "Dateiänderungsprüfungen durchgeführt und die gewünschten gepackten " "Ausgabedateien erzeugt." @@ -2587,8 +2543,8 @@ msgid "" "emitting a package record to stdout for each. This command is approximately " "equivalent to &dpkg-scanpackages;." msgstr "" -"Der packages-Befehl generiert eine Paketdatei aus einem Verzeichnisbaum. Er " -"nimmt ein vorgegebenes Verzeichnis und durchsucht es rekursiv nach .deb-" +"Der »packages«-Befehl generiert eine Paketdatei aus einem Verzeichnisbaum. " +"Er nimmt ein vorgegebenes Verzeichnis und durchsucht es rekursiv nach .deb-" "Dateien, wobei es für jede einen Paketdatensatz auf stdout ausgibt.Dieser " "Befehl entspricht etwa &dpkg-scanpackages;." @@ -2626,8 +2582,9 @@ msgid "" "change the source override file that will be used." msgstr "" "Wenn eine Override-Datei angegeben ist, wird nach einer Quellen-Override-" -"Datei mit einer .src-Dateiendung gesucht. Die Option --source-override kann " -"benutzt werden, um die Quellen-Override-Datei, die benutzt wird, zu ändern." +"Datei mit einer .src-Dateiendung gesucht. Die Option »--source-override« " +"kann benutzt werden, um die Quellen-Override-Datei, die benutzt wird, zu " +"ändern." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:97 @@ -2766,12 +2723,6 @@ msgstr "Dir-Abschnitt" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt-ftparchive.1.xml:159 -#, fuzzy -#| msgid "" -#| "The <literal>Dir</literal> section defines the standard directories " -#| "needed to locate the files required during the generation process. These " -#| "directories are prepended to certain relative paths defined in later " -#| "sections to produce a complete an absolute path." msgid "" "The <literal>Dir</literal> section defines the standard directories needed " "to locate the files required during the generation process. These " @@ -3212,7 +3163,6 @@ msgstr "" "Wenn ein <literal>Tree</literal>-Abschnitt bearbeitet wird, führt " "<command>apt-ftparchive</command> eine Operation aus, die folgender ähnelt:" -# report, that this string is missing in man page #. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting> #: apt-ftparchive.1.xml:354 #, no-wrap @@ -3489,7 +3439,7 @@ msgid "" "Configuration Item: <literal>APT::FTPArchive::DB</literal>." msgstr "" "Benutzt eine Programmzwischenspeicherdatenbank. Dies hat keine Auswirkung " -"auf den generate-Befehl. Konfigurationselement: <literal>APT::FTPArchive::" +"auf den »generate«-Befehl. Konfigurationselement: <literal>APT::FTPArchive::" "DB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -3542,7 +3492,7 @@ msgstr "" "Führt Inhaltsgenerierung durch. Wenn diese Option gesetzt ist und " "Paketindizes mit einer Zwischenspeicherdatenbank generiert werden, dann wird " "die Dateiliste auch extrahiert und für spätere Benutzung in der Datenbank " -"gespeichert. Wenn der generate-Befehl benutzt wird, erlaubt diese Option " +"gespeichert. Wenn der »generate«-Befehl benutzt wird, erlaubt diese Option " "außerdem die Erzeugung beliebiger Contents-Dateien. Die Vorgabe ist an. " "Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>." @@ -3578,10 +3528,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:547 -#, fuzzy -#| msgid "<option>--version</option>" msgid "<option>APT::FTPArchive::LongDescription</option>" -msgstr "<option>--version</option>" +msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 @@ -3592,6 +3540,12 @@ msgid "" "that it is currently not possible to create these files with <command>apt-" "ftparchive</command>." msgstr "" +"Diese Konfigurationsoption ist standardmäßig »<literal>true</literal>« und " +"sollte nur auf »<literal>false</literal>« gesetzt werden, wenn das mit " +"&apt-ftparchive; generierte Archiv außerdem " +"<filename>Translation</filename>-Dateien bereitstellt. Beachten Sie, dass " +"es derzeit nicht möglich ist, diese Dateien mit " +"<command>apt-ftparchive</command> zu erstellen." #. type: Content of: <refentry><refsect1><title> #: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 @@ -3612,8 +3566,8 @@ msgid "" "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "Um eine gepackte Paketdatei für ein Verzeichnis zu erstellen, das " -"Programmpakete (.deb) enthält: <placeholder type=\"programlisting\" id=\"0\"/" -">" +"Programmpakete (.deb) enthält: <placeholder type=\"programlisting\" " +"id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> #: apt-ftparchive.1.xml:577 @@ -3885,8 +3839,8 @@ msgstr "" "ausgewählt werden. Dies bewirkt, dass diese Version gesucht und zum " "Installieren ausgewählt wird. Alternativ kann eine bestimmte Distribution " "durch den Paketnamen gefolgt von einem Schrägstrich und der Version der " -"Distribution oder des Archivnamens (stable, testing, unstable) ausgewählt " -"werden." +"Distribution oder des Archivnamens (»stable«, »testing«, »unstable«) " +"ausgewählt werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:210 @@ -3939,13 +3893,13 @@ msgid "" "expression." msgstr "" "Wenn keine Pakete dem angegebenen Ausdruck entsprechen und der Ausdruck " -"entweder ».«,»,«,»?« oder »*« enthält, dann wird vermutet, dass es sich um einen " -"regulären POSIX-Ausdruck handelt und er wird auf alle Paketnamen in der " -"Datenbank angewandt. Jeder Treffer wird dann installiert (oder entfernt). " -"Beachten Sie, dass nach übereinstimmenden Zeichenkettenteilen gesucht wird, " -"so dass »lo.*« auf »how-lo« und »lowest« passt. Wenn dies nicht gewünscht wird, " -"hängen Sie an den regulären Ausdruck ein »^«- oder »$«-Zeichen, um genauere " -"reguläre Ausdruck zu erstellen." +"entweder ».«,»,«,»?« oder »*« enthält, dann wird vermutet, dass es sich um " +"einen regulären POSIX-Ausdruck handelt und er wird auf alle Paketnamen in " +"der Datenbank angewandt. Jeder Treffer wird dann installiert (oder " +"entfernt). Beachten Sie, dass nach übereinstimmenden Zeichenkettenteilen " +"gesucht wird, so dass »lo.*« auf »how-lo« und »lowest« passt. Wenn dies " +"nicht gewünscht wird, hängen Sie an den regulären Ausdruck ein »^«- oder " +"»$«-Zeichen, um genauere reguläre Ausdruck zu erstellen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:237 @@ -3990,15 +3944,6 @@ msgstr "source" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:251 -#, fuzzy -#| msgid "" -#| "<literal>source</literal> causes <command>apt-get</command> to fetch " -#| "source packages. APT will examine the available packages to decide which " -#| "source package to fetch. It will then find and download into the current " -#| "directory the newest available version of that source package while " -#| "respect the default release, set with the option <literal>APT::Default-" -#| "Release</literal>, the <option>-t</option> option or per package with " -#| "with the <literal>pkg/release</literal> syntax, if possible." msgid "" "<literal>source</literal> causes <command>apt-get</command> to fetch source " "packages. APT will examine the available packages to decide which source " @@ -4026,7 +3971,7 @@ msgid "" "from. If you don't do this you will properly get another (newer, older or " "none) source version than the one you have installed or could install." msgstr "" -"Paketquellen werden von Programmpaket getrennt über <literal>deb-src</" +"Paketquellen werden vom Programmpaket getrennt über <literal>deb-src</" "literal>-Typzeilen in der &sources-list;-Datei nachverfolgt. Das bedeutet, " "dass Sie für jedes Depot, aus dem Sie Quellen erhalten wollen, eine solche " "Zeile hinzufügen müssen. Wenn Sie dies nicht tun, werden Sie eine andere als " @@ -4035,12 +3980,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:266 -#, fuzzy -#| msgid "" -#| "If the <option>--compile</option> options is specified then the package " -#| "will be compiled to a binary .deb using <command>dpkg-buildpackage</" -#| "command>, if <option>--download-only</option> is specified then the " -#| "source package will not be unpacked." msgid "" "If the <option>--compile</option> option is specified then the package will " "be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if " @@ -4150,7 +4089,7 @@ msgstr "" "Zwischenspeicher über eine lange Zeitspanne zu betreuen, ohne dass er " "unkontrolliert anwächst. Die Konfigurationsoption <literal>APT::Clean-" "Installed</literal> wird installierte Pakete vor der Löschung bewahren, wenn " -"sie auf off gesetzt ist." +"sie auf »off« gesetzt ist." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:312 @@ -4165,7 +4104,7 @@ msgid "" "are no more needed." msgstr "" "<literal>autoremove</literal> wird benutzt, um Pakete, die automatisch " -"installiert wurden, um Abhängigkeiten für einige Pakete zu erfüllen und und " +"installiert wurden, um Abhängigkeiten für einige Pakete zu erfüllen und " "die nicht mehr benötigt werden, zu entfernen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> @@ -4202,7 +4141,6 @@ msgstr "" msgid "<option>--fix-broken</option>" msgstr "<option>--fix-broken</option>" -# s/Any Package that are specified/Any package that is specified/ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:334 msgid "" @@ -4219,7 +4157,7 @@ msgid "" "Get::Fix-Broken</literal>." msgstr "" "Beheben; Versucht ein System von vorhandenen beschädigten Abhängigkeiten zu " -"korrigieren. Diese Option kann, wenn sie mit install/remove benutzt wird, " +"korrigieren. Diese Option kann, wenn sie mit »install«/»remove« benutzt wird, " "einige Pakete weglassen, um es APT zu erlauben, eine wahrscheinliche Lösung " "herzuleiten. Jedes Paket, das angegeben ist, muss das Problem vollständig " "korrigieren. Die Option ist manchmal nötig, wenn APT zum ersten Mal " @@ -4335,18 +4273,12 @@ msgstr "" "(<literal>Debug::NoLocking</literal>) automatisch deaktivieren. Außerdem " "wird eine Mitteilung angezeigt, die angibt, dass dies nur eine Simulation " "ist, wenn die Option <literal>APT::Get::Show-User-Simulation-Note</literal> " -"gesetzt ist (Vorgabe ist true). Weder NoLocking noch die Mitteilung werden " +"gesetzt ist (Vorgabe ist »true«). Weder NoLocking noch die Mitteilung werden " "ausgelöst, wenn es als root ausgeführt wird (root sollte ohne weitere " "Warnungen von <literal>apt-get</literal> wissen, was er tut)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:392 -#, fuzzy -#| msgid "" -#| "Simulate prints out a series of lines each one representing a dpkg " -#| "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square " -#| "brackets indicate broken packages with and empty set of square brackets " -#| "meaning breaks that are of no consequence (rare)." msgid "" "Simulate prints out a series of lines each one representing a dpkg " "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets " @@ -4558,7 +4490,6 @@ msgstr "" msgid "<option>--purge</option>" msgstr "<option>--purge</option>" -# s/equivalent for/equivalent to the/ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:467 msgid "" @@ -4567,10 +4498,11 @@ msgid "" "<option>remove --purge</option> is equivalent for <option>purge</option> " "command. Configuration Item: <literal>APT::Get::Purge</literal>." msgstr "" -"»remove« »purge« für alles zu entfernende benutzen. Ein Stern (»*«) wird bei " -"Paketen angezeigt, die zum vollständigen Entfernen vorgemerkt sind. " -"<option>remove --purge</option> entspricht dem Befehl <option>purge</" -"option>. Konfigurationselement: <literal>APT::Get::Purge</literal>." +"»purge« anstelle von »remove« für alles zu entfernende benutzen. Ein " +"Stern (»*«) wird bei Paketen angezeigt, die zum vollständigen Entfernen " +"vorgemerkt sind. <option>remove --purge</option> entspricht dem Befehl " +"<option>purge</option>. Konfigurationselement: " +"<literal>APT::Get::Purge</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:474 @@ -4606,8 +4538,8 @@ msgstr "" "<command>apt-get</command> den Inhalt von <filename>&statedir;/lists</" "filename> automatisch verwalten, um sicherzustellen, dass veraltete Dateien " "gelöscht werden. Nur das häufige Ändern der Quelllisten stellt den einzigen " -"Grund zum Ausschalten der Option dar.Konfigurationselement: <literal>APT::" -"Get::List-Cleanup</literal>." +"Grund zum Ausschalten der Option dar. Konfigurationselement: " +"<literal>APT::Get::List-Cleanup</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:489 @@ -5111,15 +5043,11 @@ msgstr "showauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:82 -#, fuzzy -#| msgid "" -#| "<literal>showauto</literal> is used to print a list of manually installed " -#| "packages with each package on a new line." msgid "" "<literal>showauto</literal> is used to print a list of automatically " "installed packages with each package on a new line." msgstr "" -"<literal>showauto</literal> wird benutzt, um eine Liste manuell " +"<literal>showauto</literal> wird benutzt, um eine Liste automatisch " "installierter Pakete mit einem Paket in jeder neuen Zeile, auszugeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> @@ -5266,14 +5194,6 @@ msgstr "Vertrauenswürdige Archive" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:67 -#, fuzzy -#| msgid "" -#| "The chain of trust from an apt archive to the end user is made up of " -#| "different steps. <command>apt-secure</command> is the last step in this " -#| "chain, trusting an archive does not mean that the packages that you trust " -#| "it do not contain malicious code but means that you trust the archive " -#| "maintainer. Its the archive maintainer responsibility to ensure that the " -#| "archive integrity is correct." msgid "" "The chain of trust from an apt archive to the end user is made up of " "different steps. <command>apt-secure</command> is the last step in this " @@ -5323,15 +5243,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:92 -#, fuzzy -#| msgid "" -#| "Once the uploaded package is verified and included in the archive, the " -#| "maintainer signature is stripped off, an MD5 sum of the package is " -#| "computed and put in the Packages file. The MD5 sum of all of the packages " -#| "files are then computed and put into the Release file. The Release file " -#| "is then signed by the archive key (which is created once a year and " -#| "distributed through the FTP server. This key is also on the Debian " -#| "keyring." msgid "" "Once the uploaded package is verified and included in the archive, the " "maintainer signature is stripped off, an MD5 sum of the package is computed " @@ -5465,48 +5376,34 @@ msgstr "" #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:160 -#, fuzzy -#| msgid "" -#| "<literal>Create a toplevel Release file</literal>. if it does not exist " -#| "already. You can do this by running <command>apt-ftparchive release</" -#| "command> (provided in apt-utils)." msgid "" "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist " "already. You can do this by running <command>apt-ftparchive release</" "command> (provided in apt-utils)." msgstr "" -"<literal>Create a toplevel Release file</literal>, wenn es nicht bereits " -"existiert. Sie können dies tun, indem Sie <command>apt-ftparchive release</" -"command> (aus apt-utils) ausführen." +"<emphasis>Erzeugen einer Release-Datei der obersten Stufe</emphasis>, wenn " +"sie nicht bereits existiert. Sie können dies erledigen, indem Sie " +"<command>apt-ftparchive release</command> (aus apt-utils) ausführen." #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:165 -#, fuzzy -#| msgid "" -#| "<literal>Sign it</literal>. You can do this by running <command>gpg -abs -" -#| "o Release.gpg Release</command>." msgid "" "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -abs -" "o Release.gpg Release</command>." msgstr "" -"<literal>Sign it</literal>. Sie können dies tun, indem Sie <command>gpg -abs " -"-o Release.gpg Release</command> ausführen." +"<emphasis>Es signieren</emphasis>. Sie können dies tun, indem Sie " +"<command>gpg -abs -o Release.gpg Release</command> ausführen." #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:168 -#, fuzzy -#| msgid "" -#| "<literal>Publish the key fingerprint</literal>, that way your users will " -#| "know what key they need to import in order to authenticate the files in " -#| "the archive." msgid "" "<emphasis>Publish the key fingerprint</emphasis>, that way your users will " "know what key they need to import in order to authenticate the files in the " "archive." msgstr "" -"<literal>Publish the key fingerprint</literal>, derart, dass Ihre Anwender " -"wissen, welchen Schlüssel sie importieren müssen, um die Dateien im Archiv " -"zu authentifizieren." +"<emphasis>Veröffentlichen Sie den Schlüsselfingerabdruck</emphasis>, damit " +"Ihre Anwender wissen, welchen Schlüssel sie importieren müssen, um die " +"Dateien im Archiv zu authentifizieren." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:175 @@ -5680,13 +5577,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:50 -#, fuzzy -#| msgid "" -#| "The configuration file is organized in a tree with options organized into " -#| "functional groups. option specification is given with a double colon " -#| "notation, for instance <literal>APT::Get::Assume-Yes</literal> is an " -#| "option within the APT tool group, for the Get tool. options do not " -#| "inherit from their parent groups." msgid "" "The configuration file is organized in a tree with options organized into " "functional groups. Option specification is given with a double colon " @@ -5702,15 +5592,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:56 -#, fuzzy -#| msgid "" -#| "Syntactically the configuration language is modeled after what the ISC " -#| "tools such as bind and dhcp use. Lines starting with <literal>//</" -#| "literal> are treated as comments (ignored), as well as all text between " -#| "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ " -#| "comments. Each line is of the form <literal>APT::Get::Assume-Yes \"true" -#| "\";</literal> The trailing semicolon is required and the quotes are " -#| "optional. A new scope can be opened with curly braces, like:" msgid "" "Syntactically the configuration language is modeled after what the ISC tools " "such as bind and dhcp use. Lines starting with <literal>//</literal> are " @@ -5729,9 +5610,14 @@ msgstr "" "literal> beginnen, werden als Kommentar betrachtet (und ignoriert), ebenso " "wie jeglicher Text zwischen <literal>/*</literal> und <literal>*/</literal>, " "wie bei C/C++-Kommentaren. Jede Zeile hat die Form <literal>APT::Get::Assume-" -"Yes \"true\";</literal>. Das abschließende Semikolon wird benötigt und " -"Klammern sind optional. Ein neuer Geltungsbereich kann mit geschweiften " -"Klammern geöffnet werden, wie:" +"Yes \"true\";</literal>. Das abschließende Semikolon und die " +"Anführungszeichen werden benötigt. Der Wert muss in einer Zeile stehen und " +"es gibt keine Möglichkeit Zeichenketten aneinander zu hängen. Er darf keine " +"inneren Anführungszeichen enthalten. Das Verhalten des Backslashs »\\« " +"und maskierter Zeichen innerhalb eines Wertes ist nicht festgelegt und diese " +"sollten nicht benutzt werden. Ein Optionsname darf alphanumerische Zeichen " +"und die Zeichen »/-:._+« enthalten. Ein neuer Geltungsbereich kann mit " +"geschweiften Klammern geöffnet werden, wie:" #. type: Content of: <refentry><refsect1><informalexample><programlisting> #: apt.conf.5.xml:70 @@ -5808,14 +5694,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:98 -#, fuzzy -#| msgid "" -#| "Two specials are allowed, <literal>#include</literal> and " -#| "<literal>#clear</literal>: <literal>#include</literal> will include the " -#| "given file, unless the filename ends in a slash, then the whole directory " -#| "is included. <literal>#clear</literal> is used to erase a part of the " -#| "configuration tree. The specified element and all its descendants are " -#| "erased. (Note that these lines also need to end with a semicolon.)" msgid "" "Two specials are allowed, <literal>#include</literal> (which is deprecated " "and not supported by alternative implementations) and <literal>#clear</" @@ -5825,13 +5703,15 @@ msgid "" "The specified element and all its descendants are erased. (Note that these " "lines also need to end with a semicolon.)" msgstr "" -"Es sind die beiden Spezialfälle <literal>#include</literal> und " -"<literal>#clear</literal> erlaubt: <literal>#include</literal> wird die " -"angegebene Datei einfügen außer, wenn der Dateiname mit einem Schrägstrich " -"endet, dann wird das ganze Verzeichnis eingefügt. <literal>#clear</literal> " -"wird benutzt, um einen Teil des Konfigurationsbaums zu löschen. Das " -"angegebene Element und alle davon absteigenden Elemente werden gelöscht. " -"(Beachten Sie, dass diese Zeilen auch mit einem Semikolon enden müssen.)" +"Es sind die beiden Spezialfälle <literal>#include</literal> (das " +"missbilligt ist und von alternativen Implementierungen nicht unterstützt " +"wird) und <literal>#clear</literal> erlaubt: <literal>#include</literal> " +"wird die angegebene Datei einfügen außer, wenn der Dateiname mit einem " +"Schrägstrich endet, dann wird das ganze Verzeichnis eingefügt. " +"<literal>#clear</literal> wird benutzt, um einen Teil des " +"Konfigurationsbaums zu löschen. Das angegebene Element und alle davon " +"absteigenden Elemente werden gelöscht. (Beachten Sie, dass diese Zeilen " +"auch mit einem Semikolon enden müssen.)" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:106 @@ -5944,8 +5824,8 @@ msgid "" msgstr "" "Standard-Release von dem Pakete installiert werden, wenn mehr als eine " "Version verfügbar ist. Enthält Release-Name, Codename oder Release-Version. " -"Beispiele: »stable«, »testing, »unstable«, »lenny«, »squeeze«, »4.0«, »5.0«. Siehe " -"auch &apt-preferences;." +"Beispiele: »stable«, »testing, »unstable«, »lenny«, »squeeze«, »4.0«, »5.0«. " +"Siehe auch &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:146 @@ -6018,6 +5898,42 @@ msgid "" "distribution and to the APT team with the buglink below so they can work on " "improving or correcting the upgrade process." msgstr "" +"Standardmäßig »on«, wodurch APT veranlasst wird, »essential«- oder " +"»important«-Pakete so schnell wie möglich in der " +"»install«-/»upgrade«-Operation zu installieren. Dies wird getan, um den " +"Effekt eines gescheiterterten &dpkg;-Aufrufs zu begrenzen: Wenn diese " +"Option ausgeschaltet ist, behandelt APT ein »important«-Paket auf die " +"gleiche Weise wie ein »extra«-Paket: Zwischen dem Entpacken des " +"»important«-Pakets A und seiner Konfiguration können dann viele andere " +"Entpack- oder Konfigurationsaufrufe liegen, z.B. für Paket B, das keine " +"Beziehung zu A hat, aber den dpkg-Aufruf zum Scheitern bringt (z.B. weil " +"das Betreuerskript von Paket B Fehler generiert), die als Ergebnis einen " +"Systemstatus haben, in dem Paket A entpackt, aber nicht konfiguriert ist " +"und für kein von A abhängendes Paket länger gewährleistet ist, dass es " +"funktioniert, weil die Abhängigkeit zu A nicht länger befriedigt wird. Das " +"unmittelbare Konfigurationskennzeichen wird außerdem auf alle " +"Abhängigkeiten angewandt, was zu einem Problem führen könnten, falls die " +"Abhängigkeiten z.B. einen Kreis bilden, so dass eine Abhängigkeit mit der " +"Unmittelbarmarkierung mit einer Vorabhängigkeit vergleichbar ist. So ist es " +"theoretisch möglich, dass APT einer Situation begegnet, in der keine " +"unmittelbare Konfiguration durchgeführt, ein Fehler ausgegeben und sich auf " +"diese Option bezogen werden kann, so dass der Anwender die unmittelbare " +"Konfiguration zeitweise deaktivieren kann, um in der Lage zu sein, erneut " +"ein »install«/»upgrade« durchzuführen. Beachten Sie, dass hier das Wort " +"»theoretisch« benutzt wird, denn dieses Problem ist bis jetzt in der " +"Realität nur ein paar mal in unstabilen Distributionsversionen aufgetreten " +"und wurde durch falsche Abhängigkeiten des fraglichen Pakets ausgelöst oder " +"durch ein System in bereits kaputtem Status, so dass Sie diese Option nicht " +"unbesehen abschalten sollten, da das oben erwähnte Szenario nicht das " +"einzige unmittelbare Problem ist, das die Konfiguration überhaupt " +"verhindern sollte. Bevor eine große Operation wie " +"<literal>dist-upgrade</literal> mit dieser ausgeschalteten Option " +"ausgeführt wird, sollte explizit versucht werden, " +"<literal>install</literal> des Pakets durchzuführen. APT ist nicht in der " +"Lage unmittelbar zu konfigurieren, aber stellen Sie sicher, dass Sie Ihr " +"Problem außerdem an Ihre Distribution und an das APT-Team berichten mit " +"nachstehendem Fehlerverweis, so dass es am Verbessern oder Korrigieren des " +"Upgrade-Prozesses arbeiten kann." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:181 @@ -6102,7 +6018,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:209 msgid "CDROM" -msgstr "CDROM" +msgstr "CD-ROM" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:210 @@ -6110,7 +6026,7 @@ msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." msgstr "" -"Der CDROM-Unterabschnitt steuert das &apt-cdrom;-Werkzeug. Lesen Sie bitte " +"Der CD-ROM-Unterabschnitt steuert das &apt-cdrom;-Werkzeug. Lesen Sie bitte " "dessen Dokumentation, um weitere Informationen über die Optionen hier zu " "erhalten." @@ -6246,15 +6162,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:267 -#, fuzzy -#| msgid "" -#| "One setting is provided to control the pipeline depth in cases where the " -#| "remote server is not RFC conforming or buggy (such as Squid 2.0.2) " -#| "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to " -#| "5 indicating how many outstanding requests APT should send. A value of " -#| "zero MUST be specified if the remote host does not properly linger on TCP " -#| "connections - otherwise data corruption will occur. Hosts which require " -#| "this are in violation of RFC 2068." msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@ -6296,6 +6203,10 @@ msgid "" "User-Agent for the http download method as some proxies allow access for " "clients only if the client uses a known identifier." msgstr "" +"<literal>Acquire::http::User-Agent</literal> kann benutzt werden, um einen " +"unterschiedlichen User-Agent für die HTTP-Download-Methode zu setzten, da " +"einige Proxys den Clients nur dann Zugriff gewähren, wenn der Client einen " +"bekannten Bezeichner verwendet." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:286 @@ -6304,11 +6215,6 @@ msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:287 -#, fuzzy -#| msgid "" -#| "HTTPS URIs. Cache-control and proxy options are the same as for " -#| "<literal>http</literal> method. <literal>Pipeline-Depth</literal> option " -#| "is not supported yet." msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -6316,9 +6222,12 @@ msgid "" "not explicitly set for https. <literal>Pipeline-Depth</literal> option is " "not supported yet." msgstr "" -"HTTPS-URIs. Zwischenspeichersteuerung und Proxy-Optionen entsprehen denen " -"der <literal>http</literal>-Methode. Die Option <literal>Pipeline-Depth</" -"literal> wird noch nicht unterstützt." +"HTTPS-URIs. Zwischenspeichersteuerung-, Zeitüberschreitung-, AllowRedirect-, " +"Dl-Limit- und Proxy-Optionen entsprechen denen der " +"<literal>http</literal>-Methode und werden auch für die Optionen der " +"Methode <literal>http</literal> vorgegeben, falls sie nicht explizit für " +"HTTPS gesetzt sind. Die Option <literal>Pipeline-Depth</literal> wird noch " +"nicht unterstützt." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:293 @@ -6453,10 +6362,9 @@ msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> #: apt.conf.5.xml:356 -#, fuzzy, no-wrap -#| msgid "\"/cdrom/\"::Mount \"foo\";" +#, no-wrap msgid "/cdrom/::Mount \"foo\";" -msgstr "\"/cdrom/\"::Mount \"foo\";" +msgstr "/cdrom/::Mount \"foo\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:351 @@ -6471,12 +6379,12 @@ msgid "" "can be specified using UMount." msgstr "" "CDROM-URIs; Die einzige Einstellung für CDROM-URIs ist der Einhängepunkt " -"<literal>cdrom::Mount</literal>, der der Einhängepunkt des CDROM-Laufwerks " +"<literal>cdrom::Mount</literal>, der der Einhängepunkt des CD-ROM-Laufwerks " "sein muss, wie er in <filename>/etc/fstab</filename> angegeben wurde. Es ist " "möglich alternative Ein- und Aushängebefehle anzugeben, falls Ihr " "Einhängepunkt nicht in der fstab aufgelistet werden kann (so wie beim " "Einhängen per SMB und alten Mount-Paketen). Die Syntax besteht darin, " -"<placeholder type=\"literallayout\" id=\"0\"/> in den CDROM-Block " +"<placeholder type=\"literallayout\" id=\"0\"/> in den CD-ROM-Block " "einzufügen. Der abschließende Schrägstrich ist wichtig. Aushängebefehle " "können per UMount angegeben werden." @@ -6622,7 +6530,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:396 msgid "Languages" -msgstr "" +msgstr "Sprachen" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:397 @@ -6636,12 +6544,21 @@ msgid "" "long Languagecodes are rare, so please inform you which ones are available " "before you set here impossible values." msgstr "" +"Der Unterabschnitt Languages steuert welche " +"<filename>Translation</filename>-Dateien heruntergeladen werden und in " +"welcher Reihenfolge APT versucht, die Beschreibungsübersetzungen anzuzeigen. " +"APT wird versuchen, die erste verfügbare Beschreibung für die zuerst " +"aufgelistete Sprache anzuzeigen. Sprachen können durch ihre kurzen oder " +"langen Sprachcodes definiert sein. Beachten Sie, dass nicht alle Archive " +"<filename>Translation</filename>-Dateien für jede Sprache bereitstellen, " +"besonders lange Sprachcodes sind selten. Informieren Sie sich deshalb bitte " +"welche verfügbar sind, bevor Sie hier unmögliche Werte einsetzen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> #: apt.conf.5.xml:413 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" -msgstr "" +msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:403 @@ -6665,6 +6582,26 @@ msgid "" "order would be \"fr, de, en\". <placeholder type=\"programlisting\" id=\"0" "\"/>" msgstr "" +"Die Standardliste beinhaltet »environment« und »en«. " +"»<literal>environment</literal>« hat hier eine besondere Bedeutung: Es wird " +"zur Laufzeit durch die Sprachcodes ersetzt, die aus der Umgebungsvariable " +"<literal>LC_MESSAGES</literal> extrahiert wurden. Es wird außerdem " +"sicherstellen, dass diese Codes nicht zweimal in der Liste enthalten sind. " +"Falls <literal>LC_MESSAGES</literal> auf »C« gesetzt ist, wird nur die " +"Datei <filename>Translation-en</filename> (falls verfügbar) benutzt. Um APT " +"zu zwingen, keine Übersetzungsdatei zu benutzen, benutzen Sie die Einstellung " +"<literal>Acquire::Languages=none</literal>. »<literal>none</literal>« ist " +"ein weiterer Code mit besonderer Bedeutung, der die Suche nach einer " +"passenden <filename>Translation</filename>-Datei stoppen wird. Dies kann " +"vom Systemadministrator benutzt werden, um APT mitzuteilen, dass es auch " +"diese Dateien herunterladen soll ohne sie aktuell zu benutzen, falls die " +"Umgebungsvariable diese Sprachen nicht angibt. Daher wird die folgende " +"Beispielkonfiguration in der Reihenfolge »en,de« zu einer englischen und " +"»de,en« zu einer deutschen Lokalisierung führen. Beachten Sie, dass »fr« " +"heruntergeladen, aber nicht benutzt wird, falls APT nicht in einer " +"französischen Lokalisierung benutzt wird. In einer solchen Umgebung wäre " +"die Reihenfolge »fr, de, en«. <placeholder type=\"programlisting\" id=\"0" +"\"/>" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:217 @@ -6820,13 +6757,13 @@ msgid "" "for instance). pre-auto performs this action before downloading new " "packages." msgstr "" -"Zwischenspeicherbereinigungsmodus; Dieser Wert kann entweder always, prompt, " -"auto, pre-auto oder never sein. always und prompt werden, nachdem das " -"Upgrade durchgeführt wurde, alle Pakete aus dem Zwischenspeicher entfernen, " -"prompt (die Vorgabe) tut dies bedingt. auto entfernt nur jene Pakete, die " -"nicht länger heruntergeladen werden können (zum Beispiel, weil sie durch " -"eine neue Version ersetzt wurden). pre-auto führt diese Aktion vor dem " -"Herunterladen neuer Pakete durch." +"Zwischenspeicherbereinigungsmodus; Dieser Wert kann entweder »always«, " +"»prompt«, »auto«, »pre-auto« oder »never« sein. »always« und »prompt« " +"werden, nachdem das Upgrade durchgeführt wurde, alle Pakete aus dem " +"Zwischenspeicher entfernen, »prompt« (die Vorgabe) tut dies bedingt. »auto« " +"entfernt nur jene Pakete, die nicht länger heruntergeladen werden können " +"(zum Beispiel, weil sie durch eine neue Version ersetzt wurden). »pre-auto« " +"führt diese Aktion vor dem Herunterladen neuer Pakete durch." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:485 @@ -7058,16 +6995,6 @@ msgstr "DPkg::NoTriggers" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:567 -#, fuzzy -#| msgid "" -#| "Add the no triggers flag to all dpkg calls (expect the ConfigurePending " -#| "call). See &dpkg; if you are interested in what this actually means. In " -#| "short: dpkg will not run the triggers then this flag is present unless it " -#| "is explicit called to do so in an extra call. Note that this option " -#| "exists (undocumented) also in older apt versions with a slightly " -#| "different meaning: Previously these option only append --no-triggers to " -#| "the configure calls to dpkg - now apt will add these flag also to the " -#| "unpack and remove calls." msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -7085,7 +7012,7 @@ msgstr "" "außerdem in älteren APT-Versionen mit einer geringfügig anderen Bedeutung " "existiert (nicht dokumentiert): Vorher hing diese Option nur --no-triggers " "an die Konfigurationsaufrufe für Dpkg an – nun wird APT diese Markierung " -"außerdem an die unpack- und remove-Aufrufe anhängen." +"außerdem an die »unpack«- und »remove«-Aufrufe anhängen." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt.conf.5.xml:574 @@ -7094,20 +7021,6 @@ msgstr "PackageManager::Configure" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:575 -#, fuzzy -#| msgid "" -#| "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " -#| "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " -#| "value and causes APT to configure all packages explicit. The " -#| "\"<literal>smart</literal>\" way is it to configure only packages which " -#| "need to be configured before another package can be unpacked (Pre-" -#| "Depends) and let the rest configure by dpkg with a call generated by the " -#| "next option. \"<literal>no</literal>\" on the other hand will not " -#| "configure anything and totally relay on dpkg for configuration (which " -#| "will at the moment fail if a Pre-Depends is encountered). Setting this " -#| "option to another than the all value will implicit activate also the next " -#| "option per default as otherwise the system could end in an unconfigured " -#| "status which could be unbootable!" msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -7142,14 +7055,6 @@ msgstr "DPkg::ConfigurePending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:586 -#, fuzzy -#| msgid "" -#| "If this option is set apt will call <command>dpkg --configure --pending</" -#| "command> to let dpkg handle all required configurations and triggers. " -#| "This option is activated automatic per default if the previous option is " -#| "not set to <literal>all</literal>, but deactivating could be useful if " -#| "you want to run APT multiple times in a row - e.g. in an installer. In " -#| "this sceneries you could deactivate this option in all but the last run." msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -7342,7 +7247,7 @@ msgid "" "in CDROM IDs." msgstr "" "<literal>Debug::IdentCdrom</literal> schaltet das Einbeziehen von statfs-" -"Daten in CDROM-IDs aus." +"Daten in CD-ROM-IDs aus." #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:684 @@ -7607,8 +7512,8 @@ msgid "" "there is none or if it is the same version as the installed. " "<literal>section</literal> is the name of the section the package appears in." msgstr "" -"Generiert Fehlersuchmeldungen, die beschreiben, welches Paket als keep/" -"install/remove markiert ist, währen der ProblemResolver seine Arbeit " +"Generiert Fehlersuchmeldungen, die beschreiben, welches Paket als »keep«/" +"»install«/»remove« markiert ist, während der ProblemResolver seine Arbeit " "verrichtet. Jedes Hinzufügen oder Löschen kann zusätzliche Aktionen " "auslösen. Sie werden nach zwei eingerückten Leerzeichen unter dem " "Originaleintrag angezeigt. Jede Zeile hat das Format <literal>MarkKeep</" @@ -7957,7 +7862,7 @@ msgid "" "Note also that downgrading a package can be risky.)" msgstr "" "Führen Sie niemals ein Downgrade durch, außer wenn die Priorität verfügbarer " -"Pakete 1000 übersteigt. »Downgrading« ist das Installieren einer weniger " +"Pakete 1000 übersteigt. (»Downgrading« ist das Installieren einer weniger " "aktuellen Version, an Stelle einer aktuelleren Version. Beachten Sie, dass " "keine Standardpriorität von APT 1000 übersteigt. So hohe Prioritäten können " "nur durch die Einstellungsdatei gesetzt werden. Beachten Sie außerdem, dass " @@ -8110,7 +8015,7 @@ msgid "" msgstr "" "Dieser Eintrag in allgemeiner Form in der APT-Einstellungsdatei verwendet " "nur Gruppen von Paketen. Der folgende Eintrag weist zum Beispiel allen " -"Paketversionen eine hohe Priorität zu, die lokale liegen." +"Paketversionen eine hohe Priorität zu, die lokal liegen." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #: apt_preferences.5.xml:175 @@ -8952,7 +8857,7 @@ msgstr "" "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei " "wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die letzte" "(n) Version(en) im Release mit Codenamen <literal>squeeze</literal> " -"durchzuführen.<placeholder type=\"programlisting\" id=\"0\"/>" +"durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml:608 @@ -9002,12 +8907,6 @@ msgstr "Paketressourcenliste für APT" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:34 -#, fuzzy -#| msgid "" -#| "The package resource list is used to locate archives of the package " -#| "distribution system in use on the system. At this time, this manual page " -#| "documents only the packaging system used by the Debian GNU/Linux system. " -#| "This control file is located in <filename>/etc/apt/sources.list</filename>" msgid "" "The package resource list is used to locate archives of the package " "distribution system in use on the system. At this time, this manual page " @@ -9017,21 +8916,11 @@ msgstr "" "Die Paketquellenliste wird benutzt, um Archive des Paketverteilungssystems, " "das auf dem System benutzt wird, zu finden. Momentan dokumentiert diese " "Handbuchseite nur das vom Debian-GNU/Linux-System benutzte " -"Paketierungssystem. Die Steuerungsdatei befindet sich in <filename>/etc/apt/" -"sources.list</filename>." +"Paketierungssystem. Diese Steuerungsdatei ist " +"<filename>/etc/apt/sources.list</filename>." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:39 -#, fuzzy -#| msgid "" -#| "The source list is designed to support any number of active sources and a " -#| "variety of source media. The file lists one source per line, with the " -#| "most preferred source listed first. The format of each line is: " -#| "<literal>type uri args</literal> The first item, <literal>type</literal> " -#| "determines the format for <literal>args</literal> <literal>uri</literal> " -#| "is a Universal Resource Identifier (URI), which is a superset of the more " -#| "specific and well-known Universal Resource Locator, or URL. The rest of " -#| "the line can be marked as a comment by using a #." msgid "" "The source list is designed to support any number of active sources and a " "variety of source media. The file lists one source per line, with the most " @@ -9083,17 +8972,6 @@ msgstr "Die Typen deb und deb-src" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:61 -#, fuzzy -#| msgid "" -#| "The <literal>deb</literal> type describes a typical two-level Debian " -#| "archive, <filename>distribution/component</filename>. Typically, " -#| "<literal>distribution</literal> is generally one of <literal>stable</" -#| "literal> <literal>unstable</literal> or <literal>testing</literal> while " -#| "component is one of <literal>main</literal> <literal>contrib</literal> " -#| "<literal>non-free</literal> or <literal>non-us</literal> The <literal>deb-" -#| "src</literal> type describes a debian distribution's source code in the " -#| "same form as the <literal>deb</literal> type. A <literal>deb-src</" -#| "literal> line is required to fetch source indexes." msgid "" "The <literal>deb</literal> type describes a typical two-level Debian " "archive, <filename>distribution/component</filename>. Typically, " @@ -9118,10 +8996,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:73 -#, fuzzy -#| msgid "" -#| "The format for a <filename>sources.list</filename> entry using the " -#| "<literal>deb</literal> and <literal>deb-src</literal> types are:" msgid "" "The format for a <filename>sources.list</filename> entry using the " "<literal>deb</literal> and <literal>deb-src</literal> types is:" @@ -9137,16 +9011,6 @@ msgstr "deb URI Distribution [Komponente1] [Komponente2] [...]" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:78 -#, fuzzy -#| msgid "" -#| "The URI for the <literal>deb</literal> type must specify the base of the " -#| "Debian distribution, from which APT will find the information it needs. " -#| "<literal>distribution</literal> can specify an exact path, in which case " -#| "the components must be omitted and <literal>distribution</literal> must " -#| "end with a slash (/). This is useful for when only a particular sub-" -#| "section of the archive denoted by the URI is of interest. If " -#| "<literal>distribution</literal> does not specify an exact path, at least " -#| "one <literal>component</literal> must be present." msgid "" "The URI for the <literal>deb</literal> type must specify the base of the " "Debian distribution, from which APT will find the information it needs. " @@ -9275,14 +9139,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: sources.list.5.xml:141 -#, fuzzy -#| msgid "" -#| "The http scheme specifies an HTTP server for the archive. If an " -#| "environment variable <envar>http_proxy</envar> is set with the format " -#| "http://server:port/, the proxy server specified in <envar>http_proxy</" -#| "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a " -#| "string of the format http://user:pass@server:port/ Note that this is an " -#| "insecure method of authentication." msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -9364,7 +9220,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: sources.list.5.xml:178 msgid "more recongnizable URI types" -msgstr "" +msgstr "weitere erkennbare URI-Typen" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: sources.list.5.xml:180 @@ -9378,6 +9234,15 @@ msgid "" "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></" "refentrytitle> <manvolnum>1</manvolnum></citerefentry>." msgstr "" +"APT kann mit weiteren Methoden, die in anderen optionalen Paketen geliefert " +"werden, die dem Namensschema " +"<literal>apt-transport-<replaceable>Methode</replaceable></literal> folgen " +"sollten, erweitert werden. Das APT-Team betreut z.B. außerdem das Paket " +"<literal>apt-transport-https</literal>, das Zugriffsmethoden für HTTPS-URIs " +"mit Funktionen bereitstellt, die denen der HTTP-Methode ähneln, bei der " +"aber andere Methoden für z.B. debtorrent verfügbar sind, siehe " +"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></" +"refentrytitle> <manvolnum>1</manvolnum></citerefentry>." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:122 @@ -9385,8 +9250,8 @@ msgid "" "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, " "rsh. <placeholder type=\"variablelist\" id=\"0\"/>" msgstr "" -"Die aktuell erkannten URI-Typen sind cdrom, file, http, ftp, copy, ssh, rsh. " -"<placeholder type=\"variablelist\" id=\"0\"/>" +"Die aktuell erkannten URI-Typen sind »cdrom«, »file«, »http«, »ftp«, " +"»copy«, »ssh«, »rsh«. <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:194 @@ -9407,7 +9272,8 @@ msgstr "deb file:/home/jason/debian stable main contrib non-free" #: sources.list.5.xml:198 msgid "As above, except this uses the unstable (development) distribution." msgstr "" -"Wie oben, außer das dies die unstable- (Entwicklungs-) Distribution benutzt." +"Wie oben, außer das dies die »unstable«- (Entwicklungs-) Distribution " +"benutzt." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:199 @@ -9458,12 +9324,6 @@ msgstr "deb ftp://ftp.debian.org/debian stable contrib" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:212 -#, fuzzy -#| msgid "" -#| "Uses FTP to access the archive at ftp.debian.org, under the debian " -#| "directory, and uses only the unstable/contrib area. If this line appears " -#| "as well as the one in the previous example in <filename>sources.list</" -#| "filename>. a single FTP session will be used for both resource lines." msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -9519,8 +9379,8 @@ msgstr "" "<filename>unstable/binary-m68k</filename> auf m68k und so weiter für andere " "unterstützte Architekturen, gefunden werden. [Beachten Sie, dass dieses " "Beispiel nur anschaulich macht, wie die Platzhaltervariable benutzt wird. " -"non-us ist nicht länger so strukturiert] <placeholder type=\"literallayout\" " -"id=\"0\"/>" +"»non-us« ist nicht länger so strukturiert] " +"<placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:234 @@ -9530,28 +9390,30 @@ msgstr "&apt-cache; &apt-conf;" #. type: <title> #: guide.sgml:4 msgid "APT User's Guide" -msgstr "" +msgstr "APT-Benutzerhandbuch" #. type: #: guide.sgml:6 offline.sgml:6 msgid "Jason Gunthorpe jgg@debian.org" -msgstr "" +msgstr "Jason Gunthorpe jgg@debian.org" #. type: #: guide.sgml:7 msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $" -msgstr "" +msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $" #. type: #: guide.sgml:11 msgid "" "This document provides an overview of how to use the the APT package manager." msgstr "" +"Dieses Dokument stellt eine Übersicht bereit, wie das " +"APT-Paketverwaltungsprogramm benutzt wird." #. type: #: guide.sgml:15 msgid "Copyright © Jason Gunthorpe, 1998." -msgstr "" +msgstr "Copyright © Jason Gunthorpe, 1998." #. type:

#: guide.sgml:21 offline.sgml:22 @@ -9561,6 +9423,10 @@ msgid "" "published by the Free Software Foundation; either version 2 of the License, " "or (at your option) any later version." msgstr "" +"»APT« und dieses Dokument sind freie Software. Sie können sie weitergeben " +"und/oder verändern unter den Bedingungen der GNU General Public License, " +"wie sie von der Free Software Foundation veröffentlicht wird; entweder " +"Version 2 der Lizenz oder (optional) jeder späteren Version." #. type:

#: guide.sgml:24 offline.sgml:25 @@ -9568,13 +9434,13 @@ msgid "" "For more details, on Debian GNU/Linux systems, see the file /usr/share/" "common-licenses/GPL for the full license." msgstr "" +"Siehe für weitere Details auf Debian-Systemen die Datei " +"/usr/share/common-licenses/GPL, die die vollständige Lizenz enthält." #. type: #: guide.sgml:32 -#, fuzzy -#| msgid "generate" msgid "General" -msgstr "generate" +msgstr "Allgemein" #. type:

#: guide.sgml:38 @@ -9584,11 +9450,16 @@ msgid "" "provide a way to install and remove packages as well as download new " "packages from the Internet." msgstr "" +"Das Paket APT enthält derzeit zwei Abschnitte, die " +"APT-dselect-Methode und die Anwenderschnittstelle " +"apt-get für die Befehlszeile. Beide stellen eine Möglichkeit " +"bereit, Pakete zu installieren, zu entfernen, sowie neue Pakete aus dem " +"Internet herunterzuladen." #. type: #: guide.sgml:39 msgid "Anatomy of the Package System" -msgstr "" +msgstr "Anatomie des Paketsystems" #. type:

#: guide.sgml:44 @@ -9597,6 +9468,10 @@ msgid "" "with each package to help assure that it integrates cleanly and easily into " "the system. The most prominent of its features is the dependency system." msgstr "" +"Das Debian-Paketierungssystem besitzt eine große Anzahl von Informationen, " +"die mit jedem Paket verbunden sind, um zu helfen sicherzustellen, dass es " +"ordentlich und leicht in das System integriert wird. Das bekannteste seiner " +"Funktionen ist das Abhängigkeitssystem." #. type:

#: guide.sgml:52 @@ -9607,6 +9482,12 @@ msgid "" "things the average user is required to install. Also, it allows for choices " "in mail transport agents, X servers and so on." msgstr "" +"Das Abhängigkeitssystem erlaubt individuellen Programmen, Gebrauch von " +"gemeinsam im System benutzten Elementen, wie Bibliotheken, zu machen. Es " +"vereinfacht, selten benutze Teile eines Programms in separaten Paketen zu " +"platzieren, um die Zahl von Dingen zu verringern, die der " +"Durchschnittsanwender installieren sollte. Außerdem erlaubt es die Auswahl " +"von Mail-Transport-Agenten, X-Servern und so weiter." #. type:

#: guide.sgml:57 @@ -9616,6 +9497,11 @@ msgid "" "package requires another package to be installed at the same time to work " "properly." msgstr "" +"Der erste Schritt zum Verständnis des Abhängigkeitssystems besteht darin, " +"das Konzept einer einfachen Abhängigkeit zu begreifen. Die Bedeutung einer " +"einfachen Abhängigkeit besteht darin, dass ein Paket ein anderes Paket " +"benötigt, das zu gleichen Zeit installiert sein muss, um ordentlich zu " +"funktionieren." #. type:

#: guide.sgml:63 @@ -9625,6 +9511,11 @@ msgid "" "simple dependency on GPG. Also, because it is an emacs extension it has a " "simple dependency on emacs, without emacs it is completely useless." msgstr "" +"Mailcrypt ist zum Beispiel eine Emacs-Erweiterung, die hilft, E-Mails mit " +"GPG zu verschlüsseln. Ohne installiertes GPG ist Mailcrypt unbrauchbar, " +"deshalb hat Mailcrypt eine einfache Abhängigkeit von GPG. Da es außerdem " +"eine Emacs-Erweiterung ist, hat es ebenfalls eine einfache Abhängigkeit von " +"Emacs. Ohne Emacs ist es komplett unbenutzbar." #. type:

#: guide.sgml:73 @@ -9638,6 +9529,16 @@ msgid "" "system so all mail transport agents have a conflicting dependency with all " "other mail transport agents." msgstr "" +"Die andere wichtige Abhängigkeit, die es zu verstehen gilt, ist eine in " +"Konflikt stehende Abhängigkeit. Das bedeutet, dass das Paket, wenn es mit " +"einem anderen Paket installiert ist, nicht funktioniert und möglicherweise " +"extrem schädlich für das System sein könnte. Stellen Sie sich als Beispiel " +"einen Mail-Transport-Agenten wie Sendmail, Exim oder QMail vor. Es ist " +"nicht möglich, zwei Mail-Transport-Agenten installiert zu haben, da beide " +"im Netzwerk auf zu empfangende Mails warten. Der Versuch, zwei zu " +"installieren, würde das System ernsthaft beschädigen, weshalb alle " +"Mail-Transport-Agenten in Konflikt stehende Abhängigkeiten mit allen " +"anderen Mail-Transport-Agenten haben." #. type:

#: guide.sgml:83 @@ -9651,6 +9552,15 @@ msgid "" "depend on mail-transport-agent. This can add a great deal of confusion when " "trying to manually fix packages." msgstr "" +"Als zusätzliche Komplikation besteht die Möglichkeit, dass ein Paket " +"vortäuscht, ein anderes Paket zu sein. Bedenken Sie, dass Exim und Sendmail " +"in vieler Hinsicht identisch sind – sie liefern beide E-Mails aus und " +"verstehen eine gemeinsame Schnittstelle. Daher hat das Paketsystem " +"die Möglichkeit, beide als Mail-Transport-Agenten zu deklarieren. Deshalb " +"deklarieren Exim und Sendmail, dass sie einen Mail-Transport-Agenten " +"bereitstellen und andere Pakete, die einen Mail-Transport-Agenten benötigen, " +"dass sie von einem Mail-Transport-Agenten abhängen. Die kann zu großer " +"Verwirrung führen, wenn manuell versucht wird, Pakete zu reparieren." #. type:

#: guide.sgml:88 @@ -9660,6 +9570,11 @@ msgid "" "issues by providing a number of automatic algorithms that help in selecting " "packages for installation." msgstr "" +"Zu jeder Zeit könnte eine einzelne Abhängigkeit von Paketen vorgefunden " +"werden, die bereits installiert sind oder nicht. APT versucht beim Auflösen " +"von Abhängigkeitsproblemen zu helfen, indem es eine Anzahl automatischer " +"Algorithmen bereitstellt, die bei der Auswahl von Paketen zur Installation " +"helfen." #. type:

#: guide.sgml:102 @@ -9669,6 +9584,10 @@ msgid "" "understand .deb files, it works with the package's proper name and can only " "install .deb archives from a Source." msgstr "" +"apt-get stellt eine einfache Möglichkeit zu Verfügung, Pakete " +"auf der Befehlszeile zu installieren. Anders als dpkg versteht " +"apt-get keine .deb-Dateien. Es arbeitet mit dem Eigennamen des " +"Pakets und kann .deb-Archive nur aus einer Quelle installieren." #. type:

#: guide.sgml:109 @@ -9680,6 +9599,12 @@ msgid "" "packages are available. This is done with apt-get update. For " "instance," msgstr "" +"Das Erste

Falls Sie einen HTTP-Proxy-Server benutzen, müssen " +"Sie zuerst die Umgebungsvariable »http_proxy« setzen, siehe " +"sources.list(5)

, das Sie vor der Benutzung von " +"apt-get tun sollten, ist es, die Paketlisten von der " +"Quelle herunterzuladen, so dass es weiß, welche Pakete verfügbar " +"sind. Dies wird mit apt-get update erledigt. Zum Beispiel," #. type: #: guide.sgml:116 @@ -9691,11 +9616,17 @@ msgid "" "Reading Package Lists... Done\n" "Building Dependency Tree... Done" msgstr "" +"# apt-get update\n" +"OK http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n" +"OK http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n" +"Paketlisten werden gelesen... Fertig\n" +"Abhängigkeitsbaum wird aufgebaut... Fertig" #. type:

#: guide.sgml:120 msgid "Once updated there are several commands that can be used:" msgstr "" +"Einmal aktualisiert stehen mehrere Befehl zur Benutzung zur Verfügung:" #. type:

#: guide.sgml:131 @@ -9708,6 +9639,16 @@ msgid "" "on new packages or conflict with some other package. dselect or " "apt-get install can be used to force these packages to install." msgstr "" +"»Upgrade« wird versuchen, ein behutsames Upgrade des ganzen Systems " +"durchzuführen. »Upgrade« wird niemals ein neues Paket installieren oder " +"entfernen, noch wird es jemals ein Upgrade eines Pakets durchführen, das " +"andere Pakete beschädigen könnte. Dies kann täglich dazu benutzt werden, um " +"ein relativ sicheres Upgrade des Systems durchzuführen. »Upgrade« wird alle " +"Pakete auflisten, von denen es kein Upgrade durchführen kann, was " +"üblicherweise bedeutet, dass sie von neuen Paketen abhängen oder Konflikte " +"mit anderen Paketen haben. dselect oder " +"apt-get install können benutzt werden, um die Installation von " +"diesen Paketen zu erzwingen." #. type:

#: guide.sgml:140 @@ -9720,6 +9661,14 @@ msgid "" "listed packages and will print a summary and ask for confirmation if " "anything other than its arguments are changed." msgstr "" +"»Install« wird benutzt, um Pakete nach Namen zu installieren. Das Paket wird " +"automatisch heruntergeladen und installiert. Dies kann nützlich sein, wenn " +"Sie bereits den Namen des zu installierenden Pakets kennen und keine GUI " +"aufrufen möchten, um es auszuwählen. Jede Anzahl von Paketen könnte zum " +"Installieren übergeben werden, sie werden alle heruntergeladen. " +"»Install« versucht automatisch Abhängigkeitsprobleme mit den aufgelisteten " +"Paketen aufzulösen, wird eine Zusammenfassung ausgeben und nach einer " +"Bestätigung fragen, wenn sich etwas anderes als dessen Argumente ändert." #. type:

#: guide.sgml:149 @@ -9732,6 +9681,16 @@ msgid "" "dselect. Once dist-upgrade has completed then dselect can be used to install any packages that may have been left out." msgstr "" +"»Dist-upgrade« führt vollständige Upgrades durch. Es wurde entworfen, um " +"Upgrades zwischen Releases von Debian zu vereinfachen. Es benutzt einen " +"ausgeklügelten Algorithmus, um die beste Zusammenstellung von Paketen zum " +"Installieren, für das Upgrade oder zum Entfernen festzulegen, um soviel wie " +"möglich vom System auf das neuste Release zu bekommen. In einigen " +"Situationen könnte es eher gewünscht sein, »dist-upgrade« zu benutzen, als " +"Zeit in das manuelle Auflösen von Abhängigkeiten in dselect " +"zu investieren. Ist »Dist-upgrade« erst vollständig, dann kann " +"dselect benutzt werden, um einige Pakete zu installieren, die " +"außen vor geblieben sind." #. type:

#: guide.sgml:152 @@ -9739,6 +9698,8 @@ msgid "" "It is important to closely look at what dist-upgrade is going to do, its " "decisions may sometimes be quite surprising." msgstr "" +"Es ist wichtig, genau zu schauen, was »Dist-upgrade« tun wird, seine " +"Entscheidungen können manchmal ziemlich überraschend sein." #. type:

#: guide.sgml:163 @@ -9751,13 +9712,20 @@ msgid "" "the downloaded archives can be installed by simply running the command that " "caused them to be downloaded again without -d." msgstr "" +"apt-get hat mehrere Befehlszeilenoptionen, die sich detailliert " +"in dessen Handbuchseite, finden. Die " +"nützlichste Option ist -d, die die heruntergeladenen Dateien nicht " +"installiert. Falls das System eine große Anzahl Pakete herunterladen soll, " +"würde es nicht erwünscht sein, wenn die Installation in dem Fall gestartet " +"würde, wenn etwas schief läuft. Falls -d benutzt wird, können die " +"heruntergeladenen Archive dadurch installiert werden, indem einfach der " +"Befehl, der das Herunterladen veranlasste, erneut ohne -d ausführt " +"wird." #. type: #: guide.sgml:168 -#, fuzzy -#| msgid "APT in DSelect" msgid "DSelect" -msgstr "APT in DSelect" +msgstr "DSelect" #. type:

#: guide.sgml:173 @@ -9767,6 +9735,10 @@ msgid "" "to select the packages to be installed or removed and APT actually installs " "them." msgstr "" +"Die APT-dselect-Methode stellt das komplette APT-System mit " +"dem dselect-Paketauswahl-GUI bereit. dselect wird " +"benutzt, um Pakete zum Installieren oder Entfernen auszuwählen und APT " +"installiert sie tatsächlich." #. type:

#: guide.sgml:184 @@ -9781,6 +9753,17 @@ msgid "" "have access to the latest bug fixes. APT will automatically use packages on " "your CDROM before downloading from the Internet." msgstr "" +"Um die APT-Methode einzuschalten, müssen Sie [Z]ugriff in " +"dselect auswählen und dann die APT-Methode wählen. Sie werden " +"nach einer Zusammenstellung von Quellen gefragt. Dies sind Plätze, " +"von denen Archive heruntergeladen werden. Dies können ferne Internetsites, " +"lokale Debian-Spiegel oder CD-ROMs sein. Jede Quelle kann einen Ausschnitt " +"des gesamten Debian-Archives bereitstellen. APT wird sie automatisch " +"kombinieren, um eine komplette Zusammenstellung von Paketen zu formen. " +"Falls Sie eine CD-ROM haben, ist es eine gute Idee, sie als erstes und dann " +"den Spiegel anzugeben, so dass Sie Zugriff auf die neusten Fehlerbehebungen " +"haben. APT wird automatisch Pakete auf der CD-ROM benutzen, bevor es sie " +"aus dem Internet herunterlädt." #. type: #: guide.sgml:198 @@ -9799,6 +9782,18 @@ msgid "" " \n" " URL [http://llug.sep.bnl.gov/debian]:" msgstr "" +" eine Liste mit Orten von Distributionsquellen einrichten\n" +"\t \n" +" Bitte geben Sie die Basis-URL der Debian-Distribution an.\n" +" Die bekannten Zugriffsschemata dafür sind: http file\n" +"\t \n" +" Zum Beispiel:\n" +" file:/mnt/debian,\n" +" ftp://ftp.debian.org/debian,\n" +" http://ftp.de.debian.org/debian,\n" +" \n" +" \n" +" URL [http://llug.sep.bnl.gov/debian]:" #. type:

#: guide.sgml:205 @@ -9807,6 +9802,9 @@ msgid "" "archive, defaulting to a HTTP mirror. Next it asks for the distribution to " "get." msgstr "" +"Das Einrichten der Quellen beginnt durch das Erfragen der Basis " +"des Debian-Archives, vorgegeben ist ein HTTP-Spiegel. Als nächstes wird " +"nach der zu erhaltenden Distribution gefragt." #. type: #: guide.sgml:212 @@ -9818,6 +9816,11 @@ msgid "" " \n" " Distribution [stable]:" msgstr "" +" Bitte geben Sie die zu erhaltende Distributionskennzeichnung oder den mit " +" einem / endenden Pfad zum Paket an. Die Distributionskennzeichnungen sind " +" normalerweise etwas wie: stable unstable testing non-US\n" +" \n" +" Distribution [stable]:" #. type:

#: guide.sgml:222 @@ -9829,6 +9832,13 @@ msgid "" "that cannot be exported from the United States. Importing these packages " "into the US is legal however." msgstr "" +"Die Distribution bezieht sich auf die Debian-Version im Archiv, " +"stable bezieht sich auf die zuletzt veröffentlichte Version und " +"unstable bezieht sich auf die Entwicklungsversion. non-US " +"ist nur auf einigen Spiegeln verfügbar und bezieht sich auf Pakete, die " +"Verschlüsselungstechnologie oder andere Dinge enthalten, die nicht aus den " +"Vereinigten Staaten exportiert werden können. Diese Pakete in die USA zu " +"importieren ist jedoch legal." #. type: #: guide.sgml:228 @@ -9839,6 +9849,10 @@ msgid "" " \n" " Components [main contrib non-free]:" msgstr "" +" Bitte geben Sie die Komponenten an, die Sie erhalten möchten\n" +" Die Komponenten sind normalerweise etwas wie: »main« »contrib« »non-free«\n" +" \n" +" Komponenten [main contrib non-free]:" #. type:

#: guide.sgml:236 @@ -9848,6 +9862,11 @@ msgid "" "packages while contrib and non-free contain things that have various " "restrictions placed on their use and distribution." msgstr "" +"Die Komponentenliste bezieht sich auf die Liste von Unter-Distributionen " +"zum Herunterladen. Die Distribution ist auf Basis von Software-Lizenzen " +"unterteilt, »Main« besteht aus Paketen die gemäß der DFSG frei sind, während " +"»Contrib« und »Non-free« Dinge enthalten, die verschiedene Einschränkungen " +"in ihrer Benutzung und ihren Vertrieb haben." #. type:

#: guide.sgml:240 @@ -9855,6 +9874,9 @@ msgid "" "Any number of sources can be added, the setup script will continue to prompt " "until you have specified all that you want." msgstr "" +"Jegliche Anzahl von Quellen kann hinzugefügt werden, das Einrichtungsskript " +"wird mit Nachfragen fortfahren, bis Sie alles angegeben haben, was Sie " +"möchten." #. type:

#: guide.sgml:247 @@ -9865,6 +9887,12 @@ msgid "" "dselect. [U]pdate must be performed even if apt-get update has been run before." msgstr "" +"Bevor sie beginnen, dselect zu benutzen, ist es notwendig, die " +"Verfügbarkeitsliste zu aktualisieren, indem sie aus dem Menü [E]rneuern " +"auswählen. Dies ist eine Obermenge von apt-get update, das " +"dselect heruntergeladene Informationen zur Verfügung stellt. " +"[E]rneuern muss auch dann durchgeführt werden, wenn vorher " +"apt-get update ausgeführt wurde." #. type:

#: guide.sgml:253 @@ -9874,6 +9902,10 @@ msgid "" "[R]emove commands have no meaning, the [I]nstall command performs both of " "them together." msgstr "" +"Sie können dann fortfahren und Ihre Auswahl per [A]uswähle treffen und dann " +"die Installation mit [I]nstall. vornehmen. Wenn Sie die APT-Methode " +"benutzen, haben die Befehle Kon[f]ig. und [L]öschen keine Bedeutung, der " +"Befehl [I]nstall. führt beides gleichermaßen aus." #. type:

#: guide.sgml:258 @@ -9882,11 +9914,14 @@ msgid "" "have been successfully installed. To change this behavior place Dselect::" "clean \"prompt\"; in /etc/apt/apt.conf." msgstr "" +"Standardmäßig wird APT automatisch die Paketdateien (.deb) entfernen, " +"sobald sie erfolgreich installiert sind. Um dieses Verhalten zu ändern, " +"platzieren Sie Dselect::clean \"prompt\"; in /etc/apt/apt.conf." #. type: #: guide.sgml:264 msgid "The Interface" -msgstr "" +msgstr "Die Schnittstelle" #. type:

#: guide.sgml:278 @@ -9900,11 +9935,20 @@ msgid "" "then will print out some informative status messages so that you can " "estimate how far along it is and how much is left to do." msgstr "" +"Sowohl die APT-Methode dselect, als auch apt-get " +"teilen sich die gleiche Schnittstelle. Es ist ein einfaches System, das " +"üblicherweise mitteilt, was es tun wird und es dann tut.

Die " +"Methode dselect ist tatsächlich eine Zusammenstellung von " +"Wrapper-Skripten für apt-get. Die Methode stellt tatsächlich " +"mehr Funktionalitäten bereit, als in apt-get allein vorhanden " +"sind.

 Nach der Ausgabe einer Zusammenfassung was passieren " +"wird, gibt APT einige informative Statusmeldungen aus, so dass Sie " +"abschätzen können, wie weit es ist und wieviel noch zu tun ist." #. type: #: guide.sgml:280 msgid "Startup" -msgstr "" +msgstr "Anfang" #. type:

#: guide.sgml:284 @@ -9914,6 +9958,10 @@ msgid "" "At any time these operations can be performed by running apt-get check." msgstr "" +"Vor allen Operationen, ausgenommen »update«, führt APT eine Reihe von " +"Aktionen durch, um seinen internen Status vorzubereiten. Es macht außerdem " +"einige Prüfungen des Systemstatus. Diese Operationen können jederzeit durch " +"Ausführung von apt-get check durchgeführt werden." #. type: #: guide.sgml:289 @@ -9923,6 +9971,9 @@ msgid "" "Reading Package Lists... Done\n" "Building Dependency Tree... Done" msgstr "" +"# apt-get check\n" +"Paketlisten werden gelesen... Fertig\n" +"Abhängigkeitsbaum wird aufgebaut" #. type:

#: guide.sgml:297 @@ -9932,6 +9983,11 @@ msgid "" "If some of the package files are not found then they will be ignored and a " "warning will be printed when apt-get exits." msgstr "" +"Das erste was es tut, ist das Einlesen aller Paketdateien in den Speicher. " +"APT benutzt ein Zwischenspeicherschema, so dass diese Operation beim " +"zweiten Ausführen schneller laufen wird. Falls einige der Paketdateien nicht " +"gefunden werden, werden sie ignoriert und beim Beenden von Apt-get wird eine " +"Warnung ausgegeben." #. type:

#: guide.sgml:303 @@ -9941,6 +9997,11 @@ msgid "" "package and considers if it is OK. Should this find a problem then a report " "will be printed out and apt-get will refuse to run." msgstr "" +"Die letzte Operation führt eine detaillierte Analyse der Abhängigkeiten des " +"Systems durch. Sie prüft jede Abhängigkeit jedes installierten oder " +"entpackten Pakets und berücksichtigt, ob es in Ordnung ist. Sollte sie ein " +"Problem finden, dann wird eine Meldung ausgegeben und apt-get " +"wird die Ausführung verweigern." #. type: #: guide.sgml:320 @@ -9962,6 +10023,22 @@ msgid "" " Depends: xlib6g (>= 3.3-5) but it is not installed\n" " libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)" msgstr "" +"# apt-get check\n" +"Paketlisten werden gelesen... Fertig\n" +"Abhängigkeitsbaum wird aufgebaut\n" +"Status-Informationen einlesen... Fertig\n" +"Probieren Sie „apt-get -f install“, um diese zu korrigieren:\n" +"Die folgenden Pakete haben nichterfüllte Abhängigkeiten:\n" +" 9fonts: Hängt ab: xlib6g ist aber nicht installiert\n" +" uucp: Hängt ab: mailx ist aber nicht installiert\n" +" blast: Hängt ab: xlib6g (>= 3.3-5) ist aber nicht installiert\n" +" adduser: Hängt ab: perl-base ist aber nicht installiert\n" +" aumix: Hängt ab: libgpmg1 ist aber nicht installiert\n" +" debiandoc-sgml: Hängt ab: sgml-base ist aber nicht installiert\n" +" bash-builtins: Hängt ab: bash (>= 2.01) but 2.0-3 ist installiert\n" +" cthugha: Hängt ab: svgalibg1 ist aber nicht installiert\n" +" Hängt ab: xlib6g (>= 3.3-5) ist aber nicht installiert\n" +" libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)" #. type:

#: guide.sgml:329 @@ -9972,6 +10049,11 @@ msgid "" "that are unmet. A short explanation of why the package has a dependency " "problem is also included." msgstr "" +"In diesem Beispiel hat das System viele Probleme, einschließlich eines " +"ernsten Problems mit libreadlineg2. Für jedes Paket, das nichterfüllte " +"Abhängigkeiten hat, wird eine Zeile ausgegeben, die das Paket mit dem " +"Problem anzeigt und die Abhängigkeiten, die nicht erfüllt sind. Eine kurze " +"Erklärung, warum das Paket ein Abhängigkeitsproblem hat, ist inbegriffen." #. type:

#: guide.sgml:337 @@ -9984,6 +10066,14 @@ msgid "" "situation a package may have been unpacked without its dependents being " "installed." msgstr "" +"Es gibt zwei Möglichkeiten, wie ein System in einen kaputten Status wie " +"diesen kommen kann. Die erste wird dadurch verursacht, dass " +"dpkg einige feine Beziehungen zwischen Paketen übersieht, wenn " +"Upgrades durchgeführt werden.

APT berücksichtigt jedoch alle " +"bekannten Abhängigkeiten und versucht, kaputte Pakete zu vermeiden" +"

. Die zweite tritt auf, falls eine Paketinstallation während " +"der Ausführung fehlschlägt. In dieser Situation könnte ein Paket entpackt " +"worden sein, ohne dass die von ihm Abhängigen installiert sind." #. type:

#: guide.sgml:345 @@ -9995,6 +10085,13 @@ msgid "" "dselect method always supplies the -f option to allow " "for easy continuation of failed maintainer scripts." msgstr "" +"Die zweite Situation ist weit weniger ernst als die erste, weil APT " +"bestimmte Beschränkungen in der Reihenfolge setzt, in der Pakete installiert " +"werden. In beiden Fällen veranlasst die Option -f " +"apt-get, eine mögliche Lösung für das Problem zu folgern und " +"dann fortzufahren. Die APT-Methode dselect liefert immer die " +"Option -f, zum einfachen Fortfahren von gescheiterten " +"Betreuerskripten." #. type:

#: guide.sgml:351 @@ -10005,11 +10102,17 @@ msgid "" "necessary to manually use dpkg (possibly with forcing options) to correct " "the situation enough to allow APT to proceed." msgstr "" +"Falls jedoch die Option -f benutzt wird, um ein ernsthaft kaputtes " +"System zu korrigieren, das vom ersten Fall verursacht wurde, dann ist es " +"möglich, dass es entweder sofort fehlschlägt oder die Installationsabfolge " +"fehlschlagen wird. In beiden Fällen ist es nötig, Dpkg (möglicherweise mit " +"erzwingenden Optionen) manuell zu benutzen, um die Situation ausreichend zu " +"korrigieren, so dass es APT ermöglicht wird, fortzufahren." #. type: #: guide.sgml:356 msgid "The Status Report" -msgstr "" +msgstr "Der Statusbericht" #. type:

#: guide.sgml:363 @@ -10020,11 +10123,17 @@ msgid "" "final state of things, taking into account the -f option and any " "other relevant activities to the command being executed." msgstr "" +"Bevor es fortfährt, wird apt-get einen Bericht darüber " +"präsentieren, was geschehen wird. Im Allgemeinen spiegelt der Bericht den Typ " +"der Operation, die ausgeführt wird, wider, aber es gibt auch mehrere " +"geläufige Elemente. Auf jeden Fall spiegelt die Liste den Endstatus der Dinge " +"wider, bezieht die Option -f in Betracht und alle andere " +"relevante Aktivitäten zum Befehl, der ausgeführt wird." #. type: #: guide.sgml:364 msgid "The Extra Package list" -msgstr "" +msgstr "Die zusätzliche Paketliste" #. type: #: guide.sgml:372 @@ -10037,6 +10146,12 @@ msgid "" " squake pgp-i python-base debmake ldso perl libreadlineg2\n" " ssh" msgstr "" +"Die folgenden Pakete werden zusätzlich installiert:\n" +" libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n" +" mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n" +" bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n" +" squake pgp-i python-base debmake ldso perl libreadlineg2\n" +" ssh" #. type:

#: guide.sgml:379 @@ -10046,11 +10161,16 @@ msgid "" "generated for an install command. The listed packages are often the " "result of an Auto Install." msgstr "" +"Die zusätzliche Paketliste zeigt alle Pakete, die installiert werden oder " +"von denen ein Upgrade durchgeführt wird, zusätzlich zu den auf der " +"Befehlszeile angegebenen. Sie wird nur für einen " +"install-Befehl generiert. Die aufgelisteten Pakete sind häufig das " +"Ergebnis einer automatischen Installation." #. type: #: guide.sgml:382 msgid "The Packages to Remove" -msgstr "" +msgstr "Die zu entfernenden Pakete" #. type: #: guide.sgml:389 @@ -10062,6 +10182,11 @@ msgid "" " xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n" " nas xpilot xfig" msgstr "" +"Die folgenden Pakete werden ENTFERNT:\n" +" xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n" +" xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n" +" xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n" +" nas xpilot xfig" #. type:

#: guide.sgml:399 @@ -10074,11 +10199,19 @@ msgid "" "that are going to be removed because they are only partially installed, " "possibly due to an aborted installation." msgstr "" +"Die Liste der zu entfernenden Pakete zeigt all die Pakete, die vom System " +"entfernt werden. Sie kann für jede der Operationen angezeigt werden und " +"sollte einer sorgfältige Überprüfung unterzogen werden, um sicherzustellen, " +"dass nichts Wichtiges weggenommen wird. Die Option -f ist " +"insbesondere gut darin, Pakete zum Entfernen vorzumerken, so dass in diesem " +"Fall mit extremer Vorsicht vorgegangen werden sollte. Die Liste könnte " +"Pakete enthalten, die entfernt werden, weil sie nur teilweise installiert " +"sind, möglicherweise aufgrund einer abgebrochenen Installation." #. type: #: guide.sgml:402 msgid "The New Packages list" -msgstr "" +msgstr "Die Liste neuer Pakete" #. type: #: guide.sgml:406 @@ -10087,6 +10220,8 @@ msgid "" "The following NEW packages will installed:\n" " zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base" msgstr "" +"Die folgenden NEUEN Pakete werden zusätzlich installiert:\n" +" zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base" #. type:

#: guide.sgml:411 @@ -10095,11 +10230,14 @@ msgid "" "listed are not presently installed in the system but will be when APT is " "done." msgstr "" +"Die Liste neuer Pakete ist einfache eine Erinnerung, was geschehen " +"wird. Die aufgelisteten Pakete sind zurzeit nicht auf dem System " +"installiert, werden es aber sein, wenn APT fertig ist." #. type: #: guide.sgml:414 msgid "The Kept Back list" -msgstr "" +msgstr "Die Liste zurückgehaltener Pakete" #. type: #: guide.sgml:419 @@ -10109,6 +10247,9 @@ msgid "" " compface man-db tetex-base msql libpaper svgalib1\n" " gs snmp arena lynx xpat2 groff xscreensaver" msgstr "" +"Die folgenden Pakete werden zurückgehalten:\n" +" compface man-db tetex-base msql libpaper svgalib1\n" +" gs snmp arena lynx xpat2 groff xscreensaver" #. type:

#: guide.sgml:428 @@ -10120,11 +10261,18 @@ msgid "" "to install is with apt-get install or by using dselect " "to resolve their problems." msgstr "" +"Jedesmal, wenn ein Upgrade des ganzen Systems durchgeführt wird, besteht die " +"Möglichkeit, dass neue Versionen von Paketen nicht installiert werden " +"können, weil sie neue Dinge benötigen oder einen Konflikt mit bereits " +"installierten Dingen haben. In diesem Fall wird das Paket auf der Liste " +"zurückgehaltener Pakete erscheinen. Der beste Weg dort aufgeführte Pakete " +"zur Installation zu bewegen, ist per apt-get install oder indem " +"dselect zum Lösen ihrer Probleme benutzt wird." #. type: #: guide.sgml:431 msgid "Held Packages warning" -msgstr "" +msgstr "Warnung wegen zurückgehaltener Pakete" #. type: #: guide.sgml:435 @@ -10133,6 +10281,8 @@ msgid "" "The following held packages will be changed:\n" " cvs" msgstr "" +"Die folgenden zurückgehaltenen Pakete werden geändert:\n" +" cvs" #. type:

#: guide.sgml:441 @@ -10141,17 +10291,23 @@ msgid "" "case it prints out a warning that the held package is going to be changed. " "This should only happen during dist-upgrade or install." msgstr "" +"Manchmal können Sie APT bitten, ein auf »zurückgehalten« gesetztes Paket zu " +"installieren. In einem solchen Fall gibt es eine Warnung aus, dass das " +"zurückgehaltene Paket geändert wird. Dies sollte nur während »Dist-upgrade« " +"oder »Install« vorkommen." #. type: #: guide.sgml:444 msgid "Final summary" -msgstr "" +msgstr "Abschließende Zusammenfassung" #. type:

#: guide.sgml:447 msgid "" "Finally, APT will print out a summary of all the changes that will occur." msgstr "" +"Abschließend wird APT eine Zusammenfassung aller Änderungen ausgeben, die " +"auftreten werden." #. type: #: guide.sgml:452 @@ -10161,6 +10317,11 @@ msgid "" "12 packages not fully installed or removed.\n" "Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used." msgstr "" +"206 Pakete aktualisiert, 8 zusätzlich installiert, 23 werden entfernt und " +"51 nicht aktualisiert.\n" +"12 Pakete nicht vollständig installiert oder entfernt.\n" +"Muss 65,7MB/66,7MB an Archiven herunterladen. Nach dem Entpacken werden " +"26,5MB zusätzlich belegt sein." #. type:

#: guide.sgml:470 @@ -10179,6 +10340,20 @@ msgid "" "If a large number of packages are being removed then the value may indicate " "the amount of space that will be freed." msgstr "" +"Die erste Zeile der Zusammenfassung ist bloß eine Zusammenfassung von all " +"den Listen und umfasst die Anzahl der Upgrades – das sind bereits " +"installierte Pakete, für die neue Versionen verfügbar sind. Die zweite " +"Zeile zeigt die Anzahl von schlecht konfigurierten Paketen, die " +"möglicherweise das Ergebnis einer abgebrochenen Installation sind. Die " +"letzt Zeile zeigt den Speicherbedarf, den die Installation benötigt. Das " +"erste Zahlenpaar bezieht sich auf die Größe der Archivdateien. Die erste " +"Zahl zeigt die Anzahl der Bytes an, die von fernen Orten heruntergeladen " +"werden müssen und die zweite zeigt die gesamte Größe aller benötigten " +"Archive an. Die nächste Zahl zeigt den Größenunterschied zwischen den " +"derzeit installierten Paketen und den neu installierten Paketen. Es " +"entspricht ungefähr dem in /usr benötigten Speicher nachdem alles erledigt " +"ist. Wenn eine große Anzahl Pakete entfernt wird, dann kann der Wert den " +"Betrag des freiwerdenden Speichers anzeigen." #. type:

#: guide.sgml:473 @@ -10186,11 +10361,14 @@ msgid "" "Some other reports can be generated by using the -u option to show packages " "to upgrade, they are similar to the previous examples." msgstr "" +"Einige andere Berichte können durch Benutzung der Option »-u« generiert " +"werden, um Pakete anzuzeigen, von denen ein Upgrade durchgeführt werden " +"soll. Dies ist den vorherigen Beispielen ähnlich." #. type: #: guide.sgml:477 msgid "The Status Display" -msgstr "" +msgstr "Der Anzeigestatus" #. type:

#: guide.sgml:481 @@ -10198,6 +10376,8 @@ msgid "" "During the download of archives and package files APT prints out a series of " "status messages." msgstr "" +"Während des Herunterladens von Archiven und Paketdateien gibt APT eine " +"Reihe von Statusmeldungen aus." #. type: #: guide.sgml:490 @@ -10211,6 +10391,13 @@ msgid "" "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n" "11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s" msgstr "" +"# apt-get update\n" +"Hole:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n" +"Hole:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n" +"Treffer http://llug.sep.bnl.gov/debian/ testing/main Packages\n" +"Hole:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n" +"Hole:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n" +"11% [5 testing/non-free 'Warte auf Datei' 0/32.1k 0%] 2203b/s 1m52s" #. type:

#: guide.sgml:500 @@ -10222,6 +10409,13 @@ msgid "" "apt-get update estimates the percent done which causes some " "inaccuracies." msgstr "" +"Die Zeilen, die mit Hole beginnen, werden ausgegeben, wenn APT " +"anfängt, eine Datei herunterzuladen, während die letzte Zeile den " +"Fortschritt des Herunterladens anzeigt. Die erste Prozentzahl der " +"Fortschrittszeile zeigt die gesamt erledigte Prozentzahl aller Dateien an. " +"Unglücklicherweise schätzt apt-get update die erledigte " +"Prozentzahl, da die Größe der Pakete unbekannt ist, was einige " +"Ungenauigkeiten bewirkt." #. type:

#: guide.sgml:509 @@ -10234,6 +10428,15 @@ msgid "" "The next word is the short form name of the object being downloaded. For " "archives it will contain the name of the package that is being fetched." msgstr "" +"Der nächste Abschnitt der Statuszeile wird für jeden Download-Thread " +"wiederholt und zeigt die durchgeführte Operation, sowie einige nützliche " +"Informationen darüber an was geschieht. Manchmal wird dieser Abschnitt " +"einfach nur Forking darstellen, was bedeutet, dass das " +"Betriebssystem das Download-Modul am Laden ist. Das erste Wort nach dem " +"»[« ist die Ladenummer, wie sie auf den Verlaufszeilen angezeigt wird. Das " +"nächste Wort ist Name in Kurzform des Ojektes, das heruntergeladen wird. " +"Für Archive wird es den Namen des Paketes enthalten, das heruntergeladen " +"wird." #. type:

#: guide.sgml:524 @@ -10252,6 +10455,21 @@ msgid "" "regularly and reflects the time to complete everything at the shown transfer " "rate." msgstr "" +"Innerhalb von einzelnen Anführungszeichen folgt eine informative " +"Zeichenkette, die den Fortschritt der Übertragungsphase des Downloads " +"anzeigt. Normalerweise schreitet sie fort von Verbinde zu Warte " +"auf Datei zu Lade herunter oder Nehme wieder auf. " +"Der letzte Wert ist die Anzahl der von der fernen Site heruntergeladenen " +"Bytes. Sobald der Download beginnt, zeigt sich dies wie 102/10.2k " +"was anzeigt, dass 102 Bytes heruntergeladen und 10,2 Kilobytes erwartet " +"werden. Die Gesamtgröße wird immer in vierstelliger Schreibweise " +"dargestellt, um Platz zu sparen. Nach der Größenanzeige ist eine " +"Prozentangabe für die Datei selbst. Das zweitletzte Element ist die " +"augenblickliche Fortschrittsgeschwindigkeit. Dieser Wert wird alle fünf " +"Sekunden aktualisiert und spiegelt die Datenübertragungsgeschwindigkeit in " +"dieser Periode wider. Am Ende wird die geschätzte Übertragungszeit " +"angezeigt. Dies wird regelmäßig aktualisiert und spiegelt die Zeit zum " +"Vervollständigen bei der angezeigten Datenübertragungsgeschwindigkeit wider." #. type:

#: guide.sgml:530 @@ -10262,11 +10480,17 @@ msgid "" "for logging to a file, use the -q option to remove the status " "display." msgstr "" +"Die Statusanzeige aktualisiert sich alle halbe Sekunde, um eine " +"gleichmäßige Rückmeldung über den Download-Fortschritt bereitzustellen, " +"während die »Hole«-Zeilen bei jeder gestarteten neuen Datei zurückscrollen. " +"Da die Statusanzeige ständig aktualisiert wird, ist sie für die " +"Protokollierung in eine Datei ungeeignet. Benutzen Sie die Option " +"-q, um die Statusanzeige zu entfernen." #. type: #: guide.sgml:535 msgid "Dpkg" -msgstr "" +msgstr "Dpkg" #. type:

#: guide.sgml:542 @@ -10278,16 +10502,23 @@ msgid "" "each question there is usually a description of what it is asking and the " "questions are too varied to discuss completely here." msgstr "" +"APT benutzt dpkg, um die Archive zu installieren und wird " +"zu der dpkg-Schnittstelle herüberschalten, sobald der " +"Download vollständig ist. dpkg wird außerdem eine Reihe von " +"Fragen stellen, während es die Pakete abarbeitet und die Pakete können auch " +"mehrere Fragen stellen . Vor jeder Frage ist üblicherweise eine " +"Beschreibung des Gefragten und die Fragen sind zu vielfältig, um sie " +"vollständig hier zu besprechen." #. type: #: offline.sgml:4 msgid "Using APT Offline" -msgstr "" +msgstr "APT offline verwenden" #. type: #: offline.sgml:7 msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $" -msgstr "" +msgstr "$Id: offline.sgml,v 1.8 12.02.2003 15:06:41 doogie Exp $" #. type: #: offline.sgml:12 @@ -10295,23 +10526,24 @@ msgid "" "This document describes how to use APT in a non-networked environment, " "specifically a 'sneaker-net' approach for performing upgrades." msgstr "" +"Dieses Dokument beschreibt, wie APT in einer Umgebung ohne Netzwerk, " +"speziell einem »Turnschuhnetzwerk«, an die Durchführung von Upgrades " +"herangeht." #. type: #: offline.sgml:16 msgid "Copyright © Jason Gunthorpe, 1999." -msgstr "" +msgstr "Copyright © Jason Gunthorpe, 1999." #. type: #: offline.sgml:32 msgid "Introduction" -msgstr "" +msgstr "Einleitung" #. type: #: offline.sgml:34 offline.sgml:65 offline.sgml:180 -#, fuzzy -#| msgid "OverrideDir" msgid "Overview" -msgstr "OverrideDir" +msgstr "Übersicht" #. type:

#: offline.sgml:40 @@ -10321,6 +10553,11 @@ msgid "" "machine is on a slow link, such as a modem and another machine has a very " "fast connection but they are physically distant." msgstr "" +"Normalerweise benötigt APT direkten Zugang zu einem Debian-Archiv, entweder " +"von einem lokalen Medium oder über ein Netz. Eine andere häufige " +"Beanstandung ist, dass eine Debian-Maschine an einer langsamen Anbindung, " +"wie einem Modem, hängt und eine andere Maschine eine sehr schnelle " +"Verbindung hat, sie jedoch physisch fern sind." #. type:

#: offline.sgml:51 @@ -10335,6 +10572,17 @@ msgid "" "the machine downloading the packages, and target host the one with " "bad or no connection." msgstr "" +"Die Lösung dazu besteht darin, große Wechselmedien, wie eine Zip-Platte " +"oder eine SuperDisk zu benutzen. Diese Platten sind nicht groß genug, um " +"ein ganzes Debian-Archiv zu speichern, können aber leicht eine Untermenge " +"aufnehmen, die für die meisten Anwender groß genug ist. Die Idee besteht " +"darin, APT zu benutzen, um eine Liste benötigter Pakete zu generieren und " +"diese dann mit einer anderen Maschine mit guter Verbindung auf die Platte " +"herunterzuladen. Es ist sogar möglich, eine andere Debian-Maschine mit APT " +"oder ein komplett unterschiedliches Betriebssystem und ein " +"Download-Werkzeug wie Wget zu benutzen. Nennen wir die Maschine, die die " +"Pakete herunterlädt ferner Rechner und die mit der schlechten oder " +"fehlenden Verbindung Zielrechner." #. type:

#: offline.sgml:57 @@ -10344,11 +10592,16 @@ msgid "" "that the disc should be formated with a filesystem that can handle long file " "names such as ext2, fat32 or vfat." msgstr "" +"Dies wird durch kreatives Manipulieren der APT-Konfigurationsdatei " +"erreicht. Die wesentliche Voraussetzung besteht darin, APT mitzuteilen, " +"dass es für seine Archivdateien auf einer Platte nachsieht. Beachten Sie, " +"dass diese Platte mit einem Dateisystem formatiert sein sollte, das mit " +"langen Dateinamen umgehen kann, so wie ext2, fat32 oder vfat." #. type: #: offline.sgml:63 msgid "Using APT on both machines" -msgstr "" +msgstr "APT auf beiden Maschinen benutzen" #. type:

#: offline.sgml:71 @@ -10358,6 +10611,11 @@ msgid "" "remote machine to fetch the latest package files and decide which packages " "to download. The disk directory structure should look like:" msgstr "" +"Ein verfügbares APT auf beiden Maschinen stellt die einfachste Konfiguration " +"dar. Die Grundidee besteht darin, eine Kopie der Statusdatei auf der Platte " +"zu platzieren und die ferne Maschine zu benutzen, um die neusten " +"Paketdateien herunterzuladen und zu entscheiden, welche Pakete " +"heruntergeladen werden. Die Plattenverzeichnisstruktur sollte so aussehen:" #. type: #: offline.sgml:80 @@ -10372,13 +10630,19 @@ msgid "" " sources.list\n" " apt.conf" msgstr "" +" /Platte/\n" +" Archive/\n" +" partial/\n" +" lists/\n" +" partial/\n" +" status\n" +" sources.list\n" +" apt.conf" #. type: #: offline.sgml:88 -#, fuzzy -#| msgid "User configuration" msgid "The configuration file" -msgstr "Benutzerkonfiguration" +msgstr "Die Konfigurationsdatei" #. type:

#: offline.sgml:96 @@ -10390,6 +10654,13 @@ msgid "" "target host. Please note, if you are using a local archive you must " "use copy URIs, the syntax is identical to file URIs." msgstr "" +"Die Konfigurationsdatei sollte APT mitteilen, dass es seine Dateien auf der " +"Platte speichert und obendrein die Konfigurationsdateien auf der Platte " +"benutzt. Die »sources.list« sollte genau die Sites enthalten, die Sie " +"auf der fernen Maschine benutzen möchten und die Statusdatei sollte eine " +"Kopie von /var/lib/dpkg/status vom Zielrechner sein. " +"Bitte beachten Sie, falls Sie lokale Archive benutzen, dass Sie »copy«-URIs " +"benutzen müssen. Die Syntax entspricht der von »file«-URIs." #. type:

#: offline.sgml:100 @@ -10397,6 +10668,8 @@ msgid "" "apt.conf must contain the necessary information to make APT use the " "disc:" msgstr "" +"apt.conf muss die nötigen Informationen enthalten, damit APT die " +"Platte benutzt:" #. type: #: offline.sgml:124 @@ -10426,6 +10699,30 @@ msgid "" " Etc \"/disc/\";\n" " };" msgstr "" +" APT\n" +" {\n" +" /* Dies ist nicht nötig, falls die beiden Maschinen die gleiche\n" +" Architektur haben. Es teilt dem fernen APT mit, welche Architektur " +" die Zielmaschine hat */\n" +" Architecture \"i386\";\n" +" \n" +" Get::Download-Only \"true\";\n" +" };\n" +" \n" +" Dir\n" +" {\n" +" /* Die Platte für Statusinformationen benutzen und die Statusdatei\n" +" umleiten von /var/lib/dpkg default */\n" +" State \"/disc/\";\n" +" State::status \"status\";\n" +"\n" +" // Programmzwischenspeicher werden lokal gespeichert\n" +" Cache::archives \"/disc/archives/\";\n" +" Cache \"/tmp/\";\n" +" \n" +" // Ort der Quellenliste.\n" +" Etc \"/disc/\";\n" +" };" #. type:

#: offline.sgml:129 @@ -10433,6 +10730,8 @@ msgid "" "More details can be seen by examining the apt.conf man page and the sample " "configuration file in /usr/share/doc/apt/examples/apt.conf." msgstr "" +"Weitere Details finden sich in der apt.conf-Handbuchseite und der " +"Musterkonfigurationsdatei in /usr/share/doc/apt/examples/apt.conf." #. type:

#: offline.sgml:136 @@ -10443,6 +10742,12 @@ msgid "" "em> Then take the disc to the remote machine and configure the sources.list. " "On the remote machine execute the following:" msgstr "" +"Das Erste, was auf der Zielmaschine getan werden muss, ist das Einhängen " +"der Platte und das Kopieren von /var/lib/dpkg/status dorthin. Sie " +"werden außerdem die in der Übersicht umrissenen Verzeichnisse " +"archives/partial/ und lists/partial/ erstellen müssen. " +"Dann bringen Sie die Platte zu der fernen Maschine und konfigurieren Sie " +"die »sources.list«. Führen Sie das folgende aus:" #. type: #: offline.sgml:142 @@ -10451,9 +10756,15 @@ msgid "" " # export APT_CONFIG=\"/disc/apt.conf\"\n" " # apt-get update\n" " [ APT fetches the package files ]\n" -" # apt-get dist-upgrade\n" +" apt-get dist-upgrade\n" " [ APT fetches all the packages needed to upgrade the target machine ]" msgstr "" +" # export APT_CONFIG=\"/disc/apt.conf\"\n" +" # apt-get update\n" +" [ APT lädt die Paketdateien herunter ]\n" +" # apt-get dist-upgrade\n" +" [ APT lädt all die Pakete herunter, die die Zielmaschine benötigt, um ein\n" +" Upgrade durchzuführen ]" #. type:

#: offline.sgml:149 @@ -10463,6 +10774,10 @@ msgid "" "such as dselect However this presents a problem in communicating " "your selections back to the local computer." msgstr "" +"Der Befehl »dist-upgrade« kann durch alle anderen Standard-APT-Befehle " +"ersetzt werden, insbesondere »dselect-upgrade«. Sie können sogar eine " +"APT-Oberfläche, wie dselect, benutzen. Jedoch stellt dies ein " +"Problem dar, Ihre Auswahl zurück an den lokalen Rechner zu kommunizieren." #. type:

#: offline.sgml:153 @@ -10470,6 +10785,9 @@ msgid "" "Now the disc contains all of the index files and archives needed to upgrade " "the target machine. Take the disc back and run:" msgstr "" +"Nun enthält die Platte alle Indexdateien und Archive, die nötig sind, um " +"ein Upgrade der Zielmaschine druchzuführen. Bringen Sie die Platte zurück " +"und starten Sie:" #. type: #: offline.sgml:159 @@ -10481,6 +10799,11 @@ msgid "" " # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n" " [ Or any other APT command ]" msgstr "" +" # export APT_CONFIG=\"/disc/apt.conf\"\n" +" # apt-get check\n" +" [ APT generiert eine lokale Kopie der Zwischenspeicherdateien ]\n" +" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n" +" [ Oder irgendeinen anderen APT-Befehl ]" #. type:

#: offline.sgml:165 @@ -10488,6 +10811,8 @@ msgid "" "It is necessary for proper function to re-specify the status file to be the " "local one. This is very important!" msgstr "" +"Es ist für ordentliches Funktionieren notwendig, die Statusdatei erneut als " +"die lokale anzugeben. Dies ist sehr wichtig!" #. type:

#: offline.sgml:172 @@ -10498,11 +10823,18 @@ msgid "" "the local machine - but this may not always be possible. DO NOT copy the " "status file if dpkg or APT have been run in the mean time!!" msgstr "" +"Wenn Sie Dselect benutzen, können Sie die sehr riskante Operation " +"durchführen, disc/status auf /var/lib/dpkg/status zu kopieren, so dass die " +"von Ihnen gemachte Auswahl auf der fernen Maschine aktualisiert wird. Es " +"wird in höchstem Maße empfohlen, dass Leute nur auf der lokalen Maschine " +"Auswahlen treffen – aber dies könnte manchmal unmöglich sein. Kopieren Sie " +"die Statusdatei NICHT, falls Dpkg oder APT in der Zwischenzeit benutzt " +"wurden!" #. type: #: offline.sgml:178 msgid "Using APT and wget" -msgstr "" +msgstr "APT und Wget benutzen" #. type:

#: offline.sgml:185 @@ -10511,6 +10843,10 @@ msgid "" "any machine. Unlike the method above this requires that the Debian machine " "already has a list of available packages." msgstr "" +"wget ist eine populäres und portierbares Download-Werkzeug, das " +"auf nahezu jeder Maschine laufen kann. Anders als die Methode oben wird " +"hierfür benötigt, dass die Debian-Maschine bereits eine Liste verfügbarer " +"Pakete hat." #. type:

#: offline.sgml:190 @@ -10520,13 +10856,16 @@ msgid "" "option to apt-get and then preparing a wget script to actually fetch the " "packages." msgstr "" +"Die Grundidee besteht darin, eine Platte zu erzeugen, die nur die " +"heruntergeladenen Archivdateien von der fernen Site enthält. Die wird durch " +"Benutzen der apt-get-Option »--print-uris« und dem anschließenden " +"Vorbereiten eines Wget-Skripts getan, um die eigentlichen Pakete " +"herunterzuladen." #. type: #: offline.sgml:196 -#, fuzzy -#| msgid "Options" msgid "Operation" -msgstr "Optionen" +msgstr "Betrieb" #. type:

#: offline.sgml:200 @@ -10534,6 +10873,9 @@ msgid "" "Unlike the previous technique no special configuration files are required. " "We merely use the standard APT commands to generate the file list." msgstr "" +"Anders als bei der vorherigen Technik werden keine speziellen " +"Konfigurationsdateien benötigt. Es werden lediglich die Standard-APT-Befehle " +"benutzt, um die Dateiliste zu erstellen." #. type: #: offline.sgml:205 @@ -10544,6 +10886,11 @@ msgid "" " # apt-get -qq --print-uris dist-upgrade > uris\n" " # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script" msgstr "" +" # apt-get dist-upgrade \n" +" [ Antworten Sie »nein« auf gestellte Fragen, wenn Sie mit den Aktionen\n" +" zufrieden sind ]\n" +" # apt-get -qq --print-uris dist-upgrade > uris\n" +" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /Platte/wget-script" #. type:

#: offline.sgml:210 @@ -10551,6 +10898,8 @@ msgid "" "Any command other than dist-upgrade could be used here, including dselect-" "upgrade." msgstr "" +"Jeder andere Befehl als »dist-upgrade« könnte hier benutzt werden, " +"einschließlich »upgrade«." #. type:

#: offline.sgml:216 @@ -10560,11 +10909,15 @@ msgid "" "with the current directory as the disc's mount point so as to save the " "output on the disc." msgstr "" +"Die Datei /Platte/wget-script wird nun eine Liste der Wget-Befehle enthalten, " +"um die erforderlichen Archive herunterzuladen. Dieses Skript sollte mit dem " +"aktuellen Verzeichnis als Platteneinhängepunkt ausgeführt werden, so dass " +"die Ausgabe auf die Platte gespeichert wird." #. type:

#: offline.sgml:219 msgid "The remote machine would do something like" -msgstr "" +msgstr "Die ferne Maschine würde etwas wie das folgende tun" #. type: #: offline.sgml:223 @@ -10574,6 +10927,9 @@ msgid "" " # sh -x ./wget-script\n" " [ wait.. ]" msgstr "" +" # cd /Platte\n" +" # sh -x ./wget-script\n" +" [ warten ... ]" #. type: #: offline.sgml:228 @@ -10581,28 +10937,17 @@ msgid "" "Once the archives are downloaded and the disc returned to the Debian machine " "installation can proceed using," msgstr "" +"Sobald die Archive heruntergeladen und die Platte zur Debian-Maschine " +"zurückgekehrt ist, kann die Installation fortfahren durch Benutzung von " #. type: #: offline.sgml:230 #, no-wrap msgid " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade" -msgstr "" +msgstr " # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade" #. type:

#: offline.sgml:234 msgid "Which will use the already fetched archives on the disc." msgstr "" - -#~ msgid "" -#~ "Disable Immediate Configuration; This dangerous option disables some of " -#~ "APT's ordering code to cause it to make fewer dpkg calls. Doing so may be " -#~ "necessary on some extremely slow single user systems but is very " -#~ "dangerous and may cause package install scripts to fail or worse. Use at " -#~ "your own risk." -#~ msgstr "" -#~ "Sofortkonfiguration ausschalten; Diese gefährliche Option schaltet " -#~ "einigen Befehlscode von APT aus, um es zu veranlassen, Dpkg seltener " -#~ "aufzurufen. Dies zu tun, könnte auf besonders langsamen " -#~ "Einzelbenutzersystemen nötig sein, ist aber gefährlich und könnte " -#~ "Paketinstallationsskripte zum Scheitern oder schlimmeren veranlassen. " -#~ "Benutzen Sie es auf eigene Gefahr." +"Es wird die bereits auf die Platte heruntergeladenen Archive benutzen." \ No newline at end of file -- cgit v1.2.3 From 24b9038634f87cede3f1d58b223282f7f7a6e3cd Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 1 Jan 2010 19:15:15 +0100 Subject: remove translatable marker from the "%4i %s\n" string in apt-cache.cc --- cmdline/apt-cache.cc | 2 +- debian/changelog | 2 ++ po/apt-all.pot | 9 ++------- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 7d7f58a62..286f306cd 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1620,7 +1620,7 @@ bool Policy(CommandLine &CmdL) if (SrcList->FindIndex(VF.File(),Indx) == false && _system->FindIndex(VF.File(),Indx) == false) return _error->Error(_("Cache is out of sync, can't x-ref a package file")); - printf(_(" %4i %s\n"),Plcy.GetPriority(VF.File()), + printf(" %4i %s\n",Plcy.GetPriority(VF.File()), Indx->Describe(true).c_str()); } } diff --git a/debian/changelog b/debian/changelog index acc53b037..67b9283aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,8 @@ apt (0.7.26) UNRELEASED; urgency=low - add APT::FTPArchive::AlwaysStat to disable the too aggressive caching if versions are build multiply times (not recommend) Patch by Christoph Goehre, thanks! (Closes: #463260) + * cmdline/apt-cache.cc: + - remove translatable marker from the "%4i %s\n" string -- Michael Vogt Thu, 10 Dec 2009 22:02:38 +0100 diff --git a/po/apt-all.pot b/po/apt-all.pot index 4ccf7413d..c17a2e9e9 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: 2009-12-10 23:01+0100\n" +"POT-Creation-Date: 2010-01-01 19:13+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -144,11 +144,6 @@ msgstr "" msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1623 -#, c-format -msgid " %4i %s\n" -msgstr "" - #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 #: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 @@ -2788,7 +2783,7 @@ msgstr "" msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:908 +#: apt-pkg/deb/dpkgpm.cc:909 msgid "Running dpkg" msgstr "" -- cgit v1.2.3 From 699ec9460d846c6cd749882f3fc3e69a7ecaf14b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 1 Jan 2010 21:00:54 +0100 Subject: instruct debiandoc to build files with utf-8 encoding --- buildlib/po4a_manpage.mak | 2 +- debian/changelog | 2 ++ doc/makefile | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index dfa215d29..6eec9d031 100644 --- a/buildlib/po4a_manpage.mak +++ b/buildlib/po4a_manpage.mak @@ -57,5 +57,5 @@ endif # Debian Doc SGML Documents SOURCE := $(wildcard *.$(LC).sgml) -DEBIANDOC_HTML_OPTIONS=-l $(LC) +DEBIANDOC_HTML_OPTIONS=-l $(LC).UTF-8 include $(DEBIANDOC_H) diff --git a/debian/changelog b/debian/changelog index 67b9283aa..3b0bf6c10 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ apt (0.7.26) UNRELEASED; urgency=low Patch by Christoph Goehre, thanks! (Closes: #463260) * cmdline/apt-cache.cc: - remove translatable marker from the "%4i %s\n" string + * buildlib/po4a_manpage.mak: + - instruct debiandoc to build files with utf-8 encoding -- Michael Vogt Thu, 10 Dec 2009 22:02:38 +0100 diff --git a/doc/makefile b/doc/makefile index 6fb604e4e..6e6186466 100644 --- a/doc/makefile +++ b/doc/makefile @@ -8,7 +8,7 @@ include ../buildlib/defaults.mak # Debian Doc SGML Documents SOURCE = $(wildcard *.sgml) -DEBIANDOC_HTML_OPTIONS=-l en +DEBIANDOC_HTML_OPTIONS=-l en.UTF-8 include $(DEBIANDOC_H) # Do not use XMLTO, build the manpages directly with XSLTPROC -- cgit v1.2.3 From 6fb4e89012d2cc606100e475fb53b337df07e454 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 1 Jan 2010 21:05:58 +0100 Subject: fix some warning from the buildtools in tools.m4 and configure.in --- buildlib/tools.m4 | 12 ++++++------ configure.in | 6 +++--- debian/changelog | 2 ++ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/buildlib/tools.m4 b/buildlib/tools.m4 index d1d692331..433d5ca32 100644 --- a/buildlib/tools.m4 +++ b/buildlib/tools.m4 @@ -1,4 +1,4 @@ -AC_DEFUN(ah_HAVE_GETCONF, +AC_DEFUN([ah_HAVE_GETCONF], [AC_ARG_WITH(getconf, [ --with-getconf Enable automagical buildtime configuration], [if test "$withval" = "yes"; then @@ -14,7 +14,7 @@ AC_DEFUN(ah_HAVE_GETCONF, ]) dnl ah_GET_CONF(variable, value ..., [default]) -AC_DEFUN(ah_GET_GETCONF, +AC_DEFUN([ah_GET_GETCONF], [AC_REQUIRE([ah_HAVE_GETCONF]) if test ! -z "$GETCONF";then old_args="[$]@" @@ -28,7 +28,7 @@ AC_DEFUN(ah_GET_GETCONF, eval $1="$3" fi ]) -AC_DEFUN(ah_NUM_CPUS, +AC_DEFUN([ah_NUM_CPUS], [AC_MSG_CHECKING([number of cpus]) AC_ARG_WITH(cpus, [ --with-cpus The number of cpus to be used for building(see --with-procs, default 1)], @@ -56,7 +56,7 @@ AC_DEFUN(ah_NUM_CPUS, AC_MSG_RESULT([$ah_NUM_CPUS_msg]) AC_SUBST(NUM_CPUS) ]) -AC_DEFUN(ah_PROC_MULTIPLY, +AC_DEFUN([ah_PROC_MULTIPLY], [AC_REQUIRE([ah_NUM_CPUS]) AC_MSG_CHECKING([processor multiplier]) AC_ARG_WITH(proc-multiply, @@ -72,7 +72,7 @@ AC_DEFUN(ah_PROC_MULTIPLY, AC_SUBST(PROC_MULTIPLY) ]) -AC_DEFUN(ah_NUM_PROCS, +AC_DEFUN([ah_NUM_PROCS], [AC_REQUIRE([ah_PROC_MULTIPLY]) AC_REQUIRE([ah_NUM_CPUS]) AC_MSG_CHECKING([number of processes to run during make]) @@ -89,7 +89,7 @@ AC_DEFUN(ah_NUM_PROCS, AC_SUBST(NUM_PROCS) ]) -AC_DEFUN(ah_GCC3DEP,[ +AC_DEFUN([ah_GCC3DEP],[ AC_MSG_CHECKING(if $CXX -MD works) touch gcc3dep.cc ${CXX-c++} -MD -o gcc3dep_test.o -c gcc3dep.cc diff --git a/configure.in b/configure.in index fe30d4ca1..302d88d51 100644 --- a/configure.in +++ b/configure.in @@ -96,10 +96,10 @@ AC_MSG_RESULT($archset) AC_DEFINE_UNQUOTED(COMMON_ARCH,"$archset") dnl We use C99 types if at all possible -AC_CACHE_CHECK([for C99 integer types],c9x_ints,[ +AC_CACHE_CHECK([for C99 integer types],apt_cv_c9x_ints,[ AC_TRY_COMPILE([#include ], [uint8_t Foo1;uint16_t Foo2;uint32_t Foo3;], - c9x_ints=yes,c9x_ints=no)]) + apt_cv_c9x_ints=yes,apt_cv_c9x_ints=no)]) dnl Single Unix Spec statvfs AC_CHECK_FUNC(statvfs,[HAVE_STATVFS=yes]) @@ -150,7 +150,7 @@ AC_C_BIGENDIAN dnl We do not need this if we have inttypes! HAVE_C9X=yes -if test x"$c9x_ints" = x"no"; then +if test x"$apt_cv_c9x_ints" = x"no"; then AC_CHECK_SIZEOF(char,$size_char) AC_CHECK_SIZEOF(int,$size_int) AC_CHECK_SIZEOF(short,$size_short) diff --git a/debian/changelog b/debian/changelog index 3b0bf6c10..e36813148 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,8 @@ apt (0.7.26) UNRELEASED; urgency=low - remove translatable marker from the "%4i %s\n" string * buildlib/po4a_manpage.mak: - instruct debiandoc to build files with utf-8 encoding + * buildlib/tools.m4: + - fix some warning from the buildtools -- Michael Vogt Thu, 10 Dec 2009 22:02:38 +0100 -- cgit v1.2.3 From 806969420fa6a12471b237eccd21edaff4a33767 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 1 Jan 2010 21:32:50 +0100 Subject: bzrignore the now linked config.{guess,sub} files --- .bzrignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.bzrignore b/.bzrignore index 45db3c607..ac276b3fb 100644 --- a/.bzrignore +++ b/.bzrignore @@ -8,6 +8,8 @@ aclocal.m4 autom4te.cache/ build/ configure +buildlib/config.sub +buildlib/config.guess # generated files in the progress to build all # apt man pages and other documentation -- cgit v1.2.3 From 02dceb31f77f0812c76334a1758631c7cf9544a3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 2 Jan 2010 00:22:31 +0100 Subject: add configuration PDiffs::Limit-options (FileLimit and SizeLimit) to not download too many or too big patches (Closes: #554349) --- apt-pkg/acquire-item.cc | 62 ++++++++++++++++++++++++++++++++++---------- debian/changelog | 3 +++ doc/apt.conf.5.xml | 9 ++++++- doc/examples/configure-index | 5 +++- 4 files changed, 64 insertions(+), 15 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 10e80eb56..4f0abbb91 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -219,19 +219,19 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/ if(TF.Step(Tags) == true) { - string local_sha1; bool found = false; DiffInfo d; string size; - string tmp = Tags.FindS("SHA1-Current"); + string const tmp = Tags.FindS("SHA1-Current"); std::stringstream ss(tmp); - ss >> ServerSha1; + ss >> ServerSha1 >> size; + unsigned long const ServerSize = atol(size.c_str()); FileFd fd(CurrentPackagesFile, FileFd::ReadOnly); SHA1Summation SHA1; SHA1.AddFD(fd.Fd(), fd.Size()); - local_sha1 = string(SHA1.Result()); + string const local_sha1 = SHA1.Result(); if(local_sha1 == ServerSha1) { @@ -248,20 +248,56 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/ std::clog << "SHA1-Current: " << ServerSha1 << std::endl; // check the historie and see what patches we need - string history = Tags.FindS("SHA1-History"); + string const history = Tags.FindS("SHA1-History"); std::stringstream hist(history); - while(hist >> d.sha1 >> size >> d.file) + while(hist >> d.sha1 >> size >> d.file) { - d.size = atoi(size.c_str()); // read until the first match is found + // from that point on, we probably need all diffs if(d.sha1 == local_sha1) found=true; - // from that point on, we probably need all diffs - if(found) + else if (found == false) + continue; + + if(Debug) + std::clog << "Need to get diff: " << d.file << std::endl; + available_patches.push_back(d); + } + + if (available_patches.empty() == false) + { + // patching with too many files is rather slow compared to a fast download + unsigned long const fileLimit = _config->FindI("Acquire::PDiffs::FileLimit", 0); + if (fileLimit != 0 && fileLimit < available_patches.size()) + { + if (Debug) + std::clog << "Need " << available_patches.size() << " diffs (Limit is " << fileLimit + << ") so fallback to complete download" << std::endl; + return false; + } + + // see if the patches are too big + found = false; // it was true and it will be true again at the end + d = *available_patches.begin(); + string const firstPatch = d.file; + unsigned long patchesSize = 0; + std::stringstream patches(Tags.FindS("SHA1-Patches")); + while(patches >> d.sha1 >> size >> d.file) + { + if (firstPatch == d.file) + found = true; + else if (found == false) + continue; + + patchesSize += atol(size.c_str()); + } + unsigned long const sizeLimit = ServerSize * _config->FindI("Acquire::PDiffs::SizeLimit", 100); + if (sizeLimit > 0 && (sizeLimit/100) < patchesSize) { - if(Debug) - std::clog << "Need to get diff: " << d.file << std::endl; - available_patches.push_back(d); + if (Debug) + std::clog << "Need " << patchesSize << " bytes (Limit is " << sizeLimit/100 + << ") so fallback to complete download" << std::endl; + return false; } } } @@ -270,7 +306,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/ if(found) { // queue the diffs - string::size_type last_space = Description.rfind(" "); + string::size_type const last_space = Description.rfind(" "); if(last_space != string::npos) Description.erase(last_space, Description.size()-last_space); new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc, diff --git a/debian/changelog b/debian/changelog index e36813148..1454eed3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,9 @@ apt (0.7.26) UNRELEASED; urgency=low - instruct debiandoc to build files with utf-8 encoding * buildlib/tools.m4: - fix some warning from the buildtools + * apt-pkg/acquire-item.cc: + - add configuration PDiffs::Limit-options to not download + too many or too big patches (Closes: #554349) -- Michael Vogt Thu, 10 Dec 2009 22:02:38 +0100 diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 734ae1fe7..fd50e377f 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -221,7 +221,14 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; PDiffs Try to download deltas called PDiffs for Packages or Sources files instead of downloading whole ones. True - by default. + by default. + Two sub-options to limit the use of PDiffs are also available: + With FileLimit can be specified how many PDiff files + are downloaded at most to patch a file. SizeLimit + on the other hand is the maximum precentage of the size of all patches + compared to the size of the targeted file. If one of these limits is + exceeded the complete file is downloaded instead of the patches. + Queue-Mode diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 0a20e8f2b..be461aaad 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -176,7 +176,10 @@ Acquire Source-Symlinks "true"; PDiffs "true"; // try to get the IndexFile diffs - + PDiffs::FileLimit "4"; // don't use diffs if we would need more than 4 diffs + PDiffs::SizeLimit "50"; // don't use diffs if size of all patches excess + // 50% of the size of the original file + // HTTP method configuration http { -- cgit v1.2.3 From 20f463e8f67a6d442444cb6a18ddbe60fc06742d Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 2 Jan 2010 17:03:23 +0100 Subject: let all packages depend on --- debian/changelog | 2 ++ debian/control | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1454eed3c..1e935c682 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,8 @@ apt (0.7.26) UNRELEASED; urgency=low * apt-pkg/acquire-item.cc: - add configuration PDiffs::Limit-options to not download too many or too big patches (Closes: #554349) + * debian/control: + - let all packages depend on ${misc:Depends} -- Michael Vogt Thu, 10 Dec 2009 22:02:38 +0100 diff --git a/debian/control b/debian/control index 357fb3f5f..d756871d1 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Package: apt Architecture: any -Depends: ${shlibs:Depends}, debian-archive-keyring +Depends: ${shlibs:Depends}, debian-archive-keyring, ${misc:Depends} Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt @@ -26,6 +26,7 @@ Description: Advanced front-end for dpkg Package: apt-doc Architecture: all Priority: optional +Depends: ${misc:Depends} Replaces: apt (<< 0.5.4.9) Section: doc Description: Documentation for APT @@ -35,7 +36,7 @@ Description: Documentation for APT Package: libapt-pkg-dev Architecture: any Priority: optional -Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides} +Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides}, ${misc:Depends} Section: libdevel Description: Development files for APT's libapt-pkg and libapt-inst This package contains the header files and libraries for @@ -45,6 +46,7 @@ Description: Development files for APT's libapt-pkg and libapt-inst Package: libapt-pkg-doc Architecture: all Priority: optional +Depends: ${misc:Depends} Section: doc Description: Documentation for APT development This package contains documentation for development of the APT @@ -52,7 +54,7 @@ Description: Documentation for APT development Package: apt-utils Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Provides: ${libapt-inst:provides} Replaces: apt (<< 0.5.9) Description: APT utility programs @@ -65,7 +67,7 @@ Description: APT utility programs Package: apt-transport-https Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Priority: optional Description: APT https transport This package contains a APT https transport. It makes it possible to -- cgit v1.2.3 From 749eb4cf0416b1eb7a950bbfce2937f04ab0b6ab Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 2 Jan 2010 17:19:07 +0100 Subject: =?UTF-8?q?Fix=20the=20following=20gcc-4.5=20buildfailure=20in=20p?= =?UTF-8?q?kgcache.cc=20by=20following=20the=20suggestion:=20pkgcache.cc:?= =?UTF-8?q?=20In=20member=20function=20=E2=80=98const=20char*=20pkgCache::?= =?UTF-8?q?PkgIterator::CandVersion()=20const=E2=80=99:=20pkgcache.cc:301:?= =?UTF-8?q?51:=20error:=20cannot=20call=20constructor=20=E2=80=98pkgPolicy?= =?UTF-8?q?::pkgPolicy=E2=80=99=20directly=20pkgcache.cc:301:51:=20note:?= =?UTF-8?q?=20for=20a=20function-style=20cast,=20remove=20the=20redundant?= =?UTF-8?q?=20=E2=80=98::pkgPolicy=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apt-pkg/pkgcache.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 997ff51fe..eb7e4957a 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -298,7 +298,7 @@ const char * pkgCache::PkgIterator::CandVersion() const { //TargetVer is empty, so don't use it. - VerIterator version = pkgPolicy::pkgPolicy(Owner).GetCandidateVer(*this); + VerIterator version = pkgPolicy(Owner).GetCandidateVer(*this); if (version.IsGood()) return version.VerStr(); return 0; -- cgit v1.2.3 From e7001c62dbd3b2a2d5b857c782dd855d525c2524 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 2 Jan 2010 17:38:04 +0100 Subject: fix another mistake spotted by lintian: I: apt: spelling-error-in-binary ./usr/lib/libapt-pkg-libc6.9-6.so.4.8.0 Alot A lot --- apt-pkg/indexcopy.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 57c9f95ca..53eb11172 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -275,7 +275,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector &List, _error->Warning("No valid records were found."); if (NotFound + WrongSize > 10) - _error->Warning("Alot of entries were discarded, something may be wrong.\n"); + _error->Warning("A lot of entries were discarded, something may be wrong.\n"); return true; @@ -847,7 +847,7 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/ _error->Warning("No valid records were found."); if (NotFound + WrongSize > 10) - _error->Warning("Alot of entries were discarded, something may be wrong.\n"); + _error->Warning("A lot of entries were discarded, something may be wrong.\n"); return true; -- cgit v1.2.3 From c6e29d051cff7036eddf17083ddc6acc6fcc9cdb Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 2 Jan 2010 17:43:07 +0100 Subject: fix a typo in the apt.conf manpage spotted by lintian W: apt: spelling-error-in-manpage usr/share/man/man5/apt.conf.5.gz enviroment environment --- doc/apt.conf.5.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index fd50e377f..e568baa35 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -408,7 +408,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; files for every Language - especially the long Languagecodes are rare, so please inform you which ones are available before you set here impossible values. The default list includes "environment" and "en". "environment" has a special meaning here: - It will be replaced at runtime with the languagecodes extracted from the LC_MESSAGES enviroment variable. + It will be replaced at runtime with the languagecodes extracted from the LC_MESSAGES environment variable. It will also ensure that these codes are not included twice in the list. If LC_MESSAGES is set to "C" only the Translation-en file (if available) will be used. To force apt to use no Translation file use the setting Acquire::Languages=none. "none" -- cgit v1.2.3 From 6aa944bc539cea4095971ccb2354c1e8f9f2c90a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 2 Jan 2010 17:53:05 +0100 Subject: remove the horrible outdated share/*-archive.gpg files and all there traces We already depend on the proper keyring so we don't need to ship our own version which isn't used anyway. --- debian/apt.postinst | 6 ------ debian/changelog | 3 +++ debian/rules | 1 - share/debian-archive.gpg | Bin 2280 -> 0 bytes share/ubuntu-archive.gpg | Bin 1724 -> 0 bytes 5 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 share/debian-archive.gpg delete mode 100644 share/ubuntu-archive.gpg diff --git a/debian/apt.postinst b/debian/apt.postinst index 88fb932df..cc0d8b1fe 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -15,13 +15,7 @@ set -e case "$1" in configure) - - if ! test -f /etc/apt/trusted.gpg; then - cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg - fi - apt-key update - ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/changelog b/debian/changelog index 1e935c682..ffd8f5c59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,9 @@ apt (0.7.26) UNRELEASED; urgency=low too many or too big patches (Closes: #554349) * debian/control: - let all packages depend on ${misc:Depends} + * share/*-archive.gpg: + - remove the horrible outdated files. We already depend on + the keyring so we don't need to ship our own version -- Michael Vogt Thu, 10 Dec 2009 22:02:38 +0100 diff --git a/debian/rules b/debian/rules index d01b57cd6..37c96ef20 100755 --- a/debian/rules +++ b/debian/rules @@ -213,7 +213,6 @@ apt: build build-doc debian/shlibs.local cp debian/bugscript debian/$@/usr/share/bug/apt/script cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt - cp share/debian-archive.gpg debian/$@/usr/share/$@ cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove # head -n 500 ChangeLog > debian/ChangeLog diff --git a/share/debian-archive.gpg b/share/debian-archive.gpg deleted file mode 100644 index da1aa5e97..000000000 Binary files a/share/debian-archive.gpg and /dev/null differ diff --git a/share/ubuntu-archive.gpg b/share/ubuntu-archive.gpg deleted file mode 100644 index 2ce60d454..000000000 Binary files a/share/ubuntu-archive.gpg and /dev/null differ -- cgit v1.2.3 From 6355a02fbfa1cffa9291095ede32c35737ed7419 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 2 Jan 2010 20:24:53 +0100 Subject: apt-key errors out nicely if wget is not installed (Closes: #545754) --- cmdline/apt-key | 9 ++++++++- debian/changelog | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/cmdline/apt-key b/cmdline/apt-key index 5f4e02fdf..24010edf3 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -56,7 +56,14 @@ add_keys_with_verify_against_master_keyring() { # (otherwise it does not make sense from a security POV) net_update() { if [ -z "$ARCHIVE_KEYRING_URI" ]; then - echo "ERROR: no location for the archive-keyring given" + echo "ERROR: no location for the archive-keyring given" + exit 1 + fi + # in theory we would need to depend on wget for this, but this feature + # isn't useable in debian anyway as we have no keyring uri nor a master key + if ! which wget >/dev/null 2>&1; then + echo "ERROR: an installed wget is required for a network-based update" + exit 1 fi if [ ! -d /var/lib/apt/keyrings ]; then mkdir -p /var/lib/apt/keyrings diff --git a/debian/changelog b/debian/changelog index ffd8f5c59..f70c5735f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,8 @@ apt (0.7.26) UNRELEASED; urgency=low * share/*-archive.gpg: - remove the horrible outdated files. We already depend on the keyring so we don't need to ship our own version + * cmdline/apt-key: + - errors out if wget is not installed (Closes: #545754) -- Michael Vogt Thu, 10 Dec 2009 22:02:38 +0100 -- cgit v1.2.3 From 52643bec17df4e36a9bd27183886e2c0c7a8ebd8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 3 Jan 2010 19:37:34 +0100 Subject: Add a GetListOfFilesInDir() helper method which replaces the old code copies used to load the various parts-files --- apt-pkg/contrib/configuration.cc | 39 ++------------------------------- apt-pkg/contrib/fileutl.cc | 47 ++++++++++++++++++++++++++++++++++++++++ apt-pkg/contrib/fileutl.h | 3 +++ apt-pkg/policy.cc | 37 +++---------------------------- apt-pkg/sourcelist.cc | 43 +----------------------------------- 5 files changed, 56 insertions(+), 113 deletions(-) diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index ff49ce857..89aa854a3 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -22,14 +22,8 @@ #include #include -#include #include #include - -#include -#include -#include -#include using namespace std; /*}}}*/ @@ -837,37 +831,8 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool const &AsSectio /* */ bool ReadConfigDir(Configuration &Conf,const string &Dir,bool const &AsSectional, unsigned const &Depth) -{ - DIR *D = opendir(Dir.c_str()); - if (D == 0) - return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str()); - - vector List; - - for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D)) - { - if (Ent->d_name[0] == '.') - continue; - - // Skip bad file names ala run-parts - const char *C = Ent->d_name; - for (; *C != 0; C++) - if (isalpha(*C) == 0 && isdigit(*C) == 0 && *C != '_' && *C != '-') - break; - if (*C != 0) - continue; - - // Make sure it is a file and not something else - string File = flCombine(Dir,Ent->d_name); - struct stat St; - if (stat(File.c_str(),&St) != 0 || S_ISREG(St.st_mode) == 0) - continue; - - List.push_back(File); - } - closedir(D); - - sort(List.begin(),List.end()); +{ + vector const List = GetListOfFilesInDir(Dir, "", true); // Read the files for (vector::const_iterator I = List.begin(); I != List.end(); I++) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 4240d9f49..3adab8fe7 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -34,9 +34,11 @@ #include #include #include +#include #include #include #include +#include /*}}}*/ using namespace std; @@ -195,6 +197,51 @@ bool FileExists(string File) return true; } /*}}}*/ +// GetListOfFilesInDir - returns a vector of files in the given dir /*{{{*/ +// --------------------------------------------------------------------- +/* If an extension is given only files with this extension are included + in the returned vector, otherwise every "normal" file is included. */ +std::vector GetListOfFilesInDir(string const &Dir, string const &Ext, + bool const &SortList) { + std::vector List; + DIR *D = opendir(Dir.c_str()); + if (D == 0) { + _error->Errno("opendir",_("Unable to read %s"),Dir.c_str()); + return List; + } + + for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D)) { + if (Ent->d_name[0] == '.') + continue; + + if (Ext.empty() == false && flExtension(Ent->d_name) != Ext) + continue; + + // Skip bad file names ala run-parts + const char *C = Ent->d_name; + for (; *C != 0; ++C) + if (isalpha(*C) == 0 && isdigit(*C) == 0 + && *C != '_' && *C != '-' && *C != '.') + break; + + if (*C != 0) + continue; + + // Make sure it is a file and not something else + string const File = flCombine(Dir,Ent->d_name); + struct stat St; + if (stat(File.c_str(),&St) != 0 || S_ISREG(St.st_mode) == 0) + continue; + + List.push_back(File); + } + closedir(D); + + if (SortList == true) + std::sort(List.begin(),List.end()); + return List; +} + /*}}}*/ // SafeGetCWD - This is a safer getcwd that returns a dynamic string /*{{{*/ // --------------------------------------------------------------------- /* We return / on failure. */ diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 73b5ea3be..3cbf67fbb 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -23,6 +23,7 @@ #include +#include using std::string; @@ -81,6 +82,8 @@ bool RunScripts(const char *Cnf); bool CopyFile(FileFd &From,FileFd &To); int GetLock(string File,bool Errors = true); bool FileExists(string File); +std::vector GetListOfFilesInDir(string const &Dir, string const &Ext, + bool const &SortList); string SafeGetCWD(); void SetCloseExec(int Fd,bool Close); void SetNonBlock(int Fd,bool Block); diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index 81fdb0431..393181b6d 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -27,14 +27,12 @@ #include #include #include +#include #include #include - + #include -#include -#include -#include #include #include /*}}}*/ @@ -282,36 +280,7 @@ bool ReadPinDir(pkgPolicy &Plcy,string Dir) return true; } - DIR *D = opendir(Dir.c_str()); - if (D == 0) - return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str()); - - vector List; - - for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D)) - { - if (Ent->d_name[0] == '.') - continue; - - // Skip bad file names ala run-parts - const char *C = Ent->d_name; - for (; *C != 0; C++) - if (isalpha(*C) == 0 && isdigit(*C) == 0 && *C != '_' && *C != '-') - break; - if (*C != 0) - continue; - - // Make sure it is a file and not something else - string File = flCombine(Dir,Ent->d_name); - struct stat St; - if (stat(File.c_str(),&St) != 0 || S_ISREG(St.st_mode) == 0) - continue; - - List.push_back(File); - } - closedir(D); - - sort(List.begin(),List.end()); + vector const List = GetListOfFilesInDir(Dir, "", true); // Read the files for (vector::const_iterator I = List.begin(); I != List.end(); I++) diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 4b3abe918..929259961 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -17,13 +17,6 @@ #include #include - -// CNC:2003-03-03 - This is needed for ReadDir stuff. -#include -#include -#include -#include -#include /*}}}*/ using namespace std; @@ -322,41 +315,7 @@ bool pkgSourceList::GetIndexes(pkgAcquire *Owner, bool GetAll) const /* */ bool pkgSourceList::ReadSourceDir(string Dir) { - DIR *D = opendir(Dir.c_str()); - if (D == 0) - return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str()); - - vector List; - - for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D)) - { - if (Ent->d_name[0] == '.') - continue; - - // CNC:2003-12-02 Only accept .list files as valid sourceparts - if (flExtension(Ent->d_name) != "list") - continue; - - // Skip bad file names ala run-parts - const char *C = Ent->d_name; - for (; *C != 0; C++) - if (isalpha(*C) == 0 && isdigit(*C) == 0 - && *C != '_' && *C != '-' && *C != '.') - break; - if (*C != 0) - continue; - - // Make sure it is a file and not something else - string File = flCombine(Dir,Ent->d_name); - struct stat St; - if (stat(File.c_str(),&St) != 0 || S_ISREG(St.st_mode) == 0) - continue; - - List.push_back(File); - } - closedir(D); - - sort(List.begin(),List.end()); + vector const List = GetListOfFilesInDir(Dir, "list", true); // Read the files for (vector::const_iterator I = List.begin(); I != List.end(); I++) -- cgit v1.2.3 From c24f6ce22cd6720004addad2e3382b3caa6b1b7c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 4 Jan 2010 13:45:14 +0100 Subject: =?UTF-8?q?add=20TrustedParts=20so=20in=20the=20future=20new=20key?= =?UTF-8?q?rings=20can=20just=20be=20dropped=20into=20/etc/apt/trusted.gpg?= =?UTF-8?q?.d/=20which=20eliminates=20the=20need=20to=20have=20gpg=20insta?= =?UTF-8?q?lled=20to=20add=20keys=20to=20APTs=20trusted=20keyring=20(with?= =?UTF-8?q?=20apt-key)=20(Closes=20#304846)=20-=20Thanks=20to=20Timo=20Wei?= =?UTF-8?q?ng=C3=A4rtner=20&=20Peter=20Palfrader=20for=20providing=20diffe?= =?UTF-8?q?rent=20patchs/ideas=20for=20this!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmdline/apt-key | 37 +++++++++++++++-- debian/apt.dirs | 1 + debian/changelog | 4 ++ doc/apt-key.8.xml | 24 ++++++++--- doc/apt.ent | 13 ++++++ doc/examples/configure-index | 7 +--- methods/gpgv.cc | 98 +++++++++++++++++++++++++------------------- 7 files changed, 126 insertions(+), 58 deletions(-) diff --git a/cmdline/apt-key b/cmdline/apt-key index 24010edf3..1950723f3 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -5,10 +5,8 @@ unset GREP_OPTIONS # We don't use a secret keyring, of course, but gpg panics and # implodes if there isn't one available - GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring --secret-keyring /etc/apt/secring.gpg --trustdb-name /etc/apt/trustdb.gpg" -GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg" - +GPG="$GPG_CMD" MASTER_KEYRING="" ARCHIVE_KEYRING_URI="" @@ -115,7 +113,7 @@ update() { usage() { - echo "Usage: apt-key [command] [arguments]" + echo "Usage: apt-key [--keyring file] [command] [arguments]" echo echo "Manage apt's list of trusted keys" echo @@ -129,8 +127,39 @@ usage() { echo " apt-key finger - list fingerprints" echo " apt-key adv - pass advanced options to gpg (download key)" echo + echo "If no specific keyring file is given the command applies to all keyring files." } +# Determine on which keyring we want to work +if [ "$1" = "--keyring" ]; then + echo "keyfile given" + shift + TRUSTEDFILE="$1" + if [ -r "$TRUSTEDFILE" ]; then + GPG="$GPG --keyring $TRUSTEDFILE --primary-keyring $TRUSTEDFILE" + else + echo >&2 "Error: The specified keyring »$TRUSTEDFILE« is missing or not readable" + exit 1 + fi + shift +else + echo "generate list" + TRUSTEDFILE="/etc/apt/trusted.gpg" + if [ -r "$TRUSTEDFILE" ]; then + GPG="$GPG --keyring $TRUSTEDFILE" + fi + GPG="$GPG --primary-keyring $TRUSTEDFILE" + TRUSTEDPARTS="/etc/apt/trusted.gpg.d" + if [ -d "$TRUSTEDPARTS" ]; then + echo "parts active" + for trusted in $(run-parts --list $TRUSTEDPARTS --regex '^.*\.gpg$'); do + echo "part -> $trusted" + GPG="$GPG --keyring $trusted" + done + fi +fi +echo "COMMAND: $GPG" + command="$1" if [ -z "$command" ]; then usage diff --git a/debian/apt.dirs b/debian/apt.dirs index fb6716c35..66556e453 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -5,6 +5,7 @@ etc/apt etc/apt/apt.conf.d etc/apt/preferences.d etc/apt/sources.list.d +etc/apt/trusted.gpg.d etc/logrotate.d var/cache/apt/archives/partial var/lib/apt/lists/partial diff --git a/debian/changelog b/debian/changelog index f70c5735f..fca8d3ccb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,10 @@ apt (0.7.26) UNRELEASED; urgency=low the keyring so we don't need to ship our own version * cmdline/apt-key: - errors out if wget is not installed (Closes: #545754) + - add --keyring option as we have now possibly many + * methods/gpgv.cc: + - pass all keyrings (TrustedParts) to gpgv instead of + using only one trusted.gpg keyring (Closes: #304846) -- Michael Vogt Thu, 10 Dec 2009 22:02:38 +0100 diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index 7b0691b5e..8f445b7f9 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -26,7 +26,8 @@ apt-key - command/ + + command @@ -135,11 +136,24 @@ + Options +Note that options need to be defined before the commands described in the previous section. + + --keyring filename + With this option it is possible to specify a specific keyring + file the command should operate on. The default is that a command is executed + on the trusted.gpg file as well as on all parts in the + trusted.gpg.d directory, through trusted.gpg + is the primary keyring which means that e.g. new keys are added to this one. + + + + + Files - /etc/apt/trusted.gpg - Keyring of local trusted keys, new keys will be added here. - + + &file-trustedgpg; /etc/apt/trustdb.gpg Local trust database of archive keys. @@ -153,8 +167,6 @@ Keyring of Debian archive removed trusted keys. - - diff --git a/doc/apt.ent b/doc/apt.ent index 0b341ec14..da43d8f3d 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -353,3 +353,16 @@ Configuration Item: Dir::State::Lists (implicit partial). "> + +/etc/apt/trusted.gpg + Keyring of local trusted keys, new keys will be added here. + Configuration Item: Dir::Etc::Trusted. + + + /etc/apt/trusted.gpg.d/ + File fragments for the trusted keys, additional keyrings can + be stored here (by other packages or the administrator). + Configuration Item Dir::Etc::TrustedParts. + +"> diff --git a/doc/examples/configure-index b/doc/examples/configure-index index be461aaad..87cf97ffe 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -90,11 +90,6 @@ APT TrustCDROM "false"; // consider the CDROM always trusted }; - GPGV - { - TrustedKeyring "/etc/apt/trusted.gpg"; - }; - // Some general options Ignore-Hold "false"; Clean-Installed "true"; @@ -320,6 +315,8 @@ Dir "/" SourceParts "sources.list.d"; VendorList "vendors.list"; VendorParts "vendors.list.d"; + Trusted "trusted.gpg"; + TrustedParts "trusted.gpg.d"; }; // Locations of binaries diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 150c1d315..e3e849827 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -1,10 +1,9 @@ #include #include #include +#include #include -#include -#include #include #include #include @@ -45,42 +44,47 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, vector &WorthlessSigners, vector &NoPubKeySigners) { + bool const Debug = _config->FindB("Debug::Acquire::gpgv", false); // setup a (empty) stringstream for formating the return value std::stringstream ret; ret.str(""); - if (_config->FindB("Debug::Acquire::gpgv", false)) - { - std::cerr << "inside VerifyGetSigners" << std::endl; - } + if (Debug == true) + std::clog << "inside VerifyGetSigners" << std::endl; + pid_t pid; int fd[2]; FILE *pipein; int status; - struct stat buff; - string gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); - string pubringpath = _config->Find("APT::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg"); - if (_config->FindB("Debug::Acquire::gpgv", false)) + string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); + // FIXME: remove support for deprecated APT::GPGV setting + string const trustedFile = _config->FindFile("Dir::Etc::Trusted", + _config->Find("APT::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg").c_str()); + string const trustedPath = _config->FindDir("Dir::Etc::TrustedParts", "/etc/apt/trusted.gpg.d"); + if (Debug == true) { - std::cerr << "gpgv path: " << gpgvpath << std::endl; - std::cerr << "Keyring path: " << pubringpath << std::endl; + std::clog << "gpgv path: " << gpgvpath << std::endl; + std::clog << "Keyring file: " << trustedFile << std::endl; + std::clog << "Keyring path: " << trustedPath << std::endl; } - if (stat(pubringpath.c_str(), &buff) != 0) + vector keyrings = GetListOfFilesInDir(trustedPath, "gpg", false); + if (FileExists(trustedFile) == true) + keyrings.push_back(trustedFile); + + if (keyrings.empty() == true) { - ioprintf(ret, _("Couldn't access keyring: '%s'"), strerror(errno)); + // TRANSLATOR: %s is the trusted keyring parts directory + ioprintf(ret, _("No keyring installed in %s."), trustedPath.c_str()); return ret.str(); } + if (pipe(fd) < 0) - { return "Couldn't create pipe"; - } pid = fork(); if (pid < 0) - { return string("Couldn't spawn new process") + strerror(errno); - } else if (pid == 0) { const char *Args[400]; @@ -90,8 +94,16 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, Args[i++] = "--status-fd"; Args[i++] = "3"; Args[i++] = "--ignore-time-conflict"; - Args[i++] = "--keyring"; - Args[i++] = pubringpath.c_str(); + for (vector::const_iterator K = keyrings.begin(); + K != keyrings.end(); ++K) + { + Args[i++] = "--keyring"; + Args[i++] = K->c_str(); + if(i >= 395) { + std::clog << _("E: Too many keyrings should be passed to gpgv. Exiting.") << std::endl; + exit(111); + } + } Configuration::Item const *Opts; Opts = _config->Tree("Acquire::gpgv::Options"); @@ -104,7 +116,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, continue; Args[i++] = Opts->Value.c_str(); if(i >= 395) { - std::cerr << _("E: Argument list from Acquire::gpgv::Options too long. Exiting.") << std::endl; + std::clog << _("E: Argument list from Acquire::gpgv::Options too long. Exiting.") << std::endl; exit(111); } } @@ -113,14 +125,14 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, Args[i++] = outfile; Args[i++] = NULL; - if (_config->FindB("Debug::Acquire::gpgv", false)) + if (Debug == true) { - std::cerr << "Preparing to exec: " << gpgvpath; + std::clog << "Preparing to exec: " << gpgvpath; for(unsigned int j=0;Args[j] != NULL; j++) - std::cerr << " " << Args[j]; - std::cerr << std::endl; + std::clog << " " << Args[j]; + std::clog << std::endl; } - int nullfd = open("/dev/null", O_RDONLY); + int const nullfd = open("/dev/null", O_RDONLY); close(fd[0]); // Redirect output to /dev/null; we read from the status fd dup2(nullfd, STDOUT_FILENO); @@ -159,8 +171,8 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, break; *(buffer+bufferoff) = '\0'; bufferoff = 0; - if (_config->FindB("Debug::Acquire::gpgv", false)) - std::cerr << "Read: " << buffer << std::endl; + if (Debug == true) + std::clog << "Read: " << buffer << std::endl; // Push the data into three separate vectors, which // we later concatenate. They're kept separate so @@ -168,33 +180,33 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, // it will be better. if (strncmp(buffer, GNUPGBADSIG, sizeof(GNUPGBADSIG)-1) == 0) { - if (_config->FindB("Debug::Acquire::gpgv", false)) - std::cerr << "Got BADSIG! " << std::endl; + if (Debug == true) + std::clog << "Got BADSIG! " << std::endl; BadSigners.push_back(string(buffer+sizeof(GNUPGPREFIX))); } if (strncmp(buffer, GNUPGNOPUBKEY, sizeof(GNUPGNOPUBKEY)-1) == 0) { - if (_config->FindB("Debug::Acquire::gpgv", false)) - std::cerr << "Got NO_PUBKEY " << std::endl; + if (Debug == true) + std::clog << "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; + if (Debug == true) + std::clog << "Got NODATA! " << std::endl; BadSigners.push_back(string(buffer+sizeof(GNUPGPREFIX))); } if (strncmp(buffer, GNUPGKEYEXPIRED, sizeof(GNUPGKEYEXPIRED)-1) == 0) { - if (_config->FindB("Debug::Acquire::gpgv", false)) - std::cerr << "Got KEYEXPIRED! " << std::endl; + if (Debug == true) + std::clog << "Got KEYEXPIRED! " << std::endl; WorthlessSigners.push_back(string(buffer+sizeof(GNUPGPREFIX))); } if (strncmp(buffer, GNUPGREVKEYSIG, sizeof(GNUPGREVKEYSIG)-1) == 0) { - if (_config->FindB("Debug::Acquire::gpgv", false)) - std::cerr << "Got REVKEYSIG! " << std::endl; + if (Debug == true) + std::clog << "Got REVKEYSIG! " << std::endl; WorthlessSigners.push_back(string(buffer+sizeof(GNUPGPREFIX))); } if (strncmp(buffer, GNUPGGOODSIG, sizeof(GNUPGGOODSIG)-1) == 0) @@ -204,17 +216,17 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, while (*p && isxdigit(*p)) p++; *p = 0; - if (_config->FindB("Debug::Acquire::gpgv", false)) - std::cerr << "Got GOODSIG, key ID:" << sig << std::endl; + if (Debug == true) + std::clog << "Got GOODSIG, key ID:" << sig << std::endl; GoodSigners.push_back(string(sig)); } } fclose(pipein); waitpid(pid, &status, 0); - if (_config->FindB("Debug::Acquire::gpgv", false)) + if (Debug == true) { - std::cerr << "gpgv exited\n"; + std::clog << "gpgv exited\n"; } if (WEXITSTATUS(status) == 0) @@ -305,7 +317,7 @@ bool GPGVMethod::Fetch(FetchItem *Itm) if (_config->FindB("Debug::Acquire::gpgv", false)) { - std::cerr << "gpgv succeeded\n"; + std::clog << "gpgv succeeded\n"; } return true; -- cgit v1.2.3 From 930f51811cd36a695c07f0b8414b118ce28dda04 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 4 Jan 2010 13:54:57 +0100 Subject: finally merge the rest of the patchset from Arnaud Ebalard with the CRL and Issuers options for https, thanks! (Closes: #485963) --- debian/changelog | 3 +++ doc/examples/apt-https-method-example.conf | 21 +++++++++++++++++++++ methods/https.cc | 14 ++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/debian/changelog b/debian/changelog index fca8d3ccb..cdf477cfd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,6 +45,9 @@ apt (0.7.26) UNRELEASED; urgency=low * methods/gpgv.cc: - pass all keyrings (TrustedParts) to gpgv instead of using only one trusted.gpg keyring (Closes: #304846) + * methods/https.cc: + - finally merge the rest of the patchset from Arnaud Ebalard + with the CRL and Issuers options, thanks! (Closes: #485963) -- Michael Vogt Thu, 10 Dec 2009 22:02:38 +0100 diff --git a/doc/examples/apt-https-method-example.conf b/doc/examples/apt-https-method-example.conf index 0067171bd..cc7889044 100644 --- a/doc/examples/apt-https-method-example.conf +++ b/doc/examples/apt-https-method-example.conf @@ -36,6 +36,8 @@ to access its content. - The certificate presented by both server have (as expected) a CN that matches their respective DNS names. + - We have CRL available for both dom1.tld and dom2.tld PKI, and intend + to use them. - It somtimes happens that we had other more generic https available repository to our list. We want the checks to be performed against a common list of anchors (like the one provided by ca-certificates @@ -56,10 +58,13 @@ Acquire::https::CaInfo "/etc/ssl/certs/ca-certificates.pem"; // Use a specific anchor and associated CRL. Enforce issuer of // server certificate using its cert. Acquire::https::secure.dom1.tld::CaInfo "/etc/apt/certs/ca-dom1-crt.pem"; +Acquire::https::secure.dom1.tld::CrlFile "/etc/apt/certs/ca-dom1-crl.pem"; +Acquire::https::secure.dom1.tld::IssuerCert "/etc/apt/certs/secure.dom1-issuer-crt.pem"; // Like previous for anchor and CRL, but also provide our // certificate and keys for client authentication. Acquire::https::secure.dom2.tld::CaInfo "/etc/apt/certs/ca-dom2-crt.pem"; +Acquire::https::secure.dom2.tld::CrlFile "/etc/apt/certs/ca-dom2-crl.pem"; Acquire::https::secure.dom2.tld::SslCert "/etc/apt/certs/my-crt.pem"; Acquire::https::secure.dom2.tld::SslKey "/etc/apt/certs/my-key.pem"; @@ -97,6 +102,22 @@ Acquire::https::secure.dom2.tld::SslKey "/etc/apt/certs/my-key.pem"; used for the https entries in the sources.list file that use that repository (with the same name). + Acquire::https[::repo.domain.tld]::CrlFile "/path/to/all/crl.pem"; + + Like previous knob but for passing the list of CRL files (in PEM + format) to be used to verify revocation status. Again, if the + option is defined with no specific mirror (probably makes little + sense), this CRL information is used for all defined https entries + in sources.list file. In a mirror specific context, it only applies + to that mirror. + + Acquire::https[::repo.domain.tld]::IssuerCert "/path/to/issuer/cert.pem"; + + Allows to constrain the issuer of the server certificate (for all + https mirrors or a specific one) to a specific issuer. If the + server certificate has not been issued by this certificate, + connection fails. + Acquire::https[::repo.domain.tld]::Verify-Peer "true"; When authenticating the server, if the certificate verification fails diff --git a/methods/https.cc b/methods/https.cc index 5d8e63f47..35c23db20 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -151,6 +151,13 @@ bool HttpsMethod::Fetch(FetchItem *Itm) default_verify = 0; curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, verify); + // Also enforce issuer of server certificate using its cert + string issuercert = _config->Find("Acquire::https::IssuerCert",""); + knob = "Acquire::https::"+remotehost+"::IssuerCert"; + issuercert = _config->Find(knob.c_str(),issuercert.c_str()); + if(issuercert != "") + curl_easy_setopt(curl, CURLOPT_ISSUERCERT,issuercert.c_str()); + // For client authentication, certificate file ... string pem = _config->Find("Acquire::https::SslCert",""); knob = "Acquire::https::"+remotehost+"::SslCert"; @@ -177,6 +184,13 @@ bool HttpsMethod::Fetch(FetchItem *Itm) final_version = CURL_SSLVERSION_SSLv3; curl_easy_setopt(curl, CURLOPT_SSLVERSION, final_version); + // CRL file + string crlfile = _config->Find("Acquire::https::CrlFile",""); + knob = "Acquire::https::"+remotehost+"::CrlFile"; + crlfile = _config->Find(knob.c_str(),crlfile.c_str()); + if(crlfile != "") + curl_easy_setopt(curl, CURLOPT_CRLFILE, crlfile.c_str()); + // cache-control if(_config->FindB("Acquire::https::No-Cache", _config->FindB("Acquire::http::No-Cache",false)) == false) -- cgit v1.2.3 From 40de549f4d2e70156048425838d55fee96d14750 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 4 Jan 2010 14:06:49 +0100 Subject: some minor style fixes: use empty() and add a few const --- methods/https.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/methods/https.cc b/methods/https.cc index 35c23db20..aa6786aa8 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -133,7 +133,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm) string cainfo = _config->Find("Acquire::https::CaInfo",""); string knob = "Acquire::https::"+remotehost+"::CaInfo"; cainfo = _config->Find(knob.c_str(),cainfo.c_str()); - if(cainfo != "") + if(cainfo.empty() == false) curl_easy_setopt(curl, CURLOPT_CAINFO,cainfo.c_str()); // Check server certificate against previous CA list ... @@ -155,21 +155,21 @@ bool HttpsMethod::Fetch(FetchItem *Itm) string issuercert = _config->Find("Acquire::https::IssuerCert",""); knob = "Acquire::https::"+remotehost+"::IssuerCert"; issuercert = _config->Find(knob.c_str(),issuercert.c_str()); - if(issuercert != "") + if(issuercert.empty() == false) curl_easy_setopt(curl, CURLOPT_ISSUERCERT,issuercert.c_str()); // For client authentication, certificate file ... string pem = _config->Find("Acquire::https::SslCert",""); knob = "Acquire::https::"+remotehost+"::SslCert"; pem = _config->Find(knob.c_str(),pem.c_str()); - if(pem != "") + if(pem.empty() == false) curl_easy_setopt(curl, CURLOPT_SSLCERT, pem.c_str()); // ... and associated key. string key = _config->Find("Acquire::https::SslKey",""); knob = "Acquire::https::"+remotehost+"::SslKey"; key = _config->Find(knob.c_str(),key.c_str()); - if(key != "") + if(key.empty() == false) curl_easy_setopt(curl, CURLOPT_SSLKEY, key.c_str()); // Allow forcing SSL version to SSLv3 or TLSv1 (SSLv2 is not @@ -188,7 +188,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm) string crlfile = _config->Find("Acquire::https::CrlFile",""); knob = "Acquire::https::"+remotehost+"::CrlFile"; crlfile = _config->Find(knob.c_str(),crlfile.c_str()); - if(crlfile != "") + if(crlfile.empty() == false) curl_easy_setopt(curl, CURLOPT_CRLFILE, crlfile.c_str()); // cache-control @@ -210,7 +210,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers); // speed limit - int dlLimit = _config->FindI("Acquire::https::Dl-Limit", + int const dlLimit = _config->FindI("Acquire::https::Dl-Limit", _config->FindI("Acquire::http::Dl-Limit",0))*1024; if (dlLimit > 0) curl_easy_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, dlLimit); @@ -222,7 +222,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm) "Debian APT-CURL/1.0 ("VERSION")").c_str()).c_str()); // set timeout - int timeout = _config->FindI("Acquire::https::Timeout", + int const timeout = _config->FindI("Acquire::https::Timeout", _config->FindI("Acquire::http::Timeout",120)); curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, timeout); //set really low lowspeed timeout (see #497983) @@ -230,7 +230,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, timeout); // set redirect options and default to 10 redirects - bool AllowRedirect = _config->FindB("Acquire::https::AllowRedirect", + bool const AllowRedirect = _config->FindB("Acquire::https::AllowRedirect", _config->FindB("Acquire::http::AllowRedirect",true)); curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, AllowRedirect); curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 10); -- cgit v1.2.3 From daee881bf82d23197d991227fa0ab36b918b4323 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 13 Jan 2010 14:52:28 +0100 Subject: correct a spelling error spotted by lintian in the debian/NEWS file: W: spelling-error-in-news-debian: informations -> information --- debian/NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/NEWS b/debian/NEWS index 7612adb9c..a12f1a4f8 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -2,7 +2,7 @@ apt (0.7.24) unstable; urgency=low * Already included in the last version but now with better documentation is the possibility to add/prefer different compression types while - downloading archive informations, which can decrease the time needed for + downloading archive information, which can decrease the time needed for update on slow machines. See apt.conf (5) manpage for details. * APT manages his manpage translations now with po4a, thanks to Nicolas François and Kurasawa Nozomu, who also provide the ja translation. -- cgit v1.2.3 From e29a6bb14dcc004d174ad8502b76623139fbee06 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 16 Jan 2010 23:09:42 +0100 Subject: Fix the newly introduced method GetListOfFilesInDir to not accept every file if no extension is enforced (= restore old behaviour). (Closes: #565213) This commit includes also: * apt-pkg/policy.cc: - accept also partfiles with "pref" file extension as valid * apt-pkg/contrib/configuration.cc: - accept also partfiles with "conf" file extension as valid * doc/apt.conf.5.xml: - reorder description and split out syntax - add partfile name convention (Closes: #558348) * doc/apt_preferences.conf.5.xml: - describe partfile name convention also here And a lovely test application of course. --- apt-pkg/contrib/configuration.cc | 2 +- apt-pkg/contrib/fileutl.cc | 84 +++++++++++++++++++++++++++++++-- apt-pkg/contrib/fileutl.h | 5 ++ apt-pkg/policy.cc | 2 +- debian/changelog | 18 +++++++ doc/apt.conf.5.xml | 33 ++++++++----- doc/apt_preferences.5.xml | 7 +++ test/libapt/getlistoffilesindir_test.cc | 82 ++++++++++++++++++++++++++++++++ test/libapt/makefile | 6 +++ test/libapt/run-tests.sh | 50 ++++++++++++++++++-- 10 files changed, 267 insertions(+), 22 deletions(-) create mode 100644 test/libapt/getlistoffilesindir_test.cc diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 80b089fac..7588b041c 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -832,7 +832,7 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool const &AsSectio bool ReadConfigDir(Configuration &Conf,const string &Dir, bool const &AsSectional, unsigned const &Depth) { - vector const List = GetListOfFilesInDir(Dir, "", true); + vector const List = GetListOfFilesInDir(Dir, "conf", true, true); // Read the files for (vector::const_iterator I = List.begin(); I != List.end(); I++) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index cce8a4512..da32983f1 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -202,8 +202,37 @@ bool FileExists(string File) /* If an extension is given only files with this extension are included in the returned vector, otherwise every "normal" file is included. */ std::vector GetListOfFilesInDir(string const &Dir, string const &Ext, - bool const &SortList) + bool const &SortList) { + return GetListOfFilesInDir(Dir, Ext, SortList, false); +} +std::vector GetListOfFilesInDir(string const &Dir, string const &Ext, + bool const &SortList, bool const &AllowNoExt) +{ + std::vector ext; + ext.reserve(2); + if (Ext.empty() == false) + ext.push_back(Ext); + if (AllowNoExt == true && ext.empty() == false) + ext.push_back(""); + return GetListOfFilesInDir(Dir, ext, SortList); +} +std::vector GetListOfFilesInDir(string const &Dir, std::vector const &Ext, + bool const &SortList) +{ + // Attention debuggers: need to be set with the environment config file! + bool const Debug = _config->FindB("Debug::GetListOfFilesInDir", false); + if (Debug == true) + { + std::clog << "Accept in " << Dir << " only files with the following " << Ext.size() << " extensions:" << std::endl; + if (Ext.empty() == true) + std::clog << "\tNO extension" << std::endl; + else + for (std::vector::const_iterator e = Ext.begin(); + e != Ext.end(); ++e) + std::clog << '\t' << (e->empty() == true ? "NO" : *e) << " extension" << std::endl; + } + std::vector List; DIR *D = opendir(Dir.c_str()); if (D == 0) @@ -214,28 +243,73 @@ std::vector GetListOfFilesInDir(string const &Dir, string const &Ext, for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D)) { + // skip "hidden" files if (Ent->d_name[0] == '.') continue; - if (Ext.empty() == false && flExtension(Ent->d_name) != Ext) - continue; + // check for accepted extension: + // no extension given -> periods are bad as hell! + // extensions given -> "" extension allows no extension + if (Ext.empty() == false) + { + string d_ext = flExtension(Ent->d_name); + if (d_ext == Ent->d_name) // no extension + { + if (std::find(Ext.begin(), Ext.end(), "") == Ext.end()) + { + if (Debug == true) + std::clog << "Bad file: " << Ent->d_name << " → no extension" << std::endl; + continue; + } + } + else if (std::find(Ext.begin(), Ext.end(), d_ext) == Ext.end()) + { + if (Debug == true) + std::clog << "Bad file: " << Ent->d_name << " → bad extension »" << flExtension(Ent->d_name) << "«" << std::endl; + continue; + } + } - // Skip bad file names ala run-parts + // Skip bad filenames ala run-parts const char *C = Ent->d_name; for (; *C != 0; ++C) if (isalpha(*C) == 0 && isdigit(*C) == 0 - && *C != '_' && *C != '-' && *C != '.') + && *C != '_' && *C != '-') { + // no required extension -> dot is a bad character + if (*C == '.' && Ext.empty() == false) + continue; break; + } + // we don't reach the end of the name -> bad character included if (*C != 0) + { + if (Debug == true) + std::clog << "Bad file: " << Ent->d_name << " → bad character »" + << *C << "« in filename (period allowed: " << (Ext.empty() ? "no" : "yes") << ")" << std::endl; continue; + } + + // skip filenames which end with a period. These are never valid + if (*(C - 1) == '.') + { + if (Debug == true) + std::clog << "Bad file: " << Ent->d_name << " → Period as last character" << std::endl; + continue; + } // Make sure it is a file and not something else string const File = flCombine(Dir,Ent->d_name); struct stat St; if (stat(File.c_str(),&St) != 0 || S_ISREG(St.st_mode) == 0) + { + if (Debug == true) + std::clog << "Bad file: " << Ent->d_name << " → stat says not a good file" << std::endl; continue; + } + if (Debug == true) + std::clog << "Accept file: " << Ent->d_name << " in " << Dir << std::endl; List.push_back(File); } closedir(D); diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 2807c29d9..85a94898c 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -82,8 +82,13 @@ bool RunScripts(const char *Cnf); bool CopyFile(FileFd &From,FileFd &To); int GetLock(string File,bool Errors = true); bool FileExists(string File); +// FIXME: next ABI-Break: merge the two method-headers std::vector GetListOfFilesInDir(string const &Dir, string const &Ext, bool const &SortList); +std::vector GetListOfFilesInDir(string const &Dir, string const &Ext, + bool const &SortList, bool const &AllowNoExt); +std::vector GetListOfFilesInDir(string const &Dir, std::vector const &Ext, + bool const &SortList); string SafeGetCWD(); void SetCloseExec(int Fd,bool Close); void SetNonBlock(int Fd,bool Block); diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index 393181b6d..f9901bc9a 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -280,7 +280,7 @@ bool ReadPinDir(pkgPolicy &Plcy,string Dir) return true; } - vector const List = GetListOfFilesInDir(Dir, "", true); + vector const List = GetListOfFilesInDir(Dir, "pref", true, true); // Read the files for (vector::const_iterator I = List.begin(); I != List.end(); I++) diff --git a/debian/changelog b/debian/changelog index ef6f846cb..caafde70c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,24 @@ apt (0.7.26) UNRELEASED; urgency=low -- Michael Vogt Thu, 10 Dec 2009 22:02:38 +0100 +apt (0.7.25.2) UNRELEASED; urgency=low + + * apt-pkg/contrib/fileutl.cc: + - Fix the newly introduced method GetListOfFilesInDir to not + accept every file if no extension is enforced + (= restore old behaviour). (Closes: #565213) + * apt-pkg/policy.cc: + - accept also partfiles with "pref" file extension as valid + * apt-pkg/contrib/configuration.cc: + - accept also partfiles with "conf" file extension as valid + * doc/apt.conf.5.xml: + - reorder description and split out syntax + - add partfile name convention (Closes: #558348) + * doc/apt_preferences.conf.5.xml: + - describe partfile name convention also here + + -- David Kalnischkies Sat, 16 Jan 2010 21:06:38 +0100 + apt (0.7.25.1) unstable; urgency=low [ Christian Perrier ] diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index e568baa35..c13ad4867 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -21,7 +21,7 @@ &apt-email; &apt-product; - 18 September 2009 + 16 January 2010 @@ -37,16 +37,27 @@ Description - apt.conf is the main configuration file for the APT suite of - tools, all tools make use of the configuration file and a common command line - parser to provide a uniform environment. When an APT tool starts up it will - read the configuration specified by the APT_CONFIG environment - variable (if any) and then read the files in Dir::Etc::Parts - then read the main configuration file specified by - Dir::Etc::main then finally apply the - command line options to override the configuration directives, possibly - loading even more config files. - + apt.conf is the main configuration file for + the APT suite of tools, but by far not the only place changes to options + can be made. All tools therefore share the configuration files and also + use a common command line parser to provide a uniform environment. + + When an APT tool starts up it will read the configuration files + in the following order: + the file specified by the APT_CONFIG + environment variable (if any) + all files in Dir::Etc::Parts in + alphanumeric ascending order which have no or "conf" + as filename extension and which only contain alphanumeric, + hyphen (-), underscore (_) and period (.) characters - + otherwise they will be silently ignored. + the main configuration file specified by + Dir::Etc::main + the command line options are applied to override the + configuration directives or to load even more configuration files. + + + Syntax The configuration file is organized in a tree with options organized into functional groups. Option specification is given with a double colon notation, for instance APT::Get::Assume-Yes is an option within diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 159d61f2b..9a4791c08 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -53,6 +53,13 @@ earliest in the &sources-list; file. The APT preferences file does not affect the choice of instance, only the choice of version. +Note that the files in the /etc/apt/preferences.d +directory are parsed in alphanumeric ascending order and need to obey the +following naming convention: The files have no or "pref" +as filename extension and which only contain alphanumeric, hyphen (-), +underscore (_) and period (.) characters - otherwise they will be silently +ignored. + APT's Default Priority Assignments If there is no preferences file or if there is no entry in the file diff --git a/test/libapt/getlistoffilesindir_test.cc b/test/libapt/getlistoffilesindir_test.cc new file mode 100644 index 000000000..ed8d2dad6 --- /dev/null +++ b/test/libapt/getlistoffilesindir_test.cc @@ -0,0 +1,82 @@ +#include + +#include "assert.h" +#include +#include + +#include +#include + +// simple helper to quickly output a vector of strings +void dumpVector(std::vector vec) { + for (std::vector::const_iterator v = vec.begin(); + v != vec.end(); v++) + std::cout << *v << std::endl; +} + +#define P(x) string(argv[1]).append("/").append(x) + +int main(int argc,char *argv[]) +{ + if (argc != 2) { + std::cout << "One parameter expected - given " << argc << std::endl; + return 100; + } + + // Files with no extension + std::vector files = GetListOfFilesInDir(argv[1], "", true); + equals(files.size(), 2); + equals(files[0], P("01yet-anothernormalfile")); + equals(files[1], P("anormalfile")); + + // Files with no extension - should be the same as above + files = GetListOfFilesInDir(argv[1], "", true, true); + equals(files.size(), 2); + equals(files[0], P("01yet-anothernormalfile")); + equals(files[1], P("anormalfile")); + + // Files with impossible extension + files = GetListOfFilesInDir(argv[1], "impossible", true); + equals(files.size(), 0); + + // Files with impossible or no extension + files = GetListOfFilesInDir(argv[1], "impossible", true, true); + equals(files.size(), 2); + equals(files[0], P("01yet-anothernormalfile")); + equals(files[1], P("anormalfile")); + + // Files with list extension - nothing more + files = GetListOfFilesInDir(argv[1], "list", true); + equals(files.size(), 4); + equals(files[0], P("01yet-anotherapt.list")); + equals(files[1], P("anormalapt.list")); + equals(files[2], P("linkedfile.list")); + equals(files[3], P("multi.dot.list")); + + // Files with conf or no extension + files = GetListOfFilesInDir(argv[1], "conf", true, true); + equals(files.size(), 5); + equals(files[0], P("01yet-anotherapt.conf")); + equals(files[1], P("01yet-anothernormalfile")); + equals(files[2], P("anormalapt.conf")); + equals(files[3], P("anormalfile")); + equals(files[4], P("multi.dot.conf")); + + // Files with disabled extension - nothing more + files = GetListOfFilesInDir(argv[1], "disabled", true); + equals(files.size(), 3); + equals(files[0], P("disabledfile.conf.disabled")); + equals(files[1], P("disabledfile.disabled")); + equals(files[2], P("disabledfile.list.disabled")); + + // Files with disabled or no extension + files = GetListOfFilesInDir(argv[1], "disabled", true, true); + equals(files.size(), 5); + equals(files[0], P("01yet-anothernormalfile")); + equals(files[1], P("anormalfile")); + equals(files[2], P("disabledfile.conf.disabled")); + equals(files[3], P("disabledfile.disabled")); + equals(files[4], P("disabledfile.list.disabled")); + + return 0; +} diff --git a/test/libapt/makefile b/test/libapt/makefile index 5712c025a..08f581e6d 100644 --- a/test/libapt/makefile +++ b/test/libapt/makefile @@ -17,3 +17,9 @@ PROGRAM = ParseDepends${BASENAME} SLIBS = -lapt-pkg SOURCE = parsedepends_test.cc include $(PROGRAM_H) + +# Program for testing GetListOfFilesInDir +PROGRAM = GetListOfFilesInDir${BASENAME} +SLIBS = -lapt-pkg +SOURCE = getlistoffilesindir_test.cc +include $(PROGRAM_H) diff --git a/test/libapt/run-tests.sh b/test/libapt/run-tests.sh index 365bbe215..1fcfb6861 100755 --- a/test/libapt/run-tests.sh +++ b/test/libapt/run-tests.sh @@ -1,10 +1,52 @@ #!/bin/sh +set -e + echo "Compiling the tests ..." make echo "Running all testcases ..." -PATH=$(pwd)/../../build/bin -for testapp in $(/bin/ls ${PATH}/*_libapt_test) +LDPATH=$(pwd)/../../build/bin +EXT="_libapt_test" +for testapp in $(ls ${LDPATH}/*$EXT) do - echo -n "Testing with \033[1;35m$(/usr/bin/basename ${testapp})\033[0m ... " - LD_LIBRARY_PATH=${PATH} ${testapp} && echo "\033[1;32mOKAY\033[0m" || echo "\033[1;31mFAILED\033[0m" + name=$(basename ${testapp}) + tmppath="" + + if [ $name = "GetListOfFilesInDir${EXT}" ]; then + # TODO: very-low: move env creation to the actual test-app + echo "Prepare Testarea for \033[1;35m$name\033[0m ..." + tmppath=$(mktemp -d) + touch "${tmppath}/anormalfile" \ + "${tmppath}/01yet-anothernormalfile" \ + "${tmppath}/anormalapt.conf" \ + "${tmppath}/01yet-anotherapt.conf" \ + "${tmppath}/anormalapt.list" \ + "${tmppath}/01yet-anotherapt.list" \ + "${tmppath}/wrongextension.wron" \ + "${tmppath}/wrong-extension.wron" \ + "${tmppath}/strangefile." \ + "${tmppath}/s.t.r.a.n.g.e.f.i.l.e" \ + "${tmppath}/.hiddenfile" \ + "${tmppath}/.hiddenfile.conf" \ + "${tmppath}/.hiddenfile.list" \ + "${tmppath}/multi..dot" \ + "${tmppath}/multi.dot.conf" \ + "${tmppath}/multi.dot.list" \ + "${tmppath}/disabledfile.disabled" \ + "${tmppath}/disabledfile.conf.disabled" \ + "${tmppath}/disabledfile.list.disabled" \ + "${tmppath}/invälid.conf" \ + "${tmppath}/invalíd" \ + "${tmppath}/01invalíd" + ln -s "${tmppath}/anormalfile" "${tmppath}/linkedfile.list" + ln -s "${tmppath}/non-existing-file" "${tmppath}/brokenlink.list" + fi + + echo -n "Testing with \033[1;35m${name}\033[0m ... " + LD_LIBRARY_PATH=${LDPATH} ${testapp} ${tmppath} && echo "\033[1;32mOKAY\033[0m" || echo "\033[1;31mFAILED\033[0m" + + if [ -n "$tmppath" -a -d "$tmppath" ]; then + echo "Cleanup Testarea after \033[1;35m$name\033[0m ..." + rm -rf "$tmppath" + fi + done -- cgit v1.2.3 From 3ad676a1420f65b4de3d1742c09f6e7e3966652c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 19 Jan 2010 13:08:01 +0100 Subject: * apt-pkg/deb/dpkgpm.cc: - don't segfault if term.log file can't be opened. Thanks Sam Brightman for the patch! (Closes: #475770) --- apt-pkg/deb/dpkgpm.cc | 7 ++++--- debian/changelog | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index d1a275a47..565f01b84 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -561,15 +561,16 @@ bool pkgDPkgPM::OpenLog() if (!logfile_name.empty()) { term_out = fopen(logfile_name.c_str(),"a"); + if (term_out == NULL) + return _error->WarningE(_("Could not open file '%s'"), logfile_name.c_str()); + chmod(logfile_name.c_str(), 0600); // output current time char outstr[200]; time_t t = time(NULL); struct tm *tmp = localtime(&t); strftime(outstr, sizeof(outstr), "%F %T", tmp); - fprintf(term_out, "\nLog started: "); - fprintf(term_out, "%s", outstr); - fprintf(term_out, "\n"); + fprintf(term_out, "\nLog started: %s\n", outstr); } return true; } diff --git a/debian/changelog b/debian/changelog index 2cc256695..e699ee6c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,9 @@ apt (0.7.25.2) UNRELEASED; urgency=low - add partfile name convention (Closes: #558348) * doc/apt_preferences.conf.5.xml: - describe partfile name convention also here + * apt-pkg/deb/dpkgpm.cc: + - don't segfault if term.log file can't be opened. + Thanks Sam Brightman for the patch! (Closes: #475770) -- David Kalnischkies Sat, 16 Jan 2010 21:06:38 +0100 -- cgit v1.2.3 From e29f5aee684afa04f84d8e0fe523dec72b231672 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 20 Jan 2010 13:39:37 +0100 Subject: replace the per language addendum with a global addendum and add a explanation why translations include (maybe) english parts to this new global addendum (Closes: #561636) --- debian/changelog | 4 + doc/apt.ent | 19 + doc/de/addendum/debiandoc_de.add | 6 - doc/de/addendum/xml_de.add | 6 - doc/es/addendum/xml_es.add | 9 - doc/fr/addendum/xml_fr.add | 7 - doc/ja/addendum/xml_ja.add | 7 - doc/po/apt-doc.pot | 708 +++++++------- doc/po/de.po | 749 ++++++++------- doc/po/es.po | 762 ++++++++------- doc/po/fr.po | 1880 +++++++++++++++++++++----------------- doc/po/it.po | 705 +++++++------- doc/po/ja.po | 750 ++++++++------- doc/po/pl.po | 705 +++++++------- doc/po/pt_BR.po | 710 +++++++------- doc/po4a.conf | 39 +- doc/pt_BR/addendum/xml_pt_BR.add | 5 - doc/xml.add | 5 + 18 files changed, 3947 insertions(+), 3129 deletions(-) delete mode 100644 doc/de/addendum/debiandoc_de.add delete mode 100644 doc/de/addendum/xml_de.add delete mode 100644 doc/es/addendum/xml_es.add delete mode 100644 doc/fr/addendum/xml_fr.add delete mode 100644 doc/ja/addendum/xml_ja.add delete mode 100644 doc/pt_BR/addendum/xml_pt_BR.add create mode 100644 doc/xml.add diff --git a/debian/changelog b/debian/changelog index e699ee6c5..588038b4c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,10 @@ apt (0.7.25.2) UNRELEASED; urgency=low * apt-pkg/deb/dpkgpm.cc: - don't segfault if term.log file can't be opened. Thanks Sam Brightman for the patch! (Closes: #475770) + * doc/*: + - replace the per language addendum with a global addendum + - add a explanation why translations include (maybe) english + parts to the new global addendum (Closes: #561636) -- David Kalnischkies Sat, 16 Jan 2010 21:06:38 +0100 diff --git a/doc/apt.ent b/doc/apt.ent index da43d8f3d..c23d906e2 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -366,3 +366,22 @@ Configuration Item Dir::Etc::TrustedParts. "> + + + + +john@doe.org in 2009, + 2010 and Daniela Acme daniela@acme.us in 2010 together with the + Debian Dummy l10n Team debian-l10n-dummy@lists.debian.org. +"> + + + diff --git a/doc/de/addendum/debiandoc_de.add b/doc/de/addendum/debiandoc_de.add deleted file mode 100644 index 2332878a6..000000000 --- a/doc/de/addendum/debiandoc_de.add +++ /dev/null @@ -1,6 +0,0 @@ -PO4A-HEADER:mode=after;position=manbugs;beginboundary=^ - Übersetzung - Die deutsche Übersetzung wurde 2009 von Chris Leick c.leick@vollbio.de angefertigt - in Zusammenarbeit mit dem Debian German-l10n-Team debian-l10n-german@lists.debian.org. - - diff --git a/doc/de/addendum/xml_de.add b/doc/de/addendum/xml_de.add deleted file mode 100644 index 2332878a6..000000000 --- a/doc/de/addendum/xml_de.add +++ /dev/null @@ -1,6 +0,0 @@ -PO4A-HEADER:mode=after;position=manbugs;beginboundary=^ - Übersetzung - Die deutsche Übersetzung wurde 2009 von Chris Leick c.leick@vollbio.de angefertigt - in Zusammenarbeit mit dem Debian German-l10n-Team debian-l10n-german@lists.debian.org. - - diff --git a/doc/es/addendum/xml_es.add b/doc/es/addendum/xml_es.add deleted file mode 100644 index dc2b06be0..000000000 --- a/doc/es/addendum/xml_es.add +++ /dev/null @@ -1,9 +0,0 @@ -PO4A-HEADER:mode=after;position=manbugs;beginboundary=^ - Translation - The spanish translation was written 2003 and 2004 by Ismael Fanlo (2003), Carlos Mestre (2003), - Rudy Godoy rudy@kernel-panik.org (2003), - Gustavo Saldumbide gsal@adinet.com.uy (2003), - Javier Fernández-Sanguino jfs@computer.org (2003) - and Rubén Porras Campo nahoo@inicia.es (2003, 2004) - under the aegis of the debian spanish-l10n-team debian-l10n-spanish@lists.debian.org. - diff --git a/doc/fr/addendum/xml_fr.add b/doc/fr/addendum/xml_fr.add deleted file mode 100644 index 987b5b1f5..000000000 --- a/doc/fr/addendum/xml_fr.add +++ /dev/null @@ -1,7 +0,0 @@ -PO4A-HEADER:mode=after;position=manbugs;beginboundary=^ - Traducteurs - Jérôme Marant, Philippe Batailler, Christian Perrier bubulle@debian.org (2000, 2005, 2009), - Équipe de traduction francophone de Debian debian-l10n-french@lists.debian.org - - - diff --git a/doc/ja/addendum/xml_ja.add b/doc/ja/addendum/xml_ja.add deleted file mode 100644 index 05d4cff3f..000000000 --- a/doc/ja/addendum/xml_ja.add +++ /dev/null @@ -1,7 +0,0 @@ -PO4A-HEADER:mode=after;position=manbugs;beginboundary=^ - 訳者 - 倉澤 望 nabetaro@debian.or.jp (2003-2006,2009), - Debian JP Documentation ML debian-doc@debian.or.jp - - - diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index fe7c6f514..40ed1f589 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-01-11 15:12+0100\n" +"POT-Creation-Date: 2010-01-20 12:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -784,7 +784,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:368 +#: apt.ent:369 #, no-wrap msgid "" " " @@ -798,6 +798,44 @@ msgid "" "\">\n" msgstr "" +#. type: Plain text +#: apt.ent:371 +msgid "" +msgstr "" + +#. type: Plain text +#: apt.ent:380 +#, no-wrap +msgid "" +"\n" +"john@doe.org in 2009,\n" +" 2010 and Daniela Acme daniela@acme.us in 2010 together " +"with the\n" +" Debian Dummy l10n Team " +"debian-l10n-dummy@lists.debian.org.\n" +"\">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:387 +#, no-wrap +msgid "" +"\n" +"\n" +msgstr "" + #. The last update date #. type: Content of: #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 apt-sortpkgs.1.xml:13 sources.list.5.xml:13 @@ -1246,7 +1284,7 @@ msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:491 apt.conf.5.xml:513 +#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 msgid "options" msgstr "" @@ -1444,7 +1482,7 @@ msgid "&apt-commonoptions;" msgstr "" #. type: Content of: -#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1024 apt_preferences.5.xml:615 +#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1035 apt_preferences.5.xml:622 msgid "Files" msgstr "" @@ -1454,7 +1492,7 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1030 apt_preferences.5.xml:622 sources.list.5.xml:233 +#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 sources.list.5.xml:233 msgid "See Also" msgstr "" @@ -2753,7 +2791,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1018 apt_preferences.5.xml:462 sources.list.5.xml:193 +#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 sources.list.5.xml:193 msgid "Examples" msgstr "" @@ -4266,7 +4304,7 @@ msgid "" "&apt-author.jgunthorpe; &apt-author.team; <author> " "<firstname>Daniel</firstname> <surname>Burrows</surname> <contrib>Initial " "documentation of Debug::*.</contrib> <email>dburrows@debian.org</email> " -"</author> &apt-email; &apt-product; <date>18 September 2009</date>" +"</author> &apt-email; &apt-product; <date>16 January 2010</date>" msgstr "" #. type: Content of: <refentry><refnamediv><refname> @@ -4288,18 +4326,53 @@ msgstr "" #: apt.conf.5.xml:40 msgid "" "<filename>apt.conf</filename> is the main configuration file for the APT " -"suite of tools, all tools make use of the configuration file and a common " -"command line parser to provide a uniform environment. When an APT tool " -"starts up it will read the configuration specified by the " -"<envar>APT_CONFIG</envar> environment variable (if any) and then read the " -"files in <literal>Dir::Etc::Parts</literal> then read the main configuration " -"file specified by <literal>Dir::Etc::main</literal> then finally apply the " -"command line options to override the configuration directives, possibly " -"loading even more config files." +"suite of tools, but by far not the only place changes to options can be " +"made. All tools therefore share the configuration files and also use a " +"common command line parser to provide a uniform environment." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><para> +#: apt.conf.5.xml:45 +msgid "" +"When an APT tool starts up it will read the configuration files in the " +"following order:" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:47 +msgid "" +"the file specified by the <envar>APT_CONFIG</envar> environment variable (if " +"any)" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:49 +msgid "" +"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " +"order which have no or \"<literal>conf</literal>\" as filename extension and " +"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " +"characters - otherwise they will be silently ignored." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:54 +msgid "the main configuration file specified by <literal>Dir::Etc::main</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:56 +msgid "" +"the command line options are applied to override the configuration " +"directives or to load even more configuration files." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:60 +msgid "Syntax" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:50 +#: apt.conf.5.xml:61 msgid "" "The configuration file is organized in a tree with options organized into " "functional groups. Option specification is given with a double colon " @@ -4309,7 +4382,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:56 +#: apt.conf.5.xml:67 msgid "" "Syntactically the configuration language is modeled after what the ISC tools " "such as bind and dhcp use. Lines starting with <literal>//</literal> are " @@ -4325,7 +4398,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:70 +#: apt.conf.5.xml:81 #, no-wrap msgid "" "APT {\n" @@ -4337,7 +4410,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:78 +#: apt.conf.5.xml:89 msgid "" "with newlines placed to make it more readable. Lists can be created by " "opening a scope and including a single string enclosed in quotes followed by " @@ -4346,13 +4419,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:83 +#: apt.conf.5.xml:94 #, no-wrap msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:86 +#: apt.conf.5.xml:97 msgid "" "In general the sample configuration file in " "<filename>&docdir;examples/apt.conf</filename> &configureindex; is a good " @@ -4360,14 +4433,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:90 +#: apt.conf.5.xml:101 msgid "" "The names of the configuration items are not case-sensitive. So in the " "previous example you could use <literal>dpkg::pre-install-pkgs</literal>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:93 +#: apt.conf.5.xml:104 msgid "" "Names for the configuration items are optional if a list is defined as it " "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example " @@ -4377,7 +4450,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:98 +#: apt.conf.5.xml:109 msgid "" "Two specials are allowed, <literal>#include</literal> (which is deprecated " "and not supported by alternative implementations) and " @@ -4389,7 +4462,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:106 +#: apt.conf.5.xml:117 msgid "" "The #clear command is the only way to delete a list or a complete scope. " "Reopening a scope or the ::-style described below will " @@ -4399,7 +4472,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:111 +#: apt.conf.5.xml:122 msgid "" "All of the APT tools take a -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " @@ -4410,7 +4483,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:118 +#: apt.conf.5.xml:129 msgid "" "Note that you can use :: only for appending one item per line to a list and " "that you should not use it in combination with the scope syntax. (The scope " @@ -4427,24 +4500,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:130 +#: apt.conf.5.xml:141 msgid "The APT Group" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:131 +#: apt.conf.5.xml:142 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:135 +#: apt.conf.5.xml:146 msgid "Architecture" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:136 +#: apt.conf.5.xml:147 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@ -4452,12 +4525,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:141 +#: apt.conf.5.xml:152 msgid "Default-Release" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:142 +#: apt.conf.5.xml:153 msgid "" "Default release to install packages from if more than one version " "available. Contains release name, codename or release version. Examples: " @@ -4466,24 +4539,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:146 +#: apt.conf.5.xml:157 msgid "Ignore-Hold" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:147 +#: apt.conf.5.xml:158 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:151 +#: apt.conf.5.xml:162 msgid "Clean-Installed" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:152 +#: apt.conf.5.xml:163 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -4492,12 +4565,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:158 +#: apt.conf.5.xml:169 msgid "Immediate-Configure" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:159 +#: apt.conf.5.xml:170 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -4530,12 +4603,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:181 +#: apt.conf.5.xml:192 msgid "Force-LoopBreak" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:182 +#: apt.conf.5.xml:193 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a " @@ -4546,82 +4619,82 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:190 +#: apt.conf.5.xml:201 msgid "Cache-Limit" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:191 +#: apt.conf.5.xml:202 msgid "" "APT uses a fixed size memory mapped cache file to store the 'available' " "information. This sets the size of that cache (in bytes)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:195 +#: apt.conf.5.xml:206 msgid "Build-Essential" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:196 +#: apt.conf.5.xml:207 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:210 msgid "Get" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:200 +#: apt.conf.5.xml:211 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:204 +#: apt.conf.5.xml:215 msgid "Cache" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:205 +#: apt.conf.5.xml:216 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:209 +#: apt.conf.5.xml:220 msgid "CDROM" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:210 +#: apt.conf.5.xml:221 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:227 msgid "The Acquire Group" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:221 +#: apt.conf.5.xml:232 msgid "PDiffs" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:222 +#: apt.conf.5.xml:233 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:225 +#: apt.conf.5.xml:236 msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " @@ -4632,12 +4705,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:234 +#: apt.conf.5.xml:245 msgid "Queue-Mode" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:246 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of " "<literal>host</literal> or <literal>access</literal> which determines how " @@ -4647,36 +4720,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:242 +#: apt.conf.5.xml:253 msgid "Retries" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:243 +#: apt.conf.5.xml:254 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:247 +#: apt.conf.5.xml:258 msgid "Source-Symlinks" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:248 +#: apt.conf.5.xml:259 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:252 sources.list.5.xml:139 +#: apt.conf.5.xml:263 sources.list.5.xml:139 msgid "http" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:253 +#: apt.conf.5.xml:264 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -4688,7 +4761,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:261 +#: apt.conf.5.xml:272 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -4702,7 +4775,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:271 apt.conf.5.xml:335 +#: apt.conf.5.xml:282 apt.conf.5.xml:346 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -4710,7 +4783,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:274 +#: apt.conf.5.xml:285 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@ -4722,7 +4795,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:282 +#: apt.conf.5.xml:293 msgid "" "The used bandwidth can be limited with " "<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in " @@ -4732,7 +4805,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:287 +#: apt.conf.5.xml:298 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -4740,12 +4813,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:293 +#: apt.conf.5.xml:304 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:305 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -4755,7 +4828,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:300 +#: apt.conf.5.xml:311 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -4777,12 +4850,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:318 sources.list.5.xml:150 +#: apt.conf.5.xml:329 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:319 +#: apt.conf.5.xml:330 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -4802,7 +4875,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:338 +#: apt.conf.5.xml:349 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -4812,7 +4885,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:345 +#: apt.conf.5.xml:356 msgid "" "It is possible to proxy FTP over HTTP by setting the " "<envar>ftp_proxy</envar> environment variable to a http url - see the " @@ -4822,7 +4895,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:350 +#: apt.conf.5.xml:361 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4832,18 +4905,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:357 sources.list.5.xml:132 +#: apt.conf.5.xml:368 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:363 +#: apt.conf.5.xml:374 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:358 +#: apt.conf.5.xml:369 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -4856,12 +4929,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:379 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:369 +#: apt.conf.5.xml:380 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -4869,12 +4942,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:385 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:380 +#: apt.conf.5.xml:391 #, no-wrap msgid "" "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> " @@ -4882,7 +4955,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:375 +#: apt.conf.5.xml:386 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4894,19 +4967,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:385 +#: apt.conf.5.xml:396 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:399 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:392 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4923,13 +4996,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:392 +#: apt.conf.5.xml:403 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:401 msgid "" "Note that at run time the " "<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be " @@ -4944,7 +5017,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:397 +#: apt.conf.5.xml:408 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@ -4954,12 +5027,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:403 +#: apt.conf.5.xml:414 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:404 +#: apt.conf.5.xml:415 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the " @@ -4972,13 +5045,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:431 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:421 msgid "" "The default list includes \"environment\" and " "\"en\". \"<literal>environment</literal>\" has a special meaning here: It " @@ -5001,7 +5074,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:217 +#: apt.conf.5.xml:228 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" " @@ -5009,12 +5082,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:438 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:429 +#: apt.conf.5.xml:440 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -5026,7 +5099,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:436 +#: apt.conf.5.xml:447 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -5039,7 +5112,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:445 +#: apt.conf.5.xml:456 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -5049,7 +5122,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:451 +#: apt.conf.5.xml:462 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -5057,7 +5130,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:455 +#: apt.conf.5.xml:466 msgid "" "Binary programs are pointed to by " "<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies " @@ -5069,7 +5142,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:463 +#: apt.conf.5.xml:474 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -5082,12 +5155,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:476 +#: apt.conf.5.xml:487 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:478 +#: apt.conf.5.xml:489 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -5095,12 +5168,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:482 +#: apt.conf.5.xml:493 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:483 +#: apt.conf.5.xml:494 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -5111,50 +5184,50 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:503 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:496 +#: apt.conf.5.xml:507 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:508 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:501 +#: apt.conf.5.xml:512 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:502 +#: apt.conf.5.xml:513 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:508 +#: apt.conf.5.xml:519 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:520 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:514 +#: apt.conf.5.xml:525 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -5162,17 +5235,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:520 +#: apt.conf.5.xml:531 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5181,12 +5254,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:537 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:527 +#: apt.conf.5.xml:538 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5196,7 +5269,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:533 +#: apt.conf.5.xml:544 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -5207,36 +5280,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:540 +#: apt.conf.5.xml:551 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:541 +#: apt.conf.5.xml:552 msgid "" "APT chdirs to this directory before invoking dpkg, the default is " "<filename>/</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:545 +#: apt.conf.5.xml:556 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:557 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:562 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:563 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@ -5251,7 +5324,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:567 +#: apt.conf.5.xml:578 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -5261,7 +5334,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:561 +#: apt.conf.5.xml:572 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -5275,12 +5348,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:573 +#: apt.conf.5.xml:584 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:574 +#: apt.conf.5.xml:585 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -5292,12 +5365,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:581 +#: apt.conf.5.xml:592 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:593 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -5314,12 +5387,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:592 +#: apt.conf.5.xml:603 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:593 +#: apt.conf.5.xml:604 msgid "" "If this option is set apt will call <command>dpkg --configure " "--pending</command> to let dpkg handle all required configurations and " @@ -5331,12 +5404,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:610 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:611 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -5346,12 +5419,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:616 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:617 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by " @@ -5363,12 +5436,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:624 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:632 #, no-wrap msgid "" "OrderList::Score {\n" @@ -5380,7 +5453,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:614 +#: apt.conf.5.xml:625 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -5394,12 +5467,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:634 +#: apt.conf.5.xml:645 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:635 +#: apt.conf.5.xml:646 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5408,12 +5481,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:643 +#: apt.conf.5.xml:654 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:645 +#: apt.conf.5.xml:656 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5424,7 +5497,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:667 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, " @@ -5432,7 +5505,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:664 +#: apt.conf.5.xml:675 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s " @@ -5440,7 +5513,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:684 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -5450,110 +5523,110 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:681 +#: apt.conf.5.xml:692 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:691 +#: apt.conf.5.xml:702 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:696 +#: apt.conf.5.xml:707 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:711 msgid "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:718 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:711 +#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:718 +#: apt.conf.5.xml:729 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:740 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:744 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:751 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:755 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:762 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:755 +#: apt.conf.5.xml:766 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:762 +#: apt.conf.5.xml:773 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:776 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:772 +#: apt.conf.5.xml:783 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:775 +#: apt.conf.5.xml:786 msgid "" "Output each cryptographic hash that is generated by the " "<literal>apt</literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:782 +#: apt.conf.5.xml:793 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:785 +#: apt.conf.5.xml:796 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -5561,92 +5634,92 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:804 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:796 +#: apt.conf.5.xml:807 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:815 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:819 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:826 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:818 +#: apt.conf.5.xml:829 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:825 +#: apt.conf.5.xml:836 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:839 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:836 +#: apt.conf.5.xml:847 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:840 +#: apt.conf.5.xml:851 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:847 +#: apt.conf.5.xml:858 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:862 msgid "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:873 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:869 +#: apt.conf.5.xml:880 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:872 +#: apt.conf.5.xml:883 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial " @@ -5656,12 +5729,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:883 +#: apt.conf.5.xml:894 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:886 +#: apt.conf.5.xml:897 msgid "" "Generate debug messages describing which package is marked as " "keep/install/remove while the ProblemResolver does his work. Each addition " @@ -5679,90 +5752,90 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:916 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:908 +#: apt.conf.5.xml:919 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:915 +#: apt.conf.5.xml:926 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:918 +#: apt.conf.5.xml:929 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:926 +#: apt.conf.5.xml:937 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:929 +#: apt.conf.5.xml:940 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:936 +#: apt.conf.5.xml:947 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:940 +#: apt.conf.5.xml:951 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:948 +#: apt.conf.5.xml:959 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:963 msgid "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:959 +#: apt.conf.5.xml:970 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:963 +#: apt.conf.5.xml:974 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:969 +#: apt.conf.5.xml:980 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:973 +#: apt.conf.5.xml:984 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:981 +#: apt.conf.5.xml:992 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:984 +#: apt.conf.5.xml:995 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5770,32 +5843,32 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:992 +#: apt.conf.5.xml:1003 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:996 +#: apt.conf.5.xml:1007 msgid "" "Print information about the vendors read from " "<filename>/etc/apt/vendors.list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1019 +#: apt.conf.5.xml:1030 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1026 +#: apt.conf.5.xml:1037 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1031 +#: apt.conf.5.xml:1042 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" @@ -5847,13 +5920,24 @@ msgid "" "choice of instance, only the choice of version." msgstr "" -#. type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 +msgid "" +"Note that the files in the <filename>/etc/apt/preferences.d</filename> " +"directory are parsed in alphanumeric ascending order and need to obey the " +"following naming convention: The files have no or " +"\"<literal>pref</literal>\" as filename extension and which only contain " +"alphanumeric, hyphen (-), underscore (_) and period (.) characters - " +"otherwise they will be silently ignored." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:63 msgid "APT's Default Priority Assignments" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:71 +#: apt_preferences.5.xml:78 #, no-wrap msgid "" "<command>apt-get install -t testing " @@ -5861,13 +5945,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:74 +#: apt_preferences.5.xml:81 #, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:58 +#: apt_preferences.5.xml:65 msgid "" "If there is no preferences file or if there is no entry in the file that " "applies to a particular version then the priority assigned to that version " @@ -5884,39 +5968,39 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:83 +#: apt_preferences.5.xml:90 msgid "priority 100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:84 +#: apt_preferences.5.xml:91 msgid "to the version that is already installed (if any)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:88 +#: apt_preferences.5.xml:95 msgid "priority 500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:89 +#: apt_preferences.5.xml:96 msgid "" "to the versions that are not installed and do not belong to the target " "release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:93 +#: apt_preferences.5.xml:100 msgid "priority 990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:94 +#: apt_preferences.5.xml:101 msgid "to the versions that are not installed and belong to the target release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:85 msgid "" "If the target release has been specified then APT uses the following " "algorithm to set the priorities of the versions of a package. Assign: " @@ -5924,7 +6008,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:99 +#: apt_preferences.5.xml:106 msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " @@ -5932,14 +6016,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:103 +#: apt_preferences.5.xml:110 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:106 +#: apt_preferences.5.xml:113 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -5949,19 +6033,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:112 +#: apt_preferences.5.xml:119 msgid "Install the highest priority version." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 +#: apt_preferences.5.xml:120 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:116 +#: apt_preferences.5.xml:123 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the " @@ -5969,7 +6053,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:122 +#: apt_preferences.5.xml:129 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@ -5980,7 +6064,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:136 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@ -5990,7 +6074,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:134 +#: apt_preferences.5.xml:141 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@ -6002,12 +6086,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:143 +#: apt_preferences.5.xml:150 msgid "The Effect of APT Preferences" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:145 +#: apt_preferences.5.xml:152 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -6016,7 +6100,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:151 +#: apt_preferences.5.xml:158 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@ -6026,7 +6110,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:165 #, no-wrap msgid "" "Package: perl\n" @@ -6035,7 +6119,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:164 +#: apt_preferences.5.xml:171 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@ -6045,7 +6129,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:170 +#: apt_preferences.5.xml:177 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@ -6053,7 +6137,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:175 +#: apt_preferences.5.xml:182 #, no-wrap msgid "" "Package: *\n" @@ -6062,7 +6146,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:180 +#: apt_preferences.5.xml:187 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " "This should not be confused with the Origin of a distribution as specified " @@ -6072,7 +6156,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:186 +#: apt_preferences.5.xml:193 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is " @@ -6080,7 +6164,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:190 +#: apt_preferences.5.xml:197 #, no-wrap msgid "" "Package: *\n" @@ -6089,7 +6173,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:195 +#: apt_preferences.5.xml:202 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is " @@ -6097,7 +6181,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:199 +#: apt_preferences.5.xml:206 #, no-wrap msgid "" "Package: *\n" @@ -6106,7 +6190,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:204 +#: apt_preferences.5.xml:211 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -6114,7 +6198,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:209 +#: apt_preferences.5.xml:216 #, no-wrap msgid "" "Package: *\n" @@ -6123,82 +6207,82 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:220 +#: apt_preferences.5.xml:227 msgid "How APT Interprets Priorities" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:228 +#: apt_preferences.5.xml:235 msgid "P > 1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:229 +#: apt_preferences.5.xml:236 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:233 +#: apt_preferences.5.xml:240 msgid "990 < P <=1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:234 +#: apt_preferences.5.xml:241 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:239 +#: apt_preferences.5.xml:246 msgid "500 < P <=990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:247 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:245 +#: apt_preferences.5.xml:252 msgid "100 < P <=500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:253 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:251 +#: apt_preferences.5.xml:258 msgid "0 < P <=100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:259 msgid "" "causes a version to be installed only if there is no installed version of " "the package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:256 +#: apt_preferences.5.xml:263 msgid "P < 0" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:257 +#: apt_preferences.5.xml:264 msgid "prevents the version from being installed" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:223 +#: apt_preferences.5.xml:230 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -6206,7 +6290,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:262 +#: apt_preferences.5.xml:269 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -6215,14 +6299,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:268 +#: apt_preferences.5.xml:275 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:272 +#: apt_preferences.5.xml:279 #, no-wrap msgid "" "Package: perl\n" @@ -6239,12 +6323,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:285 +#: apt_preferences.5.xml:292 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:287 +#: apt_preferences.5.xml:294 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -6254,7 +6338,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:299 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -6262,7 +6346,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:296 +#: apt_preferences.5.xml:303 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an " @@ -6271,12 +6355,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:313 msgid "Determination of Package Version and Distribution Properties" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:308 +#: apt_preferences.5.xml:315 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -6284,27 +6368,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:320 +#: apt_preferences.5.xml:327 msgid "the <literal>Package:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:321 +#: apt_preferences.5.xml:328 msgid "gives the package name" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:324 apt_preferences.5.xml:374 +#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 msgid "the <literal>Version:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:332 msgid "gives the version number for the named package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:312 +#: apt_preferences.5.xml:319 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>: " @@ -6316,12 +6400,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:341 +#: apt_preferences.5.xml:348 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:342 +#: apt_preferences.5.xml:349 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -6332,18 +6416,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:352 +#: apt_preferences.5.xml:359 #, no-wrap msgid "Pin: release a=stable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:365 msgid "the <literal>Codename:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:366 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: squeeze\" specifies that all of the " @@ -6354,13 +6438,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:368 +#: apt_preferences.5.xml:375 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:382 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -6371,7 +6455,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:384 +#: apt_preferences.5.xml:391 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -6380,12 +6464,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:393 +#: apt_preferences.5.xml:400 msgid "the <literal>Component:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:394 +#: apt_preferences.5.xml:401 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -6397,18 +6481,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:403 +#: apt_preferences.5.xml:410 #, no-wrap msgid "Pin: release c=main\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:409 +#: apt_preferences.5.xml:416 msgid "the <literal>Origin:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:410 +#: apt_preferences.5.xml:417 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is " @@ -6417,18 +6501,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:423 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:422 +#: apt_preferences.5.xml:429 msgid "the <literal>Label:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:423 +#: apt_preferences.5.xml:430 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is " @@ -6437,13 +6521,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:436 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:330 +#: apt_preferences.5.xml:337 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -6457,7 +6541,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:443 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -6472,12 +6556,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:449 +#: apt_preferences.5.xml:456 msgid "Optional Lines in an APT Preferences Record" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:451 +#: apt_preferences.5.xml:458 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -6485,7 +6569,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:455 +#: apt_preferences.5.xml:462 msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " "optional. If omitted, APT assigns a priority of 1 less than the last value " @@ -6494,12 +6578,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:464 +#: apt_preferences.5.xml:471 msgid "Tracking Stable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:472 +#: apt_preferences.5.xml:479 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -6514,7 +6598,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:466 +#: apt_preferences.5.xml:473 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -6524,7 +6608,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:489 apt_preferences.5.xml:535 apt_preferences.5.xml:593 +#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 apt_preferences.5.xml:600 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -6533,7 +6617,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:484 +#: apt_preferences.5.xml:491 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -6542,13 +6626,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:501 +#: apt_preferences.5.xml:508 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:495 +#: apt_preferences.5.xml:502 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -6557,12 +6641,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:507 +#: apt_preferences.5.xml:514 msgid "Tracking Testing or Unstable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:523 #, no-wrap msgid "" "Package: *\n" @@ -6579,7 +6663,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:509 +#: apt_preferences.5.xml:516 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -6590,7 +6674,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:530 +#: apt_preferences.5.xml:537 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -6599,13 +6683,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:550 +#: apt_preferences.5.xml:557 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:541 +#: apt_preferences.5.xml:548 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -6617,12 +6701,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:564 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:571 +#: apt_preferences.5.xml:578 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package " @@ -6644,7 +6728,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:559 +#: apt_preferences.5.xml:566 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -6659,7 +6743,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:588 +#: apt_preferences.5.xml:595 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -6668,13 +6752,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:608 +#: apt_preferences.5.xml:615 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:599 +#: apt_preferences.5.xml:606 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -6686,12 +6770,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:617 +#: apt_preferences.5.xml:624 msgid "&file-preferences;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:623 +#: apt_preferences.5.xml:630 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "" diff --git a/doc/po/de.po b/doc/po/de.po index 5212de908..f9d374a6d 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.7.24\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2010-01-11 15:12+0100\n" +"POT-Creation-Date: 2010-01-20 12:18+0100\n" "PO-Revision-Date: 2009-12-31 17:41+GMT\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -1074,7 +1074,7 @@ msgstr "" " </varlistentry>\n" #. type: Plain text -#: apt.ent:368 +#: apt.ent:369 #, fuzzy, no-wrap #| msgid "" #| " <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n" @@ -1096,6 +1096,42 @@ msgstr "" " </varlistentry>\n" "\">\n" +#. type: Plain text +#: apt.ent:371 +msgid "<!ENTITY translation-title \"TRANSLATION\">" +msgstr "<!ENTITY translation-title \"Übersetzung\">" + +#. type: Plain text +#: apt.ent:380 +#, no-wrap +msgid "" +"<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n" +" to the translation in the past, who is responsible now and maybe further information\n" +" specially related to your translation. -->\n" +"<!ENTITY translation-holder \"\n" +" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n" +" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n" +" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n" +"\">\n" +msgstr "" +"<!ENTITY translation-holder \"\n" +" Die deutsche Übersetzung wurde 2009 von Chris Leick <email>c.leick@vollbio.de</email> angefertigt\n" +" in Zusammenarbeit mit dem Debian German-l10n-Team <email>debian-l10n-german@lists.debian.org</email>.\n" +"\">\n" + +#. type: Plain text +#: apt.ent:387 +#, no-wrap +msgid "" +"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n" +" in a shipped manpage will maybe appear english parts. -->\n" +"<!ENTITY translation-english \"\n" +" Note that this translated document may contain untranslated parts.\n" +" This is done on purpose, to avoid losing content when the\n" +" translation is lagging behind the original content.\n" +"\">\n" +msgstr "" + #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 @@ -1715,7 +1751,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 #: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 -#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:491 apt.conf.5.xml:513 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 msgid "options" msgstr "Optionen" @@ -1958,7 +1994,7 @@ msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1024 apt_preferences.5.xml:615 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 msgid "Files" msgstr "Dateien" @@ -1971,7 +2007,7 @@ msgstr "&file-sourceslist; &file-statelists;" #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1030 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 #: sources.list.5.xml:233 msgid "See Also" msgstr "Siehe auch" @@ -3625,7 +3661,7 @@ msgstr "" "Dateien mit <command>apt-ftparchive</command> zu erstellen." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1018 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 #: sources.list.5.xml:193 msgid "Examples" msgstr "Beispiele" @@ -5645,11 +5681,17 @@ msgstr "" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt.conf.5.xml:13 +#, fuzzy +#| msgid "" +#| "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" +#| "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " +#| "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-" +#| "email; &apt-product; <date>18 September 2009</date>" msgid "" "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " -"&apt-product; <date>18 September 2009</date>" +"&apt-product; <date>16 January 2010</date>" msgstr "" "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" "firstname> <surname>Burrows</surname> <contrib>Erste Dokumentation von " @@ -5675,28 +5717,54 @@ msgstr "Konfigurationsdatei für APT" #: apt.conf.5.xml:40 msgid "" "<filename>apt.conf</filename> is the main configuration file for the APT " -"suite of tools, all tools make use of the configuration file and a common " -"command line parser to provide a uniform environment. When an APT tool " -"starts up it will read the configuration specified by the <envar>APT_CONFIG</" -"envar> environment variable (if any) and then read the files in " -"<literal>Dir::Etc::Parts</literal> then read the main configuration file " -"specified by <literal>Dir::Etc::main</literal> then finally apply the " -"command line options to override the configuration directives, possibly " -"loading even more config files." -msgstr "" -"<filename>apt.conf</filename> ist die Hauptkonfigurationsdatei für die APT-" -"Werkzeugsammlung. Alle Werkzeuge benutzen die Konfigurationsdatei und einen " -"gemeinsamen Befehlszeilenauswerter, um eine einheitliche Umgebung " -"bereitzustellen. Wenn ein APT-Werkzeug startet, liest es die in der " -"Umgebungsvariablen <envar>APT_CONFIG</envar> (falls vorhanden) angegebene " -"Konfiguration, dann die Dateien in <literal>Dir::Etc::Parts</literal>, dann " -"die durch <literal>Dir::Etc::main</literal> angegebene Konfigurationsdatei " -"und übernimmt am Ende die Befehlszeilenoptionen, um Konfigurationsdirektiven " -"zu überschreiben und möglicherweise sogar weitere Konfigurationsdateien zu " -"laden." +"suite of tools, but by far not the only place changes to options can be " +"made. All tools therefore share the configuration files and also use a " +"common command line parser to provide a uniform environment." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><para> +#: apt.conf.5.xml:45 +msgid "" +"When an APT tool starts up it will read the configuration files in the " +"following order:" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:47 +msgid "" +"the file specified by the <envar>APT_CONFIG</envar> environment variable (if " +"any)" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:49 +msgid "" +"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " +"order which have no or \"<literal>conf</literal>\" as filename extension and " +"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " +"characters - otherwise they will be silently ignored." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:54 +msgid "" +"the main configuration file specified by <literal>Dir::Etc::main</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:56 +msgid "" +"the command line options are applied to override the configuration " +"directives or to load even more configuration files." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:60 +msgid "Syntax" +msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:50 +#: apt.conf.5.xml:61 msgid "" "The configuration file is organized in a tree with options organized into " "functional groups. Option specification is given with a double colon " @@ -5711,7 +5779,7 @@ msgstr "" "das Werkzeug Get. Optionen werden nicht von ihren Elterngruppe geerbt." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:56 +#: apt.conf.5.xml:67 msgid "" "Syntactically the configuration language is modeled after what the ISC tools " "such as bind and dhcp use. Lines starting with <literal>//</literal> are " @@ -5740,7 +5808,7 @@ msgstr "" "geschweiften Klammern geöffnet werden, wie:" #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:70 +#: apt.conf.5.xml:81 #, no-wrap msgid "" "APT {\n" @@ -5758,7 +5826,7 @@ msgstr "" "};\n" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:78 +#: apt.conf.5.xml:89 msgid "" "with newlines placed to make it more readable. Lists can be created by " "opening a scope and including a single string enclosed in quotes followed by " @@ -5771,13 +5839,13 @@ msgstr "" "jeweils getrennt durch ein Semikolon." #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:83 +#: apt.conf.5.xml:94 #, no-wrap msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:86 +#: apt.conf.5.xml:97 msgid "" "In general the sample configuration file in <filename>&docdir;examples/apt." "conf</filename> &configureindex; is a good guide for how it should look." @@ -5787,7 +5855,7 @@ msgstr "" "aussehen könnte." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:90 +#: apt.conf.5.xml:101 msgid "" "The names of the configuration items are not case-sensitive. So in the " "previous example you could use <literal>dpkg::pre-install-pkgs</literal>." @@ -5797,7 +5865,7 @@ msgstr "" "<literal>dpkg::pre-install-pkgs</literal> benutzen." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:93 +#: apt.conf.5.xml:104 msgid "" "Names for the configuration items are optional if a list is defined as it " "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. " @@ -5813,7 +5881,7 @@ msgstr "" "überschreiben, indem Sie der Option erneut einen neuen Wert zuweisen." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:98 +#: apt.conf.5.xml:109 msgid "" "Two specials are allowed, <literal>#include</literal> (which is deprecated " "and not supported by alternative implementations) and <literal>#clear</" @@ -5833,7 +5901,7 @@ msgstr "" "(Beachten Sie, dass diese Zeilen auch mit einem Semikolon enden müssen.)" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:106 +#: apt.conf.5.xml:117 msgid "" "The #clear command is the only way to delete a list or a complete scope. " "Reopening a scope or the ::-style described below will <emphasis>not</" @@ -5849,7 +5917,7 @@ msgstr "" "überschrieben, sondern nur bereinigt werden." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:111 +#: apt.conf.5.xml:122 msgid "" "All of the APT tools take a -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " @@ -5868,7 +5936,7 @@ msgstr "" "Befehlszeile benutzt werden.)" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:118 +#: apt.conf.5.xml:129 msgid "" "Note that you can use :: only for appending one item per line to a list and " "that you should not use it in combination with the scope syntax. (The scope " @@ -5899,12 +5967,12 @@ msgstr "" "sich APT nicht explizit darüber beklagt." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:130 +#: apt.conf.5.xml:141 msgid "The APT Group" msgstr "Die APT-Gruppe" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:131 +#: apt.conf.5.xml:142 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." @@ -5913,12 +5981,12 @@ msgstr "" "wie es die Optionen für alle Werkzeuge enthält." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:135 +#: apt.conf.5.xml:146 msgid "Architecture" msgstr "Architecture" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:136 +#: apt.conf.5.xml:147 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@ -5929,12 +5997,12 @@ msgstr "" "die Architektur für die APT kompiliert wurde." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:141 +#: apt.conf.5.xml:152 msgid "Default-Release" msgstr "Default-Release" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:142 +#: apt.conf.5.xml:153 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -5947,12 +6015,12 @@ msgstr "" "auch &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:146 +#: apt.conf.5.xml:157 msgid "Ignore-Hold" msgstr "Ignore-Hold" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:147 +#: apt.conf.5.xml:158 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." @@ -5961,12 +6029,12 @@ msgstr "" "Problemlöser, gehaltene Pakete beim Treffen von Entscheidungen zu ignorieren." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:151 +#: apt.conf.5.xml:162 msgid "Clean-Installed" msgstr "Clean-Installed" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:152 +#: apt.conf.5.xml:163 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -5981,12 +6049,12 @@ msgstr "" "Möglichkeiten bereitstellt, um sie erneut zu installieren." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:158 +#: apt.conf.5.xml:169 msgid "Immediate-Configure" msgstr "Immediate-Configure" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:159 +#: apt.conf.5.xml:170 #, fuzzy #| msgid "" #| "Defaults to on which will cause APT to install essential and important " @@ -6084,12 +6152,12 @@ msgstr "" "Upgrade-Prozesses arbeiten kann." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:181 +#: apt.conf.5.xml:192 msgid "Force-LoopBreak" msgstr "Force-LoopBreak" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:182 +#: apt.conf.5.xml:193 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -6107,12 +6175,12 @@ msgstr "" "bash oder etwas, was davon abhängt, sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:190 +#: apt.conf.5.xml:201 msgid "Cache-Limit" msgstr "Cache-Limit" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:191 +#: apt.conf.5.xml:202 msgid "" "APT uses a fixed size memory mapped cache file to store the 'available' " "information. This sets the size of that cache (in bytes)." @@ -6122,24 +6190,24 @@ msgstr "" "(in Bytes)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:195 +#: apt.conf.5.xml:206 msgid "Build-Essential" msgstr "Build-Essential" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:196 +#: apt.conf.5.xml:207 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" "Definiert, welche(s) Paket(e) als essentielle Bauabhängigkeiten betrachtet " "werde." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:210 msgid "Get" msgstr "Get" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:200 +#: apt.conf.5.xml:211 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." @@ -6149,12 +6217,12 @@ msgstr "" "erhalten." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:204 +#: apt.conf.5.xml:215 msgid "Cache" msgstr "Cache" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:205 +#: apt.conf.5.xml:216 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." @@ -6164,12 +6232,12 @@ msgstr "" "erhalten." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:209 +#: apt.conf.5.xml:220 msgid "CDROM" msgstr "CD-ROM" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:210 +#: apt.conf.5.xml:221 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." @@ -6179,17 +6247,17 @@ msgstr "" "erhalten." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:227 msgid "The Acquire Group" msgstr "Die Erwerbgruppe" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:221 +#: apt.conf.5.xml:232 msgid "PDiffs" msgstr "PDiffs" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:222 +#: apt.conf.5.xml:233 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." @@ -6199,7 +6267,7 @@ msgstr "" "True." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:225 +#: apt.conf.5.xml:236 msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " @@ -6210,12 +6278,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:234 +#: apt.conf.5.xml:245 msgid "Queue-Mode" msgstr "Queue-Mode" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:246 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -6231,12 +6299,12 @@ msgstr "" "URI-Art geöffnet wird." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:242 +#: apt.conf.5.xml:253 msgid "Retries" msgstr "Retries" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:243 +#: apt.conf.5.xml:254 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -6245,12 +6313,12 @@ msgstr "" "APT fehlgeschlagene Dateien in der angegebenen Zahl erneut versuchen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:247 +#: apt.conf.5.xml:258 msgid "Source-Symlinks" msgstr "Source-Symlinks" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:248 +#: apt.conf.5.xml:259 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." @@ -6260,12 +6328,12 @@ msgstr "" "kopiert zu werden. True ist die Vorgabe." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:252 sources.list.5.xml:139 +#: apt.conf.5.xml:263 sources.list.5.xml:139 msgid "http" msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:253 +#: apt.conf.5.xml:264 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -6283,7 +6351,7 @@ msgstr "" "die Umgebungsvariable <envar>http_proxy</envar> benutzt." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:261 +#: apt.conf.5.xml:272 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -6309,7 +6377,7 @@ msgstr "" "unterstützt keine dieser Optionen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:271 apt.conf.5.xml:335 +#: apt.conf.5.xml:282 apt.conf.5.xml:346 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -6320,7 +6388,7 @@ msgstr "" "Dinge, einschließlich Verbindungs- und Datenzeitüberschreitungen, angewandt." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:274 +#: apt.conf.5.xml:285 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@ -6340,7 +6408,7 @@ msgstr "" "gegen RFC 2068." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:282 +#: apt.conf.5.xml:293 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -6356,7 +6424,7 @@ msgstr "" "deaktiviert.)" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:287 +#: apt.conf.5.xml:298 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -6368,12 +6436,12 @@ msgstr "" "bekannten Bezeichner verwendet." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:293 +#: apt.conf.5.xml:304 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:305 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -6388,7 +6456,7 @@ msgstr "" "<literal>Pipeline-Depth</literal> wird noch nicht unterstützt." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:300 +#: apt.conf.5.xml:311 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -6427,12 +6495,12 @@ msgstr "" "SslForceVersion</literal> ist die entsprechende per-Host-Option." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:318 sources.list.5.xml:150 +#: apt.conf.5.xml:329 sources.list.5.xml:150 msgid "ftp" msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:319 +#: apt.conf.5.xml:330 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -6467,7 +6535,7 @@ msgstr "" "entsprechenden URI-Bestandteil genommen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:338 +#: apt.conf.5.xml:349 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -6484,7 +6552,7 @@ msgstr "" "Beispielskonfiguration, um Beispiele zu erhalten)." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:345 +#: apt.conf.5.xml:356 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -6498,7 +6566,7 @@ msgstr "" "Effizienz nicht empfohlen FTP über HTTP zu benutzen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:350 +#: apt.conf.5.xml:361 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -6514,18 +6582,18 @@ msgstr "" "Server RFC2428 unterstützen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:357 sources.list.5.xml:132 +#: apt.conf.5.xml:368 sources.list.5.xml:132 msgid "cdrom" msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:363 +#: apt.conf.5.xml:374 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"foo\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:358 +#: apt.conf.5.xml:369 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -6547,12 +6615,12 @@ msgstr "" "können per UMount angegeben werden." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:379 msgid "gpgv" msgstr "gpgv" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:369 +#: apt.conf.5.xml:380 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -6563,18 +6631,18 @@ msgstr "" "Zusätzliche Parameter werden an gpgv weitergeleitet." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:385 msgid "CompressionTypes" msgstr "CompressionTypes" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:380 +#: apt.conf.5.xml:391 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>Dateierweiterung</replaceable> \"<replaceable>Methodenname</replaceable>\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:375 +#: apt.conf.5.xml:386 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -6594,19 +6662,19 @@ msgstr "" "\"synopsis\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:385 +#: apt.conf.5.xml:396 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:399 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:392 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -6637,13 +6705,13 @@ msgstr "" "explizit zur Liste hinzuzufügen, da es automatisch hinzufügt wird." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:392 +#: apt.conf.5.xml:403 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:401 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -6669,7 +6737,7 @@ msgstr "" "diesen Typ nur vor die Liste setzen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:397 +#: apt.conf.5.xml:408 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@ -6686,12 +6754,12 @@ msgstr "" "unterstützen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:403 +#: apt.conf.5.xml:414 msgid "Languages" msgstr "Sprachen" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:404 +#: apt.conf.5.xml:415 #, fuzzy #| msgid "" #| "The Languages subsection controls which <filename>Translation</filename> " @@ -6723,13 +6791,13 @@ msgstr "" "hier unmögliche Werte einsetzen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:431 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:421 #, fuzzy #| msgid "" #| "The default list includes \"environment\" and \"en\". " @@ -6791,7 +6859,7 @@ msgstr "" "Reihenfolge »fr, de, en«. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:217 +#: apt.conf.5.xml:228 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" @@ -6801,12 +6869,12 @@ msgstr "" "id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:438 msgid "Directories" msgstr "Verzeichnisse" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:429 +#: apt.conf.5.xml:440 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -6826,7 +6894,7 @@ msgstr "" "filename> oder <filename>./</filename> beginnen." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:436 +#: apt.conf.5.xml:447 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -6849,7 +6917,7 @@ msgstr "" "<literal>Dir::Cache</literal> enthalten." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:445 +#: apt.conf.5.xml:456 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -6864,7 +6932,7 @@ msgstr "" "Konfigurationsdatei erfolgt)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:451 +#: apt.conf.5.xml:462 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -6876,7 +6944,7 @@ msgstr "" "geladen." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:455 +#: apt.conf.5.xml:466 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -6894,7 +6962,7 @@ msgstr "" "Programms an." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:463 +#: apt.conf.5.xml:474 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -6914,12 +6982,12 @@ msgstr "" "<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:476 +#: apt.conf.5.xml:487 msgid "APT in DSelect" msgstr "APT in DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:478 +#: apt.conf.5.xml:489 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -6930,12 +6998,12 @@ msgstr "" "<literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:482 +#: apt.conf.5.xml:493 msgid "Clean" msgstr "Clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:483 +#: apt.conf.5.xml:494 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -6953,7 +7021,7 @@ msgstr "" "vor dem Herunterladen neuer Pakete durch." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:503 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@ -6962,12 +7030,12 @@ msgstr "" "übermittelt, wenn es für die Installationsphase durchlaufen wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:496 +#: apt.conf.5.xml:507 msgid "Updateoptions" msgstr "Updateoptions" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:508 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@ -6976,12 +7044,12 @@ msgstr "" "übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:501 +#: apt.conf.5.xml:512 msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:502 +#: apt.conf.5.xml:513 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -6990,12 +7058,12 @@ msgstr "" "nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:508 +#: apt.conf.5.xml:519 msgid "How APT calls dpkg" msgstr "Wie APT Dpkg aufruft" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:520 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -7004,7 +7072,7 @@ msgstr "" "stehen im Abschnitt <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:514 +#: apt.conf.5.xml:525 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -7015,17 +7083,17 @@ msgstr "" "jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 msgid "Post-Invoke" msgstr "Post-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:520 +#: apt.conf.5.xml:531 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -7039,12 +7107,12 @@ msgstr "" "APT abgebrochen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:537 msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:527 +#: apt.conf.5.xml:538 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -7061,7 +7129,7 @@ msgstr "" "pro Zeile." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:533 +#: apt.conf.5.xml:544 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -7077,12 +7145,12 @@ msgstr "" "literal> gegeben wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:540 +#: apt.conf.5.xml:551 msgid "Run-Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:541 +#: apt.conf.5.xml:552 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@ -7091,12 +7159,12 @@ msgstr "" "die Vorgabe ist <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:545 +#: apt.conf.5.xml:556 msgid "Build-options" msgstr "Build-options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:557 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@ -7106,12 +7174,12 @@ msgstr "" "Programme werden erstellt." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:562 msgid "dpkg trigger usage (and related options)" msgstr "Dpkd-Trigger-Benutzung (und zugehöriger Optionen)" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:563 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@ -7137,7 +7205,7 @@ msgstr "" "Status 100% stehen, während es aktuell alle Pakete konfiguriert." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:567 +#: apt.conf.5.xml:578 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -7151,7 +7219,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:561 +#: apt.conf.5.xml:572 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -7176,12 +7244,12 @@ msgstr "" "wäre <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:573 +#: apt.conf.5.xml:584 msgid "DPkg::NoTriggers" msgstr "DPkg::NoTriggers" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:574 +#: apt.conf.5.xml:585 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -7202,12 +7270,12 @@ msgstr "" "außerdem an die »unpack«- und »remove«-Aufrufe anhängen." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:581 +#: apt.conf.5.xml:592 msgid "PackageManager::Configure" msgstr "PackageManager::Configure" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:593 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -7236,12 +7304,12 @@ msgstr "" "mehr startbar sein könnte." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:592 +#: apt.conf.5.xml:603 msgid "DPkg::ConfigurePending" msgstr "DPkg::ConfigurePending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:593 +#: apt.conf.5.xml:604 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -7260,12 +7328,12 @@ msgstr "" "deaktivieren." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:610 msgid "DPkg::TriggersPending" msgstr "DPkg::TriggersPending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:611 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -7281,12 +7349,12 @@ msgstr "" "benötigt werden." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:616 msgid "PackageManager::UnpackAll" msgstr "PackageManager::UnpackAll" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:617 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -7305,12 +7373,12 @@ msgstr "" "und weitere Verbesserungen benötigt, bevor sie wirklich nützlich wird." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:624 msgid "OrderList::Score::Immediate" msgstr "OrderList::Score::Immediate" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:632 #, no-wrap msgid "" "OrderList::Score {\n" @@ -7328,7 +7396,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:614 +#: apt.conf.5.xml:625 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -7352,12 +7420,12 @@ msgstr "" "mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:634 +#: apt.conf.5.xml:645 msgid "Periodic and Archives options" msgstr "Periodische- und Archivoptionen" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:635 +#: apt.conf.5.xml:646 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -7371,12 +7439,12 @@ msgstr "" "Dokumentation dieser Optionen zu erhalten." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:643 +#: apt.conf.5.xml:654 msgid "Debug options" msgstr "Fehlersuchoptionen" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:645 +#: apt.conf.5.xml:656 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -7394,7 +7462,7 @@ msgstr "" "könnten es sein:" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:667 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -7405,7 +7473,7 @@ msgstr "" "getroffenen Entscheidungen ein." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:664 +#: apt.conf.5.xml:675 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -7416,7 +7484,7 @@ msgstr "" "<literal>apt-get -s install</literal>) als nicht root-Anwender auszuführen." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:684 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -7428,7 +7496,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:681 +#: apt.conf.5.xml:692 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." @@ -7437,17 +7505,17 @@ msgstr "" "Daten in CD-ROM-IDs aus." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:691 +#: apt.conf.5.xml:702 msgid "A full list of debugging options to apt follows." msgstr "Eine vollständige Liste der Fehlersuchoptionen von APT folgt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:696 +#: apt.conf.5.xml:707 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:711 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@ -7455,48 +7523,48 @@ msgstr "" "literal>-Quellen beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:718 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:711 +#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using FTP." msgstr "" "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per FTP " "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:718 +#: apt.conf.5.xml:729 msgid "<literal>Debug::Acquire::http</literal>" msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTP." msgstr "" "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTP " "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:740 msgid "<literal>Debug::Acquire::https</literal>" msgstr "<literal>Debug::Acquire::https</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:744 msgid "Print information related to downloading packages using HTTPS." msgstr "" "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTPS " "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:751 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "<literal>Debug::Acquire::gpgv</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:755 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -7505,12 +7573,12 @@ msgstr "" "mittels <literal>gpg</literal> beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:762 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:755 +#: apt.conf.5.xml:766 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -7519,23 +7587,23 @@ msgstr "" "CD-ROMs gespeichert sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:762 +#: apt.conf.5.xml:773 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:776 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" "Beschreibt den Prozess der Auflösung von Bauabhängigkeiten in &apt-get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:772 +#: apt.conf.5.xml:783 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:775 +#: apt.conf.5.xml:786 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -7544,12 +7612,12 @@ msgstr "" "Bibliotheken generiert wurde." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:782 +#: apt.conf.5.xml:793 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:785 +#: apt.conf.5.xml:796 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -7560,12 +7628,12 @@ msgstr "" "ID für eine CD-ROM generiert wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:804 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:796 +#: apt.conf.5.xml:807 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." @@ -7575,24 +7643,24 @@ msgstr "" "gleichen Zeit laufen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:815 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:819 msgid "Log when items are added to or removed from the global download queue." msgstr "" "Protokollieren, wenn Elemente aus der globalen Warteschlange zum " "Herunterladen hinzugefügt oder entfernt werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:826 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "<literal>Debug::pkgAcquire::Auth</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:818 +#: apt.conf.5.xml:829 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -7601,12 +7669,12 @@ msgstr "" "und kryptografischen Signaturen von heruntergeladenen Dateien beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:825 +#: apt.conf.5.xml:836 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:839 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -7615,12 +7683,12 @@ msgstr "" "und Fehler, die die Paketindexlisten-Diffs betreffen, ausgeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:836 +#: apt.conf.5.xml:847 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "<literal>Debug::pkgAcquire::RRed</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:840 +#: apt.conf.5.xml:851 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -7630,12 +7698,12 @@ msgstr "" "werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:847 +#: apt.conf.5.xml:858 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:862 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@ -7643,12 +7711,12 @@ msgstr "" "durchführen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:873 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -7658,12 +7726,12 @@ msgstr "" "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:869 +#: apt.conf.5.xml:880 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:872 +#: apt.conf.5.xml:883 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7679,12 +7747,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:883 +#: apt.conf.5.xml:894 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "<literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:886 +#: apt.conf.5.xml:897 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7716,23 +7784,23 @@ msgstr "" "erscheint." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:916 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:908 +#: apt.conf.5.xml:919 msgid "Dump the default configuration to standard error on startup." msgstr "" "Die Vorgabekonfiguration beim Start auf der Standardfehlerausgabe ausgeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:915 +#: apt.conf.5.xml:926 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:918 +#: apt.conf.5.xml:929 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -7742,12 +7810,12 @@ msgstr "" "sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:926 +#: apt.conf.5.xml:937 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:929 +#: apt.conf.5.xml:940 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -7756,12 +7824,12 @@ msgstr "" "alle während deren Auswertung gefundenen Fehler ausgeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:936 +#: apt.conf.5.xml:947 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:940 +#: apt.conf.5.xml:951 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -7771,12 +7839,12 @@ msgstr "" "soll." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:948 +#: apt.conf.5.xml:959 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:963 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" @@ -7784,22 +7852,22 @@ msgstr "" "von &dpkg; ausgeführt werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:959 +#: apt.conf.5.xml:970 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:963 +#: apt.conf.5.xml:974 msgid "Output the priority of each package list on startup." msgstr "Die Priorität jeder Paketliste beim Start ausgeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:969 +#: apt.conf.5.xml:980 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:973 +#: apt.conf.5.xml:984 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -7809,12 +7877,12 @@ msgstr "" "aufgetreten ist)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:981 +#: apt.conf.5.xml:992 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:984 +#: apt.conf.5.xml:995 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -7826,12 +7894,12 @@ msgstr "" "beschrieben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:992 +#: apt.conf.5.xml:1003 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:996 +#: apt.conf.5.xml:1007 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7840,7 +7908,7 @@ msgstr "" "gelesenen Anbieter ausgeben." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1019 +#: apt.conf.5.xml:1030 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7849,13 +7917,13 @@ msgstr "" "möglichen Optionen zeigen." #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1026 +#: apt.conf.5.xml:1037 msgid "&file-aptconf;" msgstr "&file-aptconf;" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1031 +#: apt.conf.5.xml:1042 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@ -7926,25 +7994,36 @@ msgstr "" "APT-Einstellungsdatei beeinflusst die Wahl der Instanz nicht, nur die Wahl " "der Version." -#. type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 +msgid "" +"Note that the files in the <filename>/etc/apt/preferences.d</filename> " +"directory are parsed in alphanumeric ascending order and need to obey the " +"following naming convention: The files have no or \"<literal>pref</literal>" +"\" as filename extension and which only contain alphanumeric, hyphen (-), " +"underscore (_) and period (.) characters - otherwise they will be silently " +"ignored." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:63 msgid "APT's Default Priority Assignments" msgstr "APTs Standardprioritätszuweisungen" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:71 +#: apt_preferences.5.xml:78 #, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "<command>apt-get install -t testing <replaceable>irgendein_Paket</replaceable></command>\n" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:74 +#: apt_preferences.5.xml:81 #, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "APT::Default-Release \"stable\";\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:58 +#: apt_preferences.5.xml:65 msgid "" "If there is no preferences file or if there is no entry in the file that " "applies to a particular version then the priority assigned to that version " @@ -7972,22 +8051,22 @@ msgstr "" "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:83 +#: apt_preferences.5.xml:90 msgid "priority 100" msgstr "Priorität 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:84 +#: apt_preferences.5.xml:91 msgid "to the version that is already installed (if any)." msgstr "zu der Version, die bereits installiert ist (wenn vorhanden)." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:88 +#: apt_preferences.5.xml:95 msgid "priority 500" msgstr "Priorität 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:89 +#: apt_preferences.5.xml:96 msgid "" "to the versions that are not installed and do not belong to the target " "release." @@ -7996,19 +8075,19 @@ msgstr "" "gehören." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:93 +#: apt_preferences.5.xml:100 msgid "priority 990" msgstr "Priorität 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:94 +#: apt_preferences.5.xml:101 msgid "" "to the versions that are not installed and belong to the target release." msgstr "" "zu den Versionen, die nicht installiert sind und zum Ziel-Release gehören." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:85 msgid "" "If the target release has been specified then APT uses the following " "algorithm to set the priorities of the versions of a package. Assign: " @@ -8019,7 +8098,7 @@ msgstr "" "Zuweisung: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:99 +#: apt_preferences.5.xml:106 msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " @@ -8030,7 +8109,7 @@ msgstr "" "installierten Paketversionen eine Priorität von 500 zu." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:103 +#: apt_preferences.5.xml:110 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." @@ -8040,7 +8119,7 @@ msgstr "" "ist." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:106 +#: apt_preferences.5.xml:113 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -8056,12 +8135,12 @@ msgstr "" "Downgrading eines Paketes riskant sein kann.)" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:112 +#: apt_preferences.5.xml:119 msgid "Install the highest priority version." msgstr "Die Version mit der höchsten Priorität installieren." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 +#: apt_preferences.5.xml:120 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." @@ -8070,7 +8149,7 @@ msgstr "" "aktuellste installiert (das ist die mit der höheren Versionsnummer)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:116 +#: apt_preferences.5.xml:123 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@ -8082,7 +8161,7 @@ msgstr "" "installierte installiert." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:122 +#: apt_preferences.5.xml:129 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@ -8098,7 +8177,7 @@ msgstr "" "upgrade</command> ausgeführt wird." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:136 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@ -8112,7 +8191,7 @@ msgstr "" "upgrade</command> ausgeführt wird." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:134 +#: apt_preferences.5.xml:141 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@ -8132,12 +8211,12 @@ msgstr "" "hat." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:143 +#: apt_preferences.5.xml:150 msgid "The Effect of APT Preferences" msgstr "Die Auswirkungen von APT-Einstellungen" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:145 +#: apt_preferences.5.xml:152 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -8151,7 +8230,7 @@ msgstr "" "allgemeine Gestalt." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:151 +#: apt_preferences.5.xml:158 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@ -8167,7 +8246,7 @@ msgstr "" "können durch Leerzeichen getrennt werden." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:165 #, no-wrap msgid "" "Package: perl\n" @@ -8179,7 +8258,7 @@ msgstr "" "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:164 +#: apt_preferences.5.xml:171 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@ -8194,7 +8273,7 @@ msgstr "" "ausgebildeten Domänennamen identifiziert wird, eine Priorität zu." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:170 +#: apt_preferences.5.xml:177 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@ -8205,7 +8284,7 @@ msgstr "" "Paketversionen eine hohe Priorität zu, die lokal liegen." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:175 +#: apt_preferences.5.xml:182 #, no-wrap msgid "" "Package: *\n" @@ -8217,7 +8296,7 @@ msgstr "" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:180 +#: apt_preferences.5.xml:187 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " "This should not be confused with the Origin of a distribution as specified " @@ -8233,7 +8312,7 @@ msgstr "" "wie »Debian« oder »Ximian«." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:186 +#: apt_preferences.5.xml:193 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -8244,7 +8323,7 @@ msgstr "" "Priorität zu." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:190 +#: apt_preferences.5.xml:197 #, no-wrap msgid "" "Package: *\n" @@ -8256,7 +8335,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:195 +#: apt_preferences.5.xml:202 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>squeeze</literal>" @@ -8267,7 +8346,7 @@ msgstr "" "zu." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:199 +#: apt_preferences.5.xml:206 #, no-wrap msgid "" "Package: *\n" @@ -8279,7 +8358,7 @@ msgstr "" "Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:204 +#: apt_preferences.5.xml:211 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -8290,7 +8369,7 @@ msgstr "" "Nummer »<literal>3.0</literal>« ist, eine hohe Priorität zu." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:209 +#: apt_preferences.5.xml:216 #, no-wrap msgid "" "Package: *\n" @@ -8302,17 +8381,17 @@ msgstr "" "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:220 +#: apt_preferences.5.xml:227 msgid "How APT Interprets Priorities" msgstr "Wie APT Prioritäten interpretiert" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:228 +#: apt_preferences.5.xml:235 msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:229 +#: apt_preferences.5.xml:236 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@ -8321,12 +8400,12 @@ msgstr "" "des Pakets durchführt" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:233 +#: apt_preferences.5.xml:240 msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:234 +#: apt_preferences.5.xml:241 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@ -8335,12 +8414,12 @@ msgstr "" "Ziel-Release kommt, außer wenn die installierte Version aktueller ist" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:239 +#: apt_preferences.5.xml:246 msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:247 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" @@ -8350,12 +8429,12 @@ msgstr "" "neuer ist" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:245 +#: apt_preferences.5.xml:252 msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:253 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" @@ -8365,12 +8444,12 @@ msgstr "" "installierte Version neuer ist" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:251 +#: apt_preferences.5.xml:258 msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:259 msgid "" "causes a version to be installed only if there is no installed version of " "the package" @@ -8379,17 +8458,17 @@ msgstr "" "installierte Version des Pakets gibt" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:256 +#: apt_preferences.5.xml:263 msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:257 +#: apt_preferences.5.xml:264 msgid "prevents the version from being installed" msgstr "verhindert das Installieren der Version" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:223 +#: apt_preferences.5.xml:230 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -8400,7 +8479,7 @@ msgstr "" "(grob gesagt): <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:262 +#: apt_preferences.5.xml:269 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -8414,7 +8493,7 @@ msgstr "" "erste dieser Datensätze die Priorität der Paketversion fest." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:268 +#: apt_preferences.5.xml:275 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@ -8423,7 +8502,7 @@ msgstr "" "bereits gezeigten Datensätze:" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:272 +#: apt_preferences.5.xml:279 #, no-wrap msgid "" "Package: perl\n" @@ -8451,12 +8530,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:285 +#: apt_preferences.5.xml:292 msgid "Then:" msgstr "Dann:" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:287 +#: apt_preferences.5.xml:294 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -8471,7 +8550,7 @@ msgstr "" "dann wird von <literal>perl</literal> ein Downgrade durchgeführt." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:299 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -8482,7 +8561,7 @@ msgstr "" "sogar wenn diese Versionen zum Ziel-Release gehören." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:296 +#: apt_preferences.5.xml:303 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -8496,12 +8575,12 @@ msgstr "" "Pakets installiert ist." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:313 msgid "Determination of Package Version and Distribution Properties" msgstr "Festlegung von Paketversion und Distributions-Eigenschaften" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:308 +#: apt_preferences.5.xml:315 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -8512,27 +8591,27 @@ msgstr "" "bereitstellen, um die an diesem Ort verfügbaren Pakete zu beschreiben." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:320 +#: apt_preferences.5.xml:327 msgid "the <literal>Package:</literal> line" msgstr "die <literal>Package:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:321 +#: apt_preferences.5.xml:328 msgid "gives the package name" msgstr "gibt den Paketnamen an" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:324 apt_preferences.5.xml:374 +#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 msgid "the <literal>Version:</literal> line" msgstr "die <literal>Version:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:332 msgid "gives the version number for the named package" msgstr "gibt die Versionsnummer für das genannte Paket an" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:312 +#: apt_preferences.5.xml:319 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -8553,12 +8632,12 @@ msgstr "" "Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:341 +#: apt_preferences.5.xml:348 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:342 +#: apt_preferences.5.xml:349 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -8575,18 +8654,18 @@ msgstr "" "folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:352 +#: apt_preferences.5.xml:359 #, no-wrap msgid "Pin: release a=stable\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:365 msgid "the <literal>Codename:</literal> line" msgstr "die <literal>Codename:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:366 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: squeeze\" specifies that all of the " @@ -8602,13 +8681,13 @@ msgstr "" "die folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:368 +#: apt_preferences.5.xml:375 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "Pin: release n=squeeze\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:382 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -8624,7 +8703,7 @@ msgstr "" "eine der folgenden Zeilen benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:384 +#: apt_preferences.5.xml:391 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -8636,12 +8715,12 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:393 +#: apt_preferences.5.xml:400 msgid "the <literal>Component:</literal> line" msgstr "die <literal>Component:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:394 +#: apt_preferences.5.xml:401 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -8659,18 +8738,18 @@ msgstr "" "Zeilen benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:403 +#: apt_preferences.5.xml:410 #, no-wrap msgid "Pin: release c=main\n" msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:409 +#: apt_preferences.5.xml:416 msgid "the <literal>Origin:</literal> line" msgstr "die <literal>Origin:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:410 +#: apt_preferences.5.xml:417 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8682,18 +8761,18 @@ msgstr "" "in der APT-Einstellungsdatei anzugeben würde die folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:423 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:422 +#: apt_preferences.5.xml:429 msgid "the <literal>Label:</literal> line" msgstr "die <literal>Label:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:423 +#: apt_preferences.5.xml:430 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8706,13 +8785,13 @@ msgstr "" "die folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:436 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:330 +#: apt_preferences.5.xml:337 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -8734,7 +8813,7 @@ msgstr "" "relevant: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:443 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -8760,12 +8839,12 @@ msgstr "" "Distribution heruntergeladen wurde." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:449 +#: apt_preferences.5.xml:456 msgid "Optional Lines in an APT Preferences Record" msgstr "Optionale Zeilen in einem APT-Einstellungsdatensatz" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:451 +#: apt_preferences.5.xml:458 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -8776,7 +8855,7 @@ msgstr "" "anfangen. Dieses stellt einen Platz für Kommentare bereit." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:455 +#: apt_preferences.5.xml:462 msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " "optional. If omitted, APT assigns a priority of 1 less than the last value " @@ -8790,12 +8869,12 @@ msgstr "" "anfängt." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:464 +#: apt_preferences.5.xml:471 msgid "Tracking Stable" msgstr "Stable verfolgen" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:472 +#: apt_preferences.5.xml:479 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -8819,7 +8898,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:466 +#: apt_preferences.5.xml:473 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8834,8 +8913,8 @@ msgstr "" "Distribution gehören. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:489 apt_preferences.5.xml:535 -#: apt_preferences.5.xml:593 +#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 +#: apt_preferences.5.xml:600 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -8847,7 +8926,7 @@ msgstr "" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:484 +#: apt_preferences.5.xml:491 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8860,13 +8939,13 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:501 +#: apt_preferences.5.xml:508 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "apt-get install <replaceable>Paket</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:495 +#: apt_preferences.5.xml:502 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -8880,12 +8959,12 @@ msgstr "" "\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:507 +#: apt_preferences.5.xml:514 msgid "Tracking Testing or Unstable" msgstr "Testing oder Unstable verfolgen" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:523 #, no-wrap msgid "" "Package: *\n" @@ -8913,7 +8992,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:509 +#: apt_preferences.5.xml:516 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -8930,7 +9009,7 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:530 +#: apt_preferences.5.xml:537 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8943,13 +9022,13 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:550 +#: apt_preferences.5.xml:557 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "apt-get install <replaceable>Paket</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:541 +#: apt_preferences.5.xml:548 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -8969,12 +9048,12 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:564 msgid "Tracking the evolution of a codename release" msgstr "Die Entwicklung eines Codename-Releases verfolgen" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:571 +#: apt_preferences.5.xml:578 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -9008,7 +9087,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:559 +#: apt_preferences.5.xml:566 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -9034,7 +9113,7 @@ msgstr "" "benutzen. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:588 +#: apt_preferences.5.xml:595 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -9047,13 +9126,13 @@ msgstr "" "durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:608 +#: apt_preferences.5.xml:615 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "apt-get install <replaceable>Paket</replaceable>/sid\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:599 +#: apt_preferences.5.xml:606 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -9073,12 +9152,12 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:617 +#: apt_preferences.5.xml:624 msgid "&file-preferences;" msgstr "&file-preferences;" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:623 +#: apt_preferences.5.xml:630 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -11187,6 +11266,28 @@ msgstr " # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade" msgid "Which will use the already fetched archives on the disc." msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen." +#~ msgid "" +#~ "<filename>apt.conf</filename> is the main configuration file for the APT " +#~ "suite of tools, all tools make use of the configuration file and a common " +#~ "command line parser to provide a uniform environment. When an APT tool " +#~ "starts up it will read the configuration specified by the " +#~ "<envar>APT_CONFIG</envar> environment variable (if any) and then read the " +#~ "files in <literal>Dir::Etc::Parts</literal> then read the main " +#~ "configuration file specified by <literal>Dir::Etc::main</literal> then " +#~ "finally apply the command line options to override the configuration " +#~ "directives, possibly loading even more config files." +#~ msgstr "" +#~ "<filename>apt.conf</filename> ist die Hauptkonfigurationsdatei für die " +#~ "APT-Werkzeugsammlung. Alle Werkzeuge benutzen die Konfigurationsdatei und " +#~ "einen gemeinsamen Befehlszeilenauswerter, um eine einheitliche Umgebung " +#~ "bereitzustellen. Wenn ein APT-Werkzeug startet, liest es die in der " +#~ "Umgebungsvariablen <envar>APT_CONFIG</envar> (falls vorhanden) angegebene " +#~ "Konfiguration, dann die Dateien in <literal>Dir::Etc::Parts</literal>, " +#~ "dann die durch <literal>Dir::Etc::main</literal> angegebene " +#~ "Konfigurationsdatei und übernimmt am Ende die Befehlszeilenoptionen, um " +#~ "Konfigurationsdirektiven zu überschreiben und möglicherweise sogar " +#~ "weitere Konfigurationsdateien zu laden." + #~ msgid "<filename>/etc/apt/trusted.gpg</filename>" #~ msgstr "<filename>/etc/apt/trusted.gpg</filename>" diff --git a/doc/po/es.po b/doc/po/es.po index c44bb7853..533978695 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" -"POT-Creation-Date: 2010-01-11 15:12+0100\n" +"POT-Creation-Date: 2010-01-20 12:18+0100\n" "PO-Revision-Date: 2004-09-20 17:05+0000\n" "Last-Translator: Rubén Porras Campo <nahoo@inicia.es>\n" "Language-Team: <debian-l10n-spanish@lists.debian.org>\n" @@ -835,7 +835,7 @@ msgstr "" "Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: <literal>Dir::State::Lists</literal>." #. type: Plain text -#: apt.ent:368 +#: apt.ent:369 #, fuzzy, no-wrap msgid "" " <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n" @@ -858,6 +858,46 @@ msgstr "" "#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" "Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (Implica partial)." +#. type: Plain text +#: apt.ent:371 +msgid "<!ENTITY translation-title \"TRANSLATION\">" +msgstr "" + +#. type: Plain text +#: apt.ent:380 +#, no-wrap, fuzzy +msgid "" +"<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n" +" to the translation in the past, who is responsible now and maybe further information\n" +" specially related to your translation. -->\n" +"<!ENTITY translation-holder \"\n" +" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n" +" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n" +" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n" +"\">\n" +msgstr "" +"<!ENTITY translation-holder \"\n" +" The spanish translation was written 2003 and 2004 by Ismael Fanlo (2003), Carlos Mestre (2003),\n" +" Rudy Godoy <email>rudy@kernel-panik.org</email> (2003),\n" +" Gustavo Saldumbide <email>gsal@adinet.com.uy</email> (2003),\n" +" Javier Fernández-Sanguino <email>jfs@computer.org</email> (2003)\n" +" and Rubén Porras Campo <email>nahoo@inicia.es</email> (2003, 2004)\n" +" under the aegis of the debian spanish-l10n-team <email>debian-l10n-spanish@lists.debian.org</email>.\n" +"\">\n" + +#. type: Plain text +#: apt.ent:387 +#, no-wrap +msgid "" +"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n" +" in a shipped manpage will maybe appear english parts. -->\n" +"<!ENTITY translation-english \"\n" +" Note that this translated document may contain untranslated parts.\n" +" This is done on purpose, to avoid losing content when the\n" +" translation is lagging behind the original content.\n" +"\">\n" +msgstr "" + #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 @@ -1541,7 +1581,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 #: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 -#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:491 apt.conf.5.xml:513 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 #, fuzzy msgid "options" msgstr "Opciones" @@ -1817,7 +1857,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1024 apt_preferences.5.xml:615 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 #, fuzzy msgid "Files" msgstr "Ficheros" @@ -1831,7 +1871,7 @@ msgstr "" #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1030 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 #: sources.list.5.xml:233 #, fuzzy msgid "See Also" @@ -3353,7 +3393,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1018 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 #: sources.list.5.xml:193 #, fuzzy msgid "Examples" @@ -5266,7 +5306,7 @@ msgid "" "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " -"&apt-product; <date>18 September 2009</date>" +"&apt-product; <date>16 January 2010</date>" msgstr "" #. type: Content of: <refentry><refnamediv><refname> @@ -5288,32 +5328,59 @@ msgstr "Programa para la consulta de configuración de APT" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:40 -#, fuzzy msgid "" "<filename>apt.conf</filename> is the main configuration file for the APT " -"suite of tools, all tools make use of the configuration file and a common " -"command line parser to provide a uniform environment. When an APT tool " -"starts up it will read the configuration specified by the <envar>APT_CONFIG</" -"envar> environment variable (if any) and then read the files in " -"<literal>Dir::Etc::Parts</literal> then read the main configuration file " -"specified by <literal>Dir::Etc::main</literal> then finally apply the " -"command line options to override the configuration directives, possibly " -"loading even more config files." -msgstr "" -"<filename>apt.conf</filename> es el fichero principal de configuración del " -"conjunto de herramientas APT, todas las herramientas hacen uso del fichero " -"de configuración y un analizador común de sintaxis de la línea de órdenes " -"para proporcionar un entorno uniforme. Cuando se inicia una utilidad APT, " -"este leerá la configuración especificada en la variable de entorno " -"<envar>APT_CONFIG</envar> (si existe), luego leerá los ficheos en " -"<literal>Dir::Etc::Parts</literal>, entonces leerá el fichero de " -"configuración principal especificado por <literal>Dir::Etc::main</literal>, " -"finalmente aplicará las opciones de la línea de órdenes para reescribir la " -"directrices de la configuración, posiblemente cargando incluso más ficheros " -"de configuración." +"suite of tools, but by far not the only place changes to options can be " +"made. All tools therefore share the configuration files and also use a " +"common command line parser to provide a uniform environment." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><para> +#: apt.conf.5.xml:45 +msgid "" +"When an APT tool starts up it will read the configuration files in the " +"following order:" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:47 +msgid "" +"the file specified by the <envar>APT_CONFIG</envar> environment variable (if " +"any)" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:49 +msgid "" +"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " +"order which have no or \"<literal>conf</literal>\" as filename extension and " +"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " +"characters - otherwise they will be silently ignored." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:54 +#, fuzzy +msgid "" +"the main configuration file specified by <literal>Dir::Etc::main</literal>" +msgstr "" +"Fichero de configuración de APT. Opción de Configuración: <literal>Dir::Etc::" +"Main</literal>." + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:56 +msgid "" +"the command line options are applied to override the configuration " +"directives or to load even more configuration files." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:60 +msgid "Syntax" +msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:50 +#: apt.conf.5.xml:61 #, fuzzy msgid "" "The configuration file is organized in a tree with options organized into " @@ -5329,7 +5396,7 @@ msgstr "" "Las opciones no son heredadas de sus grupos padres." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:56 +#: apt.conf.5.xml:67 msgid "" "Syntactically the configuration language is modeled after what the ISC tools " "such as bind and dhcp use. Lines starting with <literal>//</literal> are " @@ -5345,7 +5412,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:70 +#: apt.conf.5.xml:81 #, fuzzy, no-wrap msgid "" "APT {\n" @@ -5365,7 +5432,7 @@ msgstr "" "};\n" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:78 +#: apt.conf.5.xml:89 #, fuzzy msgid "" "with newlines placed to make it more readable. Lists can be created by " @@ -5379,7 +5446,7 @@ msgstr "" "punto y coma. <informalexample>" #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:83 +#: apt.conf.5.xml:94 #, fuzzy, no-wrap msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" msgstr "" @@ -5388,7 +5455,7 @@ msgstr "" "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:86 +#: apt.conf.5.xml:97 #, fuzzy msgid "" "In general the sample configuration file in <filename>&docdir;examples/apt." @@ -5399,14 +5466,14 @@ msgstr "" "entender su aspecto." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:90 +#: apt.conf.5.xml:101 msgid "" "The names of the configuration items are not case-sensitive. So in the " "previous example you could use <literal>dpkg::pre-install-pkgs</literal>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:93 +#: apt.conf.5.xml:104 msgid "" "Names for the configuration items are optional if a list is defined as it " "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. " @@ -5416,7 +5483,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:98 +#: apt.conf.5.xml:109 #, fuzzy msgid "" "Two specials are allowed, <literal>#include</literal> (which is deprecated " @@ -5434,7 +5501,7 @@ msgstr "" "para suprimir la lista de nombres." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:106 +#: apt.conf.5.xml:117 msgid "" "The #clear command is the only way to delete a list or a complete scope. " "Reopening a scope or the ::-style described below will <emphasis>not</" @@ -5444,7 +5511,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:111 +#: apt.conf.5.xml:122 #, fuzzy msgid "" "All of the APT tools take a -o option which allows an arbitrary " @@ -5462,7 +5529,7 @@ msgstr "" "lista." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:118 +#: apt.conf.5.xml:129 msgid "" "Note that you can use :: only for appending one item per line to a list and " "that you should not use it in combination with the scope syntax. (The scope " @@ -5479,13 +5546,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:130 +#: apt.conf.5.xml:141 #, fuzzy msgid "The APT Group" msgstr "El grupo APT" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:131 +#: apt.conf.5.xml:142 #, fuzzy msgid "" "This group of options controls general APT behavior as well as holding the " @@ -5495,13 +5562,13 @@ msgstr "" "mantenimiento de las opciones para todas las utilidades." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:135 +#: apt.conf.5.xml:146 #, fuzzy msgid "Architecture" msgstr "Arquitectura" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:136 +#: apt.conf.5.xml:147 #, fuzzy msgid "" "System Architecture; sets the architecture to use when fetching files and " @@ -5513,12 +5580,12 @@ msgstr "" "la arquitectura para la que ha sido compilado apt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:141 +#: apt.conf.5.xml:152 msgid "Default-Release" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:142 +#: apt.conf.5.xml:153 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -5527,13 +5594,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:146 +#: apt.conf.5.xml:157 #, fuzzy msgid "Ignore-Hold" msgstr "Ignore-Hold" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:147 +#: apt.conf.5.xml:158 #, fuzzy msgid "" "Ignore Held packages; This global option causes the problem resolver to " @@ -5543,13 +5610,13 @@ msgstr "" "problemas ignore paquetes retenidos cuando tome decisiones." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:151 +#: apt.conf.5.xml:162 #, fuzzy msgid "Clean-Installed" msgstr "Clean-Installed" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:152 +#: apt.conf.5.xml:163 #, fuzzy msgid "" "Defaults to on. When turned on the autoclean feature will remove any " @@ -5564,13 +5631,13 @@ msgstr "" "para reinstalarlos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:158 +#: apt.conf.5.xml:169 #, fuzzy msgid "Immediate-Configure" msgstr "Immediate-Configure" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:159 +#: apt.conf.5.xml:170 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -5603,13 +5670,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:181 +#: apt.conf.5.xml:192 #, fuzzy msgid "Force-LoopBreak" msgstr "Force-LoopBreak" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:182 +#: apt.conf.5.xml:193 #, fuzzy msgid "" "Never Enable this option unless you -really- know what you are doing. It " @@ -5627,13 +5694,13 @@ msgstr "" "bash o cualquier otro del que dependan estos paquetes." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:190 +#: apt.conf.5.xml:201 #, fuzzy msgid "Cache-Limit" msgstr "Cache-Limit" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:191 +#: apt.conf.5.xml:202 #, fuzzy msgid "" "APT uses a fixed size memory mapped cache file to store the 'available' " @@ -5643,13 +5710,13 @@ msgstr "" "la información disponible. Esto fija el tamaño de esa caché." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:195 +#: apt.conf.5.xml:206 #, fuzzy msgid "Build-Essential" msgstr "Build-Essential" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:196 +#: apt.conf.5.xml:207 #, fuzzy msgid "Defines which package(s) are considered essential build dependencies." msgstr "" @@ -5657,13 +5724,13 @@ msgstr "" "esenciales." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:210 #, fuzzy msgid "Get" msgstr "Get" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:200 +#: apt.conf.5.xml:211 #, fuzzy msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " @@ -5673,13 +5740,13 @@ msgstr "" "documentación para más información sobre esta opción." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:204 +#: apt.conf.5.xml:215 #, fuzzy msgid "Cache" msgstr "check" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:205 +#: apt.conf.5.xml:216 #, fuzzy msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " @@ -5689,13 +5756,13 @@ msgstr "" "documentación para más información sobre esta opción." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:209 +#: apt.conf.5.xml:220 #, fuzzy msgid "CDROM" msgstr "CDROM" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:210 +#: apt.conf.5.xml:221 #, fuzzy msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " @@ -5705,25 +5772,25 @@ msgstr "" "documentación para más información sobre esta opción." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:227 #, fuzzy msgid "The Acquire Group" msgstr "El grupo Acquire" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:221 +#: apt.conf.5.xml:232 msgid "PDiffs" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:222 +#: apt.conf.5.xml:233 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:225 +#: apt.conf.5.xml:236 msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " @@ -5734,13 +5801,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:234 +#: apt.conf.5.xml:245 #, fuzzy msgid "Queue-Mode" msgstr "Queue-Mode" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:246 #, fuzzy msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" @@ -5756,13 +5823,13 @@ msgstr "" "será abierta una conexión por cada tipo de URI." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:242 +#: apt.conf.5.xml:253 #, fuzzy msgid "Retries" msgstr "Retries" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:243 +#: apt.conf.5.xml:254 #, fuzzy msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " @@ -5772,13 +5839,13 @@ msgstr "" "los ficheros fallidos el número de veces dado." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:247 +#: apt.conf.5.xml:258 #, fuzzy msgid "Source-Symlinks" msgstr "Source-Symlinks" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:248 +#: apt.conf.5.xml:259 #, fuzzy msgid "" "Use symlinks for source archives. If set to true then source archives will " @@ -5788,13 +5855,13 @@ msgstr "" "fuente se enlazarán a ser posible, en vez de copiarse. Por omisión es true." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:252 sources.list.5.xml:139 +#: apt.conf.5.xml:263 sources.list.5.xml:139 #, fuzzy msgid "http" msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:253 +#: apt.conf.5.xml:264 #, fuzzy msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " @@ -5812,7 +5879,7 @@ msgstr "" "de entorno <envar>http_proxy</envar> modifica todas las preferencias." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:261 +#: apt.conf.5.xml:272 #, fuzzy msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " @@ -5837,7 +5904,7 @@ msgstr "" "Nota: Squid 2.0.2 no soporta ninguna de estas opciones." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:271 apt.conf.5.xml:335 +#: apt.conf.5.xml:282 apt.conf.5.xml:346 #, fuzzy msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " @@ -5849,7 +5916,7 @@ msgstr "" "realizar la conexión y para recibir datos." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:274 +#: apt.conf.5.xml:285 #, fuzzy msgid "" "One setting is provided to control the pipeline depth in cases where the " @@ -5869,7 +5936,7 @@ msgstr "" "necesiten esto violan el RFC 2068." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:282 +#: apt.conf.5.xml:293 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -5879,7 +5946,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:287 +#: apt.conf.5.xml:298 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -5887,13 +5954,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:293 +#: apt.conf.5.xml:304 #, fuzzy msgid "https" msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:305 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -5903,7 +5970,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:300 +#: apt.conf.5.xml:311 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -5924,13 +5991,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:318 sources.list.5.xml:150 +#: apt.conf.5.xml:329 sources.list.5.xml:150 #, fuzzy msgid "ftp" msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:319 +#: apt.conf.5.xml:330 #, fuzzy msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " @@ -5962,7 +6029,7 @@ msgstr "" "de la URI correspondiente." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:338 +#: apt.conf.5.xml:349 #, fuzzy msgid "" "Several settings are provided to control passive mode. Generally it is safe " @@ -5979,7 +6046,7 @@ msgstr "" "fichero de configuración de muestra para ver ejemplos)." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:345 +#: apt.conf.5.xml:356 #, fuzzy msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" @@ -5994,7 +6061,7 @@ msgstr "" "eficiencia." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:350 +#: apt.conf.5.xml:361 #, fuzzy msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " @@ -6010,19 +6077,19 @@ msgstr "" "la mayoría de los servidores FTP no soportan RFC2428." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:357 sources.list.5.xml:132 +#: apt.conf.5.xml:368 sources.list.5.xml:132 #, fuzzy msgid "cdrom" msgstr "apt-cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:363 +#: apt.conf.5.xml:374 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:358 +#: apt.conf.5.xml:369 #, fuzzy msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " @@ -6042,12 +6109,12 @@ msgstr "" "antiguas). Respecto a la sintaxis se pone" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:379 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:369 +#: apt.conf.5.xml:380 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -6055,18 +6122,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:385 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:380 +#: apt.conf.5.xml:391 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:375 +#: apt.conf.5.xml:386 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -6078,19 +6145,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:385 +#: apt.conf.5.xml:396 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:399 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:392 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -6107,13 +6174,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:392 +#: apt.conf.5.xml:403 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:401 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -6128,7 +6195,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:397 +#: apt.conf.5.xml:408 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@ -6138,12 +6205,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:403 +#: apt.conf.5.xml:414 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:404 +#: apt.conf.5.xml:415 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" @@ -6156,13 +6223,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:431 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:421 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " @@ -6185,7 +6252,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:217 +#: apt.conf.5.xml:228 #, fuzzy msgid "" "The <literal>Acquire</literal> group of options controls the download of " @@ -6195,13 +6262,13 @@ msgstr "" "paquetes y los manejadores de URI." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:438 #, fuzzy msgid "Directories" msgstr "Directorios" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:429 +#: apt.conf.5.xml:440 #, fuzzy msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " @@ -6222,7 +6289,7 @@ msgstr "" "filename> o <filename>./</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:436 +#: apt.conf.5.xml:447 #, fuzzy msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " @@ -6244,7 +6311,7 @@ msgstr "" "literal> el directorio predeterminado está en <literal>Dir::Cache</literal>" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:445 +#: apt.conf.5.xml:456 #, fuzzy msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " @@ -6261,7 +6328,7 @@ msgstr "" "envar>)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:451 +#: apt.conf.5.xml:462 #, fuzzy msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " @@ -6273,7 +6340,7 @@ msgstr "" "esto se carga el fichero principal de configuración." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:455 +#: apt.conf.5.xml:466 #, fuzzy msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" @@ -6291,7 +6358,7 @@ msgstr "" "respectivos programas." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:463 +#: apt.conf.5.xml:474 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -6304,13 +6371,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:476 +#: apt.conf.5.xml:487 #, fuzzy msgid "APT in DSelect" msgstr "APT con DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:478 +#: apt.conf.5.xml:489 #, fuzzy msgid "" "When APT is used as a &dselect; method several configuration directives " @@ -6322,13 +6389,13 @@ msgstr "" "la sección <literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:482 +#: apt.conf.5.xml:493 #, fuzzy msgid "Clean" msgstr "clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:483 +#: apt.conf.5.xml:494 #, fuzzy msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " @@ -6346,7 +6413,7 @@ msgstr "" "descargar los paquetes nuevos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:503 #, fuzzy msgid "" "The contents of this variable is passed to &apt-get; as command line options " @@ -6356,13 +6423,13 @@ msgstr "" "ordenes cuando se ejecuta en la fase de instalación." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:496 +#: apt.conf.5.xml:507 #, fuzzy msgid "Updateoptions" msgstr "Opciones" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:508 #, fuzzy msgid "" "The contents of this variable is passed to &apt-get; as command line options " @@ -6372,13 +6439,13 @@ msgstr "" "ordenes cuando se ejecuta en la fase de actualización." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:501 +#: apt.conf.5.xml:512 #, fuzzy msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:502 +#: apt.conf.5.xml:513 #, fuzzy msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " @@ -6388,13 +6455,13 @@ msgstr "" "continuar. Por omisión sólo pregunta en caso de error." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:508 +#: apt.conf.5.xml:519 #, fuzzy msgid "How APT calls dpkg" msgstr "Como APT llama a dpkg" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:520 #, fuzzy msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " @@ -6404,7 +6471,7 @@ msgstr "" "encuentran en la sección <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:514 +#: apt.conf.5.xml:525 #, fuzzy msgid "" "This is a list of options to pass to dpkg. The options must be specified " @@ -6416,19 +6483,19 @@ msgstr "" "como un sólo argumento." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 #, fuzzy msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 #, fuzzy msgid "Post-Invoke" msgstr "Post-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:520 +#: apt.conf.5.xml:531 #, fuzzy msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " @@ -6442,13 +6509,13 @@ msgstr "" "si alguna falla APT abortará." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:537 #, fuzzy msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:527 +#: apt.conf.5.xml:538 #, fuzzy msgid "" "This is a list of shell commands to run before invoking dpkg. Like " @@ -6464,7 +6531,7 @@ msgstr "" "todos los .deb que va ha instalar por la entrada estándar, uno por línea." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:533 +#: apt.conf.5.xml:544 #, fuzzy msgid "" "Version 2 of this protocol dumps more information, including the protocol " @@ -6480,13 +6547,13 @@ msgstr "" "dada a <literal>Pre-Install-Pkgs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:540 +#: apt.conf.5.xml:551 #, fuzzy msgid "Run-Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:541 +#: apt.conf.5.xml:552 #, fuzzy msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" @@ -6496,13 +6563,13 @@ msgstr "" "omisión es <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:545 +#: apt.conf.5.xml:556 #, fuzzy msgid "Build-options" msgstr "Opciones" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:557 #, fuzzy msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " @@ -6513,12 +6580,12 @@ msgstr "" "binarios." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:562 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:563 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@ -6533,7 +6600,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:567 +#: apt.conf.5.xml:578 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -6543,7 +6610,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:561 +#: apt.conf.5.xml:572 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -6557,12 +6624,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:573 +#: apt.conf.5.xml:584 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:574 +#: apt.conf.5.xml:585 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -6574,12 +6641,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:581 +#: apt.conf.5.xml:592 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:593 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -6595,12 +6662,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:592 +#: apt.conf.5.xml:603 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:593 +#: apt.conf.5.xml:604 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -6611,12 +6678,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:610 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:611 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -6626,12 +6693,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:616 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:617 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -6643,12 +6710,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:624 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:632 #, no-wrap msgid "" "OrderList::Score {\n" @@ -6660,7 +6727,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:614 +#: apt.conf.5.xml:625 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -6674,12 +6741,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:634 +#: apt.conf.5.xml:645 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:635 +#: apt.conf.5.xml:646 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -6688,13 +6755,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:643 +#: apt.conf.5.xml:654 #, fuzzy msgid "Debug options" msgstr "Opciones" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:645 +#: apt.conf.5.xml:656 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -6705,7 +6772,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:667 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -6713,7 +6780,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:664 +#: apt.conf.5.xml:675 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -6721,7 +6788,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:684 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -6731,120 +6798,120 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:681 +#: apt.conf.5.xml:692 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:691 +#: apt.conf.5.xml:702 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:696 +#: apt.conf.5.xml:707 #, fuzzy msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:711 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:718 #, fuzzy msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:711 +#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:718 +#: apt.conf.5.xml:729 #, fuzzy msgid "<literal>Debug::Acquire::http</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:740 #, fuzzy msgid "<literal>Debug::Acquire::https</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:744 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:751 #, fuzzy msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:755 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:762 #, fuzzy msgid "<literal>Debug::aptcdrom</literal>" msgstr "La línea <literal>Version:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:755 +#: apt.conf.5.xml:766 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:762 +#: apt.conf.5.xml:773 #, fuzzy msgid "<literal>Debug::BuildDeps</literal>" msgstr "La línea <literal>Label:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:776 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:772 +#: apt.conf.5.xml:783 #, fuzzy msgid "<literal>Debug::Hashes</literal>" msgstr "La línea <literal>Label:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:775 +#: apt.conf.5.xml:786 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:782 +#: apt.conf.5.xml:793 #, fuzzy msgid "<literal>Debug::IdentCDROM</literal>" msgstr "La línea <literal>Label:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:785 +#: apt.conf.5.xml:796 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -6852,99 +6919,99 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:804 #, fuzzy msgid "<literal>Debug::NoLocking</literal>" msgstr "La línea <literal>Origin:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:796 +#: apt.conf.5.xml:807 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:815 #, fuzzy msgid "<literal>Debug::pkgAcquire</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:819 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:826 #, fuzzy msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:818 +#: apt.conf.5.xml:829 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:825 +#: apt.conf.5.xml:836 #, fuzzy msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:839 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:836 +#: apt.conf.5.xml:847 #, fuzzy msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:840 +#: apt.conf.5.xml:851 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:847 +#: apt.conf.5.xml:858 #, fuzzy msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:862 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:873 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:869 +#: apt.conf.5.xml:880 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:872 +#: apt.conf.5.xml:883 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -6954,12 +7021,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:883 +#: apt.conf.5.xml:894 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:886 +#: apt.conf.5.xml:897 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -6976,96 +7043,96 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:916 #, fuzzy msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "La línea <literal>Version:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:908 +#: apt.conf.5.xml:919 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:915 +#: apt.conf.5.xml:926 #, fuzzy msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "La línea <literal>Package:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:918 +#: apt.conf.5.xml:929 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:926 +#: apt.conf.5.xml:937 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:929 +#: apt.conf.5.xml:940 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:936 +#: apt.conf.5.xml:947 #, fuzzy msgid "<literal>Debug::pkgOrderList</literal>" msgstr "La línea <literal>Origin:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:940 +#: apt.conf.5.xml:951 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:948 +#: apt.conf.5.xml:959 #, fuzzy msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "La línea <literal>Package:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:963 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:959 +#: apt.conf.5.xml:970 #, fuzzy msgid "<literal>Debug::pkgPolicy</literal>" msgstr "La línea <literal>Label:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:963 +#: apt.conf.5.xml:974 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:969 +#: apt.conf.5.xml:980 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:973 +#: apt.conf.5.xml:984 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:981 +#: apt.conf.5.xml:992 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:984 +#: apt.conf.5.xml:995 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -7073,20 +7140,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:992 +#: apt.conf.5.xml:1003 #, fuzzy msgid "<literal>Debug::sourceList</literal>" msgstr "La línea <literal>Version:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:996 +#: apt.conf.5.xml:1007 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1019 +#: apt.conf.5.xml:1030 #, fuzzy msgid "" "&configureindex; is a configuration file showing example values for all " @@ -7096,14 +7163,14 @@ msgstr "" "los valores predeterminados para todas las opciones posibles." #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1026 +#: apt.conf.5.xml:1037 #, fuzzy msgid "&file-aptconf;" msgstr "apt-cdrom" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1031 +#: apt.conf.5.xml:1042 #, fuzzy msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache; &apt-conf;" @@ -7175,14 +7242,25 @@ msgstr "" "listado primero en el fichero &sources-list;. El fichero de preferencias de " "APT no modifica la elección del ejemplar, sólo la elección de la versión." -#. type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 +msgid "" +"Note that the files in the <filename>/etc/apt/preferences.d</filename> " +"directory are parsed in alphanumeric ascending order and need to obey the " +"following naming convention: The files have no or \"<literal>pref</literal>" +"\" as filename extension and which only contain alphanumeric, hyphen (-), " +"underscore (_) and period (.) characters - otherwise they will be silently " +"ignored." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:63 #, fuzzy msgid "APT's Default Priority Assignments" msgstr "¿Cómo asigna APT las prioridades?" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:71 +#: apt_preferences.5.xml:78 #, fuzzy, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "" @@ -7190,7 +7268,7 @@ msgstr "" "<command>apt-get install -t testing <replaceable>paquete</replaceable></command>\n" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:74 +#: apt_preferences.5.xml:81 #, fuzzy, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "" @@ -7198,7 +7276,7 @@ msgstr "" "APT::Default-Release \"stable\";\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:58 +#: apt_preferences.5.xml:65 #, fuzzy msgid "" "If there is no preferences file or if there is no entry in the file that " @@ -7223,25 +7301,25 @@ msgstr "" "(<filename>/etc/apt/apt.conf</filename>). Por ejemplo," #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:83 +#: apt_preferences.5.xml:90 #, fuzzy msgid "priority 100" msgstr "prioridad 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:84 +#: apt_preferences.5.xml:91 #, fuzzy msgid "to the version that is already installed (if any)." msgstr "a la versión instalada (si existe)." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:88 +#: apt_preferences.5.xml:95 #, fuzzy msgid "priority 500" msgstr "prioridad 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:89 +#: apt_preferences.5.xml:96 #, fuzzy msgid "" "to the versions that are not installed and do not belong to the target " @@ -7250,13 +7328,13 @@ msgstr "" "a la versión que ni está instalada ni pertenece a la distribución objetivo." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:93 +#: apt_preferences.5.xml:100 #, fuzzy msgid "priority 990" msgstr "prioridad 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:94 +#: apt_preferences.5.xml:101 #, fuzzy msgid "" "to the versions that are not installed and belong to the target release." @@ -7265,7 +7343,7 @@ msgstr "" "distribución objetivo." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:85 #, fuzzy msgid "" "If the target release has been specified then APT uses the following " @@ -7277,7 +7355,7 @@ msgstr "" "Asigna:" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:99 +#: apt_preferences.5.xml:106 #, fuzzy msgid "" "If the target release has not been specified then APT simply assigns " @@ -7288,7 +7366,7 @@ msgstr "" "todas las versiones de los paquetes instalados y 500 al resto." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:103 +#: apt_preferences.5.xml:110 #, fuzzy msgid "" "APT then applies the following rules, listed in order of precedence, to " @@ -7298,7 +7376,7 @@ msgstr "" "determinar qué versión del paquete debe instalar." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:106 +#: apt_preferences.5.xml:113 #, fuzzy msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " @@ -7315,13 +7393,13 @@ msgstr "" "ser peligroso)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:112 +#: apt_preferences.5.xml:119 #, fuzzy msgid "Install the highest priority version." msgstr "Instalar la versión de mayor prioridad." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 +#: apt_preferences.5.xml:120 #, fuzzy msgid "" "If two or more versions have the same priority, install the most recent one " @@ -7331,7 +7409,7 @@ msgstr "" "(esto es, la que tiene un número de versión mayor)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:116 +#: apt_preferences.5.xml:123 #, fuzzy msgid "" "If two or more versions have the same priority and version number but either " @@ -7343,7 +7421,7 @@ msgstr "" "<literal>--reinstall</literal> se instala la que no está instalada." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:122 +#: apt_preferences.5.xml:129 #, fuzzy msgid "" "In a typical situation, the installed version of a package (priority 100) " @@ -7359,7 +7437,7 @@ msgstr "" "get upgrade</command>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:136 #, fuzzy msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " @@ -7374,7 +7452,7 @@ msgstr "" "get upgrade</command>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:134 +#: apt_preferences.5.xml:141 #, fuzzy msgid "" "Sometimes the installed version of a package is more recent than the version " @@ -7394,13 +7472,13 @@ msgstr "" "mayor que la versión instalada." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:143 +#: apt_preferences.5.xml:150 #, fuzzy msgid "The Effect of APT Preferences" msgstr "El efecto de las preferencias sobre APT" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:145 +#: apt_preferences.5.xml:152 #, fuzzy msgid "" "The APT preferences file allows the system administrator to control the " @@ -7414,7 +7492,7 @@ msgstr "" "registros pueden tener una o dos formas: una específica y otra general." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:151 +#: apt_preferences.5.xml:158 #, fuzzy msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " @@ -7430,7 +7508,7 @@ msgstr "" "\"<literal>5.8</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:165 #, fuzzy, no-wrap msgid "" "Package: perl\n" @@ -7443,7 +7521,7 @@ msgstr "" "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:164 +#: apt_preferences.5.xml:171 #, fuzzy msgid "" "The general form assigns a priority to all of the package versions in a " @@ -7459,7 +7537,7 @@ msgstr "" "nombre de dominio." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:170 +#: apt_preferences.5.xml:177 #, fuzzy msgid "" "This general-form entry in the APT preferences file applies only to groups " @@ -7471,7 +7549,7 @@ msgstr "" "prioridad alta a todas las versiones disponibles desde un sitio local." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:175 +#: apt_preferences.5.xml:182 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -7484,7 +7562,7 @@ msgstr "" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:180 +#: apt_preferences.5.xml:187 #, fuzzy msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " @@ -7501,7 +7579,7 @@ msgstr "" "\"Debian\" o \"Ximian\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:186 +#: apt_preferences.5.xml:193 #, fuzzy msgid "" "The following record assigns a low priority to all package versions " @@ -7513,7 +7591,7 @@ msgstr "" "Archivo \"<literal>unstable</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:190 +#: apt_preferences.5.xml:197 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -7526,7 +7604,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:195 +#: apt_preferences.5.xml:202 #, fuzzy msgid "" "The following record assigns a high priority to all package versions " @@ -7538,7 +7616,7 @@ msgstr "" "Archivo \"<literal>unstable</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:199 +#: apt_preferences.5.xml:206 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -7551,7 +7629,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:204 +#: apt_preferences.5.xml:211 #, fuzzy msgid "" "The following record assigns a high priority to all package versions " @@ -7564,7 +7642,7 @@ msgstr "" "literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:209 +#: apt_preferences.5.xml:216 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -7577,19 +7655,19 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:220 +#: apt_preferences.5.xml:227 #, fuzzy msgid "How APT Interprets Priorities" msgstr "¿Cómo interpreta APT las prioridades?" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:228 +#: apt_preferences.5.xml:235 #, fuzzy msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:229 +#: apt_preferences.5.xml:236 #, fuzzy msgid "" "causes a version to be installed even if this constitutes a downgrade of the " @@ -7599,13 +7677,13 @@ msgstr "" "el sistema." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:233 +#: apt_preferences.5.xml:240 #, fuzzy msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:234 +#: apt_preferences.5.xml:241 #, fuzzy msgid "" "causes a version to be installed even if it does not come from the target " @@ -7615,13 +7693,13 @@ msgstr "" "que la versión instalada sea más reciente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:239 +#: apt_preferences.5.xml:246 #, fuzzy msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:247 #, fuzzy msgid "" "causes a version to be installed unless there is a version available " @@ -7632,13 +7710,13 @@ msgstr "" "reciente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:245 +#: apt_preferences.5.xml:252 #, fuzzy msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:253 #, fuzzy msgid "" "causes a version to be installed unless there is a version available " @@ -7648,13 +7726,13 @@ msgstr "" "distribución o la versión instalada sea más reciente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:251 +#: apt_preferences.5.xml:258 #, fuzzy msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:259 #, fuzzy msgid "" "causes a version to be installed only if there is no installed version of " @@ -7663,19 +7741,19 @@ msgstr "" "la versión sólo se instala si no hay ninguna versión del paquete instalado." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:256 +#: apt_preferences.5.xml:263 #, fuzzy msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:257 +#: apt_preferences.5.xml:264 #, fuzzy msgid "prevents the version from being installed" msgstr "la versión nunca se instala." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:223 +#: apt_preferences.5.xml:230 #, fuzzy msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " @@ -7686,7 +7764,7 @@ msgstr "" "números enteros. Se interpretan (en general) del siguiente modo:" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:262 +#: apt_preferences.5.xml:269 #, fuzzy msgid "" "If any specific-form records match an available package version then the " @@ -7701,7 +7779,7 @@ msgstr "" "prioridad de la versión del paquete." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:268 +#: apt_preferences.5.xml:275 #, fuzzy msgid "" "For example, suppose the APT preferences file contains the three records " @@ -7711,7 +7789,7 @@ msgstr "" "registros antes mencionados:" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:272 +#: apt_preferences.5.xml:279 #, fuzzy, no-wrap msgid "" "Package: perl\n" @@ -7740,12 +7818,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:285 +#: apt_preferences.5.xml:292 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:287 +#: apt_preferences.5.xml:294 #, fuzzy msgid "" "The most recent available version of the <literal>perl</literal> package " @@ -7761,7 +7839,7 @@ msgstr "" "entonces se instala la versión5.8*." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:299 #, fuzzy msgid "" "A version of any package other than <literal>perl</literal> that is " @@ -7773,7 +7851,7 @@ msgstr "" "versiones, incluso sobre los pertenecientes a la distribución objetivo." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:296 +#: apt_preferences.5.xml:303 #, fuzzy msgid "" "A version of a package whose origin is not the local system but some other " @@ -7787,7 +7865,7 @@ msgstr "" "versión del paquete instalado." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:313 #, fuzzy msgid "Determination of Package Version and Distribution Properties" msgstr "" @@ -7795,7 +7873,7 @@ msgstr "" "distribución" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:308 +#: apt_preferences.5.xml:315 #, fuzzy msgid "" "The locations listed in the &sources-list; file should provide " @@ -7807,31 +7885,31 @@ msgstr "" "describen los paquetes disponibles en cada uno de los sitios." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:320 +#: apt_preferences.5.xml:327 #, fuzzy msgid "the <literal>Package:</literal> line" msgstr "La línea <literal>Package:</literal> " #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:321 +#: apt_preferences.5.xml:328 #, fuzzy msgid "gives the package name" msgstr "Indica el nombre del paquete" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:324 apt_preferences.5.xml:374 +#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 #, fuzzy msgid "the <literal>Version:</literal> line" msgstr "La línea <literal>Version:</literal> " #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:332 #, fuzzy msgid "gives the version number for the named package" msgstr "Indica el número de versión del paquete" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:312 +#: apt_preferences.5.xml:319 #, fuzzy msgid "" "The <filename>Packages</filename> file is normally found in the directory " @@ -7853,13 +7931,13 @@ msgstr "" "cada registro:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:341 +#: apt_preferences.5.xml:348 #, fuzzy msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:342 +#: apt_preferences.5.xml:349 #, fuzzy msgid "" "names the archive to which all the packages in the directory tree belong. " @@ -7878,7 +7956,7 @@ msgstr "" "preferencias de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:352 +#: apt_preferences.5.xml:359 #, fuzzy, no-wrap msgid "Pin: release a=stable\n" msgstr "" @@ -7886,13 +7964,13 @@ msgstr "" "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:365 #, fuzzy msgid "the <literal>Codename:</literal> line" msgstr "La línea <literal>Component:</literal> " #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:366 #, fuzzy msgid "" "names the codename to which all the packages in the directory tree belong. " @@ -7910,13 +7988,13 @@ msgstr "" "preferencias de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:368 +#: apt_preferences.5.xml:375 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:382 #, fuzzy msgid "" "names the release version. For example, the packages in the tree might " @@ -7933,7 +8011,7 @@ msgstr "" "siguientes línea en el fichero de preferencias de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:384 +#: apt_preferences.5.xml:391 #, fuzzy, no-wrap msgid "" "Pin: release v=3.0\n" @@ -7946,13 +8024,13 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:393 +#: apt_preferences.5.xml:400 #, fuzzy msgid "the <literal>Component:</literal> line" msgstr "La línea <literal>Component:</literal> " #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:394 +#: apt_preferences.5.xml:401 #, fuzzy msgid "" "names the licensing component associated with the packages in the directory " @@ -7971,7 +8049,7 @@ msgstr "" "de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:403 +#: apt_preferences.5.xml:410 #, fuzzy, no-wrap msgid "Pin: release c=main\n" msgstr "" @@ -7979,13 +8057,13 @@ msgstr "" "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:409 +#: apt_preferences.5.xml:416 #, fuzzy msgid "the <literal>Origin:</literal> line" msgstr "La línea <literal>Origin:</literal> " #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:410 +#: apt_preferences.5.xml:417 #, fuzzy msgid "" "names the originator of the packages in the directory tree of the " @@ -7999,7 +8077,7 @@ msgstr "" "tendrá que poner la siguiente línea en el fichero de preferencias de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:423 #, fuzzy, no-wrap msgid "Pin: release o=Debian\n" msgstr "" @@ -8007,13 +8085,13 @@ msgstr "" "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:422 +#: apt_preferences.5.xml:429 #, fuzzy msgid "the <literal>Label:</literal> line" msgstr "La línea <literal>Label:</literal> " #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:423 +#: apt_preferences.5.xml:430 #, fuzzy msgid "" "names the label of the packages in the directory tree of the " @@ -8027,7 +8105,7 @@ msgstr "" "la siguiente línea en el fichero de preferencias de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:436 #, fuzzy, no-wrap msgid "Pin: release l=Debian\n" msgstr "" @@ -8035,7 +8113,7 @@ msgstr "" "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:330 +#: apt_preferences.5.xml:337 #, fuzzy msgid "" "The <filename>Release</filename> file is normally found in the directory " @@ -8057,7 +8135,7 @@ msgstr "" "<filename>Release</filename> son relevantes para las prioridades de APT:" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:443 #, fuzzy msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " @@ -8083,13 +8161,13 @@ msgstr "" "la distribución <literal>inestable</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:449 +#: apt_preferences.5.xml:456 #, fuzzy msgid "Optional Lines in an APT Preferences Record" msgstr "Líneas opcionales en un registro de preferencias de APT" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:451 +#: apt_preferences.5.xml:458 #, fuzzy msgid "" "Each record in the APT preferences file can optionally begin with one or " @@ -8101,7 +8179,7 @@ msgstr "" "Útil para comentarios." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:455 +#: apt_preferences.5.xml:462 #, fuzzy msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " @@ -8114,13 +8192,13 @@ msgstr "" "una línea que empieze con <literal>Pin-Priority: release ...</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:464 +#: apt_preferences.5.xml:471 #, fuzzy msgid "Tracking Stable" msgstr "Siguiendo la distribución estable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:472 +#: apt_preferences.5.xml:479 #, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -8145,7 +8223,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:466 +#: apt_preferences.5.xml:473 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a priority " @@ -8160,8 +8238,8 @@ msgstr "" "de las distribuciones <literal>Debian</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:489 apt_preferences.5.xml:535 -#: apt_preferences.5.xml:593 +#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 +#: apt_preferences.5.xml:600 #, fuzzy, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -8174,7 +8252,7 @@ msgstr "" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:484 +#: apt_preferences.5.xml:491 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -8188,13 +8266,13 @@ msgstr "" "última versión <literal>estable</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:501 +#: apt_preferences.5.xml:508 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "rdepends <replaceable>paquetes(s)</replaceable>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:495 +#: apt_preferences.5.xml:502 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -8207,13 +8285,13 @@ msgstr "" "de nuevo amenos que se ejecute de nuevo la orden." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:507 +#: apt_preferences.5.xml:514 #, fuzzy msgid "Tracking Testing or Unstable" msgstr "Siguiendo la distribución de pruebas o inestable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:523 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -8242,7 +8320,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:509 +#: apt_preferences.5.xml:516 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a high priority " @@ -8259,7 +8337,7 @@ msgstr "" "de <literal>Debian</literal>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:530 +#: apt_preferences.5.xml:537 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -8273,13 +8351,13 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:550 +#: apt_preferences.5.xml:557 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "rdepends <replaceable>paquetes(s)</replaceable>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:541 +#: apt_preferences.5.xml:548 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -8299,12 +8377,12 @@ msgstr "" "versión instalada." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:564 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:571 +#: apt_preferences.5.xml:578 #, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -8334,7 +8412,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:559 +#: apt_preferences.5.xml:566 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8349,7 +8427,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:588 +#: apt_preferences.5.xml:595 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -8363,13 +8441,13 @@ msgstr "" "última versión <literal>estable</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:608 +#: apt_preferences.5.xml:615 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "rdepends <replaceable>paquetes(s)</replaceable>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:599 +#: apt_preferences.5.xml:606 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -8389,13 +8467,13 @@ msgstr "" "versión instalada." #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:617 +#: apt_preferences.5.xml:624 #, fuzzy msgid "&file-preferences;" msgstr "apt_preferences" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:623 +#: apt_preferences.5.xml:630 #, fuzzy msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-conf;, &apt-get;, &sources-list;" @@ -9975,6 +10053,30 @@ msgstr "" msgid "Which will use the already fetched archives on the disc." msgstr "" +#, fuzzy +#~ msgid "" +#~ "<filename>apt.conf</filename> is the main configuration file for the APT " +#~ "suite of tools, all tools make use of the configuration file and a common " +#~ "command line parser to provide a uniform environment. When an APT tool " +#~ "starts up it will read the configuration specified by the " +#~ "<envar>APT_CONFIG</envar> environment variable (if any) and then read the " +#~ "files in <literal>Dir::Etc::Parts</literal> then read the main " +#~ "configuration file specified by <literal>Dir::Etc::main</literal> then " +#~ "finally apply the command line options to override the configuration " +#~ "directives, possibly loading even more config files." +#~ msgstr "" +#~ "<filename>apt.conf</filename> es el fichero principal de configuración " +#~ "del conjunto de herramientas APT, todas las herramientas hacen uso del " +#~ "fichero de configuración y un analizador común de sintaxis de la línea de " +#~ "órdenes para proporcionar un entorno uniforme. Cuando se inicia una " +#~ "utilidad APT, este leerá la configuración especificada en la variable de " +#~ "entorno <envar>APT_CONFIG</envar> (si existe), luego leerá los ficheos en " +#~ "<literal>Dir::Etc::Parts</literal>, entonces leerá el fichero de " +#~ "configuración principal especificado por <literal>Dir::Etc::main</" +#~ "literal>, finalmente aplicará las opciones de la línea de órdenes para " +#~ "reescribir la directrices de la configuración, posiblemente cargando " +#~ "incluso más ficheros de configuración." + #, fuzzy #~ msgid "<filename>/etc/apt/trusted.gpg</filename>" #~ msgstr "<filename>/etc/apt/apt.conf</filename>" @@ -10250,14 +10352,6 @@ msgstr "" #~ "<arg rep=\"norepeat\" choice=\"opt\">clean</arg>\n" #~ "<arg rep=\"norepeat\" choice=\"opt\">autoclean</arg>" -#, fuzzy -#~ msgid "" -#~ "APT configuration file. Configuration Item: <literal>Dir::Etc::Main</" -#~ "literal>." -#~ msgstr "" -#~ "Fichero de configuración de APT. Opción de Configuración: <literal>Dir::" -#~ "Etc::Main</literal>." - #, fuzzy #~ msgid "<filename>/etc/apt/apt.conf.d/</filename>" #~ msgstr "<filename>/etc/apt/apt.conf.d/</filename>" diff --git a/doc/po/fr.po b/doc/po/fr.po index a8897e073..1e9b42e02 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2009-12-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-20 12:18+0100\n" "PO-Revision-Date: 2010-01-15 18:53+0100\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -359,12 +359,6 @@ msgstr "" #. type: Plain text #: apt.ent:84 #, no-wrap -#| msgid "" -#| "<!ENTITY dpkg \"<citerefentry>\n" -#| " <refentrytitle><command>dpkg</command></refentrytitle>\n" -#| " <manvolnum>8</manvolnum>\n" -#| " </citerefentry>\"\n" -#| ">\n" msgid "" "<!ENTITY dpkg \"<citerefentry>\n" " <refentrytitle><command>dpkg</command></refentrytitle>\n" @@ -413,12 +407,6 @@ msgstr "" #. type: Plain text #: apt.ent:102 #, no-wrap -#| msgid "" -#| "<!ENTITY dpkg-scanpackages \"<citerefentry>\n" -#| " <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n" -#| " <manvolnum>8</manvolnum>\n" -#| " </citerefentry>\"\n" -#| ">\n" msgid "" "<!ENTITY dpkg-scanpackages \"<citerefentry>\n" " <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n" @@ -435,12 +423,6 @@ msgstr "" #. type: Plain text #: apt.ent:108 #, no-wrap -#| msgid "" -#| "<!ENTITY dpkg-scansources \"<citerefentry>\n" -#| " <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n" -#| " <manvolnum>8</manvolnum>\n" -#| " </citerefentry>\"\n" -#| ">\n" msgid "" "<!ENTITY dpkg-scansources \"<citerefentry>\n" " <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n" @@ -457,12 +439,6 @@ msgstr "" #. type: Plain text #: apt.ent:114 #, no-wrap -#| msgid "" -#| "<!ENTITY dselect \"<citerefentry>\n" -#| " <refentrytitle><command>dselect</command></refentrytitle>\n" -#| " <manvolnum>8</manvolnum>\n" -#| " </citerefentry>\"\n" -#| ">\n" msgid "" "<!ENTITY dselect \"<citerefentry>\n" " <refentrytitle><command>dselect</command></refentrytitle>\n" @@ -1065,7 +1041,7 @@ msgstr "" " </varlistentry>\n" #. type: Plain text -#: apt.ent:355 +#: apt.ent:356 #, no-wrap msgid "" " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" @@ -1080,7 +1056,89 @@ msgstr "" " </varlistentry>\n" "\">\n" -#. The last update date +#. type: Plain text +#: apt.ent:362 +#, fuzzy, no-wrap +#| msgid "" +#| "<!ENTITY file-sourceslist \"\n" +#| " <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n" +#| " <listitem><para>Locations to fetch packages from.\n" +#| " Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n" +#| " </varlistentry>\n" +msgid "" +"<!ENTITY file-trustedgpg \"\n" +" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n" +" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n" +" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n" +" </varlistentry>\n" +msgstr "" +"<!ENTITY file-sourceslist \"\n" +" <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n" +" <listitem><para>Emplacement pour la récupération des paquets.\n" +" Élément de configuration : <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n" +" </varlistentry>\n" + +#. type: Plain text +#: apt.ent:369 +#, fuzzy, no-wrap +#| msgid "" +#| " <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n" +#| " <listitem><para>File fragments for locations to fetch packages from.\n" +#| " Configuration Item: <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n" +#| " </varlistentry>\n" +#| "\">\n" +msgid "" +" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n" +" <listitem><para>File fragments for the trusted keys, additional keyrings can\n" +" be stored here (by other packages or the administrator).\n" +" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n" +" </varlistentry>\n" +"\">\n" +msgstr "" +" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n" +" <listitem><para>Fragments de fichiers définissant les emplacements de récupération de paquets.\n" +" Élément de configuration : <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n" +" </varlistentry>\n" +"\">\n" + +#. type: Plain text +#: apt.ent:371 +msgid "<!ENTITY translation-title \"TRANSLATION\">" +msgstr "<!ENTITY translation-title \"Traducteurs\">" +"" + +#. type: Plain text +#: apt.ent:380 +#, no-wrap +msgid "" +"<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n" +" to the translation in the past, who is responsible now and maybe further information\n" +" specially related to your translation. -->\n" +"<!ENTITY translation-holder \"\n" +" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n" +" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n" +" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n" +"\">\n" +msgstr "" +"<!ENTITY translation-holder \"\n" +" Jérôme Marant, Philippe Batailler, Christian Perrier <email>bubulle@debian.org</email> (2000, 2005, 2009, 2010),\n" +" Équipe de traduction francophone de Debian <email>debian-l10n-french@lists.debian.org</email>\n" +"\">\n" + +#. type: Plain text +#: apt.ent:387 +#, no-wrap +msgid "" +"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n" +" in a shipped manpage will maybe appear english parts. -->\n" +"<!ENTITY translation-english \"\n" +" Note that this translated document may contain untranslated parts.\n" +" This is done on purpose, to avoid losing content when the\n" +" translation is lagging behind the original content.\n" +"\">\n" +msgstr "" + +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 #: apt-sortpkgs.1.xml:13 sources.list.5.xml:13 @@ -1163,7 +1221,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 #: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 -#: apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40 +#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 #: sources.list.5.xml:33 msgid "Description" @@ -1379,12 +1437,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:152 -#| msgid "" -#| "<literal>Missing</literal> is the number of package names that were " -#| "referenced in a dependency but were not provided by any package. Missing " -#| "packages may be in evidence if a full distribution is not accessed, or if " -#| "a package (real or virtual) has been dropped from the distribution. " -#| "Usually they are referenced from Conflicts or Breaks statements." msgid "" "<literal>Missing</literal> is the number of package names that were " "referenced in a dependency but were not provided by any package. Missing " @@ -1584,10 +1636,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:234 -#| msgid "" -#| "Note that a package which APT knows of is not nessasarily available to " -#| "download, installable or installed, e.g. virtual packages are also listed " -#| "in the generated list." msgid "" "Note that a package which APT knows of is not necessarily available to " "download, installable or installed, e.g. virtual packages are also listed in " @@ -1707,7 +1755,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 #: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 -#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 msgid "options" msgstr "options" @@ -1946,14 +1994,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 -#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554 +#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 -#: apt.conf.5.xml:1017 apt_preferences.5.xml:615 +#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 msgid "Files" msgstr "Fichiers" @@ -1964,9 +2012,9 @@ msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569 -#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 +#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 +#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 #: sources.list.5.xml:233 msgid "See Also" msgstr "Voir aussi" @@ -1978,7 +2026,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;." #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575 +#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "Diagnostics" @@ -2108,7 +2156,7 @@ msgstr "" "\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:91 +#: apt-cdrom.8.xml:91 apt-key.8.xml:139 msgid "Options" msgstr "Options" @@ -2358,7 +2406,7 @@ msgid "Just show the contents of the configuration space." msgstr "Affiche seulement le contenu de l'espace de configuration." #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573 +#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 #: apt-sortpkgs.1.xml:70 msgid "&apt-conf;" msgstr "&apt-conf;" @@ -2448,10 +2496,6 @@ msgstr "<option>--tempdir</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-extracttemplates.1.xml:62 -#| msgid "" -#| "Temporary directory in which to write extracted debconf template files " -#| "and config scripts Configuration Item: <literal>APT::ExtractTemplates::" -#| "TempDir</literal>" msgid "" "Temporary directory in which to write extracted debconf template files and " "config scripts. Configuration Item: <literal>APT::ExtractTemplates::" @@ -2470,12 +2514,9 @@ msgstr "" "<command>apt-extracttemplates</command> retourne zéro si tout se passe bien, " "le nombre 100 en cas d'erreur." -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-ftparchive.1.xml:13 -#| msgid "" -#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 " -#| "November 2007</date>" msgid "" "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 " "August 2009</date>" @@ -2597,7 +2638,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106 -msgid "The option <option>--db</option> can be used to specify a binary caching DB." +msgid "" +"The option <option>--db</option> can be used to specify a binary caching DB." msgstr "" "On peut se servir de l'option <option>--db</option> pour demander un cache " "binaire." @@ -2752,8 +2794,10 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-ftparchive.1.xml:155 -msgid "The generate configuration has 4 separate sections, each described below." -msgstr "Ce fichier de configuration possède quatre sections, décrites ci-dessous." +msgid "" +"The generate configuration has 4 separate sections, each described below." +msgstr "" +"Ce fichier de configuration possède quatre sections, décrites ci-dessous." #. type: Content of: <refentry><refsect1><refsect2><title> #: apt-ftparchive.1.xml:157 @@ -2762,11 +2806,6 @@ msgstr "La section Dir" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt-ftparchive.1.xml:159 -#| msgid "" -#| "The <literal>Dir</literal> section defines the standard directories " -#| "needed to locate the files required during the generation process. These " -#| "directories are prepended to certain relative paths defined in later " -#| "sections to produce a complete an absolute path." msgid "" "The <literal>Dir</literal> section defines the standard directories needed " "to locate the files required during the generation process. These " @@ -3055,8 +3094,12 @@ msgstr "Sources" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:288 +#, fuzzy +#| msgid "" +#| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" +#| "source/Sources</filename>" msgid "" -"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" +"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/" "source/Sources</filename>" msgstr "" "Indique le fichier « Packages » crée. Par défaut, c'est <filename>$(DIST)/" @@ -3197,27 +3240,37 @@ msgstr "" "peuvent s'utiliser dans la section <literal>Tree</literal> ainsi que les " "trois nouvelles variables suivantes." -#. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:351 -msgid "" -"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" -"command> performs an operation similar to:" -msgstr "" -"Quand il exécute la section <literal>Tree</literal>, <command>apt-" -"ftparchive</command> agit ainsi :" - -#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting> +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt-ftparchive.1.xml:354 -#, no-wrap +#, fuzzy, no-wrap +#| msgid "" +#| "for i in Sections do \n" +#| " for j in Architectures do\n" +#| " Generate for DIST=scope SECTION=i ARCH=j\n" msgid "" "for i in Sections do \n" " for j in Architectures do\n" " Generate for DIST=scope SECTION=i ARCH=j\n" +" " msgstr "" "for i in Sections do \n" " for j in Architectures do\n" " Generate for DIST=scope SECTION=i ARCH=j\n" +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:351 +#, fuzzy +#| msgid "" +#| "When processing a <literal>Tree</literal> section <command>apt-" +#| "ftparchive</command> performs an operation similar to:" +msgid "" +"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" +"command> performs an operation similar to: <placeholder type=\"programlisting" +"\" id=\"0\"/>" +msgstr "" +"Quand il exécute la section <literal>Tree</literal>, <command>apt-" +"ftparchive</command> agit ainsi :" + #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:360 msgid "Sections" @@ -3573,13 +3626,33 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:547 -#| msgid "<option>--version</option>" -msgid "<option>APT::FTPArchive::LongDescription</option>" +#, fuzzy +#| msgid "<option>APT::FTPArchive::LongDescription</option>" +msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 msgid "" +"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " +"packages are recompiled and/or republished with the same version again, this " +"will lead to problems as the now outdated cached metadata like size and " +"checksums will be used. With this option enabled this will no longer happen " +"as it will be checked if the file was changed. Note that this option is set " +"to \"<literal>false</literal>\" by default as it is not recommend to upload " +"multiply versions/builds of a package with the same versionnumber, so in " +"theory nobody will have these problems and therefore all these extra checks " +"are useless." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:559 +msgid "<option>APT::FTPArchive::LongDescription</option>" +msgstr "<option>APT::FTPArchive::LongDescription</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:561 +msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " "&apt-ftparchive; also provides <filename>Translation</filename> files. Note " @@ -3593,19 +3666,19 @@ msgstr "" "pas possible de créer ces fichiers avec <command>apt-ftparchive</command>." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 #: sources.list.5.xml:193 msgid "Examples" msgstr "Exemples" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:567 +#: apt-ftparchive.1.xml:579 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:563 +#: apt-ftparchive.1.xml:575 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3614,7 +3687,7 @@ msgstr "" "paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:577 +#: apt-ftparchive.1.xml:589 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -3622,7 +3695,7 @@ msgstr "" "<command>apt-ftparchive</command> retourne zéro si tout se passe bien, le " "nombre 100 en cas d'erreur." -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-get.8.xml:13 msgid "" @@ -3640,7 +3713,8 @@ msgstr "apt-get" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-get.8.xml:30 msgid "APT package handling utility -- command-line interface" -msgstr "Utilitaire APT pour la gestion des paquets -- interface en ligne de commande." +msgstr "" +"Utilitaire APT pour la gestion des paquets -- interface en ligne de commande." #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-get.8.xml:36 @@ -3721,7 +3795,7 @@ msgstr "" "existent, comme dselect, aptitude, synaptic, gnome-apt ou wajig." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:135 apt-key.8.xml:123 +#: apt-get.8.xml:135 apt-key.8.xml:124 msgid "update" msgstr "update" @@ -3986,14 +4060,6 @@ msgstr "source" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:251 -#| msgid "" -#| "<literal>source</literal> causes <command>apt-get</command> to fetch " -#| "source packages. APT will examine the available packages to decide which " -#| "source package to fetch. It will then find and download into the current " -#| "directory the newest available version of that source package while " -#| "respect the default release, set with the option <literal>APT::Default-" -#| "Release</literal>, the <option>-t</option> option or per package with " -#| "with the <literal>pkg/release</literal> syntax, if possible." msgid "" "<literal>source</literal> causes <command>apt-get</command> to fetch source " "packages. APT will examine the available packages to decide which source " @@ -4190,18 +4256,31 @@ msgstr "<option>--fix-broken</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:334 +#, fuzzy +#| msgid "" +#| "Fix; attempt to correct a system with broken dependencies in place. This " +#| "option, when used with install/remove, can omit any packages to permit " +#| "APT to deduce a likely solution. Any Package that are specified must " +#| "completely correct the problem. The option is sometimes necessary when " +#| "running APT for the first time; APT itself does not allow broken package " +#| "dependencies to exist on a system. It is possible that a system's " +#| "dependency structure can be so corrupt as to require manual intervention " +#| "(which usually means using &dselect; or <command>dpkg --remove</command> " +#| "to eliminate some of the offending packages). Use of this option together " +#| "with <option>-m</option> may produce an error in some situations. " +#| "Configuration Item: <literal>APT::Get::Fix-Broken</literal>." msgid "" "Fix; attempt to correct a system with broken dependencies in place. This " "option, when used with install/remove, can omit any packages to permit APT " -"to deduce a likely solution. Any Package that are specified must completely " -"correct the problem. The option is sometimes necessary when running APT for " -"the first time; APT itself does not allow broken package dependencies to " -"exist on a system. It is possible that a system's dependency structure can " -"be so corrupt as to require manual intervention (which usually means using " -"&dselect; or <command>dpkg --remove</command> to eliminate some of the " -"offending packages). Use of this option together with <option>-m</option> " -"may produce an error in some situations. Configuration Item: <literal>APT::" -"Get::Fix-Broken</literal>." +"to deduce a likely solution. If packages are specified, these have to " +"completely correct the problem. The option is sometimes necessary when " +"running APT for the first time; APT itself does not allow broken package " +"dependencies to exist on a system. It is possible that a system's dependency " +"structure can be so corrupt as to require manual intervention (which usually " +"means using &dselect; or <command>dpkg --remove</command> to eliminate some " +"of the offending packages). Use of this option together with <option>-m</" +"option> may produce an error in some situations. Configuration Item: " +"<literal>APT::Get::Fix-Broken</literal>." msgstr "" "Correction ; cette option demande de réparer un système où existent des " "dépendances défectueuses. Utilisée avec install ou remove, elle peut exclure " @@ -4308,14 +4387,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:386 -#| msgid "" -#| "Simulation run as user will deactivate locking (<literal>Debug::" -#| "NoLocking</literal>) automatical. Also a notice will be displayed " -#| "indicating that this is only a simulation, if the option <literal>APT::" -#| "Get::Show-User-Simulation-Note</literal> is set (Default: true) Neigther " -#| "NoLocking nor the notice will be triggered if run as root (root should " -#| "know what he is doing without further warnings by <literal>apt-get</" -#| "literal>)." msgid "" "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</" "literal>) automatic. Also a notice will be displayed indicating that this " @@ -4335,11 +4406,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:392 -#| msgid "" -#| "Simulate prints out a series of lines each one representing a dpkg " -#| "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square " -#| "brackets indicate broken packages with and empty set of square brackets " -#| "meaning breaks that are of no consequence (rare)." msgid "" "Simulate prints out a series of lines each one representing a dpkg " "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets " @@ -4552,10 +4618,17 @@ msgstr "<option>--purge</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:467 +#, fuzzy +#| msgid "" +#| "Use purge instead of remove for anything that would be removed. An " +#| "asterisk (\"*\") will be displayed next to packages which are scheduled " +#| "to be purged. <option>remove --purge</option> is equivalent for " +#| "<option>purge</option> command. Configuration Item: <literal>APT::Get::" +#| "Purge</literal>." msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " -"<option>remove --purge</option> is equivalent for <option>purge</option> " +"<option>remove --purge</option> is equivalent to the <option>purge</option> " "command. Configuration Item: <literal>APT::Get::Purge</literal>." msgstr "" "Utiliser « purge » à la place de « remove » pour supprimer tout ce qui peut " @@ -4828,8 +4901,14 @@ msgstr "Utilitaire de gestion des clés d'APT" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-key.8.xml:28 +#, fuzzy +#| msgid "" +#| "<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> " +#| "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></" +#| "option></arg>" msgid "" -"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> " +"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</" +"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> " "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></" "arg>" msgstr "" @@ -4838,7 +4917,7 @@ msgstr "" "arg>" #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:36 +#: apt-key.8.xml:37 msgid "" "<command>apt-key</command> is used to manage the list of keys used by apt to " "authenticate packages. Packages which have been authenticated using these " @@ -4848,17 +4927,17 @@ msgstr "" "les paquets. Les paquets authentifiés par ces clés seront réputés fiables." #. type: Content of: <refentry><refsect1><title> -#: apt-key.8.xml:42 +#: apt-key.8.xml:43 msgid "Commands" msgstr "Commandes" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:44 +#: apt-key.8.xml:45 msgid "add <replaceable>filename</replaceable>" msgstr "add <replaceable>fichier</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:48 +#: apt-key.8.xml:49 msgid "" "Add a new key to the list of trusted keys. The key is read from " "<replaceable>filename</replaceable>, or standard input if " @@ -4869,62 +4948,62 @@ msgstr "" "<replaceable>fichier</replaceable> est <literal>-</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:56 +#: apt-key.8.xml:57 msgid "del <replaceable>keyid</replaceable>" msgstr "del <replaceable>clé</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:60 +#: apt-key.8.xml:61 msgid "Remove a key from the list of trusted keys." msgstr "Supprimer une clé de la liste des clés fiables." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:67 +#: apt-key.8.xml:68 msgid "export <replaceable>keyid</replaceable>" msgstr "export <replaceable>clé</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:71 +#: apt-key.8.xml:72 msgid "Output the key <replaceable>keyid</replaceable> to standard output." msgstr "Afficher la clé <replaceable>clé</replaceable> sur la sortie standard." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:78 +#: apt-key.8.xml:79 msgid "exportall" msgstr "exportall" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:82 +#: apt-key.8.xml:83 msgid "Output all trusted keys to standard output." msgstr "Afficher toutes les clés fiables sur la sortie standard." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:89 +#: apt-key.8.xml:90 msgid "list" msgstr "list" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:93 +#: apt-key.8.xml:94 msgid "List trusted keys." msgstr "Afficher la liste des clés fiables." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:100 +#: apt-key.8.xml:101 msgid "finger" msgstr "finger" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:104 +#: apt-key.8.xml:105 msgid "List fingerprints of trusted keys." msgstr "Afficher les empreintes des clés fiables." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:111 +#: apt-key.8.xml:112 msgid "adv" msgstr "adv" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:115 +#: apt-key.8.xml:116 msgid "" "Pass advanced options to gpg. With adv --recv-key you can download the " "public key." @@ -4933,7 +5012,7 @@ msgstr "" "possible de télécharger une clé publique." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:127 +#: apt-key.8.xml:128 msgid "" "Update the local keyring with the keyring of Debian archive keys and removes " "from the keyring the archive keys which are no longer valid." @@ -4941,57 +5020,76 @@ msgstr "" "Mettre à jour le trousseau de clés local avec le trousseau de clés de " "l'archive Debian et supprimer les clés qui y sont périmées." -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml:140 -msgid "<filename>/etc/apt/trusted.gpg</filename>" -msgstr "<filename>/etc/apt/trusted.gpg</filename>" +msgid "" +"Note that options need to be defined before the commands described in the " +"previous section." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:142 +#, fuzzy +#| msgid "add <replaceable>filename</replaceable>" +msgid "--keyring <replaceable>filename</replaceable>" +msgstr "add <replaceable>fichier</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:141 -msgid "Keyring of local trusted keys, new keys will be added here." -msgstr "Trousseau de clés locales fiables : les nouvelles clés y seront ajoutées." +#: apt-key.8.xml:143 +msgid "" +"With this option it is possible to specify a specific keyring file the " +"command should operate on. The default is that a command is executed on the " +"<filename>trusted.gpg</filename> file as well as on all parts in the " +"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</" +"filename> is the primary keyring which means that e.g. new keys are added to " +"this one." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist> +#: apt-key.8.xml:156 +msgid "&file-trustedgpg;" +msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:144 +#: apt-key.8.xml:158 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "<filename>/etc/apt/trustdb.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:145 +#: apt-key.8.xml:159 msgid "Local trust database of archive keys." msgstr "Base de données locale de fiabilité des clés de l'archive." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:148 +#: apt-key.8.xml:162 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:149 +#: apt-key.8.xml:163 msgid "Keyring of Debian archive trusted keys." msgstr "Trousseau des clés fiables de l'archive Debian." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:152 -msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" -msgstr "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +#: apt-key.8.xml:166 +msgid "" +"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +msgstr "" +"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:153 +#: apt-key.8.xml:167 msgid "Keyring of Debian archive removed trusted keys." msgstr "Trousseau des clés fiables supprimées de l'archive Debian." #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:164 +#: apt-key.8.xml:176 msgid "&apt-get;, &apt-secure;" msgstr "&apt-get;, &apt-secure;" -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-mark.8.xml:13 -#| msgid "" -#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 " -#| "November 2007</date>" msgid "" "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " "August 2009</date>" @@ -5011,11 +5109,6 @@ msgstr "Indiquer si un paquet a été installé automatiquement ou non" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-mark.8.xml:36 -#| msgid "" -#| "<command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" -#| "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"req" -#| "\"><arg>markauto</arg><arg>unmarkauto</arg></group> <arg choice=\"plain\" " -#| "rep=\"repeat\"><replaceable>package</replaceable></arg>" msgid "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain" @@ -5042,12 +5135,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml:57 -#| msgid "" -#| "When you request that a package is installed, and as a result other " -#| "packages are installed to satisfy its dependencies, the dependencies are " -#| "marked as being automatically installed. Once these automatically " -#| "installed packages are no longer depended on by any manually installed " -#| "packages, they will be removed." msgid "" "When you request that a package is installed, and as a result other packages " "are installed to satisfy its dependencies, the dependencies are marked as " @@ -5101,10 +5188,6 @@ msgstr "showauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:82 -#| msgid "" -#| "<literal>autoremove</literal> is used to remove packages that were " -#| "automatically installed to satisfy dependencies for some package and that " -#| "are no more needed." msgid "" "<literal>showauto</literal> is used to print a list of automatically " "installed packages with each package on a new line." @@ -5114,8 +5197,10 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:93 -msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" -msgstr "<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>" +msgid "" +"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" +msgstr "" +"<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:94 @@ -5128,11 +5213,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:97 -#| msgid "" -#| "Read/Write package stats from <filename>FILENAME</filename> instead of " -#| "the default location, which is <filename>extended_status</filename> in " -#| "the directory defined by the Configuration Item: <literal>Dir::State</" -#| "literal>." msgid "" "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></" "filename> instead of the default location, which is " @@ -5176,7 +5256,6 @@ msgstr "Affiche la version du programme." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:124 -#| msgid "<filename>/etc/apt/preferences</filename>" msgid "<filename>/var/lib/apt/extended_states</filename>" msgstr "<filename>/var/lib/apt/extended_states</filename>" @@ -5193,7 +5272,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml:134 -#| msgid "&apt-cache; &apt-conf;" msgid "&apt-get;,&aptitude;,&apt-conf;" msgstr "&apt-get;,&aptitude;,&apt-conf;" @@ -5261,13 +5339,6 @@ msgstr "Trusted archives" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:67 -#| msgid "" -#| "The chain of trust from an apt archive to the end user is made up of " -#| "different steps. <command>apt-secure</command> is the last step in this " -#| "chain, trusting an archive does not mean that the packages that you trust " -#| "it do not contain malicious code but means that you trust the archive " -#| "maintainer. Its the archive maintainer responsibility to ensure that the " -#| "archive integrity is correct." msgid "" "The chain of trust from an apt archive to the end user is made up of " "different steps. <command>apt-secure</command> is the last step in this " @@ -5316,14 +5387,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:92 -#| msgid "" -#| "Once the uploaded package is verified and included in the archive, the " -#| "maintainer signature is stripped off, an MD5 sum of the package is " -#| "computed and put in the Packages file. The MD5 sum of all of the packages " -#| "files are then computed and put into the Release file. The Release file " -#| "is then signed by the archive key (which is created once a year and " -#| "distributed through the FTP server. This key is also on the Debian " -#| "keyring." msgid "" "Once the uploaded package is verified and included in the archive, the " "maintainer signature is stripped off, an MD5 sum of the package is computed " @@ -5452,10 +5515,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:160 -#| msgid "" -#| "<literal>Create a toplevel Release file</literal>. if it does not exist " -#| "already. You can do this by running <command>apt-ftparchive release</" -#| "command> (provided in apt-utils)." msgid "" "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist " "already. You can do this by running <command>apt-ftparchive release</" @@ -5467,9 +5526,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:165 -#| msgid "" -#| "<literal>Sign it</literal>. You can do this by running <command>gpg -abs -" -#| "o Release.gpg Release</command>." msgid "" "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -abs -" "o Release.gpg Release</command>." @@ -5479,10 +5535,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:168 -#| msgid "" -#| "<literal>Publish the key fingerprint</literal>, that way your users will " -#| "know what key they need to import in order to authenticate the files in " -#| "the archive." msgid "" "<emphasis>Publish the key fingerprint</emphasis>, that way your users will " "know what key they need to import in order to authenticate the files in the " @@ -5608,19 +5660,20 @@ msgstr "" "<command>apt-sortpkgs</command> retourne zéro si tout se passe bien ou 100 " "en cas d'erreur." -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt.conf.5.xml:13 +#, fuzzy #| msgid "" #| "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" #| "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " #| "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-" -#| "email; &apt-product; <date>10 December 2008</date>" +#| "email; &apt-product; <date>18 September 2009</date>" msgid "" "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " -"&apt-product; <date>18 September 2009</date>" +"&apt-product; <date>16 January 2010</date>" msgstr "" "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" "firstname> <surname>Burrows</surname> <contrib>Documentation d'origine de " @@ -5646,35 +5699,60 @@ msgstr "Fichier de configuration pour APT" #: apt.conf.5.xml:40 msgid "" "<filename>apt.conf</filename> is the main configuration file for the APT " -"suite of tools, all tools make use of the configuration file and a common " -"command line parser to provide a uniform environment. When an APT tool " -"starts up it will read the configuration specified by the <envar>APT_CONFIG</" -"envar> environment variable (if any) and then read the files in " -"<literal>Dir::Etc::Parts</literal> then read the main configuration file " -"specified by <literal>Dir::Etc::main</literal> then finally apply the " -"command line options to override the configuration directives, possibly " -"loading even more config files." -msgstr "" -"Le fichier <filename>apt.conf</filename> est le principal fichier de " -"configuration de la collection d'outils que constitue APT ; tous les outils " -"font appel à ce fichier de configuration et utilisent un analyseur " -"syntaxique en ligne de commande commun afin de fournir un environnement " -"uniforme. Quand un outil d'APT démarre, il lit la configuration désignée par " -"variable d'environnement <envar>APT_CONFIG</envar> (si elle existe), puis il " -"lit les fichiers situés dans <literal>Dir::Etc::Parts</literal> ainsi que le " -"principal fichier de configuration indiqué par <literal>Dir::Etc::main</" -"literal> ; enfin il applique les options de la ligne de commande qui " -"prévalent sur les directives de configuration, chargeant si nécessaire " -"d'autres fichiers de configuration." +"suite of tools, but by far not the only place changes to options can be " +"made. All tools therefore share the configuration files and also use a " +"common command line parser to provide a uniform environment." +msgstr "" -#. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:50 +#. type: Content of: <refentry><refsect1><orderedlist><para> +#: apt.conf.5.xml:45 +msgid "" +"When an APT tool starts up it will read the configuration files in the " +"following order:" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:47 +msgid "" +"the file specified by the <envar>APT_CONFIG</envar> environment variable (if " +"any)" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:49 +msgid "" +"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " +"order which have no or \"<literal>conf</literal>\" as filename extension and " +"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " +"characters - otherwise they will be silently ignored." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:54 +#, fuzzy #| msgid "" -#| "The configuration file is organized in a tree with options organized into " -#| "functional groups. option specification is given with a double colon " -#| "notation, for instance <literal>APT::Get::Assume-Yes</literal> is an " -#| "option within the APT tool group, for the Get tool. options do not " -#| "inherit from their parent groups." +#| "APT configuration file. Configuration Item: <literal>Dir::Etc::Main</" +#| "literal>." +msgid "" +"the main configuration file specified by <literal>Dir::Etc::main</literal>" +msgstr "" +"Fichier de configuration d'APT. Élément de configuration : <literal>Dir::" +"Etc::Main</literal>." + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:56 +msgid "" +"the command line options are applied to override the configuration " +"directives or to load even more configuration files." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:60 +msgid "Syntax" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:61 msgid "" "The configuration file is organized in a tree with options organized into " "functional groups. Option specification is given with a double colon " @@ -5689,15 +5767,7 @@ msgstr "" "Get. Il n'y a pas d'héritage des options des groupes parents." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:56 -#| msgid "" -#| "Syntactically the configuration language is modeled after what the ISC " -#| "tools such as bind and dhcp use. Lines starting with <literal>//</" -#| "literal> are treated as comments (ignored), as well as all text between " -#| "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ " -#| "comments. Each line is of the form <literal>APT::Get::Assume-Yes \"true" -#| "\";</literal> The trailing semicolon is required and the quotes are " -#| "optional. A new scope can be opened with curly braces, like:" +#: apt.conf.5.xml:67 msgid "" "Syntactically the configuration language is modeled after what the ISC tools " "such as bind and dhcp use. Lines starting with <literal>//</literal> are " @@ -5727,7 +5797,7 @@ msgstr "" "avec des accolades, comme suit :" #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:70 +#: apt.conf.5.xml:81 #, no-wrap msgid "" "APT {\n" @@ -5745,7 +5815,7 @@ msgstr "" "};\n" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:78 +#: apt.conf.5.xml:89 msgid "" "with newlines placed to make it more readable. Lists can be created by " "opening a scope and including a single string enclosed in quotes followed by " @@ -5756,13 +5826,13 @@ msgstr "" "guillemets suivie d'un point virgule pour chaque élément de la liste." #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:83 +#: apt.conf.5.xml:94 #, no-wrap msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:86 +#: apt.conf.5.xml:97 msgid "" "In general the sample configuration file in <filename>&docdir;examples/apt." "conf</filename> &configureindex; is a good guide for how it should look." @@ -5772,7 +5842,7 @@ msgstr "" "configuration." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:90 +#: apt.conf.5.xml:101 msgid "" "The names of the configuration items are not case-sensitive. So in the " "previous example you could use <literal>dpkg::pre-install-pkgs</literal>." @@ -5782,7 +5852,7 @@ msgstr "" "<literal>dpkg::pre-install-pkgs</literal>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:93 +#: apt.conf.5.xml:104 msgid "" "Names for the configuration items are optional if a list is defined as it " "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. " @@ -5798,14 +5868,7 @@ msgstr "" "réaffectant une valeur." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:98 -#| msgid "" -#| "Two specials are allowed, <literal>#include</literal> and " -#| "<literal>#clear</literal> <literal>#include</literal> will include the " -#| "given file, unless the filename ends in a slash, then the whole directory " -#| "is included. <literal>#clear</literal> is used to erase a part of the " -#| "configuration tree. The specified element and all its descendents are " -#| "erased." +#: apt.conf.5.xml:109 msgid "" "Two specials are allowed, <literal>#include</literal> (which is deprecated " "and not supported by alternative implementations) and <literal>#clear</" @@ -5825,7 +5888,7 @@ msgstr "" "également se terminer avec un point-virgule." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:106 +#: apt.conf.5.xml:117 msgid "" "The #clear command is the only way to delete a list or a complete scope. " "Reopening a scope or the ::-style described below will <emphasis>not</" @@ -5841,13 +5904,7 @@ msgstr "" "remplacés mais seulement effacés." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:111 -#| msgid "" -#| "All of the APT tools take a -o option which allows an arbitrary " -#| "configuration directive to be specified on the command line. The syntax " -#| "is a full option name (<literal>APT::Get::Assume-Yes</literal> for " -#| "instance) followed by an equals sign then the new value of the option. " -#| "Lists can be appended too by adding a trailing :: to the list name." +#: apt.conf.5.xml:122 msgid "" "All of the APT tools take a -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " @@ -5865,7 +5922,7 @@ msgstr "" "peut pas être indiquée à la ligne de commande." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:118 +#: apt.conf.5.xml:129 msgid "" "Note that you can use :: only for appending one item per line to a list and " "that you should not use it in combination with the scope syntax. (The scope " @@ -5885,23 +5942,23 @@ msgstr "" "avec la syntaxe de champ d'action (« scope ») qui inclut implicitement « :: ». " "L'utilisation simultanée des deux syntaxes déclenchera un bogue dont " "certains utilisateurs se servent comme d'une fonctionnalité : une option " -"avec le nom inhabituel « <literal>::</literal> » se comportera comme toute autre option nommée. " -"Cela risque d'avoir de nombreux problèmes comme conséquence, par exemple si " -"un utilisateur écrit plusieurs lignes avec cette syntaxe <emphasis>erronée</" -"emphasis> afin de faire un ajout à la liste, l'effet obtenu sera inverse " -"puisque seule la dernière valeur pour l'option « <literal>::</literal> » sera utilisée. Les " -"futures versions d'APT retourneront une erreur et l'exécution sera " -"interrompue si cette utilisation incorrecte est rencontrée. Il est donc " -"conseillé de corriger ces défauts tant qu'APT ne s'en plaint pas " -"explicitement." +"avec le nom inhabituel « <literal>::</literal> » se comportera comme toute " +"autre option nommée. Cela risque d'avoir de nombreux problèmes comme " +"conséquence, par exemple si un utilisateur écrit plusieurs lignes avec cette " +"syntaxe <emphasis>erronée</emphasis> afin de faire un ajout à la liste, " +"l'effet obtenu sera inverse puisque seule la dernière valeur pour l'option " +"« <literal>::</literal> » sera utilisée. Les futures versions d'APT " +"retourneront une erreur et l'exécution sera interrompue si cette utilisation " +"incorrecte est rencontrée. Il est donc conseillé de corriger ces défauts " +"tant qu'APT ne s'en plaint pas explicitement." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:130 +#: apt.conf.5.xml:141 msgid "The APT Group" msgstr "Le groupe APT" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:131 +#: apt.conf.5.xml:142 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." @@ -5910,12 +5967,12 @@ msgstr "" "également des options communes à tous les outils." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:135 +#: apt.conf.5.xml:146 msgid "Architecture" msgstr "Architecture" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:136 +#: apt.conf.5.xml:147 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@ -5926,12 +5983,12 @@ msgstr "" "valeur interne par défaut est l'architecture pour laquelle APT a été compilé." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:141 +#: apt.conf.5.xml:152 msgid "Default-Release" msgstr "Default-Release" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:142 +#: apt.conf.5.xml:153 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -5944,12 +6001,12 @@ msgstr "" "« lenny », « squeeze », « 4.0 », « 5.0* ». Voir aussi &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:146 +#: apt.conf.5.xml:157 msgid "Ignore-Hold" msgstr "Ignore-Hold" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:147 +#: apt.conf.5.xml:158 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." @@ -5959,12 +6016,12 @@ msgstr "" "décision." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:151 +#: apt.conf.5.xml:162 msgid "Clean-Installed" msgstr "Clean-Installed" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:152 +#: apt.conf.5.xml:163 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -5978,12 +6035,43 @@ msgstr "" "les réinstaller." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:158 +#: apt.conf.5.xml:169 msgid "Immediate-Configure" msgstr "Immediate-Configure" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:159 +#: apt.conf.5.xml:170 +#, fuzzy +#| msgid "" +#| "Defaults to on which will cause APT to install essential and important " +#| "packages as fast as possible in the install/upgrade operation. This is " +#| "done to limit the effect of a failing &dpkg; call: If this option is " +#| "disabled APT does treat an important package in the same way as an extra " +#| "package: Between the unpacking of the important package A and his " +#| "configuration can then be many other unpack or configuration calls, e.g. " +#| "for package B which has no relation to A, but causes the dpkg call to " +#| "fail (e.g. because maintainer script of package B generates an error) " +#| "which results in a system state in which package A is unpacked but " +#| "unconfigured - each package depending on A is now no longer guaranteed to " +#| "work as their dependency on A is not longer satisfied. The immediate " +#| "configuration marker is also applied to all dependencies which can " +#| "generate a problem if the dependencies e.g. form a circle as a dependency " +#| "with the immediate flag is comparable with a Pre-Dependency. So in theory " +#| "it is possible that APT encounters a situation in which it is unable to " +#| "perform immediate configuration, error out and refers to this option so " +#| "the user can deactivate the immediate configuration temporary to be able " +#| "to perform an install/upgrade again. Note the use of the word \"theory\" " +#| "here as this problem was only encountered by now in real world a few " +#| "times in non-stable distribution versions and caused by wrong " +#| "dependencies of the package in question or by a system in an already " +#| "broken state, so you should not blindly disable this option as the " +#| "mentioned scenario above is not the only problem immediate configuration " +#| "can help to prevent in the first place. Before a big operation like " +#| "<literal>dist-upgrade</literal> is run with this option disabled it " +#| "should be tried to explicitly <literal>install</literal> the package APT " +#| "is unable to configure immediately, but please make sure to report your " +#| "problem also to your distribution and to the APT team with the buglink " +#| "below so they can work on improving or correcting the upgrade process." msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -5999,13 +6087,13 @@ msgid "" "dependencies which can generate a problem if the dependencies e.g. form a " "circle as a dependency with the immediate flag is comparable with a Pre-" "Dependency. So in theory it is possible that APT encounters a situation in " -"which it is unable to perform immediate configuration, error out and refers " +"which it is unable to perform immediate configuration, errors out and refers " "to this option so the user can deactivate the immediate configuration " -"temporary to be able to perform an install/upgrade again. Note the use of " +"temporarily to be able to perform an install/upgrade again. Note the use of " "the word \"theory\" here as this problem was only encountered by now in real " -"world a few times in non-stable distribution versions and caused by wrong " -"dependencies of the package in question or by a system in an already broken " -"state, so you should not blindly disable this option as the mentioned " +"world a few times in non-stable distribution versions and was caused by " +"wrong dependencies of the package in question or by a system in an already " +"broken state, so you should not blindly disable this option as the mentioned " "scenario above is not the only problem immediate configuration can help to " "prevent in the first place. Before a big operation like <literal>dist-" "upgrade</literal> is run with this option disabled it should be tried to " @@ -6046,12 +6134,12 @@ msgstr "" "de la distribution utilisée afin qu'il soit étudié et corrigé." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:181 +#: apt.conf.5.xml:192 msgid "Force-LoopBreak" msgstr "Force-LoopBreak" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:182 +#: apt.conf.5.xml:193 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -6063,18 +6151,18 @@ msgstr "" "Ne jamais activer cette option à moins que vous ne sachiez - réellement - ce " "que vous faites. Elle autorise APT à supprimer temporairement un paquet " "essentiel pour mettre fin à une boucle Conflicts / Conflicts ou Conflicts / " -"Pre-Depends entre deux paquets essentiels. Une telle boucle ne devrait jamais " -"se produire : c'est un bogue très important. Cette option fonctionne si les paquets " -"essentiels ne sont pas tar, gzip, libc, dpkg, bash ou tous les paquets dont " -"ces paquets dépendent." +"Pre-Depends entre deux paquets essentiels. Une telle boucle ne devrait " +"jamais se produire : c'est un bogue très important. Cette option fonctionne " +"si les paquets essentiels ne sont pas tar, gzip, libc, dpkg, bash ou tous " +"les paquets dont ces paquets dépendent." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:190 +#: apt.conf.5.xml:201 msgid "Cache-Limit" msgstr "Cache-Limit" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:191 +#: apt.conf.5.xml:202 msgid "" "APT uses a fixed size memory mapped cache file to store the 'available' " "information. This sets the size of that cache (in bytes)." @@ -6084,24 +6172,24 @@ msgstr "" "mémoire allouée (en octets) pour le chargement de ce cache." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:195 +#: apt.conf.5.xml:206 msgid "Build-Essential" msgstr "Build-Essential" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:196 +#: apt.conf.5.xml:207 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" "Cette option définit les paquets qui sont considérés comme faisant partie " "des dépendances essentielles pour la construction de paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:210 msgid "Get" msgstr "Get" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:200 +#: apt.conf.5.xml:211 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." @@ -6111,12 +6199,12 @@ msgstr "" "question." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:204 +#: apt.conf.5.xml:215 msgid "Cache" msgstr "Cache" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:205 +#: apt.conf.5.xml:216 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." @@ -6126,12 +6214,12 @@ msgstr "" "options en question." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:209 +#: apt.conf.5.xml:220 msgid "CDROM" msgstr "CDROM" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:210 +#: apt.conf.5.xml:221 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." @@ -6141,17 +6229,17 @@ msgstr "" "options en question." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:227 msgid "The Acquire Group" msgstr "Le groupe Acquire" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:221 +#: apt.conf.5.xml:232 msgid "PDiffs" msgstr "PDiffs" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:222 +#: apt.conf.5.xml:233 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." @@ -6160,13 +6248,24 @@ msgstr "" "literal> pour les paquets ou les fichiers sources, plutôt que de les " "télécharger entièrement. Par défaut à « true »." +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:236 +msgid "" +"Two sub-options to limit the use of PDiffs are also available: With " +"<literal>FileLimit</literal> can be specified how many PDiff files are " +"downloaded at most to patch a file. <literal>SizeLimit</literal> on the " +"other hand is the maximum precentage of the size of all patches compared to " +"the size of the targeted file. If one of these limits is exceeded the " +"complete file is downloaded instead of the patches." +msgstr "" + #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:227 +#: apt.conf.5.xml:245 msgid "Queue-Mode" msgstr "Queue-Mode" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:228 +#: apt.conf.5.xml:246 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -6182,12 +6281,12 @@ msgstr "" "initiée." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:253 msgid "Retries" msgstr "Retries" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:236 +#: apt.conf.5.xml:254 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -6197,12 +6296,12 @@ msgstr "" "échoué." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:240 +#: apt.conf.5.xml:258 msgid "Source-Symlinks" msgstr "Source-Symlinks" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:241 +#: apt.conf.5.xml:259 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." @@ -6212,19 +6311,12 @@ msgstr "" "archives de sources au lieu de les copier. Par défaut à « true »." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:245 sources.list.5.xml:139 +#: apt.conf.5.xml:263 sources.list.5.xml:139 msgid "http" msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:246 -#| msgid "" -#| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " -#| "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. " -#| "Per host proxies can also be specified by using the form <literal>http::" -#| "Proxy::<host></literal> with the special keyword <literal>DIRECT</" -#| "literal> meaning to use no proxies. The <envar>http_proxy</envar> " -#| "environment variable will override all settings." +#: apt.conf.5.xml:264 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -6239,12 +6331,12 @@ msgstr "" "mandataire particulier par hôte distant en utilisant la syntaxe : " "<literal>http::Proxy::<hôte></literal>. Le mot-clé spécial " "<literal>DIRECT</literal> indique alors de n'utiliser aucun mandataire pour " -"l'hôte. Si aucun des paramètres précédents n'est défini, la variable d'environnement " -"<envar>http_proxy</envar> annule et remplace toutes les options de " -"mandataire HTTP." +"l'hôte. Si aucun des paramètres précédents n'est défini, la variable " +"d'environnement <envar>http_proxy</envar> annule et remplace toutes les " +"options de mandataire HTTP." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:254 +#: apt.conf.5.xml:272 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -6269,25 +6361,18 @@ msgstr "" "en compte aucune de ces options." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:264 apt.conf.5.xml:328 +#: apt.conf.5.xml:282 apt.conf.5.xml:346 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " "timeout." msgstr "" -"L'option <literal>timeout</literal> positionne le compteur d'expiration du délai " -"(timeout) utilisé par la méthode. Cela vaut pour tout, connexion et données." +"L'option <literal>timeout</literal> positionne le compteur d'expiration du " +"délai (timeout) utilisé par la méthode. Cela vaut pour tout, connexion et " +"données." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:267 -#| msgid "" -#| "One setting is provided to control the pipeline depth in cases where the " -#| "remote server is not RFC conforming or buggy (such as Squid 2.0.2) " -#| "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to " -#| "5 indicating how many outstanding requests APT should send. A value of " -#| "zero MUST be specified if the remote host does not properly linger on TCP " -#| "connections - otherwise data corruption will occur. Hosts which require " -#| "this are in violation of RFC 2068." +#: apt.conf.5.xml:285 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@ -6302,12 +6387,12 @@ msgstr "" "(comme Squid 2.0.2). <literal>Acquire::http::Pipeline-Depth </literal> a une " "valeur comprise entre 0 et 5 : elle indique le nombre de requêtes en attente " "qui peuvent être émises. Quand la machine distante ne conserve pas " -"correctement les connexions TCP, la valeur doit égale à 0. " -"Dans le cas contraire, des données seront corrompues. Les machines qui ont besoin de cette " -"option ne respectent pas la RFC 2068." +"correctement les connexions TCP, la valeur doit égale à 0. Dans le cas " +"contraire, des données seront corrompues. Les machines qui ont besoin de " +"cette option ne respectent pas la RFC 2068." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:275 +#: apt.conf.5.xml:293 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -6322,7 +6407,7 @@ msgstr "" "implicitement le téléchargement simultané depuis plusieurs serveurs." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:280 +#: apt.conf.5.xml:298 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -6334,16 +6419,12 @@ msgstr "" "n'autorisent l'accès qu'aux client s'identifiant de manière spécifique.." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:286 +#: apt.conf.5.xml:304 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:287 -#| msgid "" -#| "HTTPS URIs. Cache-control and proxy options are the same as for " -#| "<literal>http</literal> method. <literal>Pipeline-Depth</literal> option " -#| "is not supported yet." +#: apt.conf.5.xml:305 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -6351,14 +6432,15 @@ msgid "" "not explicitly set for https. <literal>Pipeline-Depth</literal> option is " "not supported yet." msgstr "" -"URI HTTPS. Les options de contrôle de cache, de délai limite, d'autorisation de redirection, de Dl-Limit et " -"de mandataire (proxy) sont les mêmes que pour la méthode <literal>http</" -"literal>. Les valeurs par défaut sont les mêmes que pour l'option " -"<literal>http</literal> sauf si des valeurs spécifiques à https sont " -"indiquées. L'option <literal>Pipeline-Depth</literal> n'est pas encore gérée." +"URI HTTPS. Les options de contrôle de cache, de délai limite, d'autorisation " +"de redirection, de Dl-Limit et de mandataire (proxy) sont les mêmes que pour " +"la méthode <literal>http</literal>. Les valeurs par défaut sont les mêmes " +"que pour l'option <literal>http</literal> sauf si des valeurs spécifiques à " +"https sont indiquées. L'option <literal>Pipeline-Depth</literal> n'est pas " +"encore gérée." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:293 +#: apt.conf.5.xml:311 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -6390,24 +6472,12 @@ msgstr "" "ou 'SSLv3'." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:311 sources.list.5.xml:150 +#: apt.conf.5.xml:329 sources.list.5.xml:150 msgid "ftp" msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:312 -#| msgid "" -#| "FTP URIs; ftp::Proxy is the default proxy server to use. It is in the " -#| "standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal> " -#| "and is overridden by the <envar>ftp_proxy</envar> environment variable. " -#| "To use a ftp proxy you will have to set the <literal>ftp::ProxyLogin</" -#| "literal> script in the configuration file. This entry specifies the " -#| "commands to send to tell the proxy server what to connect to. Please see " -#| "&configureindex; for an example of how to do this. The substitution " -#| "variables available are <literal>$(PROXY_USER)</literal> <literal>" -#| "$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>" -#| "$(SITE_PASS)</literal> <literal>$(SITE)</literal> and <literal>" -#| "$(SITE_PORT)</literal> Each is taken from it's respective URI component." +#: apt.conf.5.xml:330 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -6429,20 +6499,20 @@ msgstr "" "port]/</literal>. On peut spécifier un mandataire particulier par hôte " "distant en utilisant la syntaxe : <literal>ftp::Proxy::<hôte></" "literal>. Le mot-clé spécial <literal>DIRECT</literal> indique alors de " -"n'utiliser aucun mandataire pour l'hôte. Si aucun des paramètres précédents n'est définis, la " -"variable d'environnement <envar>ftp_proxy</envar> annule et replace toutes " -"les options de mandataire FTP. Pour utiliser un mandataire FTP, vous devrez " -"renseigner l'entrée <literal>ftp::ProxyLogin</literal> dans le fichier de " -"configuration. Cette entrée spécifie les commandes à envoyer au mandataire " -"pour lui préciser à quoi il doit se connecter. Voyez &configureindex; pour " -"savoir comment faire. Les variables de substitution disponibles sont : " -"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>" -"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</" -"literal> et <literal>$(SITE_PORT)</literal>. Chacune correspond à l'élément " -"respectif de l'URI." +"n'utiliser aucun mandataire pour l'hôte. Si aucun des paramètres précédents " +"n'est définis, la variable d'environnement <envar>ftp_proxy</envar> annule " +"et replace toutes les options de mandataire FTP. Pour utiliser un mandataire " +"FTP, vous devrez renseigner l'entrée <literal>ftp::ProxyLogin</literal> dans " +"le fichier de configuration. Cette entrée spécifie les commandes à envoyer " +"au mandataire pour lui préciser à quoi il doit se connecter. Voyez " +"&configureindex; pour savoir comment faire. Les variables de substitution " +"disponibles sont : <literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</" +"literal>, <literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, " +"<literal>$(SITE)</literal> et <literal>$(SITE_PORT)</literal>. Chacune " +"correspond à l'élément respectif de l'URI." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:331 +#: apt.conf.5.xml:349 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -6459,7 +6529,7 @@ msgstr "" "modèle de fichier de configuration)." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:338 +#: apt.conf.5.xml:356 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -6470,11 +6540,11 @@ msgstr "" "positionnant la variable d'environnement <envar>ftp_proxy</envar> à une URL " "HTTP -- consultez la méthode http ci-dessus pour la syntaxe. On ne peut pas " "le faire dans le fichier de configuration et il n'est de toute façon pas " -"recommandé d'utiliser FTP au travers de HTTP en raison de la faible efficacité " -"de cette méthode." +"recommandé d'utiliser FTP au travers de HTTP en raison de la faible " +"efficacité de cette méthode." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:343 +#: apt.conf.5.xml:361 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -6490,19 +6560,18 @@ msgstr "" "des serveurs FTP ne suivent pas la RFC 2428." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:350 sources.list.5.xml:132 +#: apt.conf.5.xml:368 sources.list.5.xml:132 msgid "cdrom" msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:356 +#: apt.conf.5.xml:374 #, no-wrap -#| msgid "\"/cdrom/\"::Mount \"foo\";" msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"foo\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:351 +#: apt.conf.5.xml:369 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -6516,20 +6585,20 @@ msgstr "" "URI CD ; la seule option de configuration pour les URI de CD est le point de " "montage : <literal>cdrom::Mount</literal> ; il doit représenter le point de " "montage du lecteur de CD-ROM indiqué dans <filename>/etc/fstab</filename>. " -"D'autres commandes de montage et de démontage peuvent être fournies quand le point " -"de montage ne peut être listé dans le fichier <filename>/etc/fstab</" +"D'autres commandes de montage et de démontage peuvent être fournies quand le " +"point de montage ne peut être listé dans le fichier <filename>/etc/fstab</" "filename> (par exemple, un montage SMB). Syntaxiquement, il faut placer " "<placeholder type=\"literallayout\" id=\"0\"/> dans le bloc cdrom. La barre " "oblique finale est importante. Les commandes de démontage peuvent être " "spécifiées en utilisant <literal>UMount</literal>." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:361 +#: apt.conf.5.xml:379 msgid "gpgv" msgstr "gpgv" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:362 +#: apt.conf.5.xml:380 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -6540,18 +6609,18 @@ msgstr "" "supplémentaires passées à gpgv." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:367 +#: apt.conf.5.xml:385 msgid "CompressionTypes" msgstr "CompressionTypes" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:373 +#: apt.conf.5.xml:391 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<replaceable>NomMethode</replaceable>\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:386 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -6563,27 +6632,27 @@ msgid "" msgstr "" "Cette option indique la liste des types de compression comprises par les " "méthodes d'acquisition. Des fichiers comme <filename>Packages</filename> " -"peuvent être disponibles dans divers formats de compression. Par défaut, " -"les méthodes d'acquisition décompressent les fichiers compressés avec " +"peuvent être disponibles dans divers formats de compression. Par défaut, les " +"méthodes d'acquisition décompressent les fichiers compressés avec " "<command>bzip2</command>, <command>lzma</command> et <command>gzip</" "command>. Ce réglage permet d'ajouter à la volée des formats supplémentaires " "ou de modifier la méthode utilisée. La syntaxe à utiliser est : <placeholder " "type=\"synopsis\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:378 +#: apt.conf.5.xml:396 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:399 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:392 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -6614,13 +6683,13 @@ msgstr "" "<literal>bz2</literal> à liste car il sera ajouté automatiquement." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:385 +#: apt.conf.5.xml:403 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:383 +#: apt.conf.5.xml:401 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -6646,7 +6715,7 @@ msgstr "" "simplement préfixée avec l'option en question." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:408 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@ -6662,18 +6731,28 @@ msgstr "" "non compressés afin de gérer des miroirs locaux." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:396 +#: apt.conf.5.xml:414 msgid "Languages" msgstr "Langues" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:397 +#: apt.conf.5.xml:415 +#, fuzzy +#| msgid "" +#| "The Languages subsection controls which <filename>Translation</filename> " +#| "files are downloaded and in which order APT tries to display the " +#| "Description-Translations. APT will try to display the first available " +#| "Description for the Language which is listed at first. Languages can be " +#| "defined with their short or long Languagecodes. Note that not all " +#| "archives provide <filename>Translation</filename> files for every " +#| "Language - especially the long Languagecodes are rare, so please inform " +#| "you which ones are available before you set here impossible values." msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" -"Translations. APT will try to display the first available Description for " -"the Language which is listed at first. Languages can be defined with their " -"short or long Languagecodes. Note that not all archives provide " +"Translations. APT will try to display the first available Description in the " +"Language which is listed at first. Languages can be defined with their short " +"or long Languagecodes. Note that not all archives provide " "<filename>Translation</filename> files for every Language - especially the " "long Languagecodes are rare, so please inform you which ones are available " "before you set here impossible values." @@ -6685,22 +6764,43 @@ msgstr "" "choisie en premier. Les langues peuvent être indiquées par leur code long ou " "court. Veuillez noter que tous les dépôts ne fournissent pas les fichiers " "<filename>Translation</filename> pour toutes les langues, particulièrement " -"pour les code de langues long sont rares. Il est donc conseillé de vous renseigner sur ce " -"qui est disponible avant d'établir des réglages impossibles." +"pour les code de langues long sont rares. Il est donc conseillé de vous " +"renseigner sur ce qui est disponible avant d'établir des réglages " +"impossibles." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:413 +#: apt.conf.5.xml:431 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:403 +#: apt.conf.5.xml:421 +#, fuzzy +#| msgid "" +#| "The default list includes \"environment\" and \"en\". " +#| "\"<literal>environment</literal>\" has a special meaning here: It will be " +#| "replaced at runtime with the languagecodes extracted from the " +#| "<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure " +#| "that these codes are not included twice in the list. If " +#| "<literal>LC_MESSAGES</literal> is set to \"C\" only the " +#| "<filename>Translation-en</filename> file (if available) will be used. To " +#| "force apt to use no Translation file use the setting <literal>Acquire::" +#| "Languages=none</literal>. \"<literal>none</literal>\" is another special " +#| "meaning code which will stop the search for a fitting " +#| "<filename>Translation</filename> file. This can be used by the system " +#| "administrator to let APT know that it should download also this files " +#| "without actually use them if not the environment specifies this " +#| "languages. So the following example configuration will result in the " +#| "order \"en, de\" in an english and in \"de, en\" in a german " +#| "localization. Note that \"fr\" is downloaded, but not used if APT is not " +#| "used in a french localization, in such an environment the order would be " +#| "\"fr, de, en\". <placeholder type=\"programlisting\" id=\"0\"/>" msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " "replaced at runtime with the languagecodes extracted from the " -"<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure " +"<literal>LC_MESSAGES</literal> environment variable. It will also ensure " "that these codes are not included twice in the list. If " "<literal>LC_MESSAGES</literal> is set to \"C\" only the " "<filename>Translation-en</filename> file (if available) will be used. To " @@ -6709,7 +6809,7 @@ msgid "" "meaning code which will stop the search for a fitting <filename>Translation</" "filename> file. This can be used by the system administrator to let APT " "know that it should download also this files without actually use them if " -"not the environment specifies this languages. So the following example " +"the environment doesn't specify this languages. So the following example " "configuration will result in the order \"en, de\" in an english and in \"de, " "en\" in a german localization. Note that \"fr\" is downloaded, but not used " "if APT is not used in a french localization, in such an environment the " @@ -6737,7 +6837,7 @@ msgstr "" "\"/>" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:217 +#: apt.conf.5.xml:228 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" @@ -6747,12 +6847,12 @@ msgstr "" "id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:438 msgid "Directories" msgstr "Les répertoires" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:422 +#: apt.conf.5.xml:440 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -6772,7 +6872,7 @@ msgstr "" "filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:429 +#: apt.conf.5.xml:447 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -6788,14 +6888,14 @@ msgstr "" "<literal>srcpkgcache</literal> et <literal>pkgcache</literal>, ainsi que " "l'endroit où sont placées les archives téléchargées, <literal>Dir::Cache::" "archives</literal>. On peut empêcher la création des caches en saisissant un " -"nom vide. Cela ralentit le démarrage mais économise de l'espace disque. Il vaut " -"mieux se passer du cache <literal>pkgcache</literal> plutôt que se passer du " -"cache <literal>srcpkgcache</literal>. Comme pour <literal>Dir::State</" -"literal>, le répertoire par défaut est contenu dans <literal>Dir::Cache</" -"literal>." +"nom vide. Cela ralentit le démarrage mais économise de l'espace disque. Il " +"vaut mieux se passer du cache <literal>pkgcache</literal> plutôt que se " +"passer du cache <literal>srcpkgcache</literal>. Comme pour <literal>Dir::" +"State</literal>, le répertoire par défaut est contenu dans <literal>Dir::" +"Cache</literal>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:438 +#: apt.conf.5.xml:456 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -6810,7 +6910,7 @@ msgstr "" "fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:444 +#: apt.conf.5.xml:462 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -6821,14 +6921,7 @@ msgstr "" "configuration est chargé." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:448 -#| msgid "" -#| "Binary programs are pointed to by <literal>Dir::Bin</literal>. " -#| "<literal>Dir::Bin::Methods</literal> specifies the location of the method " -#| "handlers and <literal>gzip</literal>, <literal>dpkg</literal>, " -#| "<literal>apt-get</literal> <literal>dpkg-source</literal> <literal>dpkg-" -#| "buildpackage</literal> and <literal>apt-cache</literal> specify the " -#| "location of the respective programs." +#: apt.conf.5.xml:466 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -6846,7 +6939,7 @@ msgstr "" "programmes correspondants." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:456 +#: apt.conf.5.xml:474 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -6868,12 +6961,12 @@ msgstr "" "staging/var/lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:469 +#: apt.conf.5.xml:487 msgid "APT in DSelect" msgstr "APT et DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:471 +#: apt.conf.5.xml:489 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -6884,12 +6977,12 @@ msgstr "" "<literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:475 +#: apt.conf.5.xml:493 msgid "Clean" msgstr "Clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:476 +#: apt.conf.5.xml:494 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -6907,7 +7000,7 @@ msgstr "" "supprime avant de récupérer de nouveaux paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:485 +#: apt.conf.5.xml:503 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@ -6916,12 +7009,12 @@ msgstr "" "&apt-get; lors de la phase d'installation." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:489 +#: apt.conf.5.xml:507 msgid "Updateoptions" msgstr "UpdateOptions" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:490 +#: apt.conf.5.xml:508 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@ -6930,12 +7023,12 @@ msgstr "" "&apt-get; lors de la phase de mise à jour." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:494 +#: apt.conf.5.xml:512 msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:495 +#: apt.conf.5.xml:513 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -6945,12 +7038,12 @@ msgstr "" "d'erreur que l'on propose à l'utilisateur d'intervenir." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:501 +#: apt.conf.5.xml:519 msgid "How APT calls dpkg" msgstr "Méthode d'appel de &dpkg; par APT" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:502 +#: apt.conf.5.xml:520 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -6959,7 +7052,7 @@ msgstr "" "&dpkg; : elles figurent dans la section <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:507 +#: apt.conf.5.xml:525 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -6970,17 +7063,17 @@ msgstr "" "est passé comme un seul paramètre à &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:512 +#: apt.conf.5.xml:530 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:512 +#: apt.conf.5.xml:530 msgid "Post-Invoke" msgstr "Post-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:513 +#: apt.conf.5.xml:531 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -6993,12 +7086,12 @@ msgstr "" "<filename>/bin/sh</filename> : APT s'arrête dès que l'une d'elles échoue." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:537 msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:520 +#: apt.conf.5.xml:538 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -7014,7 +7107,7 @@ msgstr "" "qu'il va installer, à raison d'un par ligne." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:544 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -7030,12 +7123,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:533 +#: apt.conf.5.xml:551 msgid "Run-Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:534 +#: apt.conf.5.xml:552 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@ -7044,12 +7137,12 @@ msgstr "" "le répertoire <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:556 msgid "Build-options" msgstr "Build-options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:539 +#: apt.conf.5.xml:557 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@ -7059,14 +7152,14 @@ msgstr "" "créés." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:544 +#: apt.conf.5.xml:562 msgid "dpkg trigger usage (and related options)" msgstr "" "utilisation des actions différées (« triggers ») de dpkg (et options " "associées)" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:545 +#: apt.conf.5.xml:563 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@ -7093,7 +7186,7 @@ msgstr "" "configuration des paquets." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:560 +#: apt.conf.5.xml:578 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -7107,7 +7200,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:554 +#: apt.conf.5.xml:572 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -7131,12 +7224,12 @@ msgstr "" "type=\"literallayout\" id=\"0\"/>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:566 +#: apt.conf.5.xml:584 msgid "DPkg::NoTriggers" msgstr "DPkg::NoTriggers" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:567 +#: apt.conf.5.xml:585 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -7158,13 +7251,12 @@ msgstr "" "options « unpack » et « remove »." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:574 -#| msgid "Packages::Compress" +#: apt.conf.5.xml:592 msgid "PackageManager::Configure" msgstr "PackageManager::Configure" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:575 +#: apt.conf.5.xml:593 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -7192,12 +7284,12 @@ msgstr "" "configuré et donc éventuellement non amorçable." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:585 +#: apt.conf.5.xml:603 msgid "DPkg::ConfigurePending" msgstr "DPkg::ConfigurePending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:586 +#: apt.conf.5.xml:604 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -7216,12 +7308,12 @@ msgstr "" "peut conserver l'option active." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:592 +#: apt.conf.5.xml:610 msgid "DPkg::TriggersPending" msgstr "DPkg::TriggersPending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:593 +#: apt.conf.5.xml:611 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -7239,12 +7331,12 @@ msgstr "" "celles concernant le paquet en cours de traitement." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:598 +#: apt.conf.5.xml:616 msgid "PackageManager::UnpackAll" msgstr "PackageManager::UnpackAll" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:617 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -7269,12 +7361,12 @@ msgstr "" "traduction n'est pas exclu...)." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:624 msgid "OrderList::Score::Immediate" msgstr "OrderList::Score::Immediate" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:614 +#: apt.conf.5.xml:632 #, no-wrap msgid "" "OrderList::Score {\n" @@ -7292,7 +7384,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:607 +#: apt.conf.5.xml:625 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -7318,12 +7410,12 @@ msgstr "" "id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:627 +#: apt.conf.5.xml:645 msgid "Periodic and Archives options" msgstr "Options « Periodic » et « Archive »" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:628 +#: apt.conf.5.xml:646 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -7335,12 +7427,12 @@ msgstr "" "script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:636 +#: apt.conf.5.xml:654 msgid "Debug options" msgstr "Les options de débogage" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:656 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -7358,7 +7450,7 @@ msgstr "" "peuvent tout de même être utiles :" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:649 +#: apt.conf.5.xml:667 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -7369,7 +7461,7 @@ msgstr "" "upgrade, upgrade, install, remove et purge</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:657 +#: apt.conf.5.xml:675 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -7381,7 +7473,7 @@ msgstr "" "superutilisateur." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:666 +#: apt.conf.5.xml:684 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -7391,9 +7483,9 @@ msgstr "" #. TODO: provide a #. motivating example, except I haven't a clue why you'd want -#. to do this. +#. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:674 +#: apt.conf.5.xml:692 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." @@ -7402,59 +7494,62 @@ msgstr "" "type statfs dans les identifiants de CD." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:684 +#: apt.conf.5.xml:702 msgid "A full list of debugging options to apt follows." msgstr "Liste complète des options de débogage de APT :" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:689 +#: apt.conf.5.xml:707 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:693 -msgid "Print information related to accessing <literal>cdrom://</literal> sources." +#: apt.conf.5.xml:711 +msgid "" +"Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" "Affiche les informations concernant les sources de type <literal>cdrom://</" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:718 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:704 +#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using FTP." -msgstr "Affiche les informations concernant le téléchargement de paquets par FTP." +msgstr "" +"Affiche les informations concernant le téléchargement de paquets par FTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:711 +#: apt.conf.5.xml:729 msgid "<literal>Debug::Acquire::http</literal>" msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:715 +#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTP." -msgstr "Affiche les informations concernant le téléchargement de paquets par HTTP." +msgstr "" +"Affiche les informations concernant le téléchargement de paquets par HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:740 msgid "<literal>Debug::Acquire::https</literal>" msgstr "<literal>Debug::Acquire::https</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:726 +#: apt.conf.5.xml:744 msgid "Print information related to downloading packages using HTTPS." msgstr "Print information related to downloading packages using HTTPS." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:751 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "<literal>Debug::Acquire::gpgv</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:737 +#: apt.conf.5.xml:755 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -7463,12 +7558,12 @@ msgstr "" "cryptographiques avec <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:762 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:748 +#: apt.conf.5.xml:766 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -7477,24 +7572,24 @@ msgstr "" "stockées sur CD." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:755 +#: apt.conf.5.xml:773 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:758 +#: apt.conf.5.xml:776 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" "Décrit le processus de résolution des dépendances pour la construction de " "paquets source ( « build-dependencies » ) par &apt-get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:783 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:768 +#: apt.conf.5.xml:786 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -7503,12 +7598,12 @@ msgstr "" "librairies d'<literal>apt</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:775 +#: apt.conf.5.xml:793 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:778 +#: apt.conf.5.xml:796 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -7519,12 +7614,12 @@ msgstr "" "utilisés sur le système de fichier du CD." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:786 +#: apt.conf.5.xml:804 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:789 +#: apt.conf.5.xml:807 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." @@ -7534,24 +7629,24 @@ msgstr "" "temps." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:797 +#: apt.conf.5.xml:815 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:801 +#: apt.conf.5.xml:819 msgid "Log when items are added to or removed from the global download queue." msgstr "" "Trace les ajouts et suppressions d'éléments de la queue globale de " "téléchargement." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:826 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "<literal>Debug::pkgAcquire::Auth</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:811 +#: apt.conf.5.xml:829 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -7561,12 +7656,12 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:818 +#: apt.conf.5.xml:836 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:821 +#: apt.conf.5.xml:839 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -7576,12 +7671,12 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:829 +#: apt.conf.5.xml:847 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "<literal>Debug::pkgAcquire::RRed</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:833 +#: apt.conf.5.xml:851 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -7591,24 +7686,25 @@ msgstr "" "place des fichiers complets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:840 +#: apt.conf.5.xml:858 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:844 -msgid "Log all interactions with the sub-processes that actually perform downloads." +#: apt.conf.5.xml:862 +msgid "" +"Log all interactions with the sub-processes that actually perform downloads." msgstr "" "Affiche toutes les interactions avec les processus enfants qui se chargent " "effectivement des téléchargements." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:855 +#: apt.conf.5.xml:873 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -7617,12 +7713,12 @@ msgstr "" "automatiquement, et la suppression des paquets inutiles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:880 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:865 +#: apt.conf.5.xml:883 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7637,12 +7733,12 @@ msgstr "" "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:876 +#: apt.conf.5.xml:894 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "<literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:879 +#: apt.conf.5.xml:897 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7677,24 +7773,24 @@ msgstr "" "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:898 +#: apt.conf.5.xml:916 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:901 +#: apt.conf.5.xml:919 msgid "Dump the default configuration to standard error on startup." msgstr "" "Affiche, au lancement, l'ensemble de la configuration sur la sortie d'erreur " "standard." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:908 +#: apt.conf.5.xml:926 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:911 +#: apt.conf.5.xml:929 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -7703,12 +7799,12 @@ msgstr "" "paramètres sont séparés par des espaces." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:919 +#: apt.conf.5.xml:937 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:922 +#: apt.conf.5.xml:940 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -7718,12 +7814,12 @@ msgstr "" "fichier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:929 +#: apt.conf.5.xml:947 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:933 +#: apt.conf.5.xml:951 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -7732,32 +7828,33 @@ msgstr "" "<literal>apt</literal> passe les paquets à &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:941 +#: apt.conf.5.xml:959 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:945 -msgid "Output status messages tracing the steps performed when invoking &dpkg;." +#: apt.conf.5.xml:963 +msgid "" +"Output status messages tracing the steps performed when invoking &dpkg;." msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:970 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:956 +#: apt.conf.5.xml:974 msgid "Output the priority of each package list on startup." msgstr "Affiche, au lancement, la priorité de chaque liste de paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:962 +#: apt.conf.5.xml:980 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:966 +#: apt.conf.5.xml:984 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -7766,12 +7863,12 @@ msgstr "" "concerne que les cas où un problème de dépendances complexe se présente)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:974 +#: apt.conf.5.xml:992 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:977 +#: apt.conf.5.xml:995 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -7782,12 +7879,12 @@ msgstr "" "est décrite dans <literal>Debug::pkgDepCache::Marker</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:985 +#: apt.conf.5.xml:1003 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:989 +#: apt.conf.5.xml:1007 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7796,7 +7893,7 @@ msgstr "" "list</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1012 +#: apt.conf.5.xml:1030 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7805,18 +7902,17 @@ msgstr "" "exemples pour toutes les options existantes." #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1019 -#| msgid "&apt-conf;" +#: apt.conf.5.xml:1037 msgid "&file-aptconf;" msgstr "&file-aptconf;" -#. ? reading apt.conf +#. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1024 +#: apt.conf.5.xml:1042 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt_preferences.5.xml:13 msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" @@ -7834,10 +7930,6 @@ msgstr "Fichier de contrôle des préférences pour APT" #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:34 -#| msgid "" -#| "The APT preferences file <filename>/etc/apt/preferences</filename> can be " -#| "used to control which versions of packages will be selected for " -#| "installation." msgid "" "The APT preferences file <filename>/etc/apt/preferences</filename> and the " "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder " @@ -7886,25 +7978,36 @@ msgstr "" "&sources-list;. Le fichier des préférences n'influe pas sur le choix des " "exemplaires, seulement sur le choix de la version." -#. type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 +msgid "" +"Note that the files in the <filename>/etc/apt/preferences.d</filename> " +"directory are parsed in alphanumeric ascending order and need to obey the " +"following naming convention: The files have no or \"<literal>pref</literal>" +"\" as filename extension and which only contain alphanumeric, hyphen (-), " +"underscore (_) and period (.) characters - otherwise they will be silently " +"ignored." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:63 msgid "APT's Default Priority Assignments" msgstr "Priorités affectées par défaut" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:71 +#: apt_preferences.5.xml:78 #, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "<command>apt-get install -t testing <replaceable>paquet</replaceable></command>\n" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:74 +#: apt_preferences.5.xml:81 #, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "APT::Default-Release \"stable\";\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:58 +#: apt_preferences.5.xml:65 msgid "" "If there is no preferences file or if there is no entry in the file that " "applies to a particular version then the priority assigned to that version " @@ -7929,22 +8032,22 @@ msgstr "" "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:83 +#: apt_preferences.5.xml:90 msgid "priority 100" msgstr "une priorité égale à 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:84 +#: apt_preferences.5.xml:91 msgid "to the version that is already installed (if any)." msgstr "est affectée à la version déjà installée (si elle existe)." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:88 +#: apt_preferences.5.xml:95 msgid "priority 500" msgstr "une priorité égale à 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:89 +#: apt_preferences.5.xml:96 msgid "" "to the versions that are not installed and do not belong to the target " "release." @@ -7953,19 +8056,20 @@ msgstr "" "pas à la distribution par défaut." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:93 +#: apt_preferences.5.xml:100 msgid "priority 990" msgstr "une priorité égale à 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:94 -msgid "to the versions that are not installed and belong to the target release." +#: apt_preferences.5.xml:101 +msgid "" +"to the versions that are not installed and belong to the target release." msgstr "" "est affectée aux versions qui ne sont pas installées et qui appartiennent à " "la distribution par défaut." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:85 msgid "" "If the target release has been specified then APT uses the following " "algorithm to set the priorities of the versions of a package. Assign: " @@ -7976,7 +8080,7 @@ msgstr "" "type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:99 +#: apt_preferences.5.xml:106 msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " @@ -7987,7 +8091,7 @@ msgstr "" "une priorité égale à 500 à tout version non installée." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:103 +#: apt_preferences.5.xml:110 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." @@ -7996,7 +8100,7 @@ msgstr "" "qu'il faut installer (par ordre de priorité) :" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:106 +#: apt_preferences.5.xml:113 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -8012,12 +8116,12 @@ msgstr "" "arrière." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:112 +#: apt_preferences.5.xml:119 msgid "Install the highest priority version." msgstr "Installer la version qui possède la priorité la plus haute." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 +#: apt_preferences.5.xml:120 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." @@ -8026,7 +8130,7 @@ msgstr "" "plus récente (c.-à-d. celle dont le numéro de version est le plus grand)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:116 +#: apt_preferences.5.xml:123 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@ -8038,7 +8142,7 @@ msgstr "" "qui n'est pas installée." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:122 +#: apt_preferences.5.xml:129 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@ -8053,7 +8157,7 @@ msgstr "" "replaceable></command> ou <command>apt-get dist-upgrade</command>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:136 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@ -8066,7 +8170,7 @@ msgstr "" "<command>apt-get upgrade</command> ne provoquent pas de retour en arrière." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:134 +#: apt_preferences.5.xml:141 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@ -8085,12 +8189,12 @@ msgstr "" "priorité que celle de la version installée." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:143 +#: apt_preferences.5.xml:150 msgid "The Effect of APT Preferences" msgstr "Conséquences des préférences" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:145 +#: apt_preferences.5.xml:152 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -8103,7 +8207,7 @@ msgstr "" "formes, une forme particulière et une forme générale." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:151 +#: apt_preferences.5.xml:158 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@ -8118,7 +8222,7 @@ msgstr "" "dont le numéro de version commence par <literal>5.8</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:165 #, no-wrap msgid "" "Package: perl\n" @@ -8130,7 +8234,7 @@ msgstr "" "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:164 +#: apt_preferences.5.xml:171 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@ -8145,7 +8249,7 @@ msgstr "" "un nom complètement qualifié." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:170 +#: apt_preferences.5.xml:177 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@ -8156,7 +8260,7 @@ msgstr "" "priorité haute à toutes les versions disponibles dans le site local." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:175 +#: apt_preferences.5.xml:182 #, no-wrap msgid "" "Package: *\n" @@ -8168,7 +8272,7 @@ msgstr "" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:180 +#: apt_preferences.5.xml:187 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " "This should not be confused with the Origin of a distribution as specified " @@ -8183,7 +8287,7 @@ msgstr "" "mais le nom d'un auteur ou d'un distributeur, comme « Debian » ou « Ximian »." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:186 +#: apt_preferences.5.xml:193 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -8194,7 +8298,7 @@ msgstr "" "<literal>unstable</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:190 +#: apt_preferences.5.xml:197 #, no-wrap msgid "" "Package: *\n" @@ -8206,7 +8310,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:195 +#: apt_preferences.5.xml:202 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>squeeze</literal>" @@ -8217,7 +8321,7 @@ msgstr "" "<literal>squeeze</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:199 +#: apt_preferences.5.xml:206 #, no-wrap msgid "" "Package: *\n" @@ -8229,7 +8333,7 @@ msgstr "" "Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:204 +#: apt_preferences.5.xml:211 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -8241,7 +8345,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:209 +#: apt_preferences.5.xml:216 #, no-wrap msgid "" "Package: *\n" @@ -8253,17 +8357,17 @@ msgstr "" "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:220 +#: apt_preferences.5.xml:227 msgid "How APT Interprets Priorities" msgstr "Méthode d'interprétation des priorités par APT" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:228 +#: apt_preferences.5.xml:235 msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:229 +#: apt_preferences.5.xml:236 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@ -8272,12 +8376,12 @@ msgstr "" "retour en arrière." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:233 +#: apt_preferences.5.xml:240 msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:234 +#: apt_preferences.5.xml:241 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@ -8287,12 +8391,12 @@ msgstr "" "plus récente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:239 +#: apt_preferences.5.xml:246 msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:247 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" @@ -8301,12 +8405,12 @@ msgstr "" "distribution par défaut ou si la version installée est plus récente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:245 +#: apt_preferences.5.xml:252 msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:253 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" @@ -8315,29 +8419,29 @@ msgstr "" "autre distribution ou si la version installée est plus récente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:251 +#: apt_preferences.5.xml:258 msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:259 msgid "" "causes a version to be installed only if there is no installed version of " "the package" msgstr "la version sera installée si aucune version du paquet n'est installée." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:256 +#: apt_preferences.5.xml:263 msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:257 +#: apt_preferences.5.xml:264 msgid "prevents the version from being installed" msgstr "cette priorité empêche l'installation de la version." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:223 +#: apt_preferences.5.xml:230 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -8348,7 +8452,7 @@ msgstr "" "<placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:262 +#: apt_preferences.5.xml:269 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -8362,7 +8466,7 @@ msgstr "" "trouvée détermine la priorité." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:268 +#: apt_preferences.5.xml:275 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@ -8371,7 +8475,7 @@ msgstr "" "entrées décrites ci-dessous :" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:272 +#: apt_preferences.5.xml:279 #, no-wrap msgid "" "Package: perl\n" @@ -8399,12 +8503,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:285 +#: apt_preferences.5.xml:292 msgid "Then:" msgstr "Alors :" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:287 +#: apt_preferences.5.xml:294 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -8418,7 +8522,7 @@ msgstr "" "installée est une version 5.9*, il y aura un retour en arrière." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:299 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -8429,7 +8533,7 @@ msgstr "" "appartenant à la distribution par défaut." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:296 +#: apt_preferences.5.xml:303 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -8442,12 +8546,13 @@ msgstr "" "paquet n'est déjà installée." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:313 msgid "Determination of Package Version and Distribution Properties" -msgstr "Détermination de la version des paquets et des propriétés des distributions" +msgstr "" +"Détermination de la version des paquets et des propriétés des distributions" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:308 +#: apt_preferences.5.xml:315 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -8458,27 +8563,27 @@ msgstr "" "décrivent les paquets disponibles à cet endroit." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:320 +#: apt_preferences.5.xml:327 msgid "the <literal>Package:</literal> line" msgstr "la ligne <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:321 +#: apt_preferences.5.xml:328 msgid "gives the package name" msgstr "donne le nom du paquet" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:324 apt_preferences.5.xml:374 +#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 msgid "the <literal>Version:</literal> line" msgstr "la ligne <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:332 msgid "gives the version number for the named package" msgstr "donne le numéro de version du paquet" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:312 +#: apt_preferences.5.xml:319 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -8499,12 +8604,12 @@ msgstr "" "\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:341 +#: apt_preferences.5.xml:348 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "La ligne <literal>Archive:</literal> ou <literal>Suite:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:342 +#: apt_preferences.5.xml:349 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -8521,18 +8626,18 @@ msgstr "" "préférences demanderait cette ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:352 +#: apt_preferences.5.xml:359 #, no-wrap msgid "Pin: release a=stable\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:365 msgid "the <literal>Codename:</literal> line" msgstr "la ligne <literal>Codename:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:366 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: squeeze\" specifies that all of the " @@ -8548,13 +8653,13 @@ msgstr "" "préférences demanderait cette ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:368 +#: apt_preferences.5.xml:375 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "Pin: release n=squeeze\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:382 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -8570,7 +8675,7 @@ msgstr "" "préférences demanderait ces lignes :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:384 +#: apt_preferences.5.xml:391 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -8582,12 +8687,12 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:393 +#: apt_preferences.5.xml:400 msgid "the <literal>Component:</literal> line" msgstr "La ligne <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:394 +#: apt_preferences.5.xml:401 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -8605,18 +8710,18 @@ msgstr "" "fichier des préférences demanderait cette ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:403 +#: apt_preferences.5.xml:410 #, no-wrap msgid "Pin: release c=main\n" msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:409 +#: apt_preferences.5.xml:416 msgid "the <literal>Origin:</literal> line" msgstr "La ligne <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:410 +#: apt_preferences.5.xml:417 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8629,18 +8734,18 @@ msgstr "" "ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:423 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:422 +#: apt_preferences.5.xml:429 msgid "the <literal>Label:</literal> line" msgstr "La ligne <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:423 +#: apt_preferences.5.xml:430 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8653,13 +8758,13 @@ msgstr "" "préférences demanderait cette ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:436 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:330 +#: apt_preferences.5.xml:337 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -8681,7 +8786,7 @@ msgstr "" "déterminer les priorités : <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:443 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -8706,12 +8811,12 @@ msgstr "" "<literal>unstable</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:449 +#: apt_preferences.5.xml:456 msgid "Optional Lines in an APT Preferences Record" msgstr "Lignes facultatives dans le fichier des préférences" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:451 +#: apt_preferences.5.xml:458 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -8722,7 +8827,7 @@ msgstr "" "commentaires." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:455 +#: apt_preferences.5.xml:462 msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " "optional. If omitted, APT assigns a priority of 1 less than the last value " @@ -8735,12 +8840,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:464 +#: apt_preferences.5.xml:471 msgid "Tracking Stable" msgstr "Méthode pour suivre Stable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:472 +#: apt_preferences.5.xml:479 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -8764,7 +8869,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:466 +#: apt_preferences.5.xml:473 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8779,8 +8884,8 @@ msgstr "" "literal>. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:489 apt_preferences.5.xml:535 -#: apt_preferences.5.xml:593 +#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 +#: apt_preferences.5.xml:600 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -8792,7 +8897,7 @@ msgstr "" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:484 +#: apt_preferences.5.xml:491 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8805,13 +8910,13 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:501 +#: apt_preferences.5.xml:508 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "apt-get install <replaceable>paquet</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:495 +#: apt_preferences.5.xml:502 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -8824,12 +8929,12 @@ msgstr "" "de relancer la commande. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:507 +#: apt_preferences.5.xml:514 msgid "Tracking Testing or Unstable" msgstr "Méthode pour suivre Testing ou Unstable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:523 #, no-wrap msgid "" "Package: *\n" @@ -8857,7 +8962,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:509 +#: apt_preferences.5.xml:516 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -8874,7 +8979,7 @@ msgstr "" "<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:530 +#: apt_preferences.5.xml:537 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8887,13 +8992,13 @@ msgstr "" "type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:550 +#: apt_preferences.5.xml:557 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "apt-get install <replaceable>paquet</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:541 +#: apt_preferences.5.xml:548 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -8912,12 +9017,12 @@ msgstr "" "installée. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:564 msgid "Tracking the evolution of a codename release" msgstr "Suivre l'évolution d'une version par son nom de code" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:571 +#: apt_preferences.5.xml:578 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -8951,7 +9056,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:559 +#: apt_preferences.5.xml:566 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8975,7 +9080,7 @@ msgstr "" "exemples précédents. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:588 +#: apt_preferences.5.xml:595 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -8988,13 +9093,13 @@ msgstr "" "type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:608 +#: apt_preferences.5.xml:615 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "apt-get install <replaceable>paquet</replaceable>/sid\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:599 +#: apt_preferences.5.xml:606 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -9013,13 +9118,12 @@ msgstr "" "type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:617 -#| msgid "apt_preferences" +#: apt_preferences.5.xml:624 msgid "&file-preferences;" msgstr "&file-preferences;" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:623 +#: apt_preferences.5.xml:630 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -9035,11 +9139,6 @@ msgstr "Liste des sources de paquets" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:34 -#| msgid "" -#| "The package resource list is used to locate archives of the package " -#| "distribution system in use on the system. At this time, this manual page " -#| "documents only the packaging system used by the Debian GNU/Linux system. " -#| "This control file is located in <filename>/etc/apt/sources.list</filename>" msgid "" "The package resource list is used to locate archives of the package " "distribution system in use on the system. At this time, this manual page " @@ -9053,15 +9152,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:39 -#| msgid "" -#| "The source list is designed to support any number of active sources and a " -#| "variety of source media. The file lists one source per line, with the " -#| "most preferred source listed first. The format of each line is: " -#| "<literal>type uri args</literal> The first item, <literal>type</literal> " -#| "determines the format for <literal>args</literal> <literal>uri</literal> " -#| "is a Universal Resource Identifier (URI), which is a superset of the more " -#| "specific and well-known Universal Resource Locator, or URL. The rest of " -#| "the line can be marked as a comment by using a #." msgid "" "The source list is designed to support any number of active sources and a " "variety of source media. The file lists one source per line, with the most " @@ -9112,16 +9202,6 @@ msgstr "Les types deb et deb-src." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:61 -#| msgid "" -#| "The <literal>deb</literal> type describes a typical two-level Debian " -#| "archive, <filename>distribution/component</filename>. Typically, " -#| "<literal>distribution</literal> is generally one of <literal>stable</" -#| "literal> <literal>unstable</literal> or <literal>testing</literal> while " -#| "component is one of <literal>main</literal> <literal>contrib</literal> " -#| "<literal>non-free</literal> or <literal>non-us</literal> The <literal>deb-" -#| "src</literal> type describes a debian distribution's source code in the " -#| "same form as the <literal>deb</literal> type. A <literal>deb-src</" -#| "literal> line is required to fetch source indexes." msgid "" "The <literal>deb</literal> type describes a typical two-level Debian " "archive, <filename>distribution/component</filename>. Typically, " @@ -9146,9 +9226,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:73 -#| msgid "" -#| "The format for a <filename>sources.list</filename> entry using the " -#| "<literal>deb</literal> and <literal>deb-src</literal> types are:" msgid "" "The format for a <filename>sources.list</filename> entry using the " "<literal>deb</literal> and <literal>deb-src</literal> types is:" @@ -9164,15 +9241,6 @@ msgstr "deb uri distribution [composant1] [composant2] [...]" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:78 -#| msgid "" -#| "The URI for the <literal>deb</literal> type must specify the base of the " -#| "Debian distribution, from which APT will find the information it needs. " -#| "<literal>distribution</literal> can specify an exact path, in which case " -#| "the components must be omitted and <literal>distribution</literal> must " -#| "end with a slash (/). This is useful for when only a particular sub-" -#| "section of the archive denoted by the URI is of interest. If " -#| "<literal>distribution</literal> does not specify an exact path, at least " -#| "one <literal>component</literal> must be present." msgid "" "The URI for the <literal>deb</literal> type must specify the base of the " "Debian distribution, from which APT will find the information it needs. " @@ -9299,13 +9367,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: sources.list.5.xml:141 -#| msgid "" -#| "The http scheme specifies an HTTP server for the archive. If an " -#| "environment variable <envar>http_proxy</envar> is set with the format " -#| "http://server:port/, the proxy server specified in <envar>http_proxy</" -#| "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a " -#| "string of the format http://user:pass@server:port/ Note that this is an " -#| "insecure method of authentication." msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -9385,17 +9446,29 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: sources.list.5.xml:178 -msgid "more recongnizable URI types" +#, fuzzy +#| msgid "more recongnizable URI types" +msgid "more recognizable URI types" msgstr "type d'URI les plus simples à reconnaître" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: sources.list.5.xml:180 +#, fuzzy +#| msgid "" +#| "APT can be extended with more methods shipped in other optional packages " +#| "which should follow the nameing scheme <literal>apt-transport-" +#| "<replaceable>method</replaceable></literal>. The APT team e.g. maintain " +#| "also the <literal>apt-transport-https</literal> package which provides " +#| "access methods for https-URIs with features similiar to the http method, " +#| "but other methods for using e.g. debtorrent are also available, see " +#| "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</" +#| "filename></refentrytitle> <manvolnum>1</manvolnum></citerefentry>." msgid "" "APT can be extended with more methods shipped in other optional packages " "which should follow the nameing scheme <literal>apt-transport-" -"<replaceable>method</replaceable></literal>. The APT team e.g. maintain " +"<replaceable>method</replaceable></literal>. The APT team e.g. maintains " "also the <literal>apt-transport-https</literal> package which provides " -"access methods for https-URIs with features similiar to the http method, but " +"access methods for https-URIs with features similar to the http method, but " "other methods for using e.g. debtorrent are also available, see " "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></" "refentrytitle> <manvolnum>1</manvolnum></citerefentry>." @@ -9490,11 +9563,6 @@ msgstr "deb ftp://ftp.debian.org/debian stable contrib" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:212 -#| msgid "" -#| "Uses FTP to access the archive at ftp.debian.org, under the debian " -#| "directory, and uses only the unstable/contrib area. If this line appears " -#| "as well as the one in the previous example in <filename>sources.list</" -#| "filename>. a single FTP session will be used for both resource lines." msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -9574,7 +9642,8 @@ msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $" #. type: <abstract></abstract> #: guide.sgml:11 -msgid "This document provides an overview of how to use the the APT package manager." +msgid "" +"This document provides an overview of how to use the the APT package manager." msgstr "" "Ce document fournit un aperçu des méthode d'utilisation du gestionnaire de " "paquets APT." @@ -9608,7 +9677,6 @@ msgstr "" #. type: <heading></heading> #: guide.sgml:32 -#| msgid "generate" msgid "General" msgstr "Généralités" @@ -9674,9 +9742,16 @@ msgstr "" #. type: <p></p> #: guide.sgml:63 +#, fuzzy +#| msgid "" +#| "For instance, mailcrypt is an emacs extension that aids in encrypting " +#| "email with GPG. Without GPGP installed mail-crypt is useless, so " +#| "mailcrypt has a simple dependency on GPG. Also, because it is an emacs " +#| "extension it has a simple dependency on emacs, without emacs it is " +#| "completely useless." msgid "" "For instance, mailcrypt is an emacs extension that aids in encrypting email " -"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a " +"with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a " "simple dependency on GPG. Also, because it is an emacs extension it has a " "simple dependency on emacs, without emacs it is completely useless." msgstr "" @@ -9898,7 +9973,6 @@ msgstr "" #. type: <heading></heading> #: guide.sgml:168 -#| msgid "APT in DSelect" msgid "DSelect" msgstr "DSelect" @@ -9918,9 +9992,20 @@ msgstr "" #. type: <p></p> #: guide.sgml:184 -msgid "" -"To enable the APT method you need to to select [A]ccess in <prgn>dselect</" -"prgn> and then choose the APT method. You will be prompted for a set of " +#, fuzzy +#| msgid "" +#| "To enable the APT method you need to to select [A]ccess in <prgn>dselect</" +#| "prgn> and then choose the APT method. You will be prompted for a set of " +#| "<em>Sources</em> which are places to fetch archives from. These can be " +#| "remote Internet sites, local Debian mirrors or CDROMs. Each source can " +#| "provide a fragment of the total Debian archive, APT will automatically " +#| "combine them to form a complete set of packages. If you have a CDROM then " +#| "it is a good idea to specify it first and then specify a mirror so that " +#| "you have access to the latest bug fixes. APT will automatically use " +#| "packages on your CDROM before downloading from the Internet." +msgid "" +"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> " +"and then choose the APT method. You will be prompted for a set of " "<em>Sources</em> which are places to fetch archives from. These can be " "remote Internet sites, local Debian mirrors or CDROMs. Each source can " "provide a fragment of the total Debian archive, APT will automatically " @@ -10060,9 +10145,16 @@ msgstr "" #. type: <p></p> #: guide.sgml:247 +#, fuzzy +#| msgid "" +#| "Before starting to use <prgn>dselect</prgn> it is necessary to update the " +#| "available list by selecting [U]pdate from the menu. This is a super-set " +#| "of <tt>apt-get update</tt> that makes the fetched information available " +#| "to <prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get " +#| "update</tt> has been run before." msgid "" "Before starting to use <prgn>dselect</prgn> it is necessary to update the " -"available list by selecting [U]pdate from the menu. This is a super-set of " +"available list by selecting [U]pdate from the menu. This is a superset of " "<tt>apt-get update</tt> that makes the fetched information available to " "<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</" "tt> has been run before." @@ -10303,9 +10395,12 @@ msgid "" "final state of things, taking into account the <tt>-f</tt> option and any " "other relevant activities to the command being executed." msgstr "" -"Avant de démarrer ses actions, <prgn>apt-get</prgn> en affiche un résumé. En général, ce rapport dépend du type d'opération qui est entreprise, mais de nombreux éléments " -"sont communs aux différents types de rapports. Ainsi, dans tous les cas, les listes reflètent l'état final du système, en tenant compte de l'option <tt>-f</tt> et des " -"autres opérations découlant du type de commande utilisée." +"Avant de démarrer ses actions, <prgn>apt-get</prgn> en affiche un résumé. En " +"général, ce rapport dépend du type d'opération qui est entreprise, mais de " +"nombreux éléments sont communs aux différents types de rapports. Ainsi, dans " +"tous les cas, les listes reflètent l'état final du système, en tenant compte " +"de l'option <tt>-f</tt> et des autres opérations découlant du type de " +"commande utilisée." #. type: <heading></heading> #: guide.sgml:364 @@ -10338,8 +10433,10 @@ msgid "" "generated for an <tt>install</tt> command. The listed packages are often the " "result of an Auto Install." msgstr "" -"La liste des paquets supplémentaires montre tous les paquets installés ou mis à jour en plus de ceux indiqués à la ligne de commande. Elle n'apparaît qu'avec la commande <" -"tt>install</tt>. Le plus souvent, les paquets concernés sont le résultat d'une installation automatique." +"La liste des paquets supplémentaires montre tous les paquets installés ou " +"mis à jour en plus de ceux indiqués à la ligne de commande. Elle n'apparaît " +"qu'avec la commande <tt>install</tt>. Le plus souvent, les paquets concernés " +"sont le résultat d'une installation automatique." #. type: <heading></heading> #: guide.sgml:382 @@ -10373,10 +10470,14 @@ msgid "" "that are going to be removed because they are only partially installed, " "possibly due to an aborted installation." msgstr "" -"La liste des paquets à enlever montre tous les paquets qui seront supprimés du système. Elle peut apparaître pour tout type d'opération. Il est conseillé de l'inspecter en " -"détail afin de vérifier qu'aucun paquet important ne va être supprimé. L'option <tt>-f</tt> provoque notamment souvent des suppressions de paquets et il est déconseillé " -"d'être particulièrement attentif dans ce genre de cas. La liste peut comporter des paquets qui seront supprimés parce qu'ils sont seulement partiellement installés, par " -"exemple après l'interruption d'une opération d'installation." +"La liste des paquets à enlever montre tous les paquets qui seront supprimés " +"du système. Elle peut apparaître pour tout type d'opération. Il est " +"conseillé de l'inspecter en détail afin de vérifier qu'aucun paquet " +"important ne va être supprimé. L'option <tt>-f</tt> provoque notamment " +"souvent des suppressions de paquets et il est déconseillé d'être " +"particulièrement attentif dans ce genre de cas. La liste peut comporter des " +"paquets qui seront supprimés parce qu'ils sont seulement partiellement " +"installés, par exemple après l'interruption d'une opération d'installation." #. type: <heading></heading> #: guide.sgml:402 @@ -10400,8 +10501,9 @@ msgid "" "listed are not presently installed in the system but will be when APT is " "done." msgstr "" -"La liste des nouveaux paquets est un simple rappel des opérations qui vont avoir lieu. Les paquets affichés ne sont pas encore présents sur le système mais le seront une " -"fois qu'APT aura terminé." +"La liste des nouveaux paquets est un simple rappel des opérations qui vont " +"avoir lieu. Les paquets affichés ne sont pas encore présents sur le système " +"mais le seront une fois qu'APT aura terminé." #. type: <heading></heading> #: guide.sgml:414 @@ -10430,9 +10532,13 @@ msgid "" "to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> " "to resolve their problems." msgstr "" -"À chaque fois que le système entier est mis à jour, il est possible que de nouvelles versions de paquets ne puissent pas être installées car elles ont besoins ne nouveaux " -"paquets ou qu'elles entrent en conflit avec des paquets existants. Ces paquets apparaîtront alors dans la liste des paquets conservés. Le meilleure méthode pour " -"effectivement installer ces paquets est souvent de le faire explicitement avec la commande <tt>apt-get install</tt> ou avec <prgn>dselect</prgn>." +"À chaque fois que le système entier est mis à jour, il est possible que de " +"nouvelles versions de paquets ne puissent pas être installées car elles ont " +"besoins ne nouveaux paquets ou qu'elles entrent en conflit avec des paquets " +"existants. Ces paquets apparaîtront alors dans la liste des paquets " +"conservés. Le meilleure méthode pour effectivement installer ces paquets est " +"souvent de le faire explicitement avec la commande <tt>apt-get install</tt> " +"ou avec <prgn>dselect</prgn>." #. type: <heading></heading> #: guide.sgml:431 @@ -10456,8 +10562,10 @@ msgid "" "case it prints out a warning that the held package is going to be changed. " "This should only happen during dist-upgrade or install." msgstr "" -"Il peut parfois être utile de demander à APT d'installer un paquet retenu (« hold »). Dans ce cas, le programme affichera un avertissement indiquant que le paquet retenu " -"va être modifié. Cela ne se produira que lors de l'utilisation des commandes dist-upgrade ou install." +"Il peut parfois être utile de demander à APT d'installer un paquet retenu " +"(« hold »). Dans ce cas, le programme affichera un avertissement indiquant " +"que le paquet retenu va être modifié. Cela ne se produira que lors de " +"l'utilisation des commandes dist-upgrade ou install." #. type: <heading></heading> #: guide.sgml:444 @@ -10466,8 +10574,10 @@ msgstr "Résumé final" #. type: <p></p> #: guide.sgml:447 -msgid "Finally, APT will print out a summary of all the changes that will occur." -msgstr "Anfin, APT affichera un résumé de toutes les opérations qui prendront place." +msgid "" +"Finally, APT will print out a summary of all the changes that will occur." +msgstr "" +"Anfin, APT affichera un résumé de toutes les opérations qui prendront place." #. type: <example></example> #: guide.sgml:452 @@ -10498,19 +10608,29 @@ msgid "" "If a large number of packages are being removed then the value may indicate " "the amount of space that will be freed." msgstr "" -"La première ligne de ce résumé est une version simplifiée de l'ensemble des listes et indique le nombre de mises à jour (paquets déjà installés et pour lesquels une " -"nouvelle version est disponible). La deuxième ligne indique le nombre de paquets incorrectement configurés, en raison notamment d'installations interrompues. La dernière " -"ligne indique l'espace disque nécessaire pour effectuer l'installation. Le premier couple de nombre fait référence à la taille des fichiers d'archive. Le premier nombre " -"est le nombre d'octets à récupérer depuis les sites distants et le deuxième la taille totale de tous les fichiers nécessaires. Le nombre suivant représente la différence " -"d'espace occupé entre les paquets installés actuellement et ce qui sera ensuite installé. Il est grossièrement égal à l'espace supplémentaire nécessaire dans /usr après " -"achèvement de toutes les opérations. Si de nombreux paquets sont supprimés, cette valeur peut représenter l'espace qui est alors libéré." +"La première ligne de ce résumé est une version simplifiée de l'ensemble des " +"listes et indique le nombre de mises à jour (paquets déjà installés et pour " +"lesquels une nouvelle version est disponible). La deuxième ligne indique le " +"nombre de paquets incorrectement configurés, en raison notamment " +"d'installations interrompues. La dernière ligne indique l'espace disque " +"nécessaire pour effectuer l'installation. Le premier couple de nombre fait " +"référence à la taille des fichiers d'archive. Le premier nombre est le " +"nombre d'octets à récupérer depuis les sites distants et le deuxième la " +"taille totale de tous les fichiers nécessaires. Le nombre suivant représente " +"la différence d'espace occupé entre les paquets installés actuellement et ce " +"qui sera ensuite installé. Il est grossièrement égal à l'espace " +"supplémentaire nécessaire dans /usr après achèvement de toutes les " +"opérations. Si de nombreux paquets sont supprimés, cette valeur peut " +"représenter l'espace qui est alors libéré." #. type: <p></p> #: guide.sgml:473 msgid "" "Some other reports can be generated by using the -u option to show packages " "to upgrade, they are similar to the previous examples." -msgstr "D'autres rapports peuvent être créés avec l'option -u qui affiche les paquets à mettre à jour. Il sont analogues aux exemples précédents." +msgstr "" +"D'autres rapports peuvent être créés avec l'option -u qui affiche les " +"paquets à mettre à jour. Il sont analogues aux exemples précédents." #. type: <heading></heading> #: guide.sgml:477 @@ -10522,7 +10642,9 @@ msgstr "L'affichage d'état" msgid "" "During the download of archives and package files APT prints out a series of " "status messages." -msgstr "Pendant le téléchargement des fichiers des paquets, APT affiche un certain nombre de messages d'avancement." +msgstr "" +"Pendant le téléchargement des fichiers des paquets, APT affiche un certain " +"nombre de messages d'avancement." #. type: <example></example> #: guide.sgml:490 @@ -10554,9 +10676,13 @@ msgid "" "<tt>apt-get update</tt> estimates the percent done which causes some " "inaccuracies." msgstr "" -"Les lignes qui débutent par « Réception de » sont affichées quand APT démarre la récupération d'un fichier alors que la dernière ligne indique la progression du " -"téléchargement. La première valeur de pourcentage de la ligne est le pourcentage de téléchargement déjà effectué, pour l'ensemble des fichiers. Il faut noter que, comme la " -"taille des fichiers de paquets n'est pas connue, <tt>apt-get update</tt> estime le pourcentage effectué ce qui peut conduire à des imprécisions." +"Les lignes qui débutent par « Réception de » sont affichées quand APT démarre " +"la récupération d'un fichier alors que la dernière ligne indique la " +"progression du téléchargement. La première valeur de pourcentage de la ligne " +"est le pourcentage de téléchargement déjà effectué, pour l'ensemble des " +"fichiers. Il faut noter que, comme la taille des fichiers de paquets n'est " +"pas connue, <tt>apt-get update</tt> estime le pourcentage effectué ce qui " +"peut conduire à des imprécisions." #. type: <p></p> #: guide.sgml:509 @@ -10569,10 +10695,14 @@ msgid "" "The next word is the short form name of the object being downloaded. For " "archives it will contain the name of the package that is being fetched." msgstr "" -"La section suivante de la ligne d'état est répétée pour chaque sous-tâche de téléchargement. Elle indique l'opération effectuée et d'autres informations utiles sur ce qui " -"est en cours. Cette section indiquera parfois <em>Forking</em> ce qui indique que le système charge le module de téléchargement. Le premier mot après le crochet ouvrant " -"([) est le numéro d'ordre de téléchargement comme indiqué dans les lignes d'historique. Le mot suivant est le nom court de l'objet téléchargé. Pour les archives, il s'agit " -"du nom du paquet en cours de récupération." +"La section suivante de la ligne d'état est répétée pour chaque sous-tâche de " +"téléchargement. Elle indique l'opération effectuée et d'autres informations " +"utiles sur ce qui est en cours. Cette section indiquera parfois <em>Forking</" +"em> ce qui indique que le système charge le module de téléchargement. Le " +"premier mot après le crochet ouvrant ([) est le numéro d'ordre de " +"téléchargement comme indiqué dans les lignes d'historique. Le mot suivant " +"est le nom court de l'objet téléchargé. Pour les archives, il s'agit du nom " +"du paquet en cours de récupération." #. type: <p></p> #: guide.sgml:524 @@ -10591,13 +10721,21 @@ msgid "" "regularly and reflects the time to complete everything at the shown transfer " "rate." msgstr "" -"À l'intérieur des guillemets, on trouve une information sur la progression de la phase de négociation du téléchargement. Usuellement, elle évolue de <em>Connexion</em> à <" -"em>Attente du fichier</em>, puis <em>Téléchargement</em> ou <em>Reprise</em>. La valeur finale est le nombre d'octets téléchargés depuis le site distant. Une fois le " -"téléchargement commencé, cette indication prend la forme <tt>102/10,2ko</tt>, ce qui indique que 102 octets ont été téléchargés et que 10,2 kilo-octets sont attendus. La " -"taille totale est toujours représentées sur 4 digits pour des raisons de place disponible. Après cet affichage de taille, se trouve une barre de progression pour le " -"téléchargement du fichier lui-même. L'élément suivant est la vitesse instantanée de téléchargement. Elle est mise à jour toutes les 5 secondes et représente la vitesse de " -"transfert pour cette période. Enfin, est affiché la temps de téléchargement restant estimé. Cette information est mise régulièrement à jour et représete la durée estimée " -"de téléchargement de toute ce qui est nécessaire, à la vitesse affichée." +"À l'intérieur des guillemets, on trouve une information sur la progression " +"de la phase de négociation du téléchargement. Usuellement, elle évolue de " +"<em>Connexion</em> à <em>Attente du fichier</em>, puis <em>Téléchargement</" +"em> ou <em>Reprise</em>. La valeur finale est le nombre d'octets téléchargés " +"depuis le site distant. Une fois le téléchargement commencé, cette " +"indication prend la forme <tt>102/10,2ko</tt>, ce qui indique que 102 octets " +"ont été téléchargés et que 10,2 kilo-octets sont attendus. La taille totale " +"est toujours représentées sur 4 digits pour des raisons de place disponible. " +"Après cet affichage de taille, se trouve une barre de progression pour le " +"téléchargement du fichier lui-même. L'élément suivant est la vitesse " +"instantanée de téléchargement. Elle est mise à jour toutes les 5 secondes et " +"représente la vitesse de transfert pour cette période. Enfin, est affiché la " +"temps de téléchargement restant estimé. Cette information est mise " +"régulièrement à jour et représete la durée estimée de téléchargement de " +"toute ce qui est nécessaire, à la vitesse affichée." #. type: <p></p> #: guide.sgml:530 @@ -10608,9 +10746,12 @@ msgid "" "for logging to a file, use the <tt>-q</tt> option to remove the status " "display." msgstr "" -"La ligne d'état est mise à jour chaque demi-seconde afin de fournir un retour régulier sur la progression du téléchargement alors que les lignes « Réception de » reculent " -"d'une unité à chaque fois qu'un nouveau fichier est démarré. Comme l'état est mis à jour régulièrement, il ne peut pas servir pour la journalisation dans un fichier. Il " -"est nécessaire d'utiliser l'option <tt>-q</tt> pour supprimer cet affichage." +"La ligne d'état est mise à jour chaque demi-seconde afin de fournir un " +"retour régulier sur la progression du téléchargement alors que les lignes " +"« Réception de » reculent d'une unité à chaque fois qu'un nouveau fichier est " +"démarré. Comme l'état est mis à jour régulièrement, il ne peut pas servir " +"pour la journalisation dans un fichier. Il est nécessaire d'utiliser " +"l'option <tt>-q</tt> pour supprimer cet affichage." #. type: <heading></heading> #: guide.sgml:535 @@ -10627,9 +10768,13 @@ msgid "" "each question there is usually a description of what it is asking and the " "questions are too varied to discuss completely here." msgstr "" -"APT utilise <prgn>dpkg</prgn> pour installer les archives et bascule vers l'interface de ce programme une fois le téléchargement terminé. <prgn>dpkg</prgn> peut poser un " -"certain nombre de questions pendant le traitement des paquets, qui peuvent eux-même être amener à poser des questions. Chacune de ces questions comporte un description de " -"ce qui est attendu et elles sont trop variables d'un paquet à l'autre pour qu'une description détaillée soit donnée dans ce document." +"APT utilise <prgn>dpkg</prgn> pour installer les archives et bascule vers " +"l'interface de ce programme une fois le téléchargement terminé. <prgn>dpkg</" +"prgn> peut poser un certain nombre de questions pendant le traitement des " +"paquets, qui peuvent eux-même être amener à poser des questions. Chacune de " +"ces questions comporte un description de ce qui est attendu et elles sont " +"trop variables d'un paquet à l'autre pour qu'une description détaillée soit " +"donnée dans ce document." #. type: <title> #: offline.sgml:4 @@ -10646,7 +10791,10 @@ msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $" msgid "" "This document describes how to use APT in a non-networked environment, " "specifically a 'sneaker-net' approach for performing upgrades." -msgstr "Ce document décrit la méthode d'utilisation d'APT hors connexion à un réseau, et plus particulièrement une approche « sneaker-net » pour les mises à jour." +msgstr "" +"Ce document décrit la méthode d'utilisation d'APT hors connexion à un " +"réseau, et plus particulièrement une approche « sneaker-net » pour les mises " +"à jour." #. type: #: offline.sgml:16 @@ -10660,7 +10808,6 @@ msgstr "Introduction" #. type: #: offline.sgml:34 offline.sgml:65 offline.sgml:180 -#| msgid "OverrideDir" msgid "Overview" msgstr "Aperçu" @@ -10672,8 +10819,10 @@ msgid "" "machine is on a slow link, such as a modem and another machine has a very " "fast connection but they are physically distant." msgstr "" -"Normalement, APT a besoin d'avoir un accès direct à une archive Debian, soit sur un support local, soit via le réseau. Un autre cas intéressant à traiter est celui d'une " -"machine dotée d'une liaison peu rapide (comme un modem) avec une autre possédant une connexion à haut débit mais située à distance." +"Normalement, APT a besoin d'avoir un accès direct à une archive Debian, soit " +"sur un support local, soit via le réseau. Un autre cas intéressant à traiter " +"est celui d'une machine dotée d'une liaison peu rapide (comme un modem) avec " +"une autre possédant une connexion à haut débit mais située à distance." #. type:

#: offline.sgml:51 @@ -10688,22 +10837,37 @@ msgid "" "the machine downloading the packages, and target host the one with " "bad or no connection." msgstr "" -"Une solution est d'utiliser un support amovible de grande taille tel qu'un disque Zip ou un disque Superdisk (NdT : ce document est daté..:-)). Bien que ces supports ne " -"disposent pas d'assez de place pour héberger une archive Debian complète, ils peuvent toutefois contenir un sous-ensemble de taille suffisante pour les besoins de nombreux " -"utilisateurs. L'idée est alors d'utiliser APT pour créer une liste de paquets nécessaires, puis de les récupérer avec une machine disposant d'une bonne connectivité. Il " -"est même possible d'utiliser soit une autre machine Debian avec APT soit un autre système d'exploitation et un outil de téléchargement tel que wget. Dans ce qui suit, " -"machine distante désignera la machine qui télécharge les paquets et machine cible, celle qui a une connectivité limitée." +"Une solution est d'utiliser un support amovible de grande taille tel qu'un " +"disque Zip ou un disque Superdisk (NdT : ce document est daté..:-)). Bien " +"que ces supports ne disposent pas d'assez de place pour héberger une archive " +"Debian complète, ils peuvent toutefois contenir un sous-ensemble de taille " +"suffisante pour les besoins de nombreux utilisateurs. L'idée est alors " +"d'utiliser APT pour créer une liste de paquets nécessaires, puis de les " +"récupérer avec une machine disposant d'une bonne connectivité. Il est même " +"possible d'utiliser soit une autre machine Debian avec APT soit un autre " +"système d'exploitation et un outil de téléchargement tel que wget. Dans ce " +"qui suit, machine distante désignera la machine qui télécharge les " +"paquets et machine cible, celle qui a une connectivité limitée." #. type:

#: offline.sgml:57 +#, fuzzy +#| msgid "" +#| "This is achieved by creatively manipulating the APT configuration file. " +#| "The essential premis to tell APT to look on a disc for it's archive " +#| "files. Note that the disc should be formated with a filesystem that can " +#| "handle long file names such as ext2, fat32 or vfat." msgid "" "This is achieved by creatively manipulating the APT configuration file. The " -"essential premis to tell APT to look on a disc for it's archive files. Note " +"essential premise to tell APT to look on a disc for it's archive files. Note " "that the disc should be formated with a filesystem that can handle long file " "names such as ext2, fat32 or vfat." msgstr "" -"Il est nécessaire de manipuler le fichier de configuration d'APT de manière intelligente. Le préalable est d'indiquer à APT d'examiner le contenu d'un disque pour y " -"trouver les fichiers d'archive. Ce disque doit utiliser un système de fichier autorisant les noms longs, par exemple ext2, fat32 ou vfat." +"Il est nécessaire de manipuler le fichier de configuration d'APT de manière " +"intelligente. Le préalable est d'indiquer à APT d'examiner le contenu d'un " +"disque pour y trouver les fichiers d'archive. Ce disque doit utiliser un " +"système de fichier autorisant les noms longs, par exemple ext2, fat32 ou " +"vfat." #. type: #: offline.sgml:63 @@ -10718,8 +10882,11 @@ msgid "" "remote machine to fetch the latest package files and decide which packages " "to download. The disk directory structure should look like:" msgstr "" -"Si APT existe sur les deux machines, le cas est relativement simple. L'idée de base est de mettre une copie du fichier d'état sur le disque et d'utiliser la machine " -"distante pour récupérer la dernière liste de paquets et choisir ceux à télécharger. La structure des répertoires du disque devraient ressembler à :" +"Si APT existe sur les deux machines, le cas est relativement simple. L'idée " +"de base est de mettre une copie du fichier d'état sur le disque et " +"d'utiliser la machine distante pour récupérer la dernière liste de paquets " +"et choisir ceux à télécharger. La structure des répertoires du disque " +"devraient ressembler à :" #. type: #: offline.sgml:80 @@ -10745,7 +10912,6 @@ msgstr "" #. type: #: offline.sgml:88 -#| msgid "User configuration" msgid "The configuration file" msgstr "Le fichier de configuration" @@ -10759,9 +10925,13 @@ msgid "" "target host. Please note, if you are using a local archive you must " "use copy URIs, the syntax is identical to file URIs." msgstr "" -"Le fichier de configuration indique à APT où conserver ses fichiers sur le disque et d'utiliser également les fichiers de configuration du disque. Le fichier sources.list " -"devrait référencer les sites que vous souhaitez utiliser depuis la machine distante et le fichier d'état doit être une copie de /var/lib/dpkg/status de l'" -"ordinateur cible. Veuillez noter que si sous utilisez une archive locale, les URI doivent en être copiés. La syntaxe est la même que celle des URI fichiers." +"Le fichier de configuration indique à APT où conserver ses fichiers sur le " +"disque et d'utiliser également les fichiers de configuration du disque. Le " +"fichier sources.list devrait référencer les sites que vous souhaitez " +"utiliser depuis la machine distante et le fichier d'état doit être une copie " +"de /var/lib/dpkg/status de l'ordinateur cible. Veuillez " +"noter que si sous utilisez une archive locale, les URI doivent en être " +"copiés. La syntaxe est la même que celle des URI fichiers." #. type:

#: offline.sgml:100 @@ -10769,8 +10939,8 @@ msgid "" "apt.conf must contain the necessary information to make APT use the " "disc:" msgstr "" -"apt.conf doit avoir les informations nécessaires pour qu'APT utilise le disque." -"disc:" +"apt.conf doit avoir les informations nécessaires pour qu'APT " +"utilise le disque.disc:" #. type: #: offline.sgml:124 @@ -10830,21 +11000,32 @@ msgid "" "More details can be seen by examining the apt.conf man page and the sample " "configuration file in /usr/share/doc/apt/examples/apt.conf." msgstr "" -"Plus d'informations peuvent être trouvées dans la page de manuel du fichier apt.conf et dans l'exemple de fichier de configuration que l'on peut trouver dans " -"/usr/share/doc/apt/examples/apt.conf." +"Plus d'informations peuvent être trouvées dans la page de manuel du fichier " +"apt.conf et dans l'exemple de fichier de configuration que l'on peut trouver " +"dans /usr/share/doc/apt/examples/apt.conf." #. type:

#: offline.sgml:136 +#, fuzzy +#| msgid "" +#| "On the target machine the first thing to do is mount the disc and copy " +#| "/var/lib/dpkg/status to it. You will also need to create the " +#| "directories outlined in the Overview, archives/partial/ and " +#| "lists/partial/ Then take the disc to the remote machine and " +#| "configure the sources.list. On the remote machine execute the following:" msgid "" "On the target machine the first thing to do is mount the disc and copy /" "var/lib/dpkg/status to it. You will also need to create the directories " "outlined in the Overview, archives/partial/ and lists/partial/ Then take the disc to the remote machine and configure the sources.list. " -"On the remote machine execute the following:" +"em>. Then take the disc to the remote machine and configure the sources." +"list. On the remote machine execute the following:" msgstr "" -"Sur la machine cible, il est d'abord nécessaire de monter le disque et y copier le fichier /" -"var/lib/dpkg/status. Il sera aussi nécessaire de créer les répertoires dans l'aperçu (Overview), archives/partial/ and lists/partial/. Connecter " -"ensuite le disque à la machine distante et configurer le fichier sources.list. Sur la machine distante, exécuter la séquence de commandes suivante :" +"Sur la machine cible, il est d'abord nécessaire de monter le disque et y " +"copier le fichier /var/lib/dpkg/status. Il sera aussi nécessaire de " +"créer les répertoires dans l'aperçu (Overview), archives/partial/ " +"and lists/partial/. Connecter ensuite le disque à la machine " +"distante et configurer le fichier sources.list. Sur la machine distante, " +"exécuter la séquence de commandes suivante :" #. type: #: offline.sgml:142 @@ -10864,14 +11045,22 @@ msgstr "" #. type:

#: offline.sgml:149 +#, fuzzy +#| msgid "" +#| "The dist-upgrade command can be replaced with any-other standard APT " +#| "commands, particularly dselect-upgrade. You can even use an APT front end " +#| "such as dselect However this presents a problem in communicating " +#| "your selections back to the local computer." msgid "" -"The dist-upgrade command can be replaced with any-other standard APT " +"The dist-upgrade command can be replaced with any other standard APT " "commands, particularly dselect-upgrade. You can even use an APT front end " -"such as dselect However this presents a problem in communicating " +"such as dselect. However this presents a problem in communicating " "your selections back to the local computer." msgstr "" -"La commande dist-upgrade peut être remplacée par toute autres commande usuelle d'APT, notamment dselect-upgrade. Il est même possible d'utiliser une interface comme " -"dselect. Cependant, cela complique la communication des choix vers l'ordinateur local." +"La commande dist-upgrade peut être remplacée par toute autres commande " +"usuelle d'APT, notamment dselect-upgrade. Il est même possible d'utiliser " +"une interface comme dselect. Cependant, cela complique la " +"communication des choix vers l'ordinateur local." #. type:

#: offline.sgml:153 @@ -10879,8 +11068,9 @@ msgid "" "Now the disc contains all of the index files and archives needed to upgrade " "the target machine. Take the disc back and run:" msgstr "" -"Après cette opération, le disque contiendra tous les fichiers d'index et les archives nécessaires pour mettr eà jour la machine cible. Il est alors possible d'y ramener le " -"disque et exécuter :" +"Après cette opération, le disque contiendra tous les fichiers d'index et les " +"archives nécessaires pour mettr eà jour la machine cible. Il est alors " +"possible d'y ramener le disque et exécuter :" #. type: #: offline.sgml:159 @@ -10903,7 +11093,9 @@ msgstr "" msgid "" "It is necessary for proper function to re-specify the status file to be the " "local one. This is very important!" -msgstr "Pour un fonctionnement correct, il est indispensable de ré-indiquer que le fichier d'état est le fichier local. Cela est très important." +msgstr "" +"Pour un fonctionnement correct, il est indispensable de ré-indiquer que le " +"fichier d'état est le fichier local. Cela est très important." #. type:

#: offline.sgml:172 @@ -10914,9 +11106,12 @@ msgid "" "the local machine - but this may not always be possible. DO NOT copy the " "status file if dpkg or APT have been run in the mean time!!" msgstr "" -"Si vous utilisez dselect, vous pouvez effectuer l'opération dangereuse consistant à copier disc/status en /var/lib/dpkg/status, afin que les choix effectués sur la machine " -"distante soient mis à jour. Il est recommandé de n'éffectuer les choix que sur la machine locale, mais ce n'est pas toujours possible. NE COPIEZ PAS le fichier d'état si " -"dpkg ou APT ont été exécutés dans l'intervalle." +"Si vous utilisez dselect, vous pouvez effectuer l'opération dangereuse " +"consistant à copier disc/status en /var/lib/dpkg/status, afin que les choix " +"effectués sur la machine distante soient mis à jour. Il est recommandé de " +"n'éffectuer les choix que sur la machine locale, mais ce n'est pas toujours " +"possible. NE COPIEZ PAS le fichier d'état si dpkg ou APT ont été exécutés " +"dans l'intervalle." #. type: #: offline.sgml:178 @@ -10930,8 +11125,10 @@ msgid "" "any machine. Unlike the method above this requires that the Debian machine " "already has a list of available packages." msgstr "" -"wget est un outil classique de téléchargement qui peut être exécuté sur à peu près tout type de machine. À la différence de la méthode précédente, cela impose que " -"la machine Debian a déjà une liste des paquets disponibles." +"wget est un outil classique de téléchargement qui peut être exécuté " +"sur à peu près tout type de machine. À la différence de la méthode " +"précédente, cela impose que la machine Debian a déjà une liste des paquets " +"disponibles." #. type:

#: offline.sgml:190 @@ -10941,12 +11138,13 @@ msgid "" "option to apt-get and then preparing a wget script to actually fetch the " "packages." msgstr "" -"L'idée de base est de créer un disque qui ne comporte que les fichiers archive téléchargés depuis le site distant. Cela peut être effectué avec l'option --print-uris " -"d'apt-get puis de la préparation d'un script wget permettant de récupérer les paquets/" +"L'idée de base est de créer un disque qui ne comporte que les fichiers " +"archive téléchargés depuis le site distant. Cela peut être effectué avec " +"l'option --print-uris d'apt-get puis de la préparation d'un script wget " +"permettant de récupérer les paquets/" #. type: #: offline.sgml:196 -#| msgid "Options" msgid "Operation" msgstr "Fonctionnement" @@ -10956,8 +11154,9 @@ msgid "" "Unlike the previous technique no special configuration files are required. " "We merely use the standard APT commands to generate the file list." msgstr "" -"À la différence de la méthode précédente, aucun fichier de configuration spécifique n'est nécessaire. Seules les commandes standard d'APT seront utilisées pour créer la " -"liste de ficheirs." +"À la différence de la méthode précédente, aucun fichier de configuration " +"spécifique n'est nécessaire. Seules les commandes standard d'APT seront " +"utilisées pour créer la liste de ficheirs." #. type: #: offline.sgml:205 @@ -10978,7 +11177,9 @@ msgstr "" msgid "" "Any command other than dist-upgrade could be used here, including dselect-" "upgrade." -msgstr "Toute autre commande que dist-upgrade peut être utilisée, y compris dselect-upgrade." +msgstr "" +"Toute autre commande que dist-upgrade peut être utilisée, y compris dselect-" +"upgrade." #. type:

#: offline.sgml:216 @@ -10988,8 +11189,10 @@ msgid "" "with the current directory as the disc's mount point so as to save the " "output on the disc." msgstr "" -"Le fichier /disc/wget-script contiendra alors la liste des commandes wget à exécuter afin de récupérer les fichiers nécessaires. Ce script doit être exécuté depuis le " -"point de montage du disque afin que les fichiers soient écrits sur le disque." +"Le fichier /disc/wget-script contiendra alors la liste des commandes wget à " +"exécuter afin de récupérer les fichiers nécessaires. Ce script doit être " +"exécuté depuis le point de montage du disque afin que les fichiers soient " +"écrits sur le disque." #. type:

#: offline.sgml:219 @@ -11013,7 +11216,9 @@ msgstr "" msgid "" "Once the archives are downloaded and the disc returned to the Debian machine " "installation can proceed using," -msgstr "Une fois les fichiers téléchargés et le disque reconnecté à la machine Debian, l'installation peut se poursuivre avec :" +msgstr "" +"Une fois les fichiers téléchargés et le disque reconnecté à la machine " +"Debian, l'installation peut se poursuivre avec :" #. type: #: offline.sgml:230 @@ -11026,6 +11231,36 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade" msgid "Which will use the already fetched archives on the disc." msgstr "Cette commande utilisera les fichiers récupérés sur le disque." +#~ msgid "/etc/apt/trusted.gpg" +#~ msgstr "/etc/apt/trusted.gpg" + +#~ msgid "Keyring of local trusted keys, new keys will be added here." +#~ msgstr "" +#~ "Trousseau de clés locales fiables : les nouvelles clés y seront ajoutées." + +#~ msgid "" +#~ "apt.conf is the main configuration file for the APT " +#~ "suite of tools, all tools make use of the configuration file and a common " +#~ "command line parser to provide a uniform environment. When an APT tool " +#~ "starts up it will read the configuration specified by the " +#~ "APT_CONFIG environment variable (if any) and then read the " +#~ "files in Dir::Etc::Parts then read the main " +#~ "configuration file specified by Dir::Etc::main then " +#~ "finally apply the command line options to override the configuration " +#~ "directives, possibly loading even more config files." +#~ msgstr "" +#~ "Le fichier apt.conf est le principal fichier de " +#~ "configuration de la collection d'outils que constitue APT ; tous les " +#~ "outils font appel à ce fichier de configuration et utilisent un analyseur " +#~ "syntaxique en ligne de commande commun afin de fournir un environnement " +#~ "uniforme. Quand un outil d'APT démarre, il lit la configuration désignée " +#~ "par variable d'environnement APT_CONFIG (si elle existe), " +#~ "puis il lit les fichiers situés dans Dir::Etc::Parts " +#~ "ainsi que le principal fichier de configuration indiqué par Dir::" +#~ "Etc::main ; enfin il applique les options de la ligne de " +#~ "commande qui prévalent sur les directives de configuration, chargeant si " +#~ "nécessaire d'autres fichiers de configuration." + #~ msgid "" #~ "Disable Immediate Configuration; This dangerous option disables some of " #~ "APT's ordering code to cause it to make fewer dpkg calls. Doing so may be " @@ -11059,13 +11294,6 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque." #~ msgid "/etc/apt/apt.conf" #~ msgstr "/etc/apt/apt.conf" -#~ msgid "" -#~ "APT configuration file. Configuration Item: Dir::Etc::Main." -#~ msgstr "" -#~ "Fichier de configuration d'APT. Élément de configuration : Dir::" -#~ "Etc::Main." - #~ msgid "/etc/apt/apt.conf.d/" #~ msgstr "/etc/apt/apt.conf.d/" diff --git a/doc/po/it.po b/doc/po/it.po index 1dd0f0187..fd2e2994e 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-01-11 15:12+0100\n" +"POT-Creation-Date: 2010-01-20 12:18+0100\n" "PO-Revision-Date: 2003-04-26 23:26+0100\n" "Last-Translator: Traduzione di Eugenia Franzoni \n" "Language-Team: \n" @@ -761,7 +761,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:368 +#: apt.ent:369 #, no-wrap msgid "" " /etc/apt/trusted.gpg.d/\n" @@ -772,6 +772,38 @@ msgid "" "\">\n" msgstr "" +#. type: Plain text +#: apt.ent:371 +msgid "" +msgstr "" + +#. type: Plain text +#: apt.ent:380 +#, no-wrap +msgid "" +"\n" +"john@doe.org in 2009,\n" +" 2010 and Daniela Acme daniela@acme.us in 2010 together with the\n" +" Debian Dummy l10n Team debian-l10n-dummy@lists.debian.org.\n" +"\">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:387 +#, no-wrap +msgid "" +"\n" +"\n" +msgstr "" + #. The last update date #. type: Content of: #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 @@ -1226,7 +1258,7 @@ msgstr "" #. type: Content of: #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 #: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 -#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:491 apt.conf.5.xml:513 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 msgid "options" msgstr "" @@ -1427,7 +1459,7 @@ msgstr "" #. type: Content of: #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1024 apt_preferences.5.xml:615 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 msgid "Files" msgstr "" @@ -1440,7 +1472,7 @@ msgstr "" #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1030 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 #: sources.list.5.xml:233 msgid "See Also" msgstr "" @@ -2740,7 +2772,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1018 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 #: sources.list.5.xml:193 msgid "Examples" msgstr "" @@ -4250,7 +4282,7 @@ msgid "" "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " -"&apt-product; <date>18 September 2009</date>" +"&apt-product; <date>16 January 2010</date>" msgstr "" #. type: Content of: <refentry><refnamediv><refname> @@ -4272,18 +4304,54 @@ msgstr "" #: apt.conf.5.xml:40 msgid "" "<filename>apt.conf</filename> is the main configuration file for the APT " -"suite of tools, all tools make use of the configuration file and a common " -"command line parser to provide a uniform environment. When an APT tool " -"starts up it will read the configuration specified by the <envar>APT_CONFIG</" -"envar> environment variable (if any) and then read the files in " -"<literal>Dir::Etc::Parts</literal> then read the main configuration file " -"specified by <literal>Dir::Etc::main</literal> then finally apply the " -"command line options to override the configuration directives, possibly " -"loading even more config files." +"suite of tools, but by far not the only place changes to options can be " +"made. All tools therefore share the configuration files and also use a " +"common command line parser to provide a uniform environment." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><para> +#: apt.conf.5.xml:45 +msgid "" +"When an APT tool starts up it will read the configuration files in the " +"following order:" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:47 +msgid "" +"the file specified by the <envar>APT_CONFIG</envar> environment variable (if " +"any)" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:49 +msgid "" +"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " +"order which have no or \"<literal>conf</literal>\" as filename extension and " +"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " +"characters - otherwise they will be silently ignored." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:54 +msgid "" +"the main configuration file specified by <literal>Dir::Etc::main</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:56 +msgid "" +"the command line options are applied to override the configuration " +"directives or to load even more configuration files." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:60 +msgid "Syntax" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:50 +#: apt.conf.5.xml:61 msgid "" "The configuration file is organized in a tree with options organized into " "functional groups. Option specification is given with a double colon " @@ -4293,7 +4361,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:56 +#: apt.conf.5.xml:67 msgid "" "Syntactically the configuration language is modeled after what the ISC tools " "such as bind and dhcp use. Lines starting with <literal>//</literal> are " @@ -4309,7 +4377,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:70 +#: apt.conf.5.xml:81 #, no-wrap msgid "" "APT {\n" @@ -4321,7 +4389,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:78 +#: apt.conf.5.xml:89 msgid "" "with newlines placed to make it more readable. Lists can be created by " "opening a scope and including a single string enclosed in quotes followed by " @@ -4329,27 +4397,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:83 +#: apt.conf.5.xml:94 #, no-wrap msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:86 +#: apt.conf.5.xml:97 msgid "" "In general the sample configuration file in <filename>&docdir;examples/apt." "conf</filename> &configureindex; is a good guide for how it should look." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:90 +#: apt.conf.5.xml:101 msgid "" "The names of the configuration items are not case-sensitive. So in the " "previous example you could use <literal>dpkg::pre-install-pkgs</literal>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:93 +#: apt.conf.5.xml:104 msgid "" "Names for the configuration items are optional if a list is defined as it " "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. " @@ -4359,7 +4427,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:98 +#: apt.conf.5.xml:109 msgid "" "Two specials are allowed, <literal>#include</literal> (which is deprecated " "and not supported by alternative implementations) and <literal>#clear</" @@ -4371,7 +4439,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:106 +#: apt.conf.5.xml:117 msgid "" "The #clear command is the only way to delete a list or a complete scope. " "Reopening a scope or the ::-style described below will <emphasis>not</" @@ -4381,7 +4449,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:111 +#: apt.conf.5.xml:122 msgid "" "All of the APT tools take a -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " @@ -4392,7 +4460,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:118 +#: apt.conf.5.xml:129 msgid "" "Note that you can use :: only for appending one item per line to a list and " "that you should not use it in combination with the scope syntax. (The scope " @@ -4409,24 +4477,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:130 +#: apt.conf.5.xml:141 msgid "The APT Group" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:131 +#: apt.conf.5.xml:142 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:135 +#: apt.conf.5.xml:146 msgid "Architecture" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:136 +#: apt.conf.5.xml:147 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@ -4434,12 +4502,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:141 +#: apt.conf.5.xml:152 msgid "Default-Release" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:142 +#: apt.conf.5.xml:153 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -4448,24 +4516,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:146 +#: apt.conf.5.xml:157 msgid "Ignore-Hold" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:147 +#: apt.conf.5.xml:158 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:151 +#: apt.conf.5.xml:162 msgid "Clean-Installed" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:152 +#: apt.conf.5.xml:163 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -4474,12 +4542,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:158 +#: apt.conf.5.xml:169 msgid "Immediate-Configure" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:159 +#: apt.conf.5.xml:170 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -4512,12 +4580,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:181 +#: apt.conf.5.xml:192 msgid "Force-LoopBreak" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:182 +#: apt.conf.5.xml:193 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -4528,82 +4596,82 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:190 +#: apt.conf.5.xml:201 msgid "Cache-Limit" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:191 +#: apt.conf.5.xml:202 msgid "" "APT uses a fixed size memory mapped cache file to store the 'available' " "information. This sets the size of that cache (in bytes)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:195 +#: apt.conf.5.xml:206 msgid "Build-Essential" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:196 +#: apt.conf.5.xml:207 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:210 msgid "Get" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:200 +#: apt.conf.5.xml:211 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:204 +#: apt.conf.5.xml:215 msgid "Cache" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:205 +#: apt.conf.5.xml:216 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:209 +#: apt.conf.5.xml:220 msgid "CDROM" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:210 +#: apt.conf.5.xml:221 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:227 msgid "The Acquire Group" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:221 +#: apt.conf.5.xml:232 msgid "PDiffs" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:222 +#: apt.conf.5.xml:233 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:225 +#: apt.conf.5.xml:236 msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " @@ -4614,12 +4682,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:234 +#: apt.conf.5.xml:245 msgid "Queue-Mode" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:246 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -4629,36 +4697,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:242 +#: apt.conf.5.xml:253 msgid "Retries" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:243 +#: apt.conf.5.xml:254 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:247 +#: apt.conf.5.xml:258 msgid "Source-Symlinks" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:248 +#: apt.conf.5.xml:259 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:252 sources.list.5.xml:139 +#: apt.conf.5.xml:263 sources.list.5.xml:139 msgid "http" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:253 +#: apt.conf.5.xml:264 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -4669,7 +4737,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:261 +#: apt.conf.5.xml:272 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -4683,7 +4751,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:271 apt.conf.5.xml:335 +#: apt.conf.5.xml:282 apt.conf.5.xml:346 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -4691,7 +4759,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:274 +#: apt.conf.5.xml:285 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@ -4703,7 +4771,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:282 +#: apt.conf.5.xml:293 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -4713,7 +4781,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:287 +#: apt.conf.5.xml:298 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -4721,12 +4789,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:293 +#: apt.conf.5.xml:304 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:305 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -4736,7 +4804,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:300 +#: apt.conf.5.xml:311 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -4757,12 +4825,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:318 sources.list.5.xml:150 +#: apt.conf.5.xml:329 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:319 +#: apt.conf.5.xml:330 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -4781,7 +4849,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:338 +#: apt.conf.5.xml:349 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -4791,7 +4859,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:345 +#: apt.conf.5.xml:356 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -4800,7 +4868,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:350 +#: apt.conf.5.xml:361 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4810,18 +4878,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:357 sources.list.5.xml:132 +#: apt.conf.5.xml:368 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:363 +#: apt.conf.5.xml:374 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:358 +#: apt.conf.5.xml:369 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -4834,12 +4902,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:379 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:369 +#: apt.conf.5.xml:380 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -4847,18 +4915,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:385 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:380 +#: apt.conf.5.xml:391 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:375 +#: apt.conf.5.xml:386 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4870,19 +4938,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:385 +#: apt.conf.5.xml:396 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:399 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:392 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4899,13 +4967,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:392 +#: apt.conf.5.xml:403 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:401 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -4920,7 +4988,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:397 +#: apt.conf.5.xml:408 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@ -4930,12 +4998,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:403 +#: apt.conf.5.xml:414 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:404 +#: apt.conf.5.xml:415 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" @@ -4948,13 +5016,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:431 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:421 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " @@ -4977,19 +5045,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:217 +#: apt.conf.5.xml:228 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:438 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:429 +#: apt.conf.5.xml:440 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -5001,7 +5069,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:436 +#: apt.conf.5.xml:447 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -5014,7 +5082,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:445 +#: apt.conf.5.xml:456 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -5024,7 +5092,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:451 +#: apt.conf.5.xml:462 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -5032,7 +5100,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:455 +#: apt.conf.5.xml:466 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -5043,7 +5111,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:463 +#: apt.conf.5.xml:474 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -5056,13 +5124,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:476 +#: apt.conf.5.xml:487 #, fuzzy msgid "APT in DSelect" msgstr "DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:478 +#: apt.conf.5.xml:489 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -5070,12 +5138,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:482 +#: apt.conf.5.xml:493 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:483 +#: apt.conf.5.xml:494 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -5086,50 +5154,50 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:503 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:496 +#: apt.conf.5.xml:507 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:508 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:501 +#: apt.conf.5.xml:512 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:502 +#: apt.conf.5.xml:513 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:508 +#: apt.conf.5.xml:519 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:520 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:514 +#: apt.conf.5.xml:525 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -5137,17 +5205,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:520 +#: apt.conf.5.xml:531 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5156,12 +5224,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:537 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:527 +#: apt.conf.5.xml:538 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5171,7 +5239,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:533 +#: apt.conf.5.xml:544 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -5181,36 +5249,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:540 +#: apt.conf.5.xml:551 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:541 +#: apt.conf.5.xml:552 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:545 +#: apt.conf.5.xml:556 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:557 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:562 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:563 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@ -5225,7 +5293,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:567 +#: apt.conf.5.xml:578 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -5235,7 +5303,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:561 +#: apt.conf.5.xml:572 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -5249,12 +5317,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:573 +#: apt.conf.5.xml:584 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:574 +#: apt.conf.5.xml:585 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -5266,12 +5334,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:581 +#: apt.conf.5.xml:592 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:593 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -5287,12 +5355,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:592 +#: apt.conf.5.xml:603 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:593 +#: apt.conf.5.xml:604 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -5303,12 +5371,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:610 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:611 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -5318,12 +5386,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:616 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:617 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -5335,12 +5403,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:624 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:632 #, no-wrap msgid "" "OrderList::Score {\n" @@ -5352,7 +5420,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:614 +#: apt.conf.5.xml:625 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -5366,12 +5434,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:634 +#: apt.conf.5.xml:645 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:635 +#: apt.conf.5.xml:646 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5380,12 +5448,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:643 +#: apt.conf.5.xml:654 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:645 +#: apt.conf.5.xml:656 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5396,7 +5464,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:667 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -5404,7 +5472,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:664 +#: apt.conf.5.xml:675 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -5412,7 +5480,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:684 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -5422,111 +5490,111 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:681 +#: apt.conf.5.xml:692 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:691 +#: apt.conf.5.xml:702 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:696 +#: apt.conf.5.xml:707 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:711 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:718 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:711 +#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:718 +#: apt.conf.5.xml:729 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:740 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:744 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:751 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:755 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:762 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:755 +#: apt.conf.5.xml:766 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:762 +#: apt.conf.5.xml:773 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:776 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:772 +#: apt.conf.5.xml:783 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:775 +#: apt.conf.5.xml:786 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:782 +#: apt.conf.5.xml:793 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:785 +#: apt.conf.5.xml:796 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -5534,93 +5602,93 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:804 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:796 +#: apt.conf.5.xml:807 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:815 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:819 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:826 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:818 +#: apt.conf.5.xml:829 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:825 +#: apt.conf.5.xml:836 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:839 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:836 +#: apt.conf.5.xml:847 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:840 +#: apt.conf.5.xml:851 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:847 +#: apt.conf.5.xml:858 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:862 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:873 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:869 +#: apt.conf.5.xml:880 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:872 +#: apt.conf.5.xml:883 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -5630,12 +5698,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:883 +#: apt.conf.5.xml:894 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:886 +#: apt.conf.5.xml:897 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -5652,91 +5720,91 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:916 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:908 +#: apt.conf.5.xml:919 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:915 +#: apt.conf.5.xml:926 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:918 +#: apt.conf.5.xml:929 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:926 +#: apt.conf.5.xml:937 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:929 +#: apt.conf.5.xml:940 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:936 +#: apt.conf.5.xml:947 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:940 +#: apt.conf.5.xml:951 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:948 +#: apt.conf.5.xml:959 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:963 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:959 +#: apt.conf.5.xml:970 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:963 +#: apt.conf.5.xml:974 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:969 +#: apt.conf.5.xml:980 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:973 +#: apt.conf.5.xml:984 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:981 +#: apt.conf.5.xml:992 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:984 +#: apt.conf.5.xml:995 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5744,32 +5812,32 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:992 +#: apt.conf.5.xml:1003 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:996 +#: apt.conf.5.xml:1007 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1019 +#: apt.conf.5.xml:1030 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1026 +#: apt.conf.5.xml:1037 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1031 +#: apt.conf.5.xml:1042 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" @@ -5821,25 +5889,36 @@ msgid "" "choice of instance, only the choice of version." msgstr "" -#. type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 +msgid "" +"Note that the files in the <filename>/etc/apt/preferences.d</filename> " +"directory are parsed in alphanumeric ascending order and need to obey the " +"following naming convention: The files have no or \"<literal>pref</literal>" +"\" as filename extension and which only contain alphanumeric, hyphen (-), " +"underscore (_) and period (.) characters - otherwise they will be silently " +"ignored." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:63 msgid "APT's Default Priority Assignments" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:71 +#: apt_preferences.5.xml:78 #, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:74 +#: apt_preferences.5.xml:81 #, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:58 +#: apt_preferences.5.xml:65 msgid "" "If there is no preferences file or if there is no entry in the file that " "applies to a particular version then the priority assigned to that version " @@ -5855,40 +5934,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:83 +#: apt_preferences.5.xml:90 msgid "priority 100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:84 +#: apt_preferences.5.xml:91 msgid "to the version that is already installed (if any)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:88 +#: apt_preferences.5.xml:95 msgid "priority 500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:89 +#: apt_preferences.5.xml:96 msgid "" "to the versions that are not installed and do not belong to the target " "release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:93 +#: apt_preferences.5.xml:100 msgid "priority 990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:94 +#: apt_preferences.5.xml:101 msgid "" "to the versions that are not installed and belong to the target release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:85 msgid "" "If the target release has been specified then APT uses the following " "algorithm to set the priorities of the versions of a package. Assign: " @@ -5896,7 +5975,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:99 +#: apt_preferences.5.xml:106 msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " @@ -5904,14 +5983,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:103 +#: apt_preferences.5.xml:110 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:106 +#: apt_preferences.5.xml:113 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -5921,19 +6000,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:112 +#: apt_preferences.5.xml:119 msgid "Install the highest priority version." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 +#: apt_preferences.5.xml:120 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:116 +#: apt_preferences.5.xml:123 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@ -5941,7 +6020,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:122 +#: apt_preferences.5.xml:129 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@ -5951,7 +6030,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:136 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@ -5960,7 +6039,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:134 +#: apt_preferences.5.xml:141 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@ -5972,12 +6051,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:143 +#: apt_preferences.5.xml:150 msgid "The Effect of APT Preferences" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:145 +#: apt_preferences.5.xml:152 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -5986,7 +6065,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:151 +#: apt_preferences.5.xml:158 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@ -5996,7 +6075,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:165 #, no-wrap msgid "" "Package: perl\n" @@ -6005,7 +6084,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:164 +#: apt_preferences.5.xml:171 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@ -6015,7 +6094,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:170 +#: apt_preferences.5.xml:177 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@ -6023,7 +6102,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:175 +#: apt_preferences.5.xml:182 #, no-wrap msgid "" "Package: *\n" @@ -6032,7 +6111,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:180 +#: apt_preferences.5.xml:187 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " "This should not be confused with the Origin of a distribution as specified " @@ -6042,7 +6121,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:186 +#: apt_preferences.5.xml:193 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -6050,7 +6129,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:190 +#: apt_preferences.5.xml:197 #, no-wrap msgid "" "Package: *\n" @@ -6059,7 +6138,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:195 +#: apt_preferences.5.xml:202 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>squeeze</literal>" @@ -6067,7 +6146,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:199 +#: apt_preferences.5.xml:206 #, no-wrap msgid "" "Package: *\n" @@ -6076,7 +6155,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:204 +#: apt_preferences.5.xml:211 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -6084,7 +6163,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:209 +#: apt_preferences.5.xml:216 #, no-wrap msgid "" "Package: *\n" @@ -6093,82 +6172,82 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:220 +#: apt_preferences.5.xml:227 msgid "How APT Interprets Priorities" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:228 +#: apt_preferences.5.xml:235 msgid "P > 1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:229 +#: apt_preferences.5.xml:236 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:233 +#: apt_preferences.5.xml:240 msgid "990 < P <=1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:234 +#: apt_preferences.5.xml:241 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:239 +#: apt_preferences.5.xml:246 msgid "500 < P <=990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:247 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:245 +#: apt_preferences.5.xml:252 msgid "100 < P <=500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:253 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:251 +#: apt_preferences.5.xml:258 msgid "0 < P <=100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:259 msgid "" "causes a version to be installed only if there is no installed version of " "the package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:256 +#: apt_preferences.5.xml:263 msgid "P < 0" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:257 +#: apt_preferences.5.xml:264 msgid "prevents the version from being installed" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:223 +#: apt_preferences.5.xml:230 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -6176,7 +6255,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:262 +#: apt_preferences.5.xml:269 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -6185,14 +6264,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:268 +#: apt_preferences.5.xml:275 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:272 +#: apt_preferences.5.xml:279 #, no-wrap msgid "" "Package: perl\n" @@ -6209,12 +6288,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:285 +#: apt_preferences.5.xml:292 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:287 +#: apt_preferences.5.xml:294 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -6224,7 +6303,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:299 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -6232,7 +6311,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:296 +#: apt_preferences.5.xml:303 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -6241,12 +6320,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:313 msgid "Determination of Package Version and Distribution Properties" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:308 +#: apt_preferences.5.xml:315 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -6254,27 +6333,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:320 +#: apt_preferences.5.xml:327 msgid "the <literal>Package:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:321 +#: apt_preferences.5.xml:328 msgid "gives the package name" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:324 apt_preferences.5.xml:374 +#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 msgid "the <literal>Version:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:332 msgid "gives the version number for the named package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:312 +#: apt_preferences.5.xml:319 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -6287,12 +6366,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:341 +#: apt_preferences.5.xml:348 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:342 +#: apt_preferences.5.xml:349 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -6303,18 +6382,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:352 +#: apt_preferences.5.xml:359 #, no-wrap msgid "Pin: release a=stable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:365 msgid "the <literal>Codename:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:366 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: squeeze\" specifies that all of the " @@ -6324,13 +6403,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:368 +#: apt_preferences.5.xml:375 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:382 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -6340,7 +6419,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:384 +#: apt_preferences.5.xml:391 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -6349,12 +6428,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:393 +#: apt_preferences.5.xml:400 msgid "the <literal>Component:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:394 +#: apt_preferences.5.xml:401 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -6365,18 +6444,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:403 +#: apt_preferences.5.xml:410 #, no-wrap msgid "Pin: release c=main\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:409 +#: apt_preferences.5.xml:416 msgid "the <literal>Origin:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:410 +#: apt_preferences.5.xml:417 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -6385,18 +6464,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:423 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:422 +#: apt_preferences.5.xml:429 msgid "the <literal>Label:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:423 +#: apt_preferences.5.xml:430 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -6405,13 +6484,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:436 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:330 +#: apt_preferences.5.xml:337 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -6424,7 +6503,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:443 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -6439,12 +6518,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:449 +#: apt_preferences.5.xml:456 msgid "Optional Lines in an APT Preferences Record" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:451 +#: apt_preferences.5.xml:458 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -6452,7 +6531,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:455 +#: apt_preferences.5.xml:462 msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " "optional. If omitted, APT assigns a priority of 1 less than the last value " @@ -6461,12 +6540,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:464 +#: apt_preferences.5.xml:471 msgid "Tracking Stable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:472 +#: apt_preferences.5.xml:479 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -6481,7 +6560,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:466 +#: apt_preferences.5.xml:473 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -6491,8 +6570,8 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:489 apt_preferences.5.xml:535 -#: apt_preferences.5.xml:593 +#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 +#: apt_preferences.5.xml:600 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -6501,7 +6580,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:484 +#: apt_preferences.5.xml:491 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -6510,13 +6589,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:501 +#: apt_preferences.5.xml:508 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:495 +#: apt_preferences.5.xml:502 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -6525,12 +6604,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:507 +#: apt_preferences.5.xml:514 msgid "Tracking Testing or Unstable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:523 #, no-wrap msgid "" "Package: *\n" @@ -6547,7 +6626,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:509 +#: apt_preferences.5.xml:516 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -6558,7 +6637,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:530 +#: apt_preferences.5.xml:537 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -6567,13 +6646,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:550 +#: apt_preferences.5.xml:557 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:541 +#: apt_preferences.5.xml:548 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -6585,12 +6664,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:564 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:571 +#: apt_preferences.5.xml:578 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -6610,7 +6689,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:559 +#: apt_preferences.5.xml:566 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -6625,7 +6704,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:588 +#: apt_preferences.5.xml:595 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -6634,13 +6713,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:608 +#: apt_preferences.5.xml:615 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:599 +#: apt_preferences.5.xml:606 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -6652,12 +6731,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:617 +#: apt_preferences.5.xml:624 msgid "&file-preferences;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:623 +#: apt_preferences.5.xml:630 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "" diff --git a/doc/po/ja.po b/doc/po/ja.po index c25fb9c82..f1a766d97 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-01-11 15:12+0100\n" +"POT-Creation-Date: 2010-01-20 12:18+0100\n" "PO-Revision-Date: 2009-07-30 22:55+0900\n" "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1087,7 +1087,7 @@ msgstr "&sources-list; に指定した、パッケージリソースごとの状 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Plain text -#: apt.ent:368 +#: apt.ent:369 #, fuzzy, no-wrap #| msgid "Storage area for state information in transit. Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial)." msgid "" @@ -1099,6 +1099,42 @@ msgid "" "\">\n" msgstr "取得中状態情報格納エリア。設定項目 - <literal>Dir::State::Lists</literal> (必然的に不完全)" +#. type: Plain text +#: apt.ent:371 +msgid "<!ENTITY translation-title \"TRANSLATION\">" +msgstr "<!ENTITY translation-title \"訳者\">" + +#. type: Plain text +#: apt.ent:380 +#, no-wrap +msgid "" +"<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n" +" to the translation in the past, who is responsible now and maybe further information\n" +" specially related to your translation. -->\n" +"<!ENTITY translation-holder \"\n" +" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n" +" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n" +" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n" +"\">\n" +msgstr "" +"<!ENTITY translation-holder \"\n" +" 倉澤 望 <email>nabetaro@debian.or.jp</email> (2003-2006,2009),\n" +" Debian JP Documentation ML <email>debian-doc@debian.or.jp</email>\n" +"\">\n" + +#. type: Plain text +#: apt.ent:387 +#, no-wrap +msgid "" +"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n" +" in a shipped manpage will maybe appear english parts. -->\n" +"<!ENTITY translation-english \"\n" +" Note that this translated document may contain untranslated parts.\n" +" This is done on purpose, to avoid losing content when the\n" +" translation is lagging behind the original content.\n" +"\">\n" +msgstr "" + #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 @@ -1751,7 +1787,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 #: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 -#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:491 apt.conf.5.xml:513 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 msgid "options" msgstr "オプション" @@ -2001,7 +2037,7 @@ msgstr "&apt-commonoptions;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1024 apt_preferences.5.xml:615 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 msgid "Files" msgstr "ファイル" @@ -2015,7 +2051,7 @@ msgstr "" #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1030 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 #: sources.list.5.xml:233 msgid "See Also" msgstr "関連項目" @@ -3800,7 +3836,7 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1018 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 #: sources.list.5.xml:193 msgid "Examples" msgstr "サンプル" @@ -5963,7 +5999,7 @@ msgid "" "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " -"&apt-product; <date>18 September 2009</date>" +"&apt-product; <date>16 January 2010</date>" msgstr "" "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " @@ -5987,31 +6023,64 @@ msgstr "5" msgid "Configuration file for APT" msgstr "APT の設定ファイル" -# type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:40 msgid "" "<filename>apt.conf</filename> is the main configuration file for the APT " -"suite of tools, all tools make use of the configuration file and a common " -"command line parser to provide a uniform environment. When an APT tool " -"starts up it will read the configuration specified by the <envar>APT_CONFIG</" -"envar> environment variable (if any) and then read the files in " -"<literal>Dir::Etc::Parts</literal> then read the main configuration file " -"specified by <literal>Dir::Etc::main</literal> then finally apply the " -"command line options to override the configuration directives, possibly " -"loading even more config files." -msgstr "" -"<filename>apt.conf</filename> は、APT ツール集のメイン設定ファイルです。この" -"設定ファイルと共通のコマンドラインパーサを使って、すべてのツールを統一環境で" -"使用できます。APT ツールの起動時には、<envar>APT_CONFIG</envar> 環境変数に指" -"定した設定を (存在すれば) 読み込みます。次に <literal>Dir::Etc::Parts</" -"literal> のファイルを読み込みます。次に <literal>Dir::Etc::main</literal> で" -"指定した主設定ファイルを読み込み、最後にコマンドラインオプションで、設定ファ" -"イルより取得した値を上書きします。" +"suite of tools, but by far not the only place changes to options can be " +"made. All tools therefore share the configuration files and also use a " +"common command line parser to provide a uniform environment." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><para> +#: apt.conf.5.xml:45 +msgid "" +"When an APT tool starts up it will read the configuration files in the " +"following order:" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:47 +msgid "" +"the file specified by the <envar>APT_CONFIG</envar> environment variable (if " +"any)" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:49 +msgid "" +"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " +"order which have no or \"<literal>conf</literal>\" as filename extension and " +"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " +"characters - otherwise they will be silently ignored." +msgstr "" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:54 +#, fuzzy +#| msgid "" +#| "APT configuration file. Configuration Item: <literal>Dir::Etc::Main</" +#| "literal>." +msgid "" +"the main configuration file specified by <literal>Dir::Etc::main</literal>" +msgstr "APT 設定ファイル。設定項目 - <literal>Dir::Etc::Main</literal>" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:56 +msgid "" +"the command line options are applied to override the configuration " +"directives or to load even more configuration files." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:60 +msgid "Syntax" +msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:50 +#: apt.conf.5.xml:61 #, fuzzy #| msgid "" #| "The configuration file is organized in a tree with options organized into " @@ -6033,7 +6102,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:56 +#: apt.conf.5.xml:67 #, fuzzy #| msgid "" #| "Syntactically the configuration language is modeled after what the ISC " @@ -6066,7 +6135,7 @@ msgstr "" # type: Content of: <refentry><refsect1><informalexample><programlisting> #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:70 +#: apt.conf.5.xml:81 #, no-wrap msgid "" "APT {\n" @@ -6085,7 +6154,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:78 +#: apt.conf.5.xml:89 msgid "" "with newlines placed to make it more readable. Lists can be created by " "opening a scope and including a single string enclosed in quotes followed by " @@ -6097,14 +6166,14 @@ msgstr "" # type: Content of: <refentry><refsect1><informalexample><programlisting> #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:83 +#: apt.conf.5.xml:94 #, no-wrap msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:86 +#: apt.conf.5.xml:97 msgid "" "In general the sample configuration file in <filename>&docdir;examples/apt." "conf</filename> &configureindex; is a good guide for how it should look." @@ -6113,7 +6182,7 @@ msgstr "" "定ファイルのサンプルです。どのように設定するか参考になるでしょう。" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:90 +#: apt.conf.5.xml:101 msgid "" "The names of the configuration items are not case-sensitive. So in the " "previous example you could use <literal>dpkg::pre-install-pkgs</literal>." @@ -6122,7 +6191,7 @@ msgstr "" "<literal>dpkg::pre-install-pkgs</literal> とできます。" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:93 +#: apt.conf.5.xml:104 msgid "" "Names for the configuration items are optional if a list is defined as it " "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. " @@ -6133,7 +6202,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:98 +#: apt.conf.5.xml:109 #, fuzzy #| msgid "" #| "Two specials are allowed, <literal>#include</literal> and " @@ -6158,7 +6227,7 @@ msgstr "" "指定した要素と、それ以下の要素を削除します。" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:106 +#: apt.conf.5.xml:117 msgid "" "The #clear command is the only way to delete a list or a complete scope. " "Reopening a scope or the ::-style described below will <emphasis>not</" @@ -6169,7 +6238,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:111 +#: apt.conf.5.xml:122 #, fuzzy #| msgid "" #| "All of the APT tools take a -o option which allows an arbitrary " @@ -6191,7 +6260,7 @@ msgstr "" "ることで、リストを追加することができます。" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:118 +#: apt.conf.5.xml:129 msgid "" "Note that you can use :: only for appending one item per line to a list and " "that you should not use it in combination with the scope syntax. (The scope " @@ -6209,13 +6278,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:130 +#: apt.conf.5.xml:141 msgid "The APT Group" msgstr "APT グループ" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:131 +#: apt.conf.5.xml:142 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." @@ -6225,13 +6294,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:135 +#: apt.conf.5.xml:146 msgid "Architecture" msgstr "Architecture" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:136 +#: apt.conf.5.xml:147 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@ -6243,12 +6312,12 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:141 +#: apt.conf.5.xml:152 msgid "Default-Release" msgstr "Default-Release" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:142 +#: apt.conf.5.xml:153 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -6261,13 +6330,13 @@ msgstr "" "す。 &apt-preferences; も参照してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:146 +#: apt.conf.5.xml:157 msgid "Ignore-Hold" msgstr "Ignore-Hold" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:147 +#: apt.conf.5.xml:158 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." @@ -6277,13 +6346,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:151 +#: apt.conf.5.xml:162 msgid "Clean-Installed" msgstr "Clean-Installed" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:152 +#: apt.conf.5.xml:163 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -6298,12 +6367,12 @@ msgstr "" # type: Content of: <refentry><refnamediv><refname> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:158 +#: apt.conf.5.xml:169 msgid "Immediate-Configure" msgstr "Immediate-Configure" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:159 +#: apt.conf.5.xml:170 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -6336,13 +6405,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:181 +#: apt.conf.5.xml:192 msgid "Force-LoopBreak" msgstr "Force-LoopBreak" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:182 +#: apt.conf.5.xml:193 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -6360,13 +6429,13 @@ msgstr "" "不可欠パッケージで動作します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:190 +#: apt.conf.5.xml:201 msgid "Cache-Limit" msgstr "Cache-Limit" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:191 +#: apt.conf.5.xml:202 msgid "" "APT uses a fixed size memory mapped cache file to store the 'available' " "information. This sets the size of that cache (in bytes)." @@ -6375,24 +6444,24 @@ msgstr "" "ファイルを使用します。このオプションは、そのキャッシュサイズを指定します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:195 +#: apt.conf.5.xml:206 msgid "Build-Essential" msgstr "Build-Essential" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:196 +#: apt.conf.5.xml:207 msgid "Defines which package(s) are considered essential build dependencies." msgstr "構築依存関係で不可欠なパッケージを定義します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:210 msgid "Get" msgstr "Get" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:200 +#: apt.conf.5.xml:211 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." @@ -6401,13 +6470,13 @@ msgstr "" "&apt-get; の文書を参照してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:204 +#: apt.conf.5.xml:215 msgid "Cache" msgstr "Cache" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:205 +#: apt.conf.5.xml:216 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." @@ -6416,13 +6485,13 @@ msgstr "" "は &apt-cache; の文書を参照してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:209 +#: apt.conf.5.xml:220 msgid "CDROM" msgstr "CDROM" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:210 +#: apt.conf.5.xml:221 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." @@ -6432,17 +6501,17 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:227 msgid "The Acquire Group" msgstr "Acquire グループ" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:221 +#: apt.conf.5.xml:232 msgid "PDiffs" msgstr "PDiffs" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:222 +#: apt.conf.5.xml:233 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." @@ -6452,7 +6521,7 @@ msgstr "" "ルトでは True です。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:225 +#: apt.conf.5.xml:236 msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " @@ -6463,13 +6532,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:234 +#: apt.conf.5.xml:245 msgid "Queue-Mode" msgstr "Queue-Mode" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:246 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -6484,13 +6553,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:242 +#: apt.conf.5.xml:253 msgid "Retries" msgstr "Retries" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:243 +#: apt.conf.5.xml:254 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -6499,13 +6568,13 @@ msgstr "" "えられた回数だけリトライを行います。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:247 +#: apt.conf.5.xml:258 msgid "Source-Symlinks" msgstr "Source-Symlinks" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:248 +#: apt.conf.5.xml:259 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." @@ -6516,13 +6585,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:252 sources.list.5.xml:139 +#: apt.conf.5.xml:263 sources.list.5.xml:139 msgid "http" msgstr "http" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:253 +#: apt.conf.5.xml:264 #, fuzzy #| msgid "" #| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " @@ -6548,7 +6617,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:261 +#: apt.conf.5.xml:272 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -6573,7 +6642,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:271 apt.conf.5.xml:335 +#: apt.conf.5.xml:282 apt.conf.5.xml:346 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -6585,7 +6654,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:274 +#: apt.conf.5.xml:285 #, fuzzy #| msgid "" #| "One setting is provided to control the pipeline depth in cases where the " @@ -6613,7 +6682,7 @@ msgstr "" "ます。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:282 +#: apt.conf.5.xml:293 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -6623,7 +6692,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:287 +#: apt.conf.5.xml:298 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -6632,12 +6701,12 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:293 +#: apt.conf.5.xml:304 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:305 #, fuzzy #| msgid "" #| "HTTPS URIs. Cache-control and proxy options are the same as for " @@ -6655,7 +6724,7 @@ msgstr "" "していません。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:300 +#: apt.conf.5.xml:311 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -6677,13 +6746,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:318 sources.list.5.xml:150 +#: apt.conf.5.xml:329 sources.list.5.xml:150 msgid "ftp" msgstr "ftp" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:319 +#: apt.conf.5.xml:330 #, fuzzy #| msgid "" #| "FTP URIs; ftp::Proxy is the default proxy server to use. It is in the " @@ -6726,7 +6795,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:338 +#: apt.conf.5.xml:349 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -6742,7 +6811,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:345 +#: apt.conf.5.xml:356 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -6756,7 +6825,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:350 +#: apt.conf.5.xml:361 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -6773,12 +6842,12 @@ msgstr "" # type: Content of: <refentry><refnamediv><refname> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:357 sources.list.5.xml:132 +#: apt.conf.5.xml:368 sources.list.5.xml:132 msgid "cdrom" msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:363 +#: apt.conf.5.xml:374 #, fuzzy, no-wrap #| msgid "\"/cdrom/\"::Mount \"foo\";" msgid "/cdrom/::Mount \"foo\";" @@ -6786,7 +6855,7 @@ msgstr "\"/cdrom/\"::Mount \"foo\";" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:358 +#: apt.conf.5.xml:369 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -6807,13 +6876,13 @@ msgstr "" "す。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:379 msgid "gpgv" msgstr "gpgv" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:369 +#: apt.conf.5.xml:380 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -6824,18 +6893,18 @@ msgstr "" "す。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:385 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:380 +#: apt.conf.5.xml:391 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:375 +#: apt.conf.5.xml:386 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -6847,19 +6916,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:385 +#: apt.conf.5.xml:396 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:399 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:392 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -6876,13 +6945,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:392 +#: apt.conf.5.xml:403 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:401 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -6897,7 +6966,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:397 +#: apt.conf.5.xml:408 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@ -6907,12 +6976,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:403 +#: apt.conf.5.xml:414 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:404 +#: apt.conf.5.xml:415 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" @@ -6925,13 +6994,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:431 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:421 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " @@ -6955,7 +7024,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:217 +#: apt.conf.5.xml:228 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" @@ -6966,13 +7035,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:438 msgid "Directories" msgstr "ディレクトリ" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:429 +#: apt.conf.5.xml:440 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -6992,7 +7061,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:436 +#: apt.conf.5.xml:447 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -7014,7 +7083,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:445 +#: apt.conf.5.xml:456 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -7029,7 +7098,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:451 +#: apt.conf.5.xml:462 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -7041,7 +7110,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:455 +#: apt.conf.5.xml:466 #, fuzzy #| msgid "" #| "Binary programs are pointed to by <literal>Dir::Bin</literal>. " @@ -7066,7 +7135,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:463 +#: apt.conf.5.xml:474 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -7087,13 +7156,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:476 +#: apt.conf.5.xml:487 msgid "APT in DSelect" msgstr "DSelect での APT" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:478 +#: apt.conf.5.xml:489 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -7103,13 +7172,13 @@ msgstr "" "設定項目で、デフォルトの動作を制御します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:482 +#: apt.conf.5.xml:493 msgid "Clean" msgstr "Clean" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:483 +#: apt.conf.5.xml:494 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -7126,7 +7195,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:503 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@ -7136,13 +7205,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:496 +#: apt.conf.5.xml:507 msgid "Updateoptions" msgstr "Updateoptions" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:508 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@ -7151,13 +7220,13 @@ msgstr "" "されます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:501 +#: apt.conf.5.xml:512 msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:502 +#: apt.conf.5.xml:513 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -7167,13 +7236,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:508 +#: apt.conf.5.xml:519 msgid "How APT calls dpkg" msgstr "APT が dpkg を呼ぶ方法" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:520 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -7183,7 +7252,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:514 +#: apt.conf.5.xml:525 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -7193,18 +7262,18 @@ msgstr "" "ければなりません。また、各リストは単一の引数として &dpkg; に渡されます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 msgid "Post-Invoke" msgstr "Post-Invoke" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:520 +#: apt.conf.5.xml:531 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -7218,13 +7287,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:537 msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:527 +#: apt.conf.5.xml:538 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -7240,7 +7309,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:533 +#: apt.conf.5.xml:544 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -7256,13 +7325,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:540 +#: apt.conf.5.xml:551 msgid "Run-Directory" msgstr "Run-Directory" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:541 +#: apt.conf.5.xml:552 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@ -7272,13 +7341,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:545 +#: apt.conf.5.xml:556 msgid "Build-options" msgstr "Build-options" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:557 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@ -7287,12 +7356,12 @@ msgstr "" "ます。デフォルトでは署名を無効にし、全バイナリを生成します。" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:562 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:563 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@ -7307,7 +7376,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:567 +#: apt.conf.5.xml:578 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -7317,7 +7386,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:561 +#: apt.conf.5.xml:572 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -7331,12 +7400,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:573 +#: apt.conf.5.xml:584 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:574 +#: apt.conf.5.xml:585 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -7349,14 +7418,14 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:581 +#: apt.conf.5.xml:592 #, fuzzy #| msgid "Packages::Compress" msgid "PackageManager::Configure" msgstr "Packages::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:593 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -7373,13 +7442,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:592 +#: apt.conf.5.xml:603 #, fuzzy msgid "DPkg::ConfigurePending" msgstr "ユーザの設定" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:593 +#: apt.conf.5.xml:604 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -7390,12 +7459,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:610 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:611 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -7405,12 +7474,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:616 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:617 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -7422,12 +7491,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:624 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:632 #, no-wrap msgid "" "OrderList::Score {\n" @@ -7439,7 +7508,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:614 +#: apt.conf.5.xml:625 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -7453,12 +7522,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:634 +#: apt.conf.5.xml:645 msgid "Periodic and Archives options" msgstr "Periodic オプションと Archives オプション" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:635 +#: apt.conf.5.xml:646 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -7472,12 +7541,12 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:643 +#: apt.conf.5.xml:654 msgid "Debug options" msgstr "デバッグオプション" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:645 +#: apt.conf.5.xml:656 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -7488,7 +7557,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:667 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -7499,7 +7568,7 @@ msgstr "" "にします。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:664 +#: apt.conf.5.xml:675 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -7510,7 +7579,7 @@ msgstr "" "literal>) を行う場合に使用します。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:684 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -7520,66 +7589,66 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:681 +#: apt.conf.5.xml:692 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:691 +#: apt.conf.5.xml:702 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:696 +#: apt.conf.5.xml:707 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:711 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" "<literal>cdrom://</literal> ソースへのアクセスに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:718 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:711 +#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using FTP." msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:718 +#: apt.conf.5.xml:729 msgid "<literal>Debug::Acquire::http</literal>" msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTP." msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:740 msgid "<literal>Debug::Acquire::https</literal>" msgstr "<literal>Debug::Acquire::https</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:744 msgid "Print information related to downloading packages using HTTPS." msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:751 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "<literal>Debug::Acquire::gpgv</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:755 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -7587,46 +7656,46 @@ msgstr "" "<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:762 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:755 +#: apt.conf.5.xml:766 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:762 +#: apt.conf.5.xml:773 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:776 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:772 +#: apt.conf.5.xml:783 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:775 +#: apt.conf.5.xml:786 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:782 +#: apt.conf.5.xml:793 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:785 +#: apt.conf.5.xml:796 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -7634,93 +7703,93 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:804 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:796 +#: apt.conf.5.xml:807 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:815 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:819 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:826 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "<literal>Debug::pkgAcquire::Auth</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:818 +#: apt.conf.5.xml:829 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:825 +#: apt.conf.5.xml:836 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:839 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:836 +#: apt.conf.5.xml:847 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "<literal>Debug::pkgAcquire::RRed</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:840 +#: apt.conf.5.xml:851 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:847 +#: apt.conf.5.xml:858 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:862 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:873 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:869 +#: apt.conf.5.xml:880 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:872 +#: apt.conf.5.xml:883 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7730,12 +7799,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:883 +#: apt.conf.5.xml:894 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "<literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:886 +#: apt.conf.5.xml:897 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7752,91 +7821,91 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:916 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:908 +#: apt.conf.5.xml:919 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:915 +#: apt.conf.5.xml:926 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:918 +#: apt.conf.5.xml:929 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:926 +#: apt.conf.5.xml:937 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:929 +#: apt.conf.5.xml:940 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:936 +#: apt.conf.5.xml:947 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:940 +#: apt.conf.5.xml:951 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:948 +#: apt.conf.5.xml:959 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:963 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:959 +#: apt.conf.5.xml:970 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:963 +#: apt.conf.5.xml:974 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:969 +#: apt.conf.5.xml:980 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:973 +#: apt.conf.5.xml:984 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:981 +#: apt.conf.5.xml:992 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:984 +#: apt.conf.5.xml:995 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -7844,12 +7913,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:992 +#: apt.conf.5.xml:1003 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:996 +#: apt.conf.5.xml:1007 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7857,7 +7926,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1019 +#: apt.conf.5.xml:1030 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7867,7 +7936,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1026 +#: apt.conf.5.xml:1037 #, fuzzy #| msgid "&apt-conf;" msgid "&file-aptconf;" @@ -7876,7 +7945,7 @@ msgstr "&apt-conf;" # type: Content of: <refentry><refsect1><para> #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1031 +#: apt.conf.5.xml:1042 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@ -7953,29 +8022,40 @@ msgstr "" "ダウンロードします。APT 設定ファイルはバージョンの選択にのみ影響し、インスタ" "ンスの選択には影響しません。" +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:56 +msgid "" +"Note that the files in the <filename>/etc/apt/preferences.d</filename> " +"directory are parsed in alphanumeric ascending order and need to obey the " +"following naming convention: The files have no or \"<literal>pref</literal>" +"\" as filename extension and which only contain alphanumeric, hyphen (-), " +"underscore (_) and period (.) characters - otherwise they will be silently " +"ignored." +msgstr "" + # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:56 +#: apt_preferences.5.xml:63 msgid "APT's Default Priority Assignments" msgstr "APT のデフォルト優先度の割り当て" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:71 +#: apt_preferences.5.xml:78 #, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:74 +#: apt_preferences.5.xml:81 #, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "APT::Default-Release \"stable\";\n" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:58 +#: apt_preferences.5.xml:65 msgid "" "If there is no preferences file or if there is no entry in the file that " "applies to a particular version then the priority assigned to that version " @@ -8000,25 +8080,25 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:83 +#: apt_preferences.5.xml:90 msgid "priority 100" msgstr "priority 100" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:84 +#: apt_preferences.5.xml:91 msgid "to the version that is already installed (if any)." msgstr "(あるならば) 既にインストールされているバージョン。" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:88 +#: apt_preferences.5.xml:95 msgid "priority 500" msgstr "priority 500" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:89 +#: apt_preferences.5.xml:96 msgid "" "to the versions that are not installed and do not belong to the target " "release." @@ -8026,20 +8106,20 @@ msgstr "インストールされておらず、ターゲットリリースに含 # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:93 +#: apt_preferences.5.xml:100 msgid "priority 990" msgstr "priority 990" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:94 +#: apt_preferences.5.xml:101 msgid "" "to the versions that are not installed and belong to the target release." msgstr "インストールされておらず、ターゲットリリースに含まれるバージョン。" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:85 msgid "" "If the target release has been specified then APT uses the following " "algorithm to set the priorities of the versions of a package. Assign: " @@ -8051,7 +8131,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:99 +#: apt_preferences.5.xml:106 msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " @@ -8063,7 +8143,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:103 +#: apt_preferences.5.xml:110 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." @@ -8073,7 +8153,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:106 +#: apt_preferences.5.xml:113 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -8089,13 +8169,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:112 +#: apt_preferences.5.xml:119 msgid "Install the highest priority version." msgstr "最も高い優先度のバージョンをインストールします。" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 +#: apt_preferences.5.xml:120 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." @@ -8105,7 +8185,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:116 +#: apt_preferences.5.xml:123 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@ -8117,7 +8197,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:122 +#: apt_preferences.5.xml:129 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@ -8133,7 +8213,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:136 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@ -8147,7 +8227,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:134 +#: apt_preferences.5.xml:141 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@ -8167,13 +8247,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:143 +#: apt_preferences.5.xml:150 msgid "The Effect of APT Preferences" msgstr "APT 設定の効果" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:145 +#: apt_preferences.5.xml:152 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -8186,7 +8266,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:151 +#: apt_preferences.5.xml:158 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@ -8201,7 +8281,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:165 #, no-wrap msgid "" "Package: perl\n" @@ -8214,7 +8294,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:164 +#: apt_preferences.5.xml:171 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@ -8229,7 +8309,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:170 +#: apt_preferences.5.xml:177 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@ -8241,7 +8321,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:175 +#: apt_preferences.5.xml:182 #, no-wrap msgid "" "Package: *\n" @@ -8254,7 +8334,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:180 +#: apt_preferences.5.xml:187 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " "This should not be confused with the Origin of a distribution as specified " @@ -8270,7 +8350,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:186 +#: apt_preferences.5.xml:193 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -8281,7 +8361,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:190 +#: apt_preferences.5.xml:197 #, no-wrap msgid "" "Package: *\n" @@ -8294,7 +8374,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:195 +#: apt_preferences.5.xml:202 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>squeeze</literal>" @@ -8305,7 +8385,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:199 +#: apt_preferences.5.xml:206 #, no-wrap msgid "" "Package: *\n" @@ -8318,7 +8398,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:204 +#: apt_preferences.5.xml:211 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -8330,7 +8410,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:209 +#: apt_preferences.5.xml:216 #, no-wrap msgid "" "Package: *\n" @@ -8343,18 +8423,18 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:220 +#: apt_preferences.5.xml:227 msgid "How APT Interprets Priorities" msgstr "APT が優先度に割り込む方法" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:228 +#: apt_preferences.5.xml:235 msgid "P > 1000" msgstr "P > 1000" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:229 +#: apt_preferences.5.xml:236 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@ -8362,13 +8442,13 @@ msgstr "" "パッケージがダウングレードしても、このバージョンのパッケージをインストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:233 +#: apt_preferences.5.xml:240 msgid "990 < P <=1000" msgstr "990 < P <=1000" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:234 +#: apt_preferences.5.xml:241 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@ -8377,13 +8457,13 @@ msgstr "" "含まれなくても、このバージョンのパッケージをインストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:239 +#: apt_preferences.5.xml:246 msgid "500 < P <=990" msgstr "500 < P <=990" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:247 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" @@ -8392,13 +8472,13 @@ msgstr "" "ジョンの方が新しいのでなければ、このバージョンのパッケージをインストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:245 +#: apt_preferences.5.xml:252 msgid "100 < P <=500" msgstr "100 < P <=500" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:253 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" @@ -8408,13 +8488,13 @@ msgstr "" "ル" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:251 +#: apt_preferences.5.xml:258 msgid "0 < P <=100" msgstr "0 < P <=100" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:259 msgid "" "causes a version to be installed only if there is no installed version of " "the package" @@ -8423,19 +8503,19 @@ msgstr "" "ンストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:256 +#: apt_preferences.5.xml:263 msgid "P < 0" msgstr "P < 0" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:257 +#: apt_preferences.5.xml:264 msgid "prevents the version from being installed" msgstr "このバージョンのインストール禁止" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:223 +#: apt_preferences.5.xml:230 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -8447,7 +8527,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:262 +#: apt_preferences.5.xml:269 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -8461,7 +8541,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:268 +#: apt_preferences.5.xml:275 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@ -8471,7 +8551,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><programlisting> #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:272 +#: apt_preferences.5.xml:279 #, no-wrap msgid "" "Package: perl\n" @@ -8500,13 +8580,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:285 +#: apt_preferences.5.xml:292 msgid "Then:" msgstr "すると、以下のように動作します。" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:287 +#: apt_preferences.5.xml:294 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -8521,7 +8601,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:299 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -8533,7 +8613,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:296 +#: apt_preferences.5.xml:303 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -8547,13 +8627,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:313 msgid "Determination of Package Version and Distribution Properties" msgstr "パッケージのバージョンとディストリビューションプロパティの決定" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:308 +#: apt_preferences.5.xml:315 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -8564,30 +8644,30 @@ msgstr "" "filename> ファイルを提供します。" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:320 +#: apt_preferences.5.xml:327 msgid "the <literal>Package:</literal> line" msgstr "<literal>Package:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:321 +#: apt_preferences.5.xml:328 msgid "gives the package name" msgstr "パッケージ名" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:324 apt_preferences.5.xml:374 +#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 msgid "the <literal>Version:</literal> line" msgstr "<literal>Version:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:332 msgid "gives the version number for the named package" msgstr "その名前のパッケージのバージョン番号" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:312 +#: apt_preferences.5.xml:319 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -8607,13 +8687,13 @@ msgstr "" "type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:341 +#: apt_preferences.5.xml:348 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "<literal>Archive:</literal> 行や <literal>Suite:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:342 +#: apt_preferences.5.xml:349 #, fuzzy msgid "" "names the archive to which all the packages in the directory tree belong. " @@ -8631,19 +8711,19 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:352 +#: apt_preferences.5.xml:359 #, no-wrap msgid "Pin: release a=stable\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:365 msgid "the <literal>Codename:</literal> line" msgstr "<literal>Codename:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:366 #, fuzzy msgid "" "names the codename to which all the packages in the directory tree belong. " @@ -8660,14 +8740,14 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:368 +#: apt_preferences.5.xml:375 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "Pin: release n=squeeze\n" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:382 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -8683,7 +8763,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:384 +#: apt_preferences.5.xml:391 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -8695,13 +8775,13 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:393 +#: apt_preferences.5.xml:400 msgid "the <literal>Component:</literal> line" msgstr "<literal>Component:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:394 +#: apt_preferences.5.xml:401 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -8719,19 +8799,19 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:403 +#: apt_preferences.5.xml:410 #, no-wrap msgid "Pin: release c=main\n" msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:409 +#: apt_preferences.5.xml:416 msgid "the <literal>Origin:</literal> line" msgstr "<literal>Origin:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:410 +#: apt_preferences.5.xml:417 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8744,19 +8824,19 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:423 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:422 +#: apt_preferences.5.xml:429 msgid "the <literal>Label:</literal> line" msgstr "<literal>Label:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:423 +#: apt_preferences.5.xml:430 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8769,14 +8849,14 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:436 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "Pin: release l=Debian\n" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:330 +#: apt_preferences.5.xml:337 #, fuzzy msgid "" "The <filename>Release</filename> file is normally found in the directory " @@ -8798,7 +8878,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:443 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -8824,13 +8904,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:449 +#: apt_preferences.5.xml:456 msgid "Optional Lines in an APT Preferences Record" msgstr "APT 設定レコードのオプション行" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:451 +#: apt_preferences.5.xml:458 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -8841,7 +8921,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:455 +#: apt_preferences.5.xml:462 #, fuzzy msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " @@ -8855,13 +8935,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:464 +#: apt_preferences.5.xml:471 msgid "Tracking Stable" msgstr "安定版の追跡" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:472 +#: apt_preferences.5.xml:479 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -8886,7 +8966,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:466 +#: apt_preferences.5.xml:473 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a priority " @@ -8902,8 +8982,8 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:489 apt_preferences.5.xml:535 -#: apt_preferences.5.xml:593 +#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 +#: apt_preferences.5.xml:600 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -8916,7 +8996,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:484 +#: apt_preferences.5.xml:491 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -8929,14 +9009,14 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:501 +#: apt_preferences.5.xml:508 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "apt-get install <replaceable>package</replaceable>/testing\n" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:495 +#: apt_preferences.5.xml:502 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -8950,13 +9030,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:507 +#: apt_preferences.5.xml:514 msgid "Tracking Testing or Unstable" msgstr "テスト版や不安定版の追跡" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:523 #, no-wrap msgid "" "Package: *\n" @@ -8985,7 +9065,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:509 +#: apt_preferences.5.xml:516 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a high priority " @@ -9003,7 +9083,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:530 +#: apt_preferences.5.xml:537 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -9016,14 +9096,14 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:550 +#: apt_preferences.5.xml:557 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "apt-get install <replaceable>package</replaceable>/unstable\n" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:541 +#: apt_preferences.5.xml:548 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -9042,13 +9122,13 @@ msgstr "" "の最新版にアップグレードします。" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:564 msgid "Tracking the evolution of a codename release" msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:571 +#: apt_preferences.5.xml:578 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -9082,7 +9162,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:559 +#: apt_preferences.5.xml:566 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -9098,7 +9178,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:588 +#: apt_preferences.5.xml:595 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -9111,14 +9191,14 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:608 +#: apt_preferences.5.xml:615 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "apt-get install <replaceable>package</replaceable>/sid\n" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:599 +#: apt_preferences.5.xml:606 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -9138,7 +9218,7 @@ msgstr "" # type: Content of: <refentry><refnamediv><refname> #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:617 +#: apt_preferences.5.xml:624 #, fuzzy #| msgid "apt_preferences" msgid "&file-preferences;" @@ -9146,7 +9226,7 @@ msgstr "apt_preferences" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:623 +#: apt_preferences.5.xml:630 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -10835,6 +10915,26 @@ msgstr "" msgid "Which will use the already fetched archives on the disc." msgstr "" +# type: Content of: <refentry><refsect1><para> +#~ msgid "" +#~ "<filename>apt.conf</filename> is the main configuration file for the APT " +#~ "suite of tools, all tools make use of the configuration file and a common " +#~ "command line parser to provide a uniform environment. When an APT tool " +#~ "starts up it will read the configuration specified by the " +#~ "<envar>APT_CONFIG</envar> environment variable (if any) and then read the " +#~ "files in <literal>Dir::Etc::Parts</literal> then read the main " +#~ "configuration file specified by <literal>Dir::Etc::main</literal> then " +#~ "finally apply the command line options to override the configuration " +#~ "directives, possibly loading even more config files." +#~ msgstr "" +#~ "<filename>apt.conf</filename> は、APT ツール集のメイン設定ファイルです。こ" +#~ "の設定ファイルと共通のコマンドラインパーサを使って、すべてのツールを統一環" +#~ "境で使用できます。APT ツールの起動時には、<envar>APT_CONFIG</envar> 環境変" +#~ "数に指定した設定を (存在すれば) 読み込みます。次に <literal>Dir::Etc::" +#~ "Parts</literal> のファイルを読み込みます。次に <literal>Dir::Etc::main</" +#~ "literal> で指定した主設定ファイルを読み込み、最後にコマンドラインオプショ" +#~ "ンで、設定ファイルより取得した値を上書きします。" + # type: Content of: <refentry><refsect1><para> #~ msgid "<filename>/etc/apt/trusted.gpg</filename>" #~ msgstr "<filename>/etc/apt/trusted.gpg</filename>" @@ -10885,12 +10985,6 @@ msgstr "" #~ msgid "<filename>/etc/apt/apt.conf</filename>" #~ msgstr "<filename>/etc/apt/apt.conf</filename>" -# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#~ msgid "" -#~ "APT configuration file. Configuration Item: <literal>Dir::Etc::Main</" -#~ "literal>." -#~ msgstr "APT 設定ファイル。設定項目 - <literal>Dir::Etc::Main</literal>" - # type: Content of: <refentry><refsect1><para> #~ msgid "<filename>/etc/apt/apt.conf.d/</filename>" #~ msgstr "<filename>/etc/apt/apt.conf.d/</filename>" diff --git a/doc/po/pl.po b/doc/po/pl.po index 80fa40db0..a3936cff2 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" -"POT-Creation-Date: 2010-01-11 15:12+0100\n" +"POT-Creation-Date: 2010-01-20 12:18+0100\n" "PO-Revision-Date: 2004-02-12 15:06+0100\n" "Last-Translator: Krzysztof Fiertek <akfedux@megapolis.pl>\n" "Language-Team: <debian-l10n-polish@lists.debian.org>\n" @@ -761,7 +761,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:368 +#: apt.ent:369 #, no-wrap msgid "" " <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n" @@ -772,6 +772,38 @@ msgid "" "\">\n" msgstr "" +#. type: Plain text +#: apt.ent:371 +msgid "<!ENTITY translation-title \"TRANSLATION\">" +msgstr "" + +#. type: Plain text +#: apt.ent:380 +#, no-wrap +msgid "" +"<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n" +" to the translation in the past, who is responsible now and maybe further information\n" +" specially related to your translation. -->\n" +"<!ENTITY translation-holder \"\n" +" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n" +" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n" +" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n" +"\">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:387 +#, no-wrap +msgid "" +"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n" +" in a shipped manpage will maybe appear english parts. -->\n" +"<!ENTITY translation-english \"\n" +" Note that this translated document may contain untranslated parts.\n" +" This is done on purpose, to avoid losing content when the\n" +" translation is lagging behind the original content.\n" +"\">\n" +msgstr "" + #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 @@ -1226,7 +1258,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 #: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 -#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:491 apt.conf.5.xml:513 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 #, fuzzy msgid "options" msgstr "Kolejne kroki" @@ -1428,7 +1460,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1024 apt_preferences.5.xml:615 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 msgid "Files" msgstr "" @@ -1441,7 +1473,7 @@ msgstr "" #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1030 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 #: sources.list.5.xml:233 msgid "See Also" msgstr "" @@ -2746,7 +2778,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1018 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 #: sources.list.5.xml:193 msgid "Examples" msgstr "" @@ -4251,7 +4283,7 @@ msgid "" "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " -"&apt-product; <date>18 September 2009</date>" +"&apt-product; <date>16 January 2010</date>" msgstr "" #. type: Content of: <refentry><refnamediv><refname> @@ -4274,18 +4306,54 @@ msgstr "Plik konfiguracyjny" #: apt.conf.5.xml:40 msgid "" "<filename>apt.conf</filename> is the main configuration file for the APT " -"suite of tools, all tools make use of the configuration file and a common " -"command line parser to provide a uniform environment. When an APT tool " -"starts up it will read the configuration specified by the <envar>APT_CONFIG</" -"envar> environment variable (if any) and then read the files in " -"<literal>Dir::Etc::Parts</literal> then read the main configuration file " -"specified by <literal>Dir::Etc::main</literal> then finally apply the " -"command line options to override the configuration directives, possibly " -"loading even more config files." +"suite of tools, but by far not the only place changes to options can be " +"made. All tools therefore share the configuration files and also use a " +"common command line parser to provide a uniform environment." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><para> +#: apt.conf.5.xml:45 +msgid "" +"When an APT tool starts up it will read the configuration files in the " +"following order:" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:47 +msgid "" +"the file specified by the <envar>APT_CONFIG</envar> environment variable (if " +"any)" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:49 +msgid "" +"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " +"order which have no or \"<literal>conf</literal>\" as filename extension and " +"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " +"characters - otherwise they will be silently ignored." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:54 +msgid "" +"the main configuration file specified by <literal>Dir::Etc::main</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:56 +msgid "" +"the command line options are applied to override the configuration " +"directives or to load even more configuration files." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:60 +msgid "Syntax" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:50 +#: apt.conf.5.xml:61 msgid "" "The configuration file is organized in a tree with options organized into " "functional groups. Option specification is given with a double colon " @@ -4295,7 +4363,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:56 +#: apt.conf.5.xml:67 msgid "" "Syntactically the configuration language is modeled after what the ISC tools " "such as bind and dhcp use. Lines starting with <literal>//</literal> are " @@ -4311,7 +4379,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:70 +#: apt.conf.5.xml:81 #, no-wrap msgid "" "APT {\n" @@ -4323,7 +4391,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:78 +#: apt.conf.5.xml:89 msgid "" "with newlines placed to make it more readable. Lists can be created by " "opening a scope and including a single string enclosed in quotes followed by " @@ -4331,27 +4399,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:83 +#: apt.conf.5.xml:94 #, no-wrap msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:86 +#: apt.conf.5.xml:97 msgid "" "In general the sample configuration file in <filename>&docdir;examples/apt." "conf</filename> &configureindex; is a good guide for how it should look." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:90 +#: apt.conf.5.xml:101 msgid "" "The names of the configuration items are not case-sensitive. So in the " "previous example you could use <literal>dpkg::pre-install-pkgs</literal>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:93 +#: apt.conf.5.xml:104 msgid "" "Names for the configuration items are optional if a list is defined as it " "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. " @@ -4361,7 +4429,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:98 +#: apt.conf.5.xml:109 msgid "" "Two specials are allowed, <literal>#include</literal> (which is deprecated " "and not supported by alternative implementations) and <literal>#clear</" @@ -4373,7 +4441,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:106 +#: apt.conf.5.xml:117 msgid "" "The #clear command is the only way to delete a list or a complete scope. " "Reopening a scope or the ::-style described below will <emphasis>not</" @@ -4383,7 +4451,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:111 +#: apt.conf.5.xml:122 msgid "" "All of the APT tools take a -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " @@ -4394,7 +4462,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:118 +#: apt.conf.5.xml:129 msgid "" "Note that you can use :: only for appending one item per line to a list and " "that you should not use it in combination with the scope syntax. (The scope " @@ -4411,24 +4479,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:130 +#: apt.conf.5.xml:141 msgid "The APT Group" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:131 +#: apt.conf.5.xml:142 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:135 +#: apt.conf.5.xml:146 msgid "Architecture" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:136 +#: apt.conf.5.xml:147 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@ -4436,12 +4504,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:141 +#: apt.conf.5.xml:152 msgid "Default-Release" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:142 +#: apt.conf.5.xml:153 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -4450,24 +4518,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:146 +#: apt.conf.5.xml:157 msgid "Ignore-Hold" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:147 +#: apt.conf.5.xml:158 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:151 +#: apt.conf.5.xml:162 msgid "Clean-Installed" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:152 +#: apt.conf.5.xml:163 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -4476,12 +4544,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:158 +#: apt.conf.5.xml:169 msgid "Immediate-Configure" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:159 +#: apt.conf.5.xml:170 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -4514,12 +4582,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:181 +#: apt.conf.5.xml:192 msgid "Force-LoopBreak" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:182 +#: apt.conf.5.xml:193 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -4530,82 +4598,82 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:190 +#: apt.conf.5.xml:201 msgid "Cache-Limit" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:191 +#: apt.conf.5.xml:202 msgid "" "APT uses a fixed size memory mapped cache file to store the 'available' " "information. This sets the size of that cache (in bytes)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:195 +#: apt.conf.5.xml:206 msgid "Build-Essential" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:196 +#: apt.conf.5.xml:207 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:210 msgid "Get" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:200 +#: apt.conf.5.xml:211 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:204 +#: apt.conf.5.xml:215 msgid "Cache" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:205 +#: apt.conf.5.xml:216 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:209 +#: apt.conf.5.xml:220 msgid "CDROM" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:210 +#: apt.conf.5.xml:221 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:227 msgid "The Acquire Group" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:221 +#: apt.conf.5.xml:232 msgid "PDiffs" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:222 +#: apt.conf.5.xml:233 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:225 +#: apt.conf.5.xml:236 msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " @@ -4616,12 +4684,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:234 +#: apt.conf.5.xml:245 msgid "Queue-Mode" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:246 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -4631,36 +4699,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:242 +#: apt.conf.5.xml:253 msgid "Retries" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:243 +#: apt.conf.5.xml:254 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:247 +#: apt.conf.5.xml:258 msgid "Source-Symlinks" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:248 +#: apt.conf.5.xml:259 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:252 sources.list.5.xml:139 +#: apt.conf.5.xml:263 sources.list.5.xml:139 msgid "http" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:253 +#: apt.conf.5.xml:264 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -4671,7 +4739,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:261 +#: apt.conf.5.xml:272 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -4685,7 +4753,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:271 apt.conf.5.xml:335 +#: apt.conf.5.xml:282 apt.conf.5.xml:346 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -4693,7 +4761,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:274 +#: apt.conf.5.xml:285 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@ -4705,7 +4773,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:282 +#: apt.conf.5.xml:293 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -4715,7 +4783,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:287 +#: apt.conf.5.xml:298 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -4723,12 +4791,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:293 +#: apt.conf.5.xml:304 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:305 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -4738,7 +4806,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:300 +#: apt.conf.5.xml:311 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -4759,12 +4827,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:318 sources.list.5.xml:150 +#: apt.conf.5.xml:329 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:319 +#: apt.conf.5.xml:330 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -4783,7 +4851,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:338 +#: apt.conf.5.xml:349 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -4793,7 +4861,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:345 +#: apt.conf.5.xml:356 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -4802,7 +4870,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:350 +#: apt.conf.5.xml:361 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4812,18 +4880,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:357 sources.list.5.xml:132 +#: apt.conf.5.xml:368 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:363 +#: apt.conf.5.xml:374 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:358 +#: apt.conf.5.xml:369 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -4836,12 +4904,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:379 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:369 +#: apt.conf.5.xml:380 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -4849,18 +4917,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:385 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:380 +#: apt.conf.5.xml:391 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:375 +#: apt.conf.5.xml:386 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4872,19 +4940,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:385 +#: apt.conf.5.xml:396 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:399 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:392 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4901,13 +4969,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:392 +#: apt.conf.5.xml:403 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:401 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -4922,7 +4990,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:397 +#: apt.conf.5.xml:408 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@ -4932,12 +5000,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:403 +#: apt.conf.5.xml:414 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:404 +#: apt.conf.5.xml:415 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" @@ -4950,13 +5018,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:431 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:421 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " @@ -4979,19 +5047,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:217 +#: apt.conf.5.xml:228 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:438 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:429 +#: apt.conf.5.xml:440 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -5003,7 +5071,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:436 +#: apt.conf.5.xml:447 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -5016,7 +5084,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:445 +#: apt.conf.5.xml:456 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -5026,7 +5094,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:451 +#: apt.conf.5.xml:462 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -5034,7 +5102,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:455 +#: apt.conf.5.xml:466 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -5045,7 +5113,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:463 +#: apt.conf.5.xml:474 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -5058,12 +5126,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:476 +#: apt.conf.5.xml:487 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:478 +#: apt.conf.5.xml:489 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -5071,12 +5139,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:482 +#: apt.conf.5.xml:493 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:483 +#: apt.conf.5.xml:494 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -5087,50 +5155,50 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:503 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:496 +#: apt.conf.5.xml:507 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:508 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:501 +#: apt.conf.5.xml:512 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:502 +#: apt.conf.5.xml:513 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:508 +#: apt.conf.5.xml:519 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:520 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:514 +#: apt.conf.5.xml:525 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -5138,17 +5206,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:520 +#: apt.conf.5.xml:531 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5157,12 +5225,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:537 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:527 +#: apt.conf.5.xml:538 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5172,7 +5240,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:533 +#: apt.conf.5.xml:544 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -5182,36 +5250,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:540 +#: apt.conf.5.xml:551 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:541 +#: apt.conf.5.xml:552 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:545 +#: apt.conf.5.xml:556 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:557 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:562 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:563 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@ -5226,7 +5294,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:567 +#: apt.conf.5.xml:578 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -5236,7 +5304,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:561 +#: apt.conf.5.xml:572 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -5250,12 +5318,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:573 +#: apt.conf.5.xml:584 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:574 +#: apt.conf.5.xml:585 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -5267,12 +5335,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:581 +#: apt.conf.5.xml:592 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:593 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -5288,12 +5356,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:592 +#: apt.conf.5.xml:603 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:593 +#: apt.conf.5.xml:604 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -5304,12 +5372,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:610 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:611 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -5319,12 +5387,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:616 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:617 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -5336,12 +5404,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:624 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:632 #, no-wrap msgid "" "OrderList::Score {\n" @@ -5353,7 +5421,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:614 +#: apt.conf.5.xml:625 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -5367,12 +5435,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:634 +#: apt.conf.5.xml:645 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:635 +#: apt.conf.5.xml:646 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5381,12 +5449,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:643 +#: apt.conf.5.xml:654 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:645 +#: apt.conf.5.xml:656 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5397,7 +5465,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:667 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -5405,7 +5473,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:664 +#: apt.conf.5.xml:675 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -5413,7 +5481,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:684 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -5423,111 +5491,111 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:681 +#: apt.conf.5.xml:692 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:691 +#: apt.conf.5.xml:702 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:696 +#: apt.conf.5.xml:707 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:711 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:718 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:711 +#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:718 +#: apt.conf.5.xml:729 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:740 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:744 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:751 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:755 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:762 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:755 +#: apt.conf.5.xml:766 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:762 +#: apt.conf.5.xml:773 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:776 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:772 +#: apt.conf.5.xml:783 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:775 +#: apt.conf.5.xml:786 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:782 +#: apt.conf.5.xml:793 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:785 +#: apt.conf.5.xml:796 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -5535,93 +5603,93 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:804 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:796 +#: apt.conf.5.xml:807 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:815 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:819 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:826 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:818 +#: apt.conf.5.xml:829 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:825 +#: apt.conf.5.xml:836 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:839 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:836 +#: apt.conf.5.xml:847 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:840 +#: apt.conf.5.xml:851 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:847 +#: apt.conf.5.xml:858 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:862 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:873 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:869 +#: apt.conf.5.xml:880 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:872 +#: apt.conf.5.xml:883 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -5631,12 +5699,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:883 +#: apt.conf.5.xml:894 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:886 +#: apt.conf.5.xml:897 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -5653,91 +5721,91 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:916 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:908 +#: apt.conf.5.xml:919 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:915 +#: apt.conf.5.xml:926 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:918 +#: apt.conf.5.xml:929 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:926 +#: apt.conf.5.xml:937 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:929 +#: apt.conf.5.xml:940 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:936 +#: apt.conf.5.xml:947 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:940 +#: apt.conf.5.xml:951 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:948 +#: apt.conf.5.xml:959 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:963 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:959 +#: apt.conf.5.xml:970 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:963 +#: apt.conf.5.xml:974 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:969 +#: apt.conf.5.xml:980 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:973 +#: apt.conf.5.xml:984 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:981 +#: apt.conf.5.xml:992 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:984 +#: apt.conf.5.xml:995 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5745,32 +5813,32 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:992 +#: apt.conf.5.xml:1003 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:996 +#: apt.conf.5.xml:1007 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1019 +#: apt.conf.5.xml:1030 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1026 +#: apt.conf.5.xml:1037 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1031 +#: apt.conf.5.xml:1042 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" @@ -5822,25 +5890,36 @@ msgid "" "choice of instance, only the choice of version." msgstr "" -#. type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 +msgid "" +"Note that the files in the <filename>/etc/apt/preferences.d</filename> " +"directory are parsed in alphanumeric ascending order and need to obey the " +"following naming convention: The files have no or \"<literal>pref</literal>" +"\" as filename extension and which only contain alphanumeric, hyphen (-), " +"underscore (_) and period (.) characters - otherwise they will be silently " +"ignored." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:63 msgid "APT's Default Priority Assignments" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:71 +#: apt_preferences.5.xml:78 #, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:74 +#: apt_preferences.5.xml:81 #, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:58 +#: apt_preferences.5.xml:65 msgid "" "If there is no preferences file or if there is no entry in the file that " "applies to a particular version then the priority assigned to that version " @@ -5856,40 +5935,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:83 +#: apt_preferences.5.xml:90 msgid "priority 100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:84 +#: apt_preferences.5.xml:91 msgid "to the version that is already installed (if any)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:88 +#: apt_preferences.5.xml:95 msgid "priority 500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:89 +#: apt_preferences.5.xml:96 msgid "" "to the versions that are not installed and do not belong to the target " "release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:93 +#: apt_preferences.5.xml:100 msgid "priority 990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:94 +#: apt_preferences.5.xml:101 msgid "" "to the versions that are not installed and belong to the target release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:85 msgid "" "If the target release has been specified then APT uses the following " "algorithm to set the priorities of the versions of a package. Assign: " @@ -5897,7 +5976,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:99 +#: apt_preferences.5.xml:106 msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " @@ -5905,14 +5984,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:103 +#: apt_preferences.5.xml:110 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:106 +#: apt_preferences.5.xml:113 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -5922,19 +6001,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:112 +#: apt_preferences.5.xml:119 msgid "Install the highest priority version." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 +#: apt_preferences.5.xml:120 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:116 +#: apt_preferences.5.xml:123 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@ -5942,7 +6021,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:122 +#: apt_preferences.5.xml:129 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@ -5952,7 +6031,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:136 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@ -5961,7 +6040,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:134 +#: apt_preferences.5.xml:141 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@ -5973,12 +6052,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:143 +#: apt_preferences.5.xml:150 msgid "The Effect of APT Preferences" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:145 +#: apt_preferences.5.xml:152 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -5987,7 +6066,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:151 +#: apt_preferences.5.xml:158 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@ -5997,7 +6076,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:165 #, no-wrap msgid "" "Package: perl\n" @@ -6006,7 +6085,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:164 +#: apt_preferences.5.xml:171 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@ -6016,7 +6095,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:170 +#: apt_preferences.5.xml:177 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@ -6024,7 +6103,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:175 +#: apt_preferences.5.xml:182 #, no-wrap msgid "" "Package: *\n" @@ -6033,7 +6112,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:180 +#: apt_preferences.5.xml:187 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " "This should not be confused with the Origin of a distribution as specified " @@ -6043,7 +6122,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:186 +#: apt_preferences.5.xml:193 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -6051,7 +6130,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:190 +#: apt_preferences.5.xml:197 #, no-wrap msgid "" "Package: *\n" @@ -6060,7 +6139,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:195 +#: apt_preferences.5.xml:202 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>squeeze</literal>" @@ -6068,7 +6147,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:199 +#: apt_preferences.5.xml:206 #, no-wrap msgid "" "Package: *\n" @@ -6077,7 +6156,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:204 +#: apt_preferences.5.xml:211 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -6085,7 +6164,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:209 +#: apt_preferences.5.xml:216 #, no-wrap msgid "" "Package: *\n" @@ -6094,82 +6173,82 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:220 +#: apt_preferences.5.xml:227 msgid "How APT Interprets Priorities" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:228 +#: apt_preferences.5.xml:235 msgid "P > 1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:229 +#: apt_preferences.5.xml:236 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:233 +#: apt_preferences.5.xml:240 msgid "990 < P <=1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:234 +#: apt_preferences.5.xml:241 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:239 +#: apt_preferences.5.xml:246 msgid "500 < P <=990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:247 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:245 +#: apt_preferences.5.xml:252 msgid "100 < P <=500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:253 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:251 +#: apt_preferences.5.xml:258 msgid "0 < P <=100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:259 msgid "" "causes a version to be installed only if there is no installed version of " "the package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:256 +#: apt_preferences.5.xml:263 msgid "P < 0" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:257 +#: apt_preferences.5.xml:264 msgid "prevents the version from being installed" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:223 +#: apt_preferences.5.xml:230 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -6177,7 +6256,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:262 +#: apt_preferences.5.xml:269 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -6186,14 +6265,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:268 +#: apt_preferences.5.xml:275 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:272 +#: apt_preferences.5.xml:279 #, no-wrap msgid "" "Package: perl\n" @@ -6210,12 +6289,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:285 +#: apt_preferences.5.xml:292 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:287 +#: apt_preferences.5.xml:294 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -6225,7 +6304,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:299 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -6233,7 +6312,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:296 +#: apt_preferences.5.xml:303 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -6242,12 +6321,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:313 msgid "Determination of Package Version and Distribution Properties" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:308 +#: apt_preferences.5.xml:315 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -6255,27 +6334,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:320 +#: apt_preferences.5.xml:327 msgid "the <literal>Package:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:321 +#: apt_preferences.5.xml:328 msgid "gives the package name" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:324 apt_preferences.5.xml:374 +#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 msgid "the <literal>Version:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:332 msgid "gives the version number for the named package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:312 +#: apt_preferences.5.xml:319 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -6288,12 +6367,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:341 +#: apt_preferences.5.xml:348 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:342 +#: apt_preferences.5.xml:349 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -6304,18 +6383,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:352 +#: apt_preferences.5.xml:359 #, no-wrap msgid "Pin: release a=stable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:365 msgid "the <literal>Codename:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:366 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: squeeze\" specifies that all of the " @@ -6325,13 +6404,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:368 +#: apt_preferences.5.xml:375 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:382 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -6341,7 +6420,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:384 +#: apt_preferences.5.xml:391 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -6350,12 +6429,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:393 +#: apt_preferences.5.xml:400 msgid "the <literal>Component:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:394 +#: apt_preferences.5.xml:401 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -6366,18 +6445,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:403 +#: apt_preferences.5.xml:410 #, no-wrap msgid "Pin: release c=main\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:409 +#: apt_preferences.5.xml:416 msgid "the <literal>Origin:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:410 +#: apt_preferences.5.xml:417 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -6386,18 +6465,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:423 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:422 +#: apt_preferences.5.xml:429 msgid "the <literal>Label:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:423 +#: apt_preferences.5.xml:430 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -6406,13 +6485,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:436 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:330 +#: apt_preferences.5.xml:337 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -6425,7 +6504,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:443 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -6440,12 +6519,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:449 +#: apt_preferences.5.xml:456 msgid "Optional Lines in an APT Preferences Record" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:451 +#: apt_preferences.5.xml:458 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -6453,7 +6532,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:455 +#: apt_preferences.5.xml:462 msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " "optional. If omitted, APT assigns a priority of 1 less than the last value " @@ -6462,12 +6541,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:464 +#: apt_preferences.5.xml:471 msgid "Tracking Stable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:472 +#: apt_preferences.5.xml:479 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -6482,7 +6561,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:466 +#: apt_preferences.5.xml:473 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -6492,8 +6571,8 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:489 apt_preferences.5.xml:535 -#: apt_preferences.5.xml:593 +#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 +#: apt_preferences.5.xml:600 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -6502,7 +6581,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:484 +#: apt_preferences.5.xml:491 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -6511,13 +6590,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:501 +#: apt_preferences.5.xml:508 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:495 +#: apt_preferences.5.xml:502 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -6526,12 +6605,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:507 +#: apt_preferences.5.xml:514 msgid "Tracking Testing or Unstable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:523 #, no-wrap msgid "" "Package: *\n" @@ -6548,7 +6627,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:509 +#: apt_preferences.5.xml:516 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -6559,7 +6638,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:530 +#: apt_preferences.5.xml:537 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -6568,13 +6647,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:550 +#: apt_preferences.5.xml:557 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:541 +#: apt_preferences.5.xml:548 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -6586,12 +6665,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:564 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:571 +#: apt_preferences.5.xml:578 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -6611,7 +6690,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:559 +#: apt_preferences.5.xml:566 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -6626,7 +6705,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:588 +#: apt_preferences.5.xml:595 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -6635,13 +6714,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:608 +#: apt_preferences.5.xml:615 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:599 +#: apt_preferences.5.xml:606 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -6653,12 +6732,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:617 +#: apt_preferences.5.xml:624 msgid "&file-preferences;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:623 +#: apt_preferences.5.xml:630 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "" diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 6f87a3d90..e6225eb67 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" -"POT-Creation-Date: 2010-01-11 15:12+0100\n" +"POT-Creation-Date: 2010-01-20 12:18+0100\n" "PO-Revision-Date: 2004-09-20 17:02+0000\n" "Last-Translator: André Luís Lopes <andrelop@debian.org>\n" "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n" @@ -804,7 +804,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:368 +#: apt.ent:369 #, no-wrap msgid "" " <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n" @@ -815,6 +815,43 @@ msgid "" "\">\n" msgstr "" +#. type: Plain text +#: apt.ent:371 +#, fuzzy +msgid "<!ENTITY translation-title \"TRANSLATION\">" +msgstr "<!ENTITY translation-title \"Tradução\">" + +#. type: Plain text +#: apt.ent:380 +#, no-wrap, fuzzy +msgid "" +"<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n" +" to the translation in the past, who is responsible now and maybe further information\n" +" specially related to your translation. -->\n" +"<!ENTITY translation-holder \"\n" +" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n" +" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n" +" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n" +"\">\n" +msgstr "" +"<!ENTITY translation-holder \"\n" +" Esta página de manual foi traduzida para o Português do Brasil por\n" +" André Luís Lopes <email>andrelop@ig.com.br</email>.\n" +"\">\n" + +#. type: Plain text +#: apt.ent:387 +#, no-wrap +msgid "" +"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n" +" in a shipped manpage will maybe appear english parts. -->\n" +"<!ENTITY translation-english \"\n" +" Note that this translated document may contain untranslated parts.\n" +" This is done on purpose, to avoid losing content when the\n" +" translation is lagging behind the original content.\n" +"\">\n" +msgstr "" + #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 @@ -1272,7 +1309,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 #: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 -#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:491 apt.conf.5.xml:513 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 msgid "options" msgstr "" @@ -1473,7 +1510,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1024 apt_preferences.5.xml:615 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 msgid "Files" msgstr "" @@ -1486,7 +1523,7 @@ msgstr "" #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1030 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 #: sources.list.5.xml:233 #, fuzzy msgid "See Also" @@ -2793,7 +2830,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1018 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 #: sources.list.5.xml:193 #, fuzzy msgid "Examples" @@ -4303,7 +4340,7 @@ msgid "" "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " -"&apt-product; <date>18 September 2009</date>" +"&apt-product; <date>16 January 2010</date>" msgstr "" #. type: Content of: <refentry><refnamediv><refname> @@ -4325,18 +4362,54 @@ msgstr "" #: apt.conf.5.xml:40 msgid "" "<filename>apt.conf</filename> is the main configuration file for the APT " -"suite of tools, all tools make use of the configuration file and a common " -"command line parser to provide a uniform environment. When an APT tool " -"starts up it will read the configuration specified by the <envar>APT_CONFIG</" -"envar> environment variable (if any) and then read the files in " -"<literal>Dir::Etc::Parts</literal> then read the main configuration file " -"specified by <literal>Dir::Etc::main</literal> then finally apply the " -"command line options to override the configuration directives, possibly " -"loading even more config files." +"suite of tools, but by far not the only place changes to options can be " +"made. All tools therefore share the configuration files and also use a " +"common command line parser to provide a uniform environment." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><para> +#: apt.conf.5.xml:45 +msgid "" +"When an APT tool starts up it will read the configuration files in the " +"following order:" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:47 +msgid "" +"the file specified by the <envar>APT_CONFIG</envar> environment variable (if " +"any)" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:49 +msgid "" +"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " +"order which have no or \"<literal>conf</literal>\" as filename extension and " +"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " +"characters - otherwise they will be silently ignored." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:54 +msgid "" +"the main configuration file specified by <literal>Dir::Etc::main</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:56 +msgid "" +"the command line options are applied to override the configuration " +"directives or to load even more configuration files." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:60 +msgid "Syntax" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:50 +#: apt.conf.5.xml:61 msgid "" "The configuration file is organized in a tree with options organized into " "functional groups. Option specification is given with a double colon " @@ -4346,7 +4419,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:56 +#: apt.conf.5.xml:67 msgid "" "Syntactically the configuration language is modeled after what the ISC tools " "such as bind and dhcp use. Lines starting with <literal>//</literal> are " @@ -4362,7 +4435,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:70 +#: apt.conf.5.xml:81 #, no-wrap msgid "" "APT {\n" @@ -4374,7 +4447,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:78 +#: apt.conf.5.xml:89 msgid "" "with newlines placed to make it more readable. Lists can be created by " "opening a scope and including a single string enclosed in quotes followed by " @@ -4382,27 +4455,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:83 +#: apt.conf.5.xml:94 #, no-wrap msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:86 +#: apt.conf.5.xml:97 msgid "" "In general the sample configuration file in <filename>&docdir;examples/apt." "conf</filename> &configureindex; is a good guide for how it should look." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:90 +#: apt.conf.5.xml:101 msgid "" "The names of the configuration items are not case-sensitive. So in the " "previous example you could use <literal>dpkg::pre-install-pkgs</literal>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:93 +#: apt.conf.5.xml:104 msgid "" "Names for the configuration items are optional if a list is defined as it " "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. " @@ -4412,7 +4485,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:98 +#: apt.conf.5.xml:109 msgid "" "Two specials are allowed, <literal>#include</literal> (which is deprecated " "and not supported by alternative implementations) and <literal>#clear</" @@ -4424,7 +4497,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:106 +#: apt.conf.5.xml:117 msgid "" "The #clear command is the only way to delete a list or a complete scope. " "Reopening a scope or the ::-style described below will <emphasis>not</" @@ -4434,7 +4507,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:111 +#: apt.conf.5.xml:122 msgid "" "All of the APT tools take a -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " @@ -4445,7 +4518,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:118 +#: apt.conf.5.xml:129 msgid "" "Note that you can use :: only for appending one item per line to a list and " "that you should not use it in combination with the scope syntax. (The scope " @@ -4462,24 +4535,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:130 +#: apt.conf.5.xml:141 msgid "The APT Group" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:131 +#: apt.conf.5.xml:142 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:135 +#: apt.conf.5.xml:146 msgid "Architecture" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:136 +#: apt.conf.5.xml:147 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@ -4487,12 +4560,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:141 +#: apt.conf.5.xml:152 msgid "Default-Release" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:142 +#: apt.conf.5.xml:153 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -4501,24 +4574,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:146 +#: apt.conf.5.xml:157 msgid "Ignore-Hold" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:147 +#: apt.conf.5.xml:158 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:151 +#: apt.conf.5.xml:162 msgid "Clean-Installed" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:152 +#: apt.conf.5.xml:163 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -4527,12 +4600,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:158 +#: apt.conf.5.xml:169 msgid "Immediate-Configure" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:159 +#: apt.conf.5.xml:170 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -4565,12 +4638,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:181 +#: apt.conf.5.xml:192 msgid "Force-LoopBreak" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:182 +#: apt.conf.5.xml:193 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -4581,82 +4654,82 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:190 +#: apt.conf.5.xml:201 msgid "Cache-Limit" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:191 +#: apt.conf.5.xml:202 msgid "" "APT uses a fixed size memory mapped cache file to store the 'available' " "information. This sets the size of that cache (in bytes)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:195 +#: apt.conf.5.xml:206 msgid "Build-Essential" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:196 +#: apt.conf.5.xml:207 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:210 msgid "Get" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:200 +#: apt.conf.5.xml:211 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:204 +#: apt.conf.5.xml:215 msgid "Cache" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:205 +#: apt.conf.5.xml:216 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:209 +#: apt.conf.5.xml:220 msgid "CDROM" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:210 +#: apt.conf.5.xml:221 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:227 msgid "The Acquire Group" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:221 +#: apt.conf.5.xml:232 msgid "PDiffs" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:222 +#: apt.conf.5.xml:233 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:225 +#: apt.conf.5.xml:236 msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " @@ -4667,12 +4740,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:234 +#: apt.conf.5.xml:245 msgid "Queue-Mode" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:246 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -4682,36 +4755,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:242 +#: apt.conf.5.xml:253 msgid "Retries" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:243 +#: apt.conf.5.xml:254 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:247 +#: apt.conf.5.xml:258 msgid "Source-Symlinks" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:248 +#: apt.conf.5.xml:259 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:252 sources.list.5.xml:139 +#: apt.conf.5.xml:263 sources.list.5.xml:139 msgid "http" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:253 +#: apt.conf.5.xml:264 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -4722,7 +4795,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:261 +#: apt.conf.5.xml:272 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -4736,7 +4809,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:271 apt.conf.5.xml:335 +#: apt.conf.5.xml:282 apt.conf.5.xml:346 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -4744,7 +4817,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:274 +#: apt.conf.5.xml:285 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@ -4756,7 +4829,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:282 +#: apt.conf.5.xml:293 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -4766,7 +4839,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:287 +#: apt.conf.5.xml:298 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -4774,12 +4847,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:293 +#: apt.conf.5.xml:304 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:305 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -4789,7 +4862,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:300 +#: apt.conf.5.xml:311 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -4810,12 +4883,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:318 sources.list.5.xml:150 +#: apt.conf.5.xml:329 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:319 +#: apt.conf.5.xml:330 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -4834,7 +4907,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:338 +#: apt.conf.5.xml:349 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -4844,7 +4917,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:345 +#: apt.conf.5.xml:356 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -4853,7 +4926,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:350 +#: apt.conf.5.xml:361 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4863,18 +4936,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:357 sources.list.5.xml:132 +#: apt.conf.5.xml:368 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:363 +#: apt.conf.5.xml:374 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:358 +#: apt.conf.5.xml:369 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -4887,12 +4960,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:379 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:369 +#: apt.conf.5.xml:380 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -4900,18 +4973,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:385 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:380 +#: apt.conf.5.xml:391 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:375 +#: apt.conf.5.xml:386 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4923,19 +4996,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:385 +#: apt.conf.5.xml:396 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:399 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:392 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4952,13 +5025,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:392 +#: apt.conf.5.xml:403 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:401 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -4973,7 +5046,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:397 +#: apt.conf.5.xml:408 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@ -4983,12 +5056,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:403 +#: apt.conf.5.xml:414 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:404 +#: apt.conf.5.xml:415 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" @@ -5001,13 +5074,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:431 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:421 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " @@ -5030,19 +5103,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:217 +#: apt.conf.5.xml:228 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:438 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:429 +#: apt.conf.5.xml:440 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -5054,7 +5127,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:436 +#: apt.conf.5.xml:447 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -5067,7 +5140,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:445 +#: apt.conf.5.xml:456 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -5077,7 +5150,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:451 +#: apt.conf.5.xml:462 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -5085,7 +5158,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:455 +#: apt.conf.5.xml:466 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -5096,7 +5169,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:463 +#: apt.conf.5.xml:474 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -5109,12 +5182,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:476 +#: apt.conf.5.xml:487 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:478 +#: apt.conf.5.xml:489 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -5122,12 +5195,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:482 +#: apt.conf.5.xml:493 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:483 +#: apt.conf.5.xml:494 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -5138,50 +5211,50 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:503 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:496 +#: apt.conf.5.xml:507 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:508 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:501 +#: apt.conf.5.xml:512 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:502 +#: apt.conf.5.xml:513 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:508 +#: apt.conf.5.xml:519 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:520 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:514 +#: apt.conf.5.xml:525 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -5189,17 +5262,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:520 +#: apt.conf.5.xml:531 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5208,12 +5281,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:537 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:527 +#: apt.conf.5.xml:538 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5223,7 +5296,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:533 +#: apt.conf.5.xml:544 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -5233,36 +5306,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:540 +#: apt.conf.5.xml:551 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:541 +#: apt.conf.5.xml:552 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:545 +#: apt.conf.5.xml:556 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:557 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:562 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:563 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@ -5277,7 +5350,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:567 +#: apt.conf.5.xml:578 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -5287,7 +5360,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:561 +#: apt.conf.5.xml:572 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -5301,12 +5374,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:573 +#: apt.conf.5.xml:584 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:574 +#: apt.conf.5.xml:585 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -5318,12 +5391,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:581 +#: apt.conf.5.xml:592 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:593 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -5339,12 +5412,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:592 +#: apt.conf.5.xml:603 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:593 +#: apt.conf.5.xml:604 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -5355,12 +5428,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:610 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:611 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -5370,12 +5443,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:616 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:617 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -5387,12 +5460,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:624 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:632 #, no-wrap msgid "" "OrderList::Score {\n" @@ -5404,7 +5477,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:614 +#: apt.conf.5.xml:625 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -5418,12 +5491,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:634 +#: apt.conf.5.xml:645 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:635 +#: apt.conf.5.xml:646 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5432,12 +5505,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:643 +#: apt.conf.5.xml:654 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:645 +#: apt.conf.5.xml:656 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5448,7 +5521,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:667 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -5456,7 +5529,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:664 +#: apt.conf.5.xml:675 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -5464,7 +5537,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:684 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -5474,120 +5547,120 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:681 +#: apt.conf.5.xml:692 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:691 +#: apt.conf.5.xml:702 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:696 +#: apt.conf.5.xml:707 #, fuzzy msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:711 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:718 #, fuzzy msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:711 +#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:718 +#: apt.conf.5.xml:729 #, fuzzy msgid "<literal>Debug::Acquire::http</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:740 #, fuzzy msgid "<literal>Debug::Acquire::https</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:744 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:751 #, fuzzy msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:755 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:762 #, fuzzy msgid "<literal>Debug::aptcdrom</literal>" msgstr "a linha <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:755 +#: apt.conf.5.xml:766 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:762 +#: apt.conf.5.xml:773 #, fuzzy msgid "<literal>Debug::BuildDeps</literal>" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:776 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:772 +#: apt.conf.5.xml:783 #, fuzzy msgid "<literal>Debug::Hashes</literal>" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:775 +#: apt.conf.5.xml:786 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:782 +#: apt.conf.5.xml:793 #, fuzzy msgid "<literal>Debug::IdentCDROM</literal>" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:785 +#: apt.conf.5.xml:796 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -5595,99 +5668,99 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:804 #, fuzzy msgid "<literal>Debug::NoLocking</literal>" msgstr "a linha <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:796 +#: apt.conf.5.xml:807 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:815 #, fuzzy msgid "<literal>Debug::pkgAcquire</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:819 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:826 #, fuzzy msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:818 +#: apt.conf.5.xml:829 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:825 +#: apt.conf.5.xml:836 #, fuzzy msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:839 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:836 +#: apt.conf.5.xml:847 #, fuzzy msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:840 +#: apt.conf.5.xml:851 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:847 +#: apt.conf.5.xml:858 #, fuzzy msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:862 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:873 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:869 +#: apt.conf.5.xml:880 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:872 +#: apt.conf.5.xml:883 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -5697,12 +5770,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:883 +#: apt.conf.5.xml:894 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:886 +#: apt.conf.5.xml:897 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -5719,96 +5792,96 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:916 #, fuzzy msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "a linha <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:908 +#: apt.conf.5.xml:919 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:915 +#: apt.conf.5.xml:926 #, fuzzy msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "a linha <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:918 +#: apt.conf.5.xml:929 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:926 +#: apt.conf.5.xml:937 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:929 +#: apt.conf.5.xml:940 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:936 +#: apt.conf.5.xml:947 #, fuzzy msgid "<literal>Debug::pkgOrderList</literal>" msgstr "a linha <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:940 +#: apt.conf.5.xml:951 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:948 +#: apt.conf.5.xml:959 #, fuzzy msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "a linha <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:963 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:959 +#: apt.conf.5.xml:970 #, fuzzy msgid "<literal>Debug::pkgPolicy</literal>" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:963 +#: apt.conf.5.xml:974 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:969 +#: apt.conf.5.xml:980 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:973 +#: apt.conf.5.xml:984 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:981 +#: apt.conf.5.xml:992 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:984 +#: apt.conf.5.xml:995 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5816,33 +5889,33 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:992 +#: apt.conf.5.xml:1003 #, fuzzy msgid "<literal>Debug::sourceList</literal>" msgstr "a linha <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:996 +#: apt.conf.5.xml:1007 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1019 +#: apt.conf.5.xml:1030 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1026 +#: apt.conf.5.xml:1037 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1031 +#: apt.conf.5.xml:1042 #, fuzzy msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -5917,14 +5990,25 @@ msgstr "" "antes no arquivo &sources-list; . O arquivo de preferências do APT não afeta " "a escolha da instância." -#. type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 +msgid "" +"Note that the files in the <filename>/etc/apt/preferences.d</filename> " +"directory are parsed in alphanumeric ascending order and need to obey the " +"following naming convention: The files have no or \"<literal>pref</literal>" +"\" as filename extension and which only contain alphanumeric, hyphen (-), " +"underscore (_) and period (.) characters - otherwise they will be silently " +"ignored." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:63 #, fuzzy msgid "APT's Default Priority Assignments" msgstr "Atribuições de Prioridade Padrão do APT" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:71 +#: apt_preferences.5.xml:78 #, fuzzy, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "" @@ -5932,7 +6016,7 @@ msgstr "" "<command>apt-get install -t testing <replaceable>algum-pacote</replaceable></command>\n" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:74 +#: apt_preferences.5.xml:81 #, fuzzy, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "" @@ -5940,7 +6024,7 @@ msgstr "" "APT::Default-Release \"stable\";\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:58 +#: apt_preferences.5.xml:65 #, fuzzy msgid "" "If there is no preferences file or if there is no entry in the file that " @@ -5965,25 +6049,25 @@ msgstr "" "etc/apt/apt.conf</filename>. Por exemplo," #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:83 +#: apt_preferences.5.xml:90 #, fuzzy msgid "priority 100" msgstr "prioridade 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:84 +#: apt_preferences.5.xml:91 #, fuzzy msgid "to the version that is already installed (if any)." msgstr "para a instância que já esteja instalada (caso exista)." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:88 +#: apt_preferences.5.xml:95 #, fuzzy msgid "priority 500" msgstr "prioridade 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:89 +#: apt_preferences.5.xml:96 #, fuzzy msgid "" "to the versions that are not installed and do not belong to the target " @@ -5992,13 +6076,13 @@ msgstr "" "para as instâncias que não estã instaladas e que não pertencem a versão alvo." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:93 +#: apt_preferences.5.xml:100 #, fuzzy msgid "priority 990" msgstr "prioridade 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:94 +#: apt_preferences.5.xml:101 #, fuzzy msgid "" "to the versions that are not installed and belong to the target release." @@ -6006,7 +6090,7 @@ msgstr "" "para as instâncias que não estejam instaladas e pertençam a versão alvo." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:85 #, fuzzy msgid "" "If the target release has been specified then APT uses the following " @@ -6018,7 +6102,7 @@ msgstr "" "Atribuirá :" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:99 +#: apt_preferences.5.xml:106 #, fuzzy msgid "" "If the target release has not been specified then APT simply assigns " @@ -6030,7 +6114,7 @@ msgstr "" "prioridade 500 para todas as instâncias de pacotes não instaladas." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:103 +#: apt_preferences.5.xml:110 #, fuzzy msgid "" "APT then applies the following rules, listed in order of precedence, to " @@ -6040,7 +6124,7 @@ msgstr "" "determinar qual instância de um pacote instalar." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:106 +#: apt_preferences.5.xml:113 #, fuzzy msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " @@ -6057,13 +6141,13 @@ msgstr "" "\"downgrade\" pode ser arriscado.)" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:112 +#: apt_preferences.5.xml:119 #, fuzzy msgid "Install the highest priority version." msgstr "Instala a instância de prioridade mais alta." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 +#: apt_preferences.5.xml:120 #, fuzzy msgid "" "If two or more versions have the same priority, install the most recent one " @@ -6073,7 +6157,7 @@ msgstr "" "mais recente (ou seja, aquela com o maior número de versão)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:116 +#: apt_preferences.5.xml:123 #, fuzzy msgid "" "If two or more versions have the same priority and version number but either " @@ -6085,7 +6169,7 @@ msgstr "" "<literal>--reinstall</literal> seja fornecida, instala aquela desinstalada." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:122 +#: apt_preferences.5.xml:129 #, fuzzy msgid "" "In a typical situation, the installed version of a package (priority 100) " @@ -6102,7 +6186,7 @@ msgstr "" "forem executados." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:136 #, fuzzy msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " @@ -6117,7 +6201,7 @@ msgstr "" "upgrade</command> forem executados." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:134 +#: apt_preferences.5.xml:141 #, fuzzy msgid "" "Sometimes the installed version of a package is more recent than the version " @@ -6137,13 +6221,13 @@ msgstr "" "disponíveis possuir uma prioridade maior do que a versão instalada." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:143 +#: apt_preferences.5.xml:150 #, fuzzy msgid "The Effect of APT Preferences" msgstr "O Efeito das Preferências do APT" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:145 +#: apt_preferences.5.xml:152 #, fuzzy msgid "" "The APT preferences file allows the system administrator to control the " @@ -6157,7 +6241,7 @@ msgstr "" "das duas formas, uma forma específica e uma forma geral." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:151 +#: apt_preferences.5.xml:158 #, fuzzy msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " @@ -6173,7 +6257,7 @@ msgstr "" "com \"<literal>5.8</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:165 #, fuzzy, no-wrap msgid "" "Package: perl\n" @@ -6186,7 +6270,7 @@ msgstr "" "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:164 +#: apt_preferences.5.xml:171 #, fuzzy msgid "" "The general form assigns a priority to all of the package versions in a " @@ -6202,7 +6286,7 @@ msgstr "" "identificado pelo nome de domínio totalmente qualificado do site Internet." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:170 +#: apt_preferences.5.xml:177 #, fuzzy msgid "" "This general-form entry in the APT preferences file applies only to groups " @@ -6215,7 +6299,7 @@ msgstr "" "no site local." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:175 +#: apt_preferences.5.xml:182 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -6228,7 +6312,7 @@ msgstr "" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:180 +#: apt_preferences.5.xml:187 #, fuzzy msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " @@ -6245,7 +6329,7 @@ msgstr "" "como \"Debian\" ou \"Ximian\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:186 +#: apt_preferences.5.xml:193 #, fuzzy msgid "" "The following record assigns a low priority to all package versions " @@ -6257,7 +6341,7 @@ msgstr "" "\"<literal>unstable</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:190 +#: apt_preferences.5.xml:197 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -6270,7 +6354,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:195 +#: apt_preferences.5.xml:202 #, fuzzy msgid "" "The following record assigns a high priority to all package versions " @@ -6282,7 +6366,7 @@ msgstr "" "\"<literal>unstable</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:199 +#: apt_preferences.5.xml:206 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -6295,7 +6379,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:204 +#: apt_preferences.5.xml:211 #, fuzzy msgid "" "The following record assigns a high priority to all package versions " @@ -6308,7 +6392,7 @@ msgstr "" "literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:209 +#: apt_preferences.5.xml:216 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -6321,19 +6405,19 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:220 +#: apt_preferences.5.xml:227 #, fuzzy msgid "How APT Interprets Priorities" msgstr "Como o APT Interpreta Prioridades" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:228 +#: apt_preferences.5.xml:235 #, fuzzy msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:229 +#: apt_preferences.5.xml:236 #, fuzzy msgid "" "causes a version to be installed even if this constitutes a downgrade of the " @@ -6343,13 +6427,13 @@ msgstr "" "dowgrade do pacote" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:233 +#: apt_preferences.5.xml:240 #, fuzzy msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:234 +#: apt_preferences.5.xml:241 #, fuzzy msgid "" "causes a version to be installed even if it does not come from the target " @@ -6359,13 +6443,13 @@ msgstr "" "versão alvo, a menos que a versão instalada seja mais recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:239 +#: apt_preferences.5.xml:246 #, fuzzy msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:247 #, fuzzy msgid "" "causes a version to be installed unless there is a version available " @@ -6375,13 +6459,13 @@ msgstr "" "disponível pertencente a versão alvo ou a versão instalada seja mais recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:245 +#: apt_preferences.5.xml:252 #, fuzzy msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:253 #, fuzzy msgid "" "causes a version to be installed unless there is a version available " @@ -6392,13 +6476,13 @@ msgstr "" "seja mais recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:251 +#: apt_preferences.5.xml:258 #, fuzzy msgid "0 < P <=100" msgstr "0 <= P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:259 #, fuzzy msgid "" "causes a version to be installed only if there is no installed version of " @@ -6408,19 +6492,19 @@ msgstr "" "instalada do pacote" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:256 +#: apt_preferences.5.xml:263 #, fuzzy msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:257 +#: apt_preferences.5.xml:264 #, fuzzy msgid "prevents the version from being installed" msgstr "impede a versão de ser instalada" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:223 +#: apt_preferences.5.xml:230 #, fuzzy msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " @@ -6432,7 +6516,7 @@ msgstr "" "seguir (a grosso modo):" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:262 +#: apt_preferences.5.xml:269 #, fuzzy msgid "" "If any specific-form records match an available package version then the " @@ -6448,7 +6532,7 @@ msgstr "" "determinará a prioridade da versão do pacote." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:268 +#: apt_preferences.5.xml:275 #, fuzzy msgid "" "For example, suppose the APT preferences file contains the three records " @@ -6458,7 +6542,7 @@ msgstr "" "registros apresentados anteriormente :" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:272 +#: apt_preferences.5.xml:279 #, fuzzy, no-wrap msgid "" "Package: perl\n" @@ -6487,12 +6571,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:285 +#: apt_preferences.5.xml:292 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:287 +#: apt_preferences.5.xml:294 #, fuzzy msgid "" "The most recent available version of the <literal>perl</literal> package " @@ -6508,7 +6592,7 @@ msgstr "" "será feito um downgrade do <literal>perl</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:299 #, fuzzy msgid "" "A version of any package other than <literal>perl</literal> that is " @@ -6520,7 +6604,7 @@ msgstr "" "mesmo versões pertencentes a versão alvo." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:296 +#: apt_preferences.5.xml:303 #, fuzzy msgid "" "A version of a package whose origin is not the local system but some other " @@ -6535,13 +6619,13 @@ msgstr "" "instalada." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:313 #, fuzzy msgid "Determination of Package Version and Distribution Properties" msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:308 +#: apt_preferences.5.xml:315 #, fuzzy msgid "" "The locations listed in the &sources-list; file should provide " @@ -6553,31 +6637,31 @@ msgstr "" "os pacotes disponíveis nessas localidades." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:320 +#: apt_preferences.5.xml:327 #, fuzzy msgid "the <literal>Package:</literal> line" msgstr "a linha <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:321 +#: apt_preferences.5.xml:328 #, fuzzy msgid "gives the package name" msgstr "informa o nome do pacote" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:324 apt_preferences.5.xml:374 +#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 #, fuzzy msgid "the <literal>Version:</literal> line" msgstr "a linha <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:332 #, fuzzy msgid "gives the version number for the named package" msgstr "informa o número de versão do pacote" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:312 +#: apt_preferences.5.xml:319 #, fuzzy msgid "" "The <filename>Packages</filename> file is normally found in the directory " @@ -6599,13 +6683,13 @@ msgstr "" "do APT :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:341 +#: apt_preferences.5.xml:348 #, fuzzy msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:342 +#: apt_preferences.5.xml:349 #, fuzzy msgid "" "names the archive to which all the packages in the directory tree belong. " @@ -6623,7 +6707,7 @@ msgstr "" "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:352 +#: apt_preferences.5.xml:359 #, fuzzy, no-wrap msgid "Pin: release a=stable\n" msgstr "" @@ -6631,13 +6715,13 @@ msgstr "" "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:365 #, fuzzy msgid "the <literal>Codename:</literal> line" msgstr "a linha <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:366 #, fuzzy msgid "" "names the codename to which all the packages in the directory tree belong. " @@ -6654,13 +6738,13 @@ msgstr "" "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:368 +#: apt_preferences.5.xml:375 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:382 #, fuzzy msgid "" "names the release version. For example, the packages in the tree might " @@ -6677,7 +6761,7 @@ msgstr "" "das linhas a seguir." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:384 +#: apt_preferences.5.xml:391 #, fuzzy, no-wrap msgid "" "Pin: release v=3.0\n" @@ -6690,13 +6774,13 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:393 +#: apt_preferences.5.xml:400 #, fuzzy msgid "the <literal>Component:</literal> line" msgstr "a linha <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:394 +#: apt_preferences.5.xml:401 #, fuzzy msgid "" "names the licensing component associated with the packages in the directory " @@ -6715,7 +6799,7 @@ msgstr "" "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:403 +#: apt_preferences.5.xml:410 #, fuzzy, no-wrap msgid "Pin: release c=main\n" msgstr "" @@ -6723,13 +6807,13 @@ msgstr "" "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:409 +#: apt_preferences.5.xml:416 #, fuzzy msgid "the <literal>Origin:</literal> line" msgstr "a linha <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:410 +#: apt_preferences.5.xml:417 #, fuzzy msgid "" "names the originator of the packages in the directory tree of the " @@ -6743,7 +6827,7 @@ msgstr "" "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:423 #, fuzzy, no-wrap msgid "Pin: release o=Debian\n" msgstr "" @@ -6751,13 +6835,13 @@ msgstr "" "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:422 +#: apt_preferences.5.xml:429 #, fuzzy msgid "the <literal>Label:</literal> line" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:423 +#: apt_preferences.5.xml:430 #, fuzzy msgid "" "names the label of the packages in the directory tree of the " @@ -6770,7 +6854,7 @@ msgstr "" "arquivo de preferências do APT iria requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:436 #, fuzzy, no-wrap msgid "Pin: release l=Debian\n" msgstr "" @@ -6778,7 +6862,7 @@ msgstr "" "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:330 +#: apt_preferences.5.xml:337 #, fuzzy msgid "" "The <filename>Release</filename> file is normally found in the directory " @@ -6801,7 +6885,7 @@ msgstr "" "do APT :" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:443 #, fuzzy msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " @@ -6827,13 +6911,13 @@ msgstr "" "<literal>unstable</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:449 +#: apt_preferences.5.xml:456 #, fuzzy msgid "Optional Lines in an APT Preferences Record" msgstr "Linhas Opcionais em um Registro de Preferências do APT" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:451 +#: apt_preferences.5.xml:458 #, fuzzy msgid "" "Each record in the APT preferences file can optionally begin with one or " @@ -6845,7 +6929,7 @@ msgstr "" "</literal>. Isto oferece um local para inserir comentários." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:455 +#: apt_preferences.5.xml:462 #, fuzzy msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " @@ -6859,13 +6943,13 @@ msgstr "" "release ...</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:464 +#: apt_preferences.5.xml:471 #, fuzzy msgid "Tracking Stable" msgstr "Acompanhando a Stable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:472 +#: apt_preferences.5.xml:479 #, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -6890,7 +6974,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:466 +#: apt_preferences.5.xml:473 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a priority " @@ -6906,8 +6990,8 @@ msgstr "" "outras distribuições <literal>Debian</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:489 apt_preferences.5.xml:535 -#: apt_preferences.5.xml:593 +#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 +#: apt_preferences.5.xml:600 #, fuzzy, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -6920,7 +7004,7 @@ msgstr "" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:484 +#: apt_preferences.5.xml:491 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -6933,7 +7017,7 @@ msgstr "" "ulítma(s) versão(ôes) <literal>stable</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:501 +#: apt_preferences.5.xml:508 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "" @@ -6941,7 +7025,7 @@ msgstr "" "apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:495 +#: apt_preferences.5.xml:502 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -6954,13 +7038,13 @@ msgstr "" "atualizado novamente a menos que esse comando seja executado novamente." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:507 +#: apt_preferences.5.xml:514 #, fuzzy msgid "Tracking Testing or Unstable" msgstr "Acompanhando a Testing" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:523 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -6989,7 +7073,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:509 +#: apt_preferences.5.xml:516 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a high priority " @@ -7006,7 +7090,7 @@ msgstr "" "versões de pacotes de outras distribuições <literal>Debian</literal>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:530 +#: apt_preferences.5.xml:537 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -7019,7 +7103,7 @@ msgstr "" "(s) última(s) versão(ões) <literal>testing</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:550 +#: apt_preferences.5.xml:557 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "" @@ -7027,7 +7111,7 @@ msgstr "" "apt-get install <replaceable>pacote</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:541 +#: apt_preferences.5.xml:548 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -7047,12 +7131,12 @@ msgstr "" "recente que a versão instalada." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:564 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:571 +#: apt_preferences.5.xml:578 #, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -7082,7 +7166,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:559 +#: apt_preferences.5.xml:566 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -7097,7 +7181,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:588 +#: apt_preferences.5.xml:595 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -7110,7 +7194,7 @@ msgstr "" "ulítma(s) versão(ôes) <literal>stable</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:608 +#: apt_preferences.5.xml:615 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "" @@ -7118,7 +7202,7 @@ msgstr "" "apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:599 +#: apt_preferences.5.xml:606 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -7138,13 +7222,13 @@ msgstr "" "recente que a versão instalada." #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:617 +#: apt_preferences.5.xml:624 #, fuzzy msgid "&file-preferences;" msgstr "apt_preferences" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:623 +#: apt_preferences.5.xml:630 #, fuzzy msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" diff --git a/doc/po4a.conf b/doc/po4a.conf index fae80d690..25c314640 100644 --- a/doc/po4a.conf +++ b/doc/po4a.conf @@ -7,32 +7,19 @@ # define source file and translated file (one file per line) [type: man] apt.8 $lang:$lang/apt.$lang.8 [type: entity] apt.ent $lang:$lang/apt.ent -[type: docbook] apt-cache.8.xml $lang:$lang/apt-cache.$lang.8.xml \ - add_$lang:$lang/addendum/xml_$lang.add -[type: docbook] apt-cdrom.8.xml $lang:$lang/apt-cdrom.$lang.8.xml \ - add_$lang:$lang/addendum/xml_$lang.add -[type: docbook] apt-config.8.xml $lang:$lang/apt-config.$lang.8.xml \ - add_$lang:$lang/addendum/xml_$lang.add -[type: docbook] apt-extracttemplates.1.xml $lang:$lang/apt-extracttemplates.$lang.1.xml \ - add_$lang:$lang/addendum/xml_$lang.add -[type: docbook] apt-ftparchive.1.xml $lang:$lang/apt-ftparchive.$lang.1.xml \ - add_$lang:$lang/addendum/xml_$lang.add -[type: docbook] apt-get.8.xml $lang:$lang/apt-get.$lang.8.xml \ - add_$lang:$lang/addendum/xml_$lang.add -[type: docbook] apt-key.8.xml $lang:$lang/apt-key.$lang.8.xml \ - add_$lang:$lang/addendum/xml_$lang.add -[type: docbook] apt-mark.8.xml $lang:$lang/apt-mark.$lang.8.xml \ - add_$lang:$lang/addendum/xml_$lang.add -[type: docbook] apt-secure.8.xml $lang:$lang/apt-secure.$lang.8.xml \ - add_$lang:$lang/addendum/xml_$lang.add -[type: docbook] apt-sortpkgs.1.xml $lang:$lang/apt-sortpkgs.$lang.1.xml \ - add_$lang:$lang/addendum/xml_$lang.add -[type: docbook] apt.conf.5.xml $lang:$lang/apt.conf.$lang.5.xml \ - add_$lang:$lang/addendum/xml_$lang.add -[type: docbook] apt_preferences.5.xml $lang:$lang/apt_preferences.$lang.5.xml \ - add_$lang:$lang/addendum/xml_$lang.add -[type: docbook] sources.list.5.xml $lang:$lang/sources.list.$lang.5.xml \ - add_$lang:$lang/addendum/xml_$lang.add +[type: docbook] apt-cache.8.xml $lang:$lang/apt-cache.$lang.8.xml add_$lang:xml.add +[type: docbook] apt-cdrom.8.xml $lang:$lang/apt-cdrom.$lang.8.xml add_$lang:xml.add +[type: docbook] apt-config.8.xml $lang:$lang/apt-config.$lang.8.xml add_$lang:xml.add +[type: docbook] apt-extracttemplates.1.xml $lang:$lang/apt-extracttemplates.$lang.1.xml add_$lang:xml.add +[type: docbook] apt-ftparchive.1.xml $lang:$lang/apt-ftparchive.$lang.1.xml add_$lang:xml.add +[type: docbook] apt-get.8.xml $lang:$lang/apt-get.$lang.8.xml add_$lang:xml.add +[type: docbook] apt-key.8.xml $lang:$lang/apt-key.$lang.8.xml add_$lang:xml.add +[type: docbook] apt-mark.8.xml $lang:$lang/apt-mark.$lang.8.xml add_$lang:xml.add +[type: docbook] apt-secure.8.xml $lang:$lang/apt-secure.$lang.8.xml add_$lang:xml.add +[type: docbook] apt-sortpkgs.1.xml $lang:$lang/apt-sortpkgs.$lang.1.xml add_$lang:xml.add +[type: docbook] apt.conf.5.xml $lang:$lang/apt.conf.$lang.5.xml add_$lang:xml.add +[type: docbook] apt_preferences.5.xml $lang:$lang/apt_preferences.$lang.5.xml add_$lang:xml.add +[type: docbook] sources.list.5.xml $lang:$lang/sources.list.$lang.5.xml add_$lang:xml.add [type: sgml] guide.sgml $lang:$lang/guide.$lang.sgml # add_$lang::$lang/addendum/debiandoc_$lang.add diff --git a/doc/pt_BR/addendum/xml_pt_BR.add b/doc/pt_BR/addendum/xml_pt_BR.add deleted file mode 100644 index 08f94ce20..000000000 --- a/doc/pt_BR/addendum/xml_pt_BR.add +++ /dev/null @@ -1,5 +0,0 @@ -PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry> - <refsect1><title>Tradução - Esta página de manual foi traduzida para o Português do Brasil por - André Luís Lopes andrelop@ig.com.br. - diff --git a/doc/xml.add b/doc/xml.add new file mode 100644 index 000000000..9311c052f --- /dev/null +++ b/doc/xml.add @@ -0,0 +1,5 @@ +PO4A-HEADER:mode=after;position=manbugs;beginboundary=^ + &translation-title; + &translation-holder; + &translation-english; + -- cgit v1.2.3 From d16aade9b781538ad5d6d79eda7b69ff075aad85 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 20 Jan 2010 14:18:12 +0100 Subject: * apt-pkg/contrib/strutl.cc: - fix malloc asseration fail with ja_JP.eucJP locale in apt-cache search. Thanks Kusanagi Kouichi! (Closes: #548884) --- apt-pkg/contrib/strutl.cc | 49 +++++++++++++++++++++++++++++++---------------- debian/changelog | 3 +++ 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 4c05f2df8..2913fbf44 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -43,9 +43,10 @@ bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest) { iconv_t cd; const char *inbuf; - char *inptr, *outbuf, *outptr; - size_t insize, outsize; - + char *inptr, *outbuf; + size_t insize, bufsize; + dest->clear(); + cd = iconv_open(codeset, "UTF-8"); if (cd == (iconv_t)(-1)) { // Something went wrong @@ -55,33 +56,49 @@ bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest) else perror("iconv_open"); - // Clean the destination string - *dest = ""; - return false; } - insize = outsize = orig.size(); + insize = bufsize = orig.size(); inbuf = orig.data(); inptr = (char *)inbuf; - outbuf = new char[insize+1]; - outptr = outbuf; + outbuf = new char[bufsize]; + size_t lastError = -1; while (insize != 0) { + char *outptr = outbuf; + size_t outsize = bufsize; size_t const err = iconv(cd, &inptr, &insize, &outptr, &outsize); + dest->append(outbuf, outptr - outbuf); if (err == (size_t)(-1)) { - insize--; - outsize++; - inptr++; - *outptr = '?'; - outptr++; + switch (errno) + { + case EILSEQ: + insize--; + inptr++; + // replace a series of unknown multibytes with a single "?" + if (lastError != insize) { + lastError = insize - 1; + dest->append("?"); + } + break; + case EINVAL: + insize = 0; + break; + case E2BIG: + if (outptr == outbuf) + { + bufsize *= 2; + delete[] outbuf; + outbuf = new char[bufsize]; + } + break; + } } } - *outptr = '\0'; - *dest = outbuf; delete[] outbuf; iconv_close(cd); diff --git a/debian/changelog b/debian/changelog index 588038b4c..9a88f084a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -42,6 +42,9 @@ apt (0.7.25.2) UNRELEASED; urgency=low - replace the per language addendum with a global addendum - add a explanation why translations include (maybe) english parts to the new global addendum (Closes: #561636) + * apt-pkg/contrib/strutl.cc: + - fix malloc asseration fail with ja_JP.eucJP locale in + apt-cache search. Thanks Kusanagi Kouichi! (Closes: #548884) -- David Kalnischkies Sat, 16 Jan 2010 21:06:38 +0100 -- cgit v1.2.3 From 3d43e5390d83a95b08d09e8b811523f2d99a092c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 22 Jan 2010 08:27:20 +0100 Subject: add a few gcc helpers, including [un]likely() and __deprecated --- apt-pkg/contrib/system.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/apt-pkg/contrib/system.h b/apt-pkg/contrib/system.h index 7ec3d7feb..b57093b93 100644 --- a/apt-pkg/contrib/system.h +++ b/apt-pkg/contrib/system.h @@ -55,4 +55,26 @@ #define CLRFLAG(v,f) ((v) &=~FLAG(f)) #define CHKFLAG(v,f) ((v) & FLAG(f) ? true : false) +// some nice optional GNUC features +#if __GNUC__ >= 3 + #define __must_check __attribute__ ((warn_unused_result)) + #define __deprecated __attribute__ ((deprecated)) + /* likely() and unlikely() can be used to mark boolean expressions + as (not) likely true which will help the compiler to optimise */ + #define likely(x) __builtin_expect (!!(x), 1) + #define unlikely(x) __builtin_expect (!!(x), 0) +#else + #define __must_check /* no warn_unused_result */ + #define __deprecated /* no deprecated */ + #define likely(x) (x) + #define unlikely(x) (x) +#endif + +// cold functions are unlikely() to be called +#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4 + #define __cold __attribute__ ((__cold__)) +#else + #define __cold /* no cold marker */ +#endif + #endif -- cgit v1.2.3 From 2a75daa6be0647be3cc405f0ad9ed4f9f8638429 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 22 Jan 2010 08:38:09 +0100 Subject: mark the Error methods as __cold --- apt-pkg/contrib/error.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index a3be6a575..86aa9eca3 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -53,6 +53,8 @@ #include +#include + using std::string; class GlobalError @@ -71,13 +73,13 @@ class GlobalError public: // Call to generate an error from a library call. - bool Errno(const char *Function,const char *Description,...) APT_MFORMAT2; - bool WarningE(const char *Function,const char *Description,...) APT_MFORMAT2; + bool Errno(const char *Function,const char *Description,...) APT_MFORMAT2 __cold; + bool WarningE(const char *Function,const char *Description,...) APT_MFORMAT2 __cold; /* A warning should be considered less severe than an error, and may be ignored by the client. */ - bool Error(const char *Description,...) APT_MFORMAT1; - bool Warning(const char *Description,...) APT_MFORMAT1; + bool Error(const char *Description,...) APT_MFORMAT1 __cold; + bool Warning(const char *Description,...) APT_MFORMAT1 __cold; // Simple accessors inline bool PendingError() {return PendingFlag;}; -- cgit v1.2.3 From 5c0d3668dd2b6852812502f33d64b1644c2b137a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 30 Jan 2010 22:19:57 +0100 Subject: * apt-pkg/contrib/macros.h: - move the header system.h with a new name to the public domain, to be able to use it in other headers (Closes: #567662) --- apt-inst/contrib/extracttar.cc | 2 +- apt-pkg/contrib/error.h | 2 +- apt-pkg/contrib/hashes.cc | 4 +-- apt-pkg/contrib/macros.h | 79 +++++++++++++++++++++++++++++++++++++++++ apt-pkg/contrib/md5.cc | 3 +- apt-pkg/contrib/sha1.cc | 2 +- apt-pkg/contrib/system.h | 80 ------------------------------------------ apt-pkg/deb/deblistparser.cc | 3 +- apt-pkg/makefile | 6 ++-- apt-pkg/pkgcache.cc | 2 +- apt-pkg/pkgcachegen.cc | 2 +- debian/changelog | 10 +++++- test/versiontest.cc | 2 +- 13 files changed, 100 insertions(+), 97 deletions(-) create mode 100644 apt-pkg/contrib/macros.h delete mode 100644 apt-pkg/contrib/system.h diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc index 8338fd89d..3d2788aaf 100644 --- a/apt-inst/contrib/extracttar.cc +++ b/apt-inst/contrib/extracttar.cc @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index 86aa9eca3..31413b2dc 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -53,7 +53,7 @@ #include -#include +#include using std::string; diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc index b43771ea7..985d89d90 100644 --- a/apt-pkg/contrib/hashes.cc +++ b/apt-pkg/contrib/hashes.cc @@ -14,9 +14,9 @@ #include #include #include - +#include + #include -#include #include #include /*}}}*/ diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h new file mode 100644 index 000000000..e53eb32df --- /dev/null +++ b/apt-pkg/contrib/macros.h @@ -0,0 +1,79 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/* ###################################################################### + + Macros Header - Various useful macro definitions + + This source is placed in the Public Domain, do with it what you will + It was originally written by Brian C. White. + + ##################################################################### */ + /*}}}*/ +// Private header +#ifndef MACROS_H +#define MACROS_H + +// MIN_VAL(SINT16) will return -0x8000 and MAX_VAL(SINT16) = 0x7FFF +#define MIN_VAL(t) (((t)(-1) > 0) ? (t)( 0) : (t)(((1L<<(sizeof(t)*8-1)) ))) +#define MAX_VAL(t) (((t)(-1) > 0) ? (t)(-1) : (t)(((1L<<(sizeof(t)*8-1))-1))) + +// Min/Max functions +#if !defined(MIN) +#if defined(__HIGHC__) +#define MIN(x,y) _min(x,y) +#define MAX(x,y) _max(x,y) +#endif + +// GNU C++ has a min/max operator +#if defined(__GNUG__) +#define MIN(A,B) ((A) ? (B)) +#endif + +/* Templates tend to mess up existing code that uses min/max because of the + strict matching requirements */ +#if !defined(MIN) +#define MIN(A,B) ((A) < (B)?(A):(B)) +#define MAX(A,B) ((A) > (B)?(A):(B)) +#endif +#endif + +/* Bound functions, bound will return the value b within the limits a-c + bounv will change b so that it is within the limits of a-c. */ +#define _bound(a,b,c) MIN(c,MAX(b,a)) +#define _boundv(a,b,c) b = _bound(a,b,c) +#define ABS(a) (((a) < (0)) ?-(a) : (a)) + +/* Usefull count macro, use on an array of things and it will return the + number of items in the array */ +#define _count(a) (sizeof(a)/sizeof(a[0])) + +// Flag Macros +#define FLAG(f) (1L << (f)) +#define SETFLAG(v,f) ((v) |= FLAG(f)) +#define CLRFLAG(v,f) ((v) &=~FLAG(f)) +#define CHKFLAG(v,f) ((v) & FLAG(f) ? true : false) + +// some nice optional GNUC features +#if __GNUC__ >= 3 + #define __must_check __attribute__ ((warn_unused_result)) + #define __deprecated __attribute__ ((deprecated)) + /* likely() and unlikely() can be used to mark boolean expressions + as (not) likely true which will help the compiler to optimise */ + #define likely(x) __builtin_expect (!!(x), 1) + #define unlikely(x) __builtin_expect (!!(x), 0) +#else + #define __must_check /* no warn_unused_result */ + #define __deprecated /* no deprecated */ + #define likely(x) (x) + #define unlikely(x) (x) +#endif + +// cold functions are unlikely() to be called +#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4 + #define __cold __attribute__ ((__cold__)) +#else + #define __cold /* no cold marker */ +#endif + +#endif diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc index 2bfd70f1b..c0fa8493d 100644 --- a/apt-pkg/contrib/md5.cc +++ b/apt-pkg/contrib/md5.cc @@ -37,14 +37,13 @@ // Include Files /*{{{*/ #include #include +#include #include #include #include // For htonl #include #include -#include - /*}}}*/ // byteSwap - Swap bytes in a buffer /*{{{*/ diff --git a/apt-pkg/contrib/sha1.cc b/apt-pkg/contrib/sha1.cc index b70f31dc6..eae52d52f 100644 --- a/apt-pkg/contrib/sha1.cc +++ b/apt-pkg/contrib/sha1.cc @@ -31,12 +31,12 @@ // Include Files /*{{{*/ #include #include +#include #include #include #include #include -#include /*}}}*/ // SHA1Transform - Alters an existing SHA-1 hash /*{{{*/ diff --git a/apt-pkg/contrib/system.h b/apt-pkg/contrib/system.h deleted file mode 100644 index b57093b93..000000000 --- a/apt-pkg/contrib/system.h +++ /dev/null @@ -1,80 +0,0 @@ -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/ -// $Id: system.h,v 1.3 1999/12/10 23:40:29 jgg Exp $ -/* ###################################################################### - - System Header - Usefull private definitions - - This source is placed in the Public Domain, do with it what you will - It was originally written by Brian C. White. - - ##################################################################### */ - /*}}}*/ -// Private header -#ifndef SYSTEM_H -#define SYSTEM_H - -// MIN_VAL(SINT16) will return -0x8000 and MAX_VAL(SINT16) = 0x7FFF -#define MIN_VAL(t) (((t)(-1) > 0) ? (t)( 0) : (t)(((1L<<(sizeof(t)*8-1)) ))) -#define MAX_VAL(t) (((t)(-1) > 0) ? (t)(-1) : (t)(((1L<<(sizeof(t)*8-1))-1))) - -// Min/Max functions -#if !defined(MIN) -#if defined(__HIGHC__) -#define MIN(x,y) _min(x,y) -#define MAX(x,y) _max(x,y) -#endif - -// GNU C++ has a min/max operator -#if defined(__GNUG__) -#define MIN(A,B) ((A) ? (B)) -#endif - -/* Templates tend to mess up existing code that uses min/max because of the - strict matching requirements */ -#if !defined(MIN) -#define MIN(A,B) ((A) < (B)?(A):(B)) -#define MAX(A,B) ((A) > (B)?(A):(B)) -#endif -#endif - -/* Bound functions, bound will return the value b within the limits a-c - bounv will change b so that it is within the limits of a-c. */ -#define _bound(a,b,c) MIN(c,MAX(b,a)) -#define _boundv(a,b,c) b = _bound(a,b,c) -#define ABS(a) (((a) < (0)) ?-(a) : (a)) - -/* Usefull count macro, use on an array of things and it will return the - number of items in the array */ -#define _count(a) (sizeof(a)/sizeof(a[0])) - -// Flag Macros -#define FLAG(f) (1L << (f)) -#define SETFLAG(v,f) ((v) |= FLAG(f)) -#define CLRFLAG(v,f) ((v) &=~FLAG(f)) -#define CHKFLAG(v,f) ((v) & FLAG(f) ? true : false) - -// some nice optional GNUC features -#if __GNUC__ >= 3 - #define __must_check __attribute__ ((warn_unused_result)) - #define __deprecated __attribute__ ((deprecated)) - /* likely() and unlikely() can be used to mark boolean expressions - as (not) likely true which will help the compiler to optimise */ - #define likely(x) __builtin_expect (!!(x), 1) - #define unlikely(x) __builtin_expect (!!(x), 0) -#else - #define __must_check /* no warn_unused_result */ - #define __deprecated /* no deprecated */ - #define likely(x) (x) - #define unlikely(x) (x) -#endif - -// cold functions are unlikely() to be called -#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4 - #define __cold __attribute__ ((__cold__)) -#else - #define __cold /* no cold marker */ -#endif - -#endif diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 25a1df3f9..66108d822 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -17,10 +17,9 @@ #include #include #include +#include #include - -#include /*}}}*/ static debListParser::WordList PrioList[] = {{"important",pkgCache::State::Important}, diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 3d6209658..bdd49c089 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -24,7 +24,8 @@ SOURCE = contrib/mmap.cc contrib/error.cc contrib/strutl.cc \ contrib/cdromutl.cc contrib/crc-16.cc contrib/netrc.cc \ contrib/fileutl.cc HEADERS = mmap.h error.h configuration.h fileutl.h cmndline.h netrc.h\ - md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha256.h hashes.h + md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha256.h hashes.h \ + macros.h # Source code for the core main library SOURCE+= pkgcache.cc version.cc depcache.cc \ @@ -53,7 +54,4 @@ HEADERS+= debversion.h debsrcrecords.h dpkgpm.h debrecords.h \ HEADERS := $(addprefix apt-pkg/,$(HEADERS)) -# Private header files -HEADERS+= system.h - include $(LIBRARY_H) diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index eb7e4957a..038bd7ec4 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -27,6 +27,7 @@ #include #include #include +#include #include @@ -35,7 +36,6 @@ #include #include -#include /*}}}*/ using std::string; diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index f988c1018..3eeb18cae 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -21,6 +21,7 @@ #include #include #include +#include #include @@ -32,7 +33,6 @@ #include #include #include -#include /*}}}*/ typedef vector::iterator FileIterator; diff --git a/debian/changelog b/debian/changelog index 9a88f084a..c287600e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,7 +20,15 @@ apt (0.7.26) UNRELEASED; urgency=low -- Michael Vogt Thu, 10 Dec 2009 22:02:38 +0100 -apt (0.7.25.2) UNRELEASED; urgency=low +apt (0.7.25.3) UNRELEASED; urgency=low + + * apt-pkg/contrib/macros.h: + - move the header system.h with a new name to the public domain, + to be able to use it in other headers (Closes: #567662) + + -- David Kalnischkies Sat, 30 Jan 2010 22:13:48 +0100 + +apt (0.7.25.2) unstable; urgency=low * apt-pkg/contrib/fileutl.cc: - Fix the newly introduced method GetListOfFilesInDir to not diff --git a/test/versiontest.cc b/test/versiontest.cc index 5438eb4de..4ede4b280 100644 --- a/test/versiontest.cc +++ b/test/versiontest.cc @@ -14,7 +14,7 @@ ##################################################################### */ /*}}}*/ -#include +#include #include #include #include -- cgit v1.2.3 From 8f3d83eeaec58e9347fe4c61dae18686782f94ca Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 30 Jan 2010 22:30:29 +0100 Subject: cleanup the error header a bit by moving the printf-macros out and remove the using std::string --- apt-pkg/contrib/error.h | 30 +++++++----------------------- apt-pkg/contrib/macros.h | 9 +++++++++ 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index 31413b2dc..90747ff7e 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -40,28 +40,15 @@ #ifndef PKGLIB_ERROR_H #define PKGLIB_ERROR_H - - -#ifdef __GNUG__ -// Methods have a hidden this parameter that is visible to this attribute -#define APT_MFORMAT1 __attribute__ ((format (printf, 2, 3))) -#define APT_MFORMAT2 __attribute__ ((format (printf, 3, 4))) -#else -#define APT_MFORMAT1 -#define APT_MFORMAT2 -#endif - -#include - #include -using std::string; +#include class GlobalError { struct Item { - string Text; + std::string Text; bool Error; Item *Next; }; @@ -73,18 +60,18 @@ class GlobalError public: // Call to generate an error from a library call. - bool Errno(const char *Function,const char *Description,...) APT_MFORMAT2 __cold; - bool WarningE(const char *Function,const char *Description,...) APT_MFORMAT2 __cold; + bool Errno(const char *Function,const char *Description,...) __like_printf_2 __cold; + bool WarningE(const char *Function,const char *Description,...) __like_printf_2 __cold; /* A warning should be considered less severe than an error, and may be ignored by the client. */ - bool Error(const char *Description,...) APT_MFORMAT1 __cold; - bool Warning(const char *Description,...) APT_MFORMAT1 __cold; + bool Error(const char *Description,...) __like_printf_1 __cold; + bool Warning(const char *Description,...) __like_printf_1 __cold; // Simple accessors inline bool PendingError() {return PendingFlag;}; inline bool empty() {return List == 0;}; - bool PopMessage(string &Text); + bool PopMessage(std::string &Text); void Discard(); // Usefull routine to dump to cerr @@ -97,7 +84,4 @@ class GlobalError GlobalError *_GetErrorObj(); #define _error _GetErrorObj() -#undef APT_MFORMAT1 -#undef APT_MFORMAT2 - #endif diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h index e53eb32df..9aeb77b81 100644 --- a/apt-pkg/contrib/macros.h +++ b/apt-pkg/contrib/macros.h @@ -76,4 +76,13 @@ #define __cold /* no cold marker */ #endif +#ifdef __GNUG__ +// Methods have a hidden this parameter that is visible to this attribute + #define __like_printf_1 __attribute__ ((format (printf, 2, 3))) + #define __like_printf_2 __attribute__ ((format (printf, 3, 4))) +#else + #define __like_printf_1 + #define __like_printf_2 +#endif + #endif -- cgit v1.2.3 From ee6970ea70dff6f700d13424a3d0ed620f056547 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 30 Jan 2010 22:40:25 +0100 Subject: * cmdline/acqprogress.cc: - Set Mode to Medium so that the correct prefix is used. Thanks Stefan Haller for the patch! (Closes: #567304 LP: #275243) --- cmdline/acqprogress.cc | 2 +- debian/changelog | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmdline/acqprogress.cc b/cmdline/acqprogress.cc index b3ded4142..32e8243bf 100644 --- a/cmdline/acqprogress.cc +++ b/cmdline/acqprogress.cc @@ -150,7 +150,7 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner) if (Quiet > 0) return true; - enum {Long = 0,Medium,Short} Mode = Long; + enum {Long = 0,Medium,Short} Mode = Medium; char Buffer[sizeof(BlankLine)]; char *End = Buffer + sizeof(Buffer); diff --git a/debian/changelog b/debian/changelog index c287600e8..d791eb5a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,9 @@ apt (0.7.25.3) UNRELEASED; urgency=low * apt-pkg/contrib/macros.h: - move the header system.h with a new name to the public domain, to be able to use it in other headers (Closes: #567662) + * cmdline/acqprogress.cc: + - Set Mode to Medium so that the correct prefix is used. + Thanks Stefan Haller for the patch! (Closes: #567304 LP: #275243) -- David Kalnischkies Sat, 30 Jan 2010 22:13:48 +0100 -- cgit v1.2.3 From f99da9089c1122bdb47173171d3c6a692fb4d439 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 30 Jan 2010 23:57:27 +0100 Subject: * ftparchive/writer.cc: - generate sha1 and sha256 checksums for dsc (Closes: #567343) --- debian/changelog | 2 ++ ftparchive/writer.cc | 30 +++++++++++++++++++++++++----- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index d791eb5a0..57c9c1f7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,8 @@ apt (0.7.25.3) UNRELEASED; urgency=low * cmdline/acqprogress.cc: - Set Mode to Medium so that the correct prefix is used. Thanks Stefan Haller for the patch! (Closes: #567304 LP: #275243) + * ftparchive/writer.cc: + - generate sha1 and sha256 checksums for dsc (Closes: #567343) -- David Kalnischkies Sat, 30 Jan 2010 22:13:48 +0100 diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 5547c6aa5..b9dd554b3 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -555,7 +555,12 @@ bool SourcesWriter::DoPackage(string FileName) char *BlkEnd = Buffer + St.st_size; MD5Summation MD5; MD5.Add((unsigned char *)Start,BlkEnd - Start); - + + SHA1Summation SHA1; + SHA256Summation SHA256; + SHA1.Add((unsigned char *)Start,BlkEnd - Start); + SHA256.Add((unsigned char *)Start,BlkEnd - Start); + // Add an extra \n to the end, just in case *BlkEnd++ = '\n'; @@ -646,12 +651,25 @@ bool SourcesWriter::DoPackage(string FileName) } // Add the dsc to the files hash list + string const strippedName = flNotDir(FileName); char Files[1000]; snprintf(Files,sizeof(Files),"\n %s %lu %s\n %s", string(MD5.Result()).c_str(),St.st_size, - flNotDir(FileName).c_str(), + strippedName.c_str(), Tags.FindS("Files").c_str()); - + + char ChecksumsSha1[1000]; + snprintf(ChecksumsSha1,sizeof(ChecksumsSha1),"\n %s %lu %s\n %s", + string(SHA1.Result()).c_str(),St.st_size, + strippedName.c_str(), + Tags.FindS("Checksums-Sha1").c_str()); + + char ChecksumsSha256[1000]; + snprintf(ChecksumsSha256,sizeof(ChecksumsSha256),"\n %s %lu %s\n %s", + string(SHA256.Result()).c_str(),St.st_size, + strippedName.c_str(), + Tags.FindS("Checksums-Sha256").c_str()); + // Strip the DirStrip prefix from the FileName and add the PathPrefix string NewFileName; if (DirStrip.empty() == false && @@ -694,12 +712,14 @@ bool SourcesWriter::DoPackage(string FileName) Directory.erase(Directory.end()-1); // This lists all the changes to the fields we are going to make. - // (5 hardcoded + maintainer + end marker) - TFRewriteData Changes[5+1+SOverItem->FieldOverride.size()+1]; + // (5 hardcoded + checksums + maintainer + end marker) + TFRewriteData Changes[5+2+1+SOverItem->FieldOverride.size()+1]; unsigned int End = 0; SetTFRewriteData(Changes[End++],"Source",Package.c_str(),"Package"); SetTFRewriteData(Changes[End++],"Files",Files); + SetTFRewriteData(Changes[End++],"Checksums-Sha1",ChecksumsSha1); + SetTFRewriteData(Changes[End++],"Checksums-Sha256",ChecksumsSha256); if (Directory != "./") SetTFRewriteData(Changes[End++],"Directory",Directory.c_str()); SetTFRewriteData(Changes[End++],"Priority",BestPrio.c_str()); -- cgit v1.2.3 From e57a5bff9c131aaa02f5756186927c755289089e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 31 Jan 2010 02:16:17 +0100 Subject: * cmdline/apt-get.cc: - don't mark as manually if in download only (Closes: #468180) --- cmdline/apt-get.cc | 3 ++- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index dede0137e..34ae2fed9 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1776,7 +1776,8 @@ bool DoInstall(CommandLine &CmdL) if(!Remove && Cache[Pkg].Install() == false && (Cache[Pkg].Flags & pkgCache::Flag::Auto) && - _config->FindB("APT::Get::ReInstall",false) == false) + _config->FindB("APT::Get::ReInstall",false) == false && + _config->FindB("APT::Get::Download-Only",false) == false) { ioprintf(c1out,_("%s set to manually installed.\n"), Pkg.Name()); diff --git a/debian/changelog b/debian/changelog index 57c9c1f7b..5da8edb3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,8 @@ apt (0.7.25.3) UNRELEASED; urgency=low Thanks Stefan Haller for the patch! (Closes: #567304 LP: #275243) * ftparchive/writer.cc: - generate sha1 and sha256 checksums for dsc (Closes: #567343) + * cmdline/apt-get.cc: + - don't mark as manually if in download only (Closes: #468180) -- David Kalnischkies Sat, 30 Jan 2010 22:13:48 +0100 -- cgit v1.2.3 From 857e9c13d8d9808fcd1ac8ff3469f6c0b90b7fea Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 7 Feb 2010 12:38:13 +0100 Subject: Drop the Arch information from the Version structure as we can get the information from the parent package now --- apt-pkg/cacheiterators.h | 2 +- apt-pkg/deb/deblistparser.cc | 10 +++++++--- apt-pkg/deb/deblistparser.h | 1 + apt-pkg/pkgcache.cc | 4 ++-- apt-pkg/pkgcache.h | 1 - apt-pkg/pkgcachegen.h | 1 + 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 33d2ed6be..d8e044f88 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -178,7 +178,7 @@ class pkgCache::VerIterator : public Iterator { // Accessors inline const char *VerStr() const {return S->VerStr == 0?0:Owner->StrP + S->VerStr;}; inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;}; - inline const char *Arch() const {return S->Arch == 0?0:Owner->StrP + S->Arch;}; + inline const char *Arch() const {return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch;}; inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);}; inline DescIterator DescriptionList() const; diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index f683de423..26841d3d2 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -83,6 +83,13 @@ string debListParser::Architecture() { return Result; } /*}}}*/ +// ListParser::ArchitectureAll /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool debListParser::ArchitectureAll() { + return Section.FindS("Architecture") == "all"; +} + /*}}}*/ // ListParser::Version - Return the version string /*{{{*/ // --------------------------------------------------------------------- /* This is to return the string describing the version in debian form, @@ -101,9 +108,6 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver) // Parse the section Ver->Section = UniqFindTagWrite("Section"); - // Parse the architecture - Ver->Arch = WriteUniqString(Architecture()); - // Parse multi-arch if (Section.FindS("Architecture") == "all") /* Arch all packages can't have a Multi-Arch field, diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index cba4f8e5d..8da051530 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -47,6 +47,7 @@ class debListParser : public pkgCacheGenerator::ListParser // These all operate against the current section virtual string Package(); virtual string Architecture(); + virtual bool ArchitectureAll(); virtual string Version(); virtual bool NewVersion(pkgCache::VerIterator Ver); virtual string Description(); diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 1e4c7edb3..7d98869ea 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -399,7 +399,7 @@ const char * pkgCache::PkgIterator::CandVersion() const { //TargetVer is empty, so don't use it. - VerIterator version = pkgPolicy::pkgPolicy(Owner).GetCandidateVer(*this); + VerIterator version = pkgPolicy(Owner).GetCandidateVer(*this); if (version.IsGood()) return version.VerStr(); return 0; @@ -727,7 +727,7 @@ string pkgCache::VerIterator::RelStr() Res += File.Site(); } } - if (S->Arch != 0) + if (S->ParentPkg != 0) Res.append(" [").append(Arch()).append("]"); return Res; } diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 5f50001d0..5edeedfd1 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -276,7 +276,6 @@ struct pkgCache::Version /*{{{*/ { map_ptrloc VerStr; // Stringtable map_ptrloc Section; // StringTable (StringItem) - map_ptrloc Arch; // StringTable enum {None, All, Foreign, Same, Allowed} MultiArch; // Lists diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 53f09b991..ca5d74a9f 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -112,6 +112,7 @@ class pkgCacheGenerator::ListParser // These all operate against the current section virtual string Package() = 0; virtual string Architecture() = 0; + virtual bool ArchitectureAll() = 0; virtual string Version() = 0; virtual bool NewVersion(pkgCache::VerIterator Ver) = 0; virtual string Description() = 0; -- cgit v1.2.3 From eef21b9f52adc2170a3a3ffd0258a19810cacfd7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 7 Feb 2010 19:26:02 +0100 Subject: fix progress reporting while reading extended_states file --- apt-pkg/depcache.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index ec7a5de64..5943d858a 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -192,10 +192,10 @@ bool pkgDepCache::readStateFile(OpProgress *Prog) /*{{{*/ Prog->OverallProgress(amt, file_size, 1, _("Reading state information")); } - if(Prog != NULL) - Prog->OverallProgress(file_size, file_size, 1, - _("Reading state information")); } + if(Prog != NULL) + Prog->OverallProgress(file_size, file_size, 1, + _("Reading state information")); } return true; -- cgit v1.2.3 From 8b32e9209ecfab776f064e3c4ccab249307ae49d Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 10 Feb 2010 17:42:39 +0100 Subject: Pre-MultiArch a package which depends on a package with architecture "all" can be sure that a package comeing in as a dependency of this package will be of the same architecture as itself (or all). We don't want to break this, so internal an arch all package is represented as many arch depending packages. The only problem we have now is that we only know that a arch all package is installed or not - we don't know for which architecture it was installed: So we will look at all these broken arch all pseudo packages and "remove" them. --- apt-pkg/depcache.cc | 93 +++++++++++++++++++++++++++++++++++++++++++++++--- apt-pkg/depcache.h | 12 ++++--- apt-pkg/pkgcachegen.cc | 16 +++++++-- 3 files changed, 110 insertions(+), 11 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 228750b74..b04181d76 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -596,6 +597,57 @@ void pkgDepCache::UpdateVerState(PkgIterator Pkg) } } /*}}}*/ +// DepCache::RemovePseudoInstalledPkg - MultiArch helper for Update() /*{{{*/ +// --------------------------------------------------------------------- +/* We "install" arch all packages for all archs if it is installed. Many + of these will be broken. This method will look at these broken Pkg and + "remove" it. */ +bool pkgDepCache::RemovePseudoInstalledPkg(PkgIterator &Pkg, std::set &recheck) { + if (unlikely(Pkg->CurrentVer == 0)) + return false; + + VerIterator V = Pkg.CurrentVer(); + if (V->MultiArch != Version::All) + return false; + + unsigned char const DepState = VersionState(V.DependsList(),DepInstall,DepInstMin,DepInstPolicy); + if ((DepState & DepInstMin) == DepInstMin) + return false; + + // Dependencies for this arch all are not statisfied + // so we installed it only for our convenience: get right of it now. + RemoveSizes(Pkg); + RemoveStates(Pkg); + + Pkg->CurrentVer = 0; + PkgState[Pkg->ID].InstallVer = 0; + + AddStates(Pkg); + Update(Pkg); + AddSizes(Pkg); + + // After the remove previously satisfied pseudo pkg could be now + // no longer satisfied, so we need to recheck the reverse dependencies + for (DepIterator d = Pkg.RevDependsList(); d.end() != true; ++d) + { + PkgIterator const P = d.ParentPkg(); + if (P->CurrentVer != 0) + recheck.insert(P.Index()); + } + + if (V.end() != true) + for (PrvIterator Prv = V.ProvidesList(); Prv.end() != true; Prv++) + for (DepIterator d = Prv.ParentPkg().RevDependsList(); + d.end() != true; ++d) + { + PkgIterator const P = d.ParentPkg(); + if (P->CurrentVer != 0) + recheck.insert(P.Index()); + } + + return true; +} + /*}}}*/ // DepCache::Update - Figure out all the state information /*{{{*/ // --------------------------------------------------------------------- /* This will figure out the state of all the packages and all the @@ -609,9 +661,13 @@ void pkgDepCache::Update(OpProgress *Prog) iKeepCount = 0; iBrokenCount = 0; iBadCount = 0; - + + std::set recheck; + // Perform the depends pass int Done = 0; + bool const checkMultiArch = APT::Configuration::getArchitectures().size() > 1; + unsigned long killed = 0; for (PkgIterator I = PkgBegin(); I.end() != true; I++,Done++) { if (Prog != 0 && Done%20 == 0) @@ -619,7 +675,7 @@ void pkgDepCache::Update(OpProgress *Prog) for (VerIterator V = I.VersionList(); V.end() != true; V++) { unsigned char Group = 0; - + for (DepIterator D = V.DependsList(); D.end() != true; D++) { // Build the dependency state. @@ -637,16 +693,43 @@ void pkgDepCache::Update(OpProgress *Prog) D->Type == Dep::DpkgBreaks || D->Type == Dep::Obsoletes) State = ~State; - } + } } - // Compute the pacakge dependency state and size additions + // Compute the package dependency state and size additions AddSizes(I); UpdateVerState(I); AddStates(I); + + if (checkMultiArch != true || I->CurrentVer == 0) + continue; + + VerIterator const V = I.CurrentVer(); + if (V->MultiArch != Version::All) + continue; + + recheck.insert(I.Index()); + --Done; // no progress if we need to recheck the package } - if (Prog != 0) + if (checkMultiArch == true) { + /* FIXME: recheck breaks proper progress reporting as we don't know + how many packages we need to recheck. To lower the effect + a bit we increase with a kill, but we should do something more clever… */ + for(std::set::const_iterator p = recheck.begin(); + p != recheck.end(); ++p) { + if (Prog != 0 && Done%20 == 0) + Prog->Progress(Done); + PkgIterator P = PkgIterator(*Cache, Cache->PkgP + *p); + if (RemovePseudoInstalledPkg(P, recheck) == true) { + ++killed; + ++Done; + } + recheck.erase(p); + } + } + + if (Prog != 0) Prog->Progress(Done); readStateFile(Prog); diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 0306861a1..63cd954ad 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -46,6 +46,7 @@ #include #include +#include class pkgDepCache : protected pkgCache::Namespace { @@ -442,9 +443,6 @@ class pkgDepCache : protected pkgCache::Namespace virtual bool IsDeleteOk(const PkgIterator &Pkg,bool Purge = false, unsigned long Depth = 0, bool FromUser = true); - // This is for debuging - void Update(OpProgress *Prog = 0); - // read persistent states bool readStateFile(OpProgress *prog); bool writeStateFile(OpProgress *prog, bool InstalledOnly=false); @@ -460,9 +458,15 @@ class pkgDepCache : protected pkgCache::Namespace inline unsigned long BadCount() {return iBadCount;}; bool Init(OpProgress *Prog); - + // Generate all state information + void Update(OpProgress *Prog = 0); + pkgDepCache(pkgCache *Cache,Policy *Plcy = 0); virtual ~pkgDepCache(); + + private: + // Helper for Update(OpProgress) to remove pseudoinstalled arch all packages + bool RemovePseudoInstalledPkg(PkgIterator &Pkg, std::set &recheck); }; #endif diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 2a4a30349..a4ca9dfe4 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -108,13 +108,24 @@ bool pkgCacheGenerator::MergeList(ListParser &List, unsigned int Counter = 0; while (List.Step() == true) { - // Get a pointer to the package structure string const PackageName = List.Package(); if (PackageName.empty() == true) return false; + /* As we handle Arch all packages as architecture bounded + we add all information to every (simulated) arch package */ + std::vector genArch; + if (List.ArchitectureAll() == true) + genArch = APT::Configuration::getArchitectures(); + else + genArch.push_back(List.Architecture()); + + for (std::vector::const_iterator arch = genArch.begin(); + arch != genArch.end(); ++arch) + { + // Get a pointer to the package structure pkgCache::PkgIterator Pkg; - if (NewPackage(Pkg, PackageName, List.Architecture()) == false) + if (NewPackage(Pkg, PackageName, *arch) == false) return _error->Error(_("Error occurred while processing %s (NewPackage)"),PackageName.c_str()); Counter++; if (Counter % 100 == 0 && Progress != 0) @@ -257,6 +268,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List, if ((*LastDesc == 0 && _error->PendingError()) || NewFileDesc(Desc,List) == false) return _error->Error(_("Error occurred while processing %s (NewFileDesc2)"),PackageName.c_str()); + } } FoundFileDeps |= List.HasFileDeps(); -- cgit v1.2.3 From 302578f3b286540a327c822d8be3ccbb4fa47d0a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 10 Feb 2010 21:23:39 +0100 Subject: Create implicit dependencies needed for Multi-Arch handling --- apt-pkg/pkgcachegen.cc | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index a4ca9dfe4..037c0cb63 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -532,11 +532,14 @@ bool pkgCacheGenerator::FinishCache(OpProgress &Progress) { string const PkgName = G.Name(); for (pkgCache::PkgIterator P = G.PackageList(); P.end() != true; P = G.NextPkg(P)) { for (pkgCache::VerIterator V = P.VersionList(); V.end() != true; V++) { - // Arch all packages are "co-installable" - if (V->MultiArch == pkgCache::Version::All) - continue; string const Arch = V.Arch(); map_ptrloc *OldDepLast = NULL; + /* MultiArch handling introduces a lot of implicit Dependencies: + - MultiArch: same → Co-Installable if they have the same version + - Architecture: all → Need to be Co-Installable for internal reasons + - All others conflict with all other group members */ + bool const coInstall = (V->MultiArch == pkgCache::Version::All || + V->MultiArch == pkgCache::Version::Same); for (vector::const_iterator A = archs.begin(); A != archs.end(); ++A) { if (*A == Arch) continue; @@ -546,10 +549,24 @@ bool pkgCacheGenerator::FinishCache(OpProgress &Progress) { pkgCache::PkgIterator D = G.FindPkg(*A); if (D.end() == true) continue; - // Conflicts: ${self}:other - NewDepends(D, V, "", - pkgCache::Dep::NoOp, pkgCache::Dep::Conflicts, - OldDepLast); + if (coInstall == true) { + // Replaces: ${self}:other ( << ${binary:Version}) + NewDepends(D, V, V.VerStr(), + pkgCache::Dep::Less, pkgCache::Dep::Replaces, + OldDepLast); + // Breaks: ${self}:other (!= ${binary:Version}) + NewDepends(D, V, V.VerStr(), + pkgCache::Dep::Less, pkgCache::Dep::DpkgBreaks, + OldDepLast); + NewDepends(D, V, V.VerStr(), + pkgCache::Dep::Greater, pkgCache::Dep::DpkgBreaks, + OldDepLast); + } else { + // Conflicts: ${self}:other + NewDepends(D, V, "", + pkgCache::Dep::NoOp, pkgCache::Dep::Conflicts, + OldDepLast); + } } } } -- cgit v1.2.3 From 67e0766f0eab85ce1aeacee75fc6b200f36996c9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 10 Feb 2010 22:45:58 +0100 Subject: Foreign Versions add an implicit Provides to the other packages in the group --- apt-pkg/deb/deblistparser.cc | 55 +++++++++++++++++++++++++++++--------------- apt-pkg/pkgcachegen.cc | 7 +++--- apt-pkg/pkgcachegen.h | 4 ++-- 3 files changed, 42 insertions(+), 24 deletions(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 26841d3d2..b6082cdd5 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -618,29 +618,46 @@ bool debListParser::ParseProvides(pkgCache::VerIterator Ver) { const char *Start; const char *Stop; - if (Section.Find("Provides",Start,Stop) == false) - return true; - - string Package; - string Version; - unsigned int Op; - - while (1) + if (Section.Find("Provides",Start,Stop) == true) { - Start = ParseDepends(Start,Stop,Package,Version,Op); - if (Start == 0) - return _error->Error("Problem parsing Provides line"); - if (Op != pkgCache::Dep::NoOp) { - _error->Warning("Ignoring Provides line with DepCompareOp for package %s", Package.c_str()); - } else { - if (NewProvides(Ver,Package,Version) == false) - return false; + string Package; + string Version; + string const Arch = Ver.Arch(); + unsigned int Op; + + while (1) + { + Start = ParseDepends(Start,Stop,Package,Version,Op); + if (Start == 0) + return _error->Error("Problem parsing Provides line"); + if (Op != pkgCache::Dep::NoOp) { + _error->Warning("Ignoring Provides line with DepCompareOp for package %s", Package.c_str()); + } else { + if (NewProvides(Ver, Package, Arch, Version) == false) + return false; + } + + if (Start == Stop) + break; } + } - if (Start == Stop) - break; + if (Ver->MultiArch != pkgCache::Version::Foreign) + return true; + + std::vector const archs = APT::Configuration::getArchitectures(); + if (archs.size() <= 1) + return true; + + string const Package = Ver.ParentPkg().Name(); + string const Version = Ver.VerStr(); + for (std::vector::const_iterator a = archs.begin(); + a != archs.end(); ++a) + { + if (NewProvides(Ver, Package, *a, Version) == false) + return false; } - + return true; } /*}}}*/ diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 037c0cb63..ebda325f7 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -668,13 +668,14 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, // --------------------------------------------------------------------- /* */ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver, - const string &PackageName, + const string &PkgName, + const string &PkgArch, const string &Version) { pkgCache &Cache = Owner->Cache; // We do not add self referencing provides - if (unlikely(Ver.ParentPkg().Name() == PackageName)) + if (Ver.ParentPkg().Name() == PkgName && PkgArch == Ver.Arch()) return true; // Get a structure @@ -693,7 +694,7 @@ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver, // Locate the target package pkgCache::PkgIterator Pkg; - if (unlikely(Owner->NewPackage(Pkg,PackageName,string(Ver.Arch())) == false)) + if (unlikely(Owner->NewPackage(Pkg,PkgName, PkgArch) == false)) return false; // Link it to the package diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index ca5d74a9f..46d0cd893 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -104,8 +104,8 @@ class pkgCacheGenerator::ListParser bool NewDepends(pkgCache::VerIterator Ver,const string &Package, const string &Arch, const string &Version,unsigned int Op, unsigned int Type); - bool NewProvides(pkgCache::VerIterator Ver,const string &Package, - const string &Version); + bool NewProvides(pkgCache::VerIterator Ver,const string &PkgName, + const string &PkgArch, const string &Version); public: -- cgit v1.2.3 From 4d174dc84ea184b5afa81abb3b94e2ef3380ece8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 11 Feb 2010 12:19:48 +0100 Subject: Add Multi-Arch: allowed support by creating an implicit provide of name:any for such packages, so dependencies in this style can be easily resolved. --- apt-pkg/deb/deblistparser.cc | 6 ++++++ apt-pkg/pkgcache.cc | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index b6082cdd5..3726a6a04 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -642,6 +642,12 @@ bool debListParser::ParseProvides(pkgCache::VerIterator Ver) } } + if (Ver->MultiArch == pkgCache::Version::Allowed) + { + string const Package = string(Ver.ParentPkg().Name()).append(":").append("any"); + NewProvides(Ver, Package, "any", Ver.VerStr()); + } + if (Ver->MultiArch != pkgCache::Version::Foreign) return true; diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 7d98869ea..2d4ee1010 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -186,7 +186,10 @@ pkgCache::PkgIterator pkgCache::FindPkg(const string &Name) { size_t const found = Name.find(':'); if (found == string::npos) return FindPkg(Name, "native"); - return FindPkg(Name.substr(0, found), Name.substr(found+1, string::npos)); + string const Arch = Name.substr(found+1); + if (Arch == "any") + return FindPkg(Name, "any"); + return FindPkg(Name.substr(0, found), Arch); } /*}}}*/ // Cache::FindPkg - Locate a package by name /*{{{*/ -- cgit v1.2.3 From 6293e04ff36cd1cb4756fc30a4777ad6aaf8ffac Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 11 Feb 2010 15:41:04 +0100 Subject: display the architecture of the package if it is not the default architecture in apt-get, display policy for all available architectures and use GrpIterator in apt-cache pkgnames --- cmdline/apt-cache.cc | 46 +++++++++++++++++++++++++++++++--------------- cmdline/apt-get.cc | 33 ++++++++++++++++++++++----------- 2 files changed, 53 insertions(+), 26 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 7d7f58a62..cd806286c 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1417,11 +1417,15 @@ bool ShowPackage(CommandLine &CmdL) for (const char **I = CmdL.FileList + 1; *I != 0; I++) { + // FIXME: Handle the case in which pkgname name:arch is not found pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); if (Pkg.end() == true) { - _error->Warning(_("Unable to locate package %s"),*I); - continue; + Pkg = Cache.FindPkg(*I, "any"); + if (Pkg.end() == true) { + _error->Warning(_("Unable to locate package %s"),*I); + continue; + } } ++found; @@ -1457,16 +1461,17 @@ bool ShowPackage(CommandLine &CmdL) bool ShowPkgNames(CommandLine &CmdL) { pkgCache &Cache = *GCache; - pkgCache::PkgIterator I = Cache.PkgBegin(); - bool All = _config->FindB("APT::Cache::AllNames","false"); - + pkgCache::GrpIterator I = Cache.GrpBegin(); + bool const All = _config->FindB("APT::Cache::AllNames","false"); + if (CmdL.FileList[1] != 0) { for (;I.end() != true; I++) { - if (All == false && I->VersionList == 0) + if (All == false && I->FirstPackage == 0) + continue; + if (I.FindPkg("any")->VersionList == 0) continue; - if (strncmp(I.Name(),CmdL.FileList[1],strlen(CmdL.FileList[1])) == 0) cout << I.Name() << endl; } @@ -1477,7 +1482,9 @@ bool ShowPkgNames(CommandLine &CmdL) // Show all pkgs for (;I.end() != true; I++) { - if (All == false && I->VersionList == 0) + if (All == false && I->FirstPackage == 0) + continue; + if (I.FindPkg("any")->VersionList == 0) continue; cout << I.Name() << endl; } @@ -1565,19 +1572,27 @@ bool Policy(CommandLine &CmdL) return true; } - + + string const myArch = _config->Find("APT::Architecture"); + // Print out detailed information for each package for (const char **I = CmdL.FileList + 1; *I != 0; I++) { - pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); + pkgCache::GrpIterator Grp = Cache.FindGrp(*I); + pkgCache::PkgIterator Pkg = Grp.FindPkg("any"); if (Pkg.end() == true) { _error->Warning(_("Unable to locate package %s"),*I); continue; } - - cout << Pkg.Name() << ":" << endl; - + + for (; Pkg.end() != true; Pkg = Grp.NextPkg(Pkg)) { + + if (myArch == Pkg.Arch()) + cout << Pkg.Name() << ":" << endl; + else + cout << Pkg.Name() << ": [" << Pkg.Arch() << "]" << endl; + // Installed version cout << _(" Installed: "); if (Pkg->CurrentVer == 0) @@ -1622,8 +1637,9 @@ bool Policy(CommandLine &CmdL) return _error->Error(_("Cache is out of sync, can't x-ref a package file")); printf(_(" %4i %s\n"),Plcy.GetPriority(VF.File()), Indx->Describe(true).c_str()); - } - } + } + } + } } return true; diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 7325bbf22..2597a6acb 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -227,6 +227,17 @@ bool ShowList(ostream &out,string Title,string List,string VersionsList) return false; } /*}}}*/ +// ShowPkg - display a package name /*{{{*/ +// --------------------------------------------------------------------- +/* Displays the package name and maybe also the architecture + if it is not the main architecture */ +string ShowPkg(pkgCache::PkgIterator const Pkg) { + string p = Pkg.Name(); + if (_config->Find("APT::Architecture") != Pkg.Arch()) + p.append(":").append(Pkg.Arch()); + return p; +} + /*}}}*/ // ShowBroken - Debugging aide /*{{{*/ // --------------------------------------------------------------------- /* This prints out the names of all the packages that are broken along @@ -258,8 +269,8 @@ void ShowBroken(ostream &out,CacheFile &Cache,bool Now) } // Print out each package and the failed dependencies - out <<" " << I.Name() << ":"; - unsigned Indent = strlen(I.Name()) + 3; + out << " " << ShowPkg(I) << " :"; + unsigned const Indent = ShowPkg(I).size() + 3; bool First = true; pkgCache::VerIterator Ver; @@ -312,7 +323,7 @@ void ShowBroken(ostream &out,CacheFile &Cache,bool Now) out << ' ' << End.DepType() << ": "; FirstOr = false; - out << Start.TargetPkg().Name(); + out << ShowPkg(Start.TargetPkg()); // Show a quick summary of the version requirements if (Start.TargetVer() != 0) @@ -374,7 +385,7 @@ void ShowNew(ostream &out,CacheFile &Cache) { pkgCache::PkgIterator I(Cache,Cache.List[J]); if (Cache[I].NewInstall() == true) { - List += string(I.Name()) + " "; + List += ShowPkg(I) + " "; VersionsList += string(Cache[I].CandVersion) + "\n"; } } @@ -397,9 +408,9 @@ void ShowDel(ostream &out,CacheFile &Cache) if (Cache[I].Delete() == true) { if ((Cache[I].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge) - List += string(I.Name()) + "* "; + List += ShowPkg(I) + "* "; else - List += string(I.Name()) + " "; + List += ShowPkg(I) + " "; VersionsList += string(Cache[I].CandVersion)+ "\n"; } @@ -424,7 +435,7 @@ void ShowKept(ostream &out,CacheFile &Cache) I->CurrentVer == 0 || Cache[I].Delete() == true) continue; - List += string(I.Name()) + " "; + List += ShowPkg(I) + " "; VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; } ShowList(out,_("The following packages have been kept back:"),List,VersionsList); @@ -445,7 +456,7 @@ void ShowUpgraded(ostream &out,CacheFile &Cache) if (Cache[I].Upgrade() == false || Cache[I].NewInstall() == true) continue; - List += string(I.Name()) + " "; + List += ShowPkg(I) + " "; VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; } ShowList(out,_("The following packages will be upgraded:"),List,VersionsList); @@ -466,7 +477,7 @@ bool ShowDowngraded(ostream &out,CacheFile &Cache) if (Cache[I].Downgrade() == false || Cache[I].NewInstall() == true) continue; - List += string(I.Name()) + " "; + List += ShowPkg(I) + " "; VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; } return ShowList(out,_("The following packages will be DOWNGRADED:"),List,VersionsList); @@ -484,7 +495,7 @@ bool ShowHold(ostream &out,CacheFile &Cache) pkgCache::PkgIterator I(Cache,Cache.List[J]); if (Cache[I].InstallVer != (pkgCache::Version *)I.CurrentVer() && I->SelectedState == pkgCache::State::Hold) { - List += string(I.Name()) + " "; + List += ShowPkg(I) + " "; VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; } } @@ -518,7 +529,7 @@ bool ShowEssential(ostream &out,CacheFile &Cache) if (Added[I->ID] == false) { Added[I->ID] = true; - List += string(I.Name()) + " "; + List += ShowPkg(I) + " "; //VersionsList += string(Cache[I].CurVersion) + "\n"; ??? } } -- cgit v1.2.3 From c5dac10c3dd6d8f54d97d3105803d07fa891fcd4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 11 Feb 2010 18:20:02 +0100 Subject: Arch() on a MultiArch:all version should return "all" to be compatible with previous usecases. You now need to requested with Arch(true) the return of the architecture this version (and pseudo package) was created for. --- apt-pkg/cacheiterators.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index d8e044f88..e8cf28496 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -178,7 +178,16 @@ class pkgCache::VerIterator : public Iterator { // Accessors inline const char *VerStr() const {return S->VerStr == 0?0:Owner->StrP + S->VerStr;}; inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;}; - inline const char *Arch() const {return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch;}; + inline const char *Arch() const { + if(S->MultiArch == pkgCache::Version::All) + return "all"; + return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch; + }; + inline const char *Arch(bool const pseudo) const { + if(pseudo == false) + return Arch(); + return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch; + }; inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);}; inline DescIterator DescriptionList() const; -- cgit v1.2.3 From 803ea2a87f81252b2c0d541b8502ed206ce57c84 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 12 Feb 2010 00:04:31 +0100 Subject: Add yet another pseudo package which isn't as pseudo as the others: Arch all packages are now represented by arch depending packages which all depend on a package with the same name and the special arch "all". This packages has NO dependencies, but beside this the same information. It is the only package which has a size, the arch depending ones all have a zero size. While the arch depending pseudo packages are used for dependency resolution the arch "all" package is used for downloading and ordering of the package. --- apt-pkg/algorithms.cc | 52 ++++++++++++++++++++++++++++++++++++++++---- apt-pkg/cacheiterators.h | 1 + apt-pkg/deb/deblistparser.cc | 22 +++++++++++++++++-- apt-pkg/depcache.cc | 4 ++++ apt-pkg/depcache.h | 1 + apt-pkg/orderlist.cc | 4 ++++ apt-pkg/packagemanager.cc | 23 +++++++++++++++----- apt-pkg/pkgcache.cc | 12 ++++++++++ apt-pkg/pkgcache.h | 2 +- apt-pkg/pkgcachegen.cc | 20 +++++++++++++---- cmdline/apt-cache.cc | 2 ++ cmdline/apt-get.cc | 14 +++++++++--- 12 files changed, 137 insertions(+), 20 deletions(-) diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 34da745de..c905cffa9 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -83,13 +83,28 @@ void pkgSimulate::Describe(PkgIterator Pkg,ostream &out,bool Current,bool Candid bool pkgSimulate::Install(PkgIterator iPkg,string /*File*/) { // Adapt the iterator - PkgIterator Pkg = Sim.FindPkg(iPkg.Name()); + PkgIterator Pkg = Sim.FindPkg(iPkg.Name(), iPkg.Arch()); Flags[Pkg->ID] = 1; cout << "Inst "; Describe(Pkg,cout,true,true); Sim.MarkInstall(Pkg,false); - + + if (strcmp(Pkg.Arch(),"all") == 0) + { + pkgCache::GrpIterator G = Pkg.Group(); + pkgCache::GrpIterator iG = iPkg.Group(); + for (pkgCache::PkgIterator P = G.FindPkg("any"); P.end() != true; P = G.NextPkg(P)) + { + if (strcmp(P.Arch(), "all") == 0) + continue; + if (iG.FindPkg(P.Arch())->CurrentVer == 0) + continue; + Flags[P->ID] = 1; + Sim.MarkInstall(P, false); + } + } + // Look for broken conflicts+predepends. for (PkgIterator I = Sim.PkgBegin(); I.end() == false; I++) { @@ -131,9 +146,22 @@ bool pkgSimulate::Install(PkgIterator iPkg,string /*File*/) bool pkgSimulate::Configure(PkgIterator iPkg) { // Adapt the iterator - PkgIterator Pkg = Sim.FindPkg(iPkg.Name()); + PkgIterator Pkg = Sim.FindPkg(iPkg.Name(), iPkg.Arch()); Flags[Pkg->ID] = 2; + + if (strcmp(Pkg.Arch(),"all") == 0) + { + pkgCache::GrpIterator G = Pkg.Group(); + for (pkgCache::PkgIterator P = G.FindPkg("any"); P.end() != true; P = G.NextPkg(P)) + { + if (strcmp(P.Arch(), "all") == 0) + continue; + if (Flags[P->ID] == 1) + Flags[P->ID] = 2; + } + } + // Sim.MarkInstall(Pkg,false); if (Sim[Pkg].InstBroken() == true) { @@ -181,10 +209,26 @@ bool pkgSimulate::Configure(PkgIterator iPkg) bool pkgSimulate::Remove(PkgIterator iPkg,bool Purge) { // Adapt the iterator - PkgIterator Pkg = Sim.FindPkg(iPkg.Name()); + PkgIterator Pkg = Sim.FindPkg(iPkg.Name(), iPkg.Arch()); Flags[Pkg->ID] = 3; Sim.MarkDelete(Pkg); + + if (strcmp(Pkg.Arch(),"all") == 0) + { + pkgCache::GrpIterator G = Pkg.Group(); + pkgCache::GrpIterator iG = iPkg.Group(); + for (pkgCache::PkgIterator P = G.FindPkg("any"); P.end() != true; P = G.NextPkg(P)) + { + if (strcmp(P.Arch(), "all") == 0) + continue; + if (iG.FindPkg(P.Arch())->CurrentVer == 0) + continue; + Flags[P->ID] = 3; + Sim.MarkDelete(P); + } + } + if (Purge == true) cout << "Purg "; else diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index e8cf28496..43cbe1377 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -200,6 +200,7 @@ class pkgCache::VerIterator : public Iterator { string RelStr(); bool Automatic() const; + bool Pseudo() const; VerFileIterator NewestFile() const; inline VerIterator(pkgCache &Owner,Version *Trg = 0) : Iterator(Owner, Trg) { diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 3726a6a04..b3d95164a 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -148,6 +148,24 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver) Ver->Priority = pkgCache::State::Extra; } + if (Ver->MultiArch == pkgCache::Version::All) + { + /* We maintain a "pseudo" arch=all package for architecture all versions + on which these versions can depend on. This pseudo package is many used + for downloading/installing: The other pseudo-packages will degenerate + to a NOP in the download/install step - this package will ensure that + it is downloaded only one time and installed only one time -- even if + the architecture bound versions coming in and out on regular basis. */ + if (strcmp(Ver.Arch(true),"all") == 0) + return true; + else + { + // our pseudo packages have no size to not confuse the fetcher + Ver->Size = 0; + Ver->InstalledSize = 0; + } + } + if (ParseDepends(Ver,"Depends",pkgCache::Dep::Depends) == false) return false; if (ParseDepends(Ver,"Pre-Depends",pkgCache::Dep::PreDepends) == false) @@ -593,7 +611,7 @@ bool debListParser::ParseDepends(pkgCache::VerIterator Ver, return true; string Package; - string const pkgArch = Ver.Arch(); + string const pkgArch = Ver.Arch(true); string Version; unsigned int Op; @@ -622,7 +640,7 @@ bool debListParser::ParseProvides(pkgCache::VerIterator Ver) { string Package; string Version; - string const Arch = Ver.Arch(); + string const Arch = Ver.Arch(true); unsigned int Op; while (1) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index b04181d76..e817adb77 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -896,6 +896,10 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge, AddStates(Pkg); Update(Pkg); AddSizes(Pkg); + + // if we remove the pseudo package, we also need to remove the "real" + if (Pkg->CurrentVer != 0 && Pkg.CurrentVer().Pseudo() == true) + MarkDelete(Pkg.Group().FindPkg("all"), rPurge, Depth+1, FromUser); } /*}}}*/ // DepCache::IsDeleteOk - check if it is ok to remove this package /*{{{*/ diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 63cd954ad..ab1021a44 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -333,6 +333,7 @@ class pkgDepCache : protected pkgCache::Namespace inline Header &Head() {return *Cache->HeaderP;}; inline PkgIterator PkgBegin() {return Cache->PkgBegin();}; inline PkgIterator FindPkg(string const &Name) {return Cache->FindPkg(Name);}; + inline PkgIterator FindPkg(string const &Name, string const &Arch) {return Cache->FindPkg(Name, Arch);}; inline pkgCache &GetCache() {return *Cache;}; inline pkgVersioningSystem &VS() {return *Cache->VS;}; diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index 0ee2e2bc8..2e7618b55 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -126,6 +126,10 @@ bool pkgOrderList::IsMissing(PkgIterator Pkg) if (FileList[Pkg->ID].empty() == false) return false; + + if (pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == true) + return false; + return true; } /*}}}*/ diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 1ab3203a1..08e7fc00f 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -80,7 +80,10 @@ bool pkgPackageManager::GetArchives(pkgAcquire *Owner,pkgSourceList *Sources, // Skip already processed packages if (List->IsNow(Pkg) == false) continue; - + + if (pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == true) + continue; + new pkgAcqArchive(Owner,Sources,Recs,Cache[Pkg].InstVerIter(Cache), FileNames[Pkg->ID]); } @@ -277,8 +280,10 @@ bool pkgPackageManager::ConfigureAll() for (pkgOrderList::iterator I = OList.begin(); I != OList.end(); I++) { PkgIterator Pkg(Cache,*I); - - if (ConfigurePkgs == true && Configure(Pkg) == false) + + if (ConfigurePkgs == true && + pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == false && + Configure(Pkg) == false) return false; List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States); @@ -310,7 +315,9 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg) { PkgIterator Pkg(Cache,*I); - if (ConfigurePkgs == true && Configure(Pkg) == false) + if (ConfigurePkgs == true && + pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == false && + Configure(Pkg) == false) return false; List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States); @@ -457,7 +464,10 @@ bool pkgPackageManager::SmartRemove(PkgIterator Pkg) return true; List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States); - return Remove(Pkg,(Cache[Pkg].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge); + + if (pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == false) + return Remove(Pkg,(Cache[Pkg].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge); + return true; } /*}}}*/ // PM::SmartUnPack - Install helper /*{{{*/ @@ -565,7 +575,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg) P.end() == false; P++) CheckRConflicts(Pkg,P.ParentPkg().RevDependsList(),P.ProvideVersion()); - if (Install(Pkg,FileNames[Pkg->ID]) == false) + if (pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == false && + Install(Pkg,FileNames[Pkg->ID]) == false) return false; List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States); diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 2d4ee1010..04a2c7234 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -649,6 +649,18 @@ bool pkgCache::VerIterator::Automatic() const return false; } /*}}}*/ +// VerIterator::Pseudo - Check if this version is a pseudo one /*{{{*/ +// --------------------------------------------------------------------- +/* Sometimes you have the need to express dependencies with versions + which doesn't really exist or exist multiply times for "different" + packages. We need these versions for dependency resolution but they + are a problem everytime we need to download/install something. */ +bool pkgCache::VerIterator::Pseudo() const +{ + return (S->MultiArch == pkgCache::Version::All && + strcmp(Arch(true),"all") != 0); +} + /*}}}*/ // VerIterator::NewestFile - Return the newest file version relation /*{{{*/ // --------------------------------------------------------------------- /* This looks at the version numbers associated with all of the sources diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 5edeedfd1..012caac76 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -357,7 +357,7 @@ inline pkgCache::PkgFileIterator pkgCache::FileEnd() class pkgCache::Namespace /*{{{*/ { public: - + typedef pkgCache::GrpIterator GrpIterator; typedef pkgCache::PkgIterator PkgIterator; typedef pkgCache::VerIterator VerIterator; typedef pkgCache::DescIterator DescIterator; diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index ebda325f7..c1b546a00 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -115,9 +115,10 @@ bool pkgCacheGenerator::MergeList(ListParser &List, /* As we handle Arch all packages as architecture bounded we add all information to every (simulated) arch package */ std::vector genArch; - if (List.ArchitectureAll() == true) + if (List.ArchitectureAll() == true) { genArch = APT::Configuration::getArchitectures(); - else + genArch.push_back("all"); + } else genArch.push_back(List.Architecture()); for (std::vector::const_iterator arch = genArch.begin(); @@ -531,8 +532,11 @@ bool pkgCacheGenerator::FinishCache(OpProgress &Progress) { for (pkgCache::GrpIterator G = GetCache().GrpBegin(); G.end() != true; G++) { string const PkgName = G.Name(); for (pkgCache::PkgIterator P = G.PackageList(); P.end() != true; P = G.NextPkg(P)) { + if (strcmp(P.Arch(),"all") == 0) + continue; + pkgCache::PkgIterator allPkg; for (pkgCache::VerIterator V = P.VersionList(); V.end() != true; V++) { - string const Arch = V.Arch(); + string const Arch = V.Arch(true); map_ptrloc *OldDepLast = NULL; /* MultiArch handling introduces a lot of implicit Dependencies: - MultiArch: same → Co-Installable if they have the same version @@ -540,6 +544,8 @@ bool pkgCacheGenerator::FinishCache(OpProgress &Progress) { - All others conflict with all other group members */ bool const coInstall = (V->MultiArch == pkgCache::Version::All || V->MultiArch == pkgCache::Version::Same); + if (V->MultiArch == pkgCache::Version::All && allPkg.end() == true) + allPkg = G.FindPkg("all"); for (vector::const_iterator A = archs.begin(); A != archs.end(); ++A) { if (*A == Arch) continue; @@ -561,6 +567,12 @@ bool pkgCacheGenerator::FinishCache(OpProgress &Progress) { NewDepends(D, V, V.VerStr(), pkgCache::Dep::Greater, pkgCache::Dep::DpkgBreaks, OldDepLast); + if (V->MultiArch == pkgCache::Version::All) { + // Depend on ${self}:all which does depend on nothing + NewDepends(allPkg, V, V.VerStr(), + pkgCache::Dep::Equals, pkgCache::Dep::Depends, + OldDepLast); + } } else { // Conflicts: ${self}:other NewDepends(D, V, "", @@ -675,7 +687,7 @@ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver, pkgCache &Cache = Owner->Cache; // We do not add self referencing provides - if (Ver.ParentPkg().Name() == PkgName && PkgArch == Ver.Arch()) + if (Ver.ParentPkg().Name() == PkgName && PkgArch == Ver.Arch(true)) return true; // Get a structure diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index cd806286c..275daa187 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1587,6 +1587,8 @@ bool Policy(CommandLine &CmdL) } for (; Pkg.end() != true; Pkg = Grp.NextPkg(Pkg)) { + if (strcmp(Pkg.Arch(),"all") == 0) + continue; if (myArch == Pkg.Arch()) cout << Pkg.Name() << ":" << endl; diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 2597a6acb..93065004c 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -233,7 +233,7 @@ bool ShowList(ostream &out,string Title,string List,string VersionsList) if it is not the main architecture */ string ShowPkg(pkgCache::PkgIterator const Pkg) { string p = Pkg.Name(); - if (_config->Find("APT::Architecture") != Pkg.Arch()) + if (strcmp(Pkg.Arch(),"all") != 0 && _config->Find("APT::Architecture") != Pkg.Arch()) p.append(":").append(Pkg.Arch()); return p; } @@ -385,6 +385,8 @@ void ShowNew(ostream &out,CacheFile &Cache) { pkgCache::PkgIterator I(Cache,Cache.List[J]); if (Cache[I].NewInstall() == true) { + if (Cache[I].CandidateVerIter(Cache).Pseudo() == true) + continue; List += ShowPkg(I) + " "; VersionsList += string(Cache[I].CandVersion) + "\n"; } @@ -407,6 +409,8 @@ void ShowDel(ostream &out,CacheFile &Cache) pkgCache::PkgIterator I(Cache,Cache.List[J]); if (Cache[I].Delete() == true) { + if (Cache[I].CandidateVerIter(Cache).Pseudo() == true) + continue; if ((Cache[I].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge) List += ShowPkg(I) + "* "; else @@ -455,7 +459,9 @@ void ShowUpgraded(ostream &out,CacheFile &Cache) // Not interesting if (Cache[I].Upgrade() == false || Cache[I].NewInstall() == true) continue; - + if (Cache[I].CandidateVerIter(Cache).Pseudo() == true) + continue; + List += ShowPkg(I) + " "; VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; } @@ -476,7 +482,9 @@ bool ShowDowngraded(ostream &out,CacheFile &Cache) // Not interesting if (Cache[I].Downgrade() == false || Cache[I].NewInstall() == true) continue; - + if (Cache[I].CandidateVerIter(Cache).Pseudo() == true) + continue; + List += ShowPkg(I) + " "; VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; } -- cgit v1.2.3 From 42d71ab5fe58953a680bd300a99d173e23430d7c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 12 Feb 2010 17:17:16 +0100 Subject: In SingleArch environments we don't need the arch "all" pseudo package for handling arch:all packages, so we create only one package and stop calling it a pseudo package. --- apt-pkg/deb/deblistparser.cc | 2 +- apt-pkg/pkgcache.cc | 9 +++++++-- apt-pkg/pkgcachegen.cc | 3 ++- cmdline/apt-get.cc | 3 +++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index b3d95164a..1948aedf3 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -158,7 +158,7 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver) the architecture bound versions coming in and out on regular basis. */ if (strcmp(Ver.Arch(true),"all") == 0) return true; - else + else if (Ver.Pseudo() == true) { // our pseudo packages have no size to not confuse the fetcher Ver->Size = 0; diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 04a2c7234..d4268b31c 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -657,8 +657,13 @@ bool pkgCache::VerIterator::Automatic() const are a problem everytime we need to download/install something. */ bool pkgCache::VerIterator::Pseudo() const { - return (S->MultiArch == pkgCache::Version::All && - strcmp(Arch(true),"all") != 0); + if (S->MultiArch == pkgCache::Version::All && + strcmp(Arch(true),"all") != 0) + { + GrpIterator const Grp = ParentPkg().Group(); + return (Grp->LastPackage != Grp->FirstPackage); + } + return false; } /*}}}*/ // VerIterator::NewestFile - Return the newest file version relation /*{{{*/ diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index c1b546a00..6d103c6b6 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -117,7 +117,8 @@ bool pkgCacheGenerator::MergeList(ListParser &List, std::vector genArch; if (List.ArchitectureAll() == true) { genArch = APT::Configuration::getArchitectures(); - genArch.push_back("all"); + if (genArch.size() != 1) + genArch.push_back("all"); } else genArch.push_back(List.Architecture()); diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 93065004c..343226bc3 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -585,6 +585,9 @@ void Stats(ostream &out,pkgDepCache &Dep) unsigned long ReInstall = 0; for (pkgCache::PkgIterator I = Dep.PkgBegin(); I.end() == false; I++) { + if (pkgCache::VerIterator(Dep, Dep[I].CandidateVer).Pseudo() == true) + continue; + if (Dep[I].NewInstall() == true) Install++; else -- cgit v1.2.3 From 9a230738b2287dc5316f601ff0b4765eff9d898d Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 13 Feb 2010 00:39:10 +0100 Subject: Add a more or less useful README file for everything related to MultiArch and install it in the apt-doc package. --- README.MultiArch | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++ debian/apt-doc.docs | 3 +- 2 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 README.MultiArch diff --git a/README.MultiArch b/README.MultiArch new file mode 100644 index 000000000..92491631e --- /dev/null +++ b/README.MultiArch @@ -0,0 +1,106 @@ +Before we start with this topic: Note that MultiArch is not yet ready for +prime time and/or for the casual user. The implementation is so far widely +untested and only useful for developers of packagemanagment tools which +use APT and his friends and maintainers of (upcoming) MultiArch packages. +This README is especially NOT written for the casual user and is NOT a +usage guide - you have been warned. It is assumed that the reader has +at least a bit of knowledge about APT internals, dependency relations +and the MultiArch spec [0]. + + +The implementation is focused on NOT breaking existing singleArch-only +applications and/or systems as this is the current status-quo for all +systems. Also, many systems don't need (or can't make use of) MultiArch, +so APT will proceed in thinking SingleArch as long as it is not explicitly +told to handle MultiArch: +To activate MultiArch handling you need to specify architectures you +want to be considered by APT with the config list APT::Architectures +(Insert architectures in order of preference). +APT will download Packages files for all these architectures in the +update step. Exception: In the sourcelist is the optionfield used: +deb [ arch=amd64,i386 ] http://example.org/ experimental main +(This optionfield is a NOP in previous apt versions) + +Internally in APT a package is represented as a PkgIterator - +before MultiArch this PkgIterator was architecture unaware, +only VerIterators include the architecture they came from. +This is/was a big problem as all versions in a package are +considered for dependency resolution, so pinning will not work in all cases. + +The problem is solved by a conceptional change: +A PkgIterator is now architecture aware, so the packages +of foobar for amd64 and for i386 are now for apt internal totally +different packages. That is a good thing for e.g. pinning, but +sometimes you need the information that such packages are belonging together: +All these foobar packages therefore form a Group accessible with GrpIterators. +Note that the GrpIterator has the same name as all the packages in this group, +so e.g. apt-cache pkgnames iterates over GrpIterator to get the package names: +This is compatible to SingleArch as a Group consists only of a single package +and also to MultiArch as a Group consists of possible many packages which +all have the same name and are therefore out of interest for pkgnames. + + +Caused by the paragraph "Dependencies involving Architecture: all packages" +in the MultiArch spec we have a second major conceptional change +which could even break existing applications, but we hope for the best… +An Architecture: all package is internally split into pseudo packages +for all MultiArch Architectures and additional a package with the +architecture "all" with no dependencies which is a dependency of all +these architecture depending packages. While the architecture depending +packages are mainly used for dependency resolution (a package of arch A which +depends on an arch all package assumes that the dependencies of this package +are also from arch A. Packages also sometimes change from any to all or v.v.) +the arch "all" package is used for scheduling download/installation of the +underlying "real" package. Note that the architecture depending packages can +be detected with Pseudo() while the "all" package reports exactly this arch +as package architecture and as pseudo architecture of the versions of this pkg. +Beware: All versions of a "real" architecture all package will be report "all" +as their architecture if asked with Arch() regardless if they are the "all" or +the architecture depending packages. If you want to know the architecture this +pseudo package was created for call Arch(true). Also, while the spec say that +arch:all packages are not allowed to have a MultiArch flag APT assigns a +special value to them: MultiArch: all. + + +As you might guess this arch:all handling has a few problems (but we think so +far that the problems are minor compared to the problems we would have with +other implementations.) +APT doesn't know which pseudo packages of such an arch all package are +"installed" (to satisfy dependencies), so APT will generate a Cache in which +all these pseudo packages are installed (e.g. apt-cache policy will display +them all as installed). Later in the DepCache step it will "remove" +all pseudo packages whose dependencies are not satisfied. +The expense is that if the package state is broken APT could come to the +conclusion to "remove" too many pseudo packages, but in a stable environment +APT should never end up in a broken system state… + + +Given all these internal changes it is quite interesting that the actual +implementation of MultiArch is trivial: Some implicit dependencies and a few +more provides are all changes needed to get it working. Especially noteworthy +is that it wasn't needed to change the resolver in any way and other parts only +need to be told about ignoring pseudo packages or using GrpIterator instead of +PkgIterator, so chances are good that libapt-applications will proceed to work +without or at least only require minor changes, but your mileage may vary… + + +Known Issues and/or noteworthy stuff: +* The implementation is mostly untested, so it is very likely that APT will + eat your kids if you aren't as lucky as the author of these patches. +* the (install)size of a pseudo package is always NULL - if you want to know + the (install)size you need to get the info from the arch "all" package. +* It is maybe confusing, but the arch "all" package does have the same versions + and in general roughly the same information with one subtil difference: + It doesn't have any dependency, regardless of the type. The pseudo packages + depend on this package. +* apt-cache policy foobar on installed architecture all package foobar will + report all architecture depending packages as installed. Displaying here the + correct information would require to build the complete DepCache… +* [BUG] An installed package which changes the architecture from any to all + (and v.v.) shows up in the NEW packages section instead of UPGRADE. +* [TODO] Investigate the DepCache pseudo-package killer heuristic: + e.g. add more safety guards… +* [FIXME] a few corner cases/missing features marked as FIXME in the code + + +[0] https://wiki.ubuntu.com/MultiarchSpec diff --git a/debian/apt-doc.docs b/debian/apt-doc.docs index a7507f4e7..86aa69ceb 100644 --- a/debian/apt-doc.docs +++ b/debian/apt-doc.docs @@ -1 +1,2 @@ -README.progress-reporting \ No newline at end of file +README.progress-reporting +README.MultiArch -- cgit v1.2.3 From 4cc6f8dc52144f773b96ee99070d1be0821b984e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 13 Feb 2010 01:59:22 +0100 Subject: * apt-pkg/deb/dpkgpm.cc: - stdin redirected to /dev/null takes all CPU (Closes: #569488) Thanks to Aurelien Jarno for providing (again) a patch! --- apt-pkg/deb/dpkgpm.cc | 2 +- debian/changelog | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 565f01b84..3dca2b209 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1005,7 +1005,7 @@ bool pkgDPkgPM::Go(int OutStatusFd) // wait for input or output here FD_ZERO(&rfds); - if (!stdin_is_dev_null) + if (master >= 0 && !stdin_is_dev_null) FD_SET(0, &rfds); FD_SET(_dpkgin, &rfds); if(master >= 0) diff --git a/debian/changelog b/debian/changelog index a81a2abd0..5d2527cbd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,9 @@ apt (0.7.26) UNRELEASED; urgency=low - add APT::FTPArchive::AlwaysStat to disable the too aggressive caching if versions are build multiply times (not recommend) Patch by Christoph Goehre, thanks! (Closes: #463260) + * apt-pkg/deb/dpkgpm.cc: + - stdin redirected to /dev/null takes all CPU (Closes: #569488) + Thanks to Aurelien Jarno for providing (again) a patch! [ Ivan Masár ] * Slovak translation update. Closes: #568294 -- cgit v1.2.3 From 584fb392715b4e6f6c08b0c59352b1c20de8ff99 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 13 Feb 2010 17:22:34 +0100 Subject: - add --arch option for apt-ftparchive packages and contents commands - if an arch is given accept only *_all.deb and *_arch.deb instead of *.deb. Thanks Stephan Bosch for the patch! (Closes: #319710) --- debian/changelog | 3 +++ doc/apt-ftparchive.1.xml | 12 ++++++++++-- ftparchive/apt-ftparchive.cc | 7 ++++--- ftparchive/writer.cc | 30 ++++++++++++++---------------- ftparchive/writer.h | 6 +++--- 5 files changed, 34 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5d2527cbd..addee11cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,9 @@ apt (0.7.26) UNRELEASED; urgency=low - allow also to skip the last patch if target is reached, thanks Bernhard R. Link! (Closes: #545699) * ftparchive/writer.{cc,h}: + - add --arch option for packages and contents commands + - if an arch is given accept only *_all.deb and *_arch.deb instead + of *.deb. Thanks Stephan Bosch for the patch! (Closes: #319710) - add APT::FTPArchive::AlwaysStat to disable the too aggressive caching if versions are build multiply times (not recommend) Patch by Christoph Goehre, thanks! (Closes: #463260) diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index eb61eae51..f88dbe631 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -39,6 +39,7 @@ + @@ -542,11 +543,18 @@ for i in Sections do Make the caching databases read only. Configuration Item: APT::FTPArchive::ReadOnlyDB. - + + + + Accept in the packages and contents + commands only package files matching *_arch.deb or + *_all.deb instead of all package files in the given path. + Configuration Item: APT::FTPArchive::Architecture. + - &apt-ftparchive; caches as much as possible of metadata in it is cachedb. If packages + &apt-ftparchive; caches as much as possible of metadata in a cachedb. If packages are recompiled and/or republished with the same version again, this will lead to problems as the now outdated cached metadata like size and checksums will be used. With this option enabled this will no longer happen as it will be checked if the file was changed. diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index 5b6b3940c..f1a182e52 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -333,7 +333,7 @@ bool PackageMap::GenContents(Configuration &Setup, gettimeofday(&StartTime,0); // Create a package writer object. - ContentsWriter Contents(""); + ContentsWriter Contents("", Arch); if (PkgExt.empty() == false && Contents.SetExts(PkgExt) == false) return _error->Error(_("Package extension list is too long")); if (_error->PendingError() == true) @@ -606,7 +606,7 @@ bool SimpleGenPackages(CommandLine &CmdL) // Create a package writer object. PackagesWriter Packages(_config->Find("APT::FTPArchive::DB"), - Override, ""); + Override, "", _config->Find("APT::FTPArchive::Architecture")); if (_error->PendingError() == true) return false; @@ -629,7 +629,7 @@ bool SimpleGenContents(CommandLine &CmdL) return ShowHelp(CmdL); // Create a package writer object. - ContentsWriter Contents(_config->Find("APT::FTPArchive::DB")); + ContentsWriter Contents(_config->Find("APT::FTPArchive::DB"), _config->Find("APT::FTPArchive::Architecture")); if (_error->PendingError() == true) return false; @@ -910,6 +910,7 @@ int main(int argc, const char *argv[]) {0,"delink","APT::FTPArchive::DeLinkAct",0}, {0,"readonly","APT::FTPArchive::ReadOnlyDB",0}, {0,"contents","APT::FTPArchive::Contents",0}, + {'a',"arch","APT::FTPArchive::Architecture",CommandLine::HasArg}, {'c',"config-file",0,CommandLine::ConfigFile}, {'o',"option",0,CommandLine::ArbItem}, {0,0,0,0}}; diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 18a3de0c2..9e5b7d4f3 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -54,7 +54,7 @@ inline void SetTFRewriteData(struct TFRewriteData &tfrd, // FTWScanner::FTWScanner - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -FTWScanner::FTWScanner() +FTWScanner::FTWScanner(string const &Arch): Arch(Arch) { ErrorPrinted = false; NoLinkAct = !_config->FindB("APT::FTPArchive::DeLinkAct",true); @@ -299,12 +299,11 @@ bool FTWScanner::Delink(string &FileName,const char *OriginalPath, // --------------------------------------------------------------------- /* */ PackagesWriter::PackagesWriter(string const &DB,string const &Overrides,string const &ExtOverrides, - string const &aArch) : - Db(DB),Stats(Db.Stats), Arch(aArch) + string const &Arch) : + FTWScanner(Arch), Db(DB), Stats(Db.Stats) { Output = stdout; - SetExts(".deb .udeb .foo .bar .baz"); - AddPattern("*.deb"); + SetExts(".deb .udeb"); DeLinkLimit = 0; // Process the command line options @@ -340,17 +339,16 @@ bool FTWScanner::SetExts(string const &Vals) string::size_type Start = 0; while (Start <= Vals.length()-1) { - string::size_type Space = Vals.find(' ',Start); - string::size_type Length; - if (Space == string::npos) + string::size_type const Space = Vals.find(' ',Start); + string::size_type const Length = ((Space == string::npos) ? Vals.length() : Space) - Start; + if ( Arch.empty() == false ) { - Length = Vals.length()-Start; + AddPattern(string("*_") + Arch + Vals.substr(Start, Length)); + AddPattern(string("*_all") + Vals.substr(Start, Length)); } else - { - Length = Space-Start; - } - AddPattern(string("*") + Vals.substr(Start, Length)); + AddPattern(string("*") + Vals.substr(Start, Length)); + Start += Length + 1; } @@ -767,11 +765,11 @@ bool SourcesWriter::DoPackage(string FileName) // ContentsWriter::ContentsWriter - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -ContentsWriter::ContentsWriter(string const &DB) : - Db(DB), Stats(Db.Stats) +ContentsWriter::ContentsWriter(string const &DB, string const &Arch) : + FTWScanner(Arch), Db(DB), Stats(Db.Stats) { - AddPattern("*.deb"); + SetExts(".deb"); Output = stdout; } /*}}}*/ diff --git a/ftparchive/writer.h b/ftparchive/writer.h index 520e91dd6..af7ba4edd 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -34,6 +34,7 @@ class FTWScanner { protected: vector Patterns; + string Arch; const char *OriginalPath; bool ErrorPrinted; @@ -68,7 +69,7 @@ class FTWScanner void AddPattern(string const &Pattern) { Patterns.push_back(Pattern); }; bool SetExts(string const &Vals); - FTWScanner(); + FTWScanner(string const &Arch = string()); }; class PackagesWriter : public FTWScanner @@ -92,7 +93,6 @@ class PackagesWriter : public FTWScanner string DirStrip; FILE *Output; struct CacheDB::Stats &Stats; - string Arch; inline bool ReadOverride(string const &File) {return Over.ReadOverride(File);}; inline bool ReadExtraOverride(string const &File) @@ -125,7 +125,7 @@ class ContentsWriter : public FTWScanner void Finish() {Gen.Print(Output);}; inline bool ReadyDB(string const &DB) {return Db.ReadyDB(DB);}; - ContentsWriter(string const &DB); + ContentsWriter(string const &DB, string const &Arch = string()); virtual ~ContentsWriter() {}; }; -- cgit v1.2.3 From ee60a63480f7d1a963d7ef2a8e399d0f9b651d71 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 14 Feb 2010 22:24:55 +0100 Subject: Pseudo() doesn't work in the Cache generation step as the check if only one package is in the group will generate false positives - as the others will (maybe) added a little time later in the process. --- apt-pkg/deb/deblistparser.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index bfc0e762e..84eab44a7 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -155,9 +155,10 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver) to a NOP in the download/install step - this package will ensure that it is downloaded only one time and installed only one time -- even if the architecture bound versions coming in and out on regular basis. */ + bool const static multiArch = APT::Configuration::getArchitectures().size() > 1; if (strcmp(Ver.Arch(true),"all") == 0) return true; - else if (Ver.Pseudo() == true) + else if (multiArch == true) { // our pseudo packages have no size to not confuse the fetcher Ver->Size = 0; -- cgit v1.2.3 From 83742b3cf4b541fd61533dfecdc97e0e4502a7a4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 14 Feb 2010 23:34:56 +0100 Subject: Add support for the LANGUAGE environment variable --- apt-pkg/aptconfiguration.cc | 91 ++++++++++++++++++++++++++-------------- apt-pkg/aptconfiguration.h | 2 +- apt-pkg/contrib/strutl.cc | 2 +- test/libapt/getlanguages_test.cc | 61 ++++++++++++++++++++------- 4 files changed, 108 insertions(+), 48 deletions(-) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 0fe84db74..f1989599b 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -8,10 +8,11 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#include #include #include +#include #include +#include #include #include @@ -97,7 +98,7 @@ const Configuration::getCompressionTypes(bool const &Cached) { will result in "de_DE, de, en". The special word "none" is the stopcode for the not-All code vector */ std::vector const Configuration::getLanguages(bool const &All, - bool const &Cached, char const * const Locale) { + bool const &Cached, char const ** const Locale) { using std::string; // The detection is boring and has a lot of cornercases, @@ -118,27 +119,29 @@ std::vector const Configuration::getLanguages(bool const &All, } } - // get the environment language code + // get the environment language codes: LC_MESSAGES (and later LANGUAGE) // we extract both, a long and a short code and then we will // check if we actually need both (rare) or if the short is enough - string const envMsg = string(Locale == 0 ? std::setlocale(LC_MESSAGES, NULL) : Locale); + string const envMsg = string(Locale == 0 ? std::setlocale(LC_MESSAGES, NULL) : *Locale); size_t const lenShort = (envMsg.find('_') != string::npos) ? envMsg.find('_') : 2; - size_t const lenLong = (envMsg.find('.') != string::npos) ? envMsg.find('.') : (lenShort + 3); + size_t const lenLong = (envMsg.find_first_of(".@") != string::npos) ? envMsg.find_first_of(".@") : (lenShort + 3); string envLong = envMsg.substr(0,lenLong); string const envShort = envLong.substr(0,lenShort); - bool envLongIncluded = true, envShortIncluded = false; + bool envLongIncluded = true; // first cornercase: LANG=C, so we use only "en" Translation if (envLong == "C") { codes.push_back("en"); + allCodes = codes; return codes; } + // to save the servers from unneeded queries, we only try also long codes + // for languages it is realistic to have a long code translation file… + // TODO: Improve translation acquire system to drop them dynamic + char const *needLong[] = { "cs", "en", "pt", "sv", "zh", NULL }; if (envLong != envShort) { - // to save the servers from unneeded queries, we only try also long codes - // for languages it is realistic to have a long code translation file... - char const *needLong[] = { "cs", "en", "pt", "sv", "zh", NULL }; for (char const **l = needLong; *l != NULL; l++) if (envShort.compare(*l) == 0) { envLongIncluded = false; @@ -156,33 +159,64 @@ std::vector const Configuration::getLanguages(bool const &All, if (oldAcquire.empty() == false && oldAcquire != "environment") { if (oldAcquire != "none") codes.push_back(oldAcquire); + allCodes = codes; return codes; } + // It is very likely we will need to environment codes later, + // so let us generate them now from LC_MESSAGES and LANGUAGE + std::vector environment; + // take care of LC_MESSAGES + if (envLongIncluded == false) + environment.push_back(envLong); + environment.push_back(envShort); + // take care of LANGUAGE + string envLang = Locale == 0 ? getenv("LANGUAGE") : *(Locale+1); + if (envLang.empty() == false) { + std::vector env = ExplodeString(envLang,':'); + short addedLangs = 0; // add a maximum of 3 fallbacks from the environment + for (std::vector::const_iterator e = env.begin(); + e != env.end() && addedLangs < 3; ++e) { + if (unlikely(e->empty() == true) || *e == "en") + continue; + if (*e == envLong || *e == envShort) + continue; + if (std::find(environment.begin(), environment.end(), *e) != environment.end()) + continue; + if (e->find('_') != string::npos) { + // Drop LongCodes here - ShortCodes are also included + string const shorty = e->substr(0, e->find('_')); + char const **n = needLong; + for (; *n != NULL; ++n) + if (shorty == *n) + break; + if (*n == NULL) + continue; + } + ++addedLangs; + environment.push_back(*e); + } + } + // Support settings like Acquire::Translation=none on the command line to // override the configuration settings vector of languages. string const forceLang = _config->Find("Acquire::Languages",""); if (forceLang.empty() == false) { if (forceLang == "environment") { - if (envLongIncluded == false) - codes.push_back(envLong); - if (envShortIncluded == false) - codes.push_back(envShort); - return codes; + codes = environment; } else if (forceLang != "none") codes.push_back(forceLang); + allCodes = codes; return codes; } std::vector const lang = _config->FindVector("Acquire::Languages"); // the default setting -> "environment, en" if (lang.empty() == true) { - if (envLongIncluded == false) - codes.push_back(envLong); - if (envShortIncluded == false) - codes.push_back(envShort); + codes = environment; if (envShort != "en") codes.push_back("en"); + allCodes = codes; return codes; } @@ -192,26 +226,19 @@ std::vector const Configuration::getLanguages(bool const &All, for (std::vector::const_iterator l = lang.begin(); l != lang.end(); l++) { if (*l == "environment") { - if (envLongIncluded == true && envShortIncluded == true) - continue; - if (envLongIncluded == false) { - envLongIncluded = true; - if (noneSeen == false) - codes.push_back(envLong); - allCodes.push_back(envLong); - } - if (envShortIncluded == false) { - envShortIncluded = true; + for (std::vector::const_iterator e = environment.begin(); + e != environment.end(); ++e) { + if (std::find(allCodes.begin(), allCodes.end(), *e) != allCodes.end()) + continue; if (noneSeen == false) - codes.push_back(envShort); - allCodes.push_back(envShort); + codes.push_back(*e); + allCodes.push_back(*e); } continue; } else if (*l == "none") { noneSeen = true; continue; - } else if ((envLongIncluded == true && *l == envLong) || - (envShortIncluded == true && *l == envShort)) + } else if (std::find(allCodes.begin(), allCodes.end(), *l) != allCodes.end()) continue; if (noneSeen == false) diff --git a/apt-pkg/aptconfiguration.h b/apt-pkg/aptconfiguration.h index b6650e20c..dd339d841 100644 --- a/apt-pkg/aptconfiguration.h +++ b/apt-pkg/aptconfiguration.h @@ -64,7 +64,7 @@ public: /*{{{*/ * \return a vector of (all) Language Codes in the prefered usage order */ std::vector static const getLanguages(bool const &All = false, - bool const &Cached = true, char const * const Locale = 0); + bool const &Cached = true, char const ** const Locale = 0); /** \brief Returns a vector of Architectures we support * diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index b285a9f2e..d3d6e2739 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -1012,7 +1012,7 @@ vector ExplodeString(string const &haystack, char const &split) { do { for (; end != haystack.end() && *end != split; ++end); exploded.push_back(string(start, end)); - start = end; + start = end + 1; } while (end != haystack.end() && (++end) != haystack.end()); return exploded; } diff --git a/test/libapt/getlanguages_test.cc b/test/libapt/getlanguages_test.cc index fd3c8269f..fb7afb4ef 100644 --- a/test/libapt/getlanguages_test.cc +++ b/test/libapt/getlanguages_test.cc @@ -16,75 +16,108 @@ void dumpVector(std::vector vec) { int main(int argc,char *argv[]) { - std::vector vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); + char const* env[2]; + env[0] = "de_DE.UTF-8"; + env[1] = ""; + std::vector vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 2); equals(vec[0], "de"); equals(vec[1], "en"); // Special: Check if the cache is actually in use - vec = APT::Configuration::getLanguages(false, true, "en_GB.UTF-8"); + env[0] = "en_GB.UTF-8"; + vec = APT::Configuration::getLanguages(false, true, env); equals(vec.size(), 2); equals(vec[0], "de"); equals(vec[1], "en"); - vec = APT::Configuration::getLanguages(false, false, "en_GB.UTF-8"); + env[0] = "en_GB.UTF-8"; + vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 2); equals(vec[0], "en_GB"); equals(vec[1], "en"); - vec = APT::Configuration::getLanguages(false, false, "pt_PR.UTF-8"); + env[0] = "tr_DE@euro"; + vec = APT::Configuration::getLanguages(false, false, env); + equals(vec.size(), 2); + equals(vec[0], "tr"); + equals(vec[1], "en"); + + env[0] = "de_NO"; + env[1] = "se_NO:en_GB:nb_NO:nb:no_NO:no:nn_NO:nn:da:sv:en"; + vec = APT::Configuration::getLanguages(false, false, env); + equals(vec.size(), 5); + equals(vec[0], "de"); + equals(vec[1], "en_GB"); + equals(vec[2], "nb"); + equals(vec[3], "no"); + equals(vec[4], "en"); + + env[0] = "pt_PR.UTF-8"; + env[1] = ""; + vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 3); equals(vec[0], "pt_PR"); equals(vec[1], "pt"); equals(vec[2], "en"); - vec = APT::Configuration::getLanguages(false, false, "ast_DE.UTF-8"); // bogus, but syntactical correct + env[0] = "ast_DE.UTF-8"; + vec = APT::Configuration::getLanguages(false, false, env); // bogus, but syntactical correct equals(vec.size(), 2); equals(vec[0], "ast"); equals(vec[1], "en"); - vec = APT::Configuration::getLanguages(false, false, "C"); + env[0] = "C"; + vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 1); equals(vec[0], "en"); _config->Set("Acquire::Languages::1", "environment"); _config->Set("Acquire::Languages::2", "en"); - vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); + env[0] = "de_DE.UTF-8"; + vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 2); equals(vec[0], "de"); equals(vec[1], "en"); _config->Set("Acquire::Languages::3", "de"); - vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); + env[0] = "de_DE.UTF-8"; + vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 2); equals(vec[0], "de"); equals(vec[1], "en"); _config->Set("Acquire::Languages::1", "none"); - vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); + env[0] = "de_DE.UTF-8"; + vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 0); - vec = APT::Configuration::getLanguages(true, false, "de_DE.UTF-8"); + env[0] = "de_DE.UTF-8"; + vec = APT::Configuration::getLanguages(true, false, env); equals(vec[0], "en"); equals(vec[1], "de"); _config->Set("Acquire::Languages::1", "fr"); _config->Set("Acquire::Languages", "de_DE"); - vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); + env[0] = "de_DE.UTF-8"; + vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 1); equals(vec[0], "de_DE"); _config->Set("Acquire::Languages", "none"); - vec = APT::Configuration::getLanguages(true, false, "de_DE.UTF-8"); + env[0] = "de_DE.UTF-8"; + vec = APT::Configuration::getLanguages(true, false, env); equals(vec.size(), 0); _config->Set("Acquire::Languages", ""); //FIXME: Remove support for this deprecated setting _config->Set("APT::Acquire::Translation", "ast_DE"); - vec = APT::Configuration::getLanguages(true, false, "de_DE.UTF-8"); + env[0] = "de_DE.UTF-8"; + vec = APT::Configuration::getLanguages(true, false, env); equals(vec.size(), 1); equals(vec[0], "ast_DE"); _config->Set("APT::Acquire::Translation", "none"); - vec = APT::Configuration::getLanguages(true, false, "de_DE.UTF-8"); + env[0] = "de_DE.UTF-8"; + vec = APT::Configuration::getLanguages(true, false, env); equals(vec.size(), 0); return 0; -- cgit v1.2.3 From af3f8112590edf58cab36e72bca6d5f8e161fbc3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 15 Feb 2010 00:01:36 +0100 Subject: Activate support of :any and stuff in apt-get build-dep as we have now support for MultiArch, so Multi-Arch: allowed packages should already provide package:any --- cmdline/apt-get.cc | 2 +- debian/changelog | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 5ef5533e2..216383bc6 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2458,7 +2458,7 @@ bool DoBuildDep(CommandLine &CmdL) // Process the build-dependencies vector BuildDeps; - if (Last->BuildDepends(BuildDeps, _config->FindB("APT::Get::Arch-Only",false)) == false) + if (Last->BuildDepends(BuildDeps, _config->FindB("APT::Get::Arch-Only",true)) == false) return _error->Error(_("Unable to get build-dependency information for %s"),Src.c_str()); // Also ensure that build-essential packages are present diff --git a/debian/changelog b/debian/changelog index addee11cd..948846a6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,9 +8,10 @@ apt (0.7.26) UNRELEASED; urgency=low but we support the usage of the new ABI so libapt users can start to prepare for MultiArch (Closes: #536029) * Ignore :qualifiers after package name in build dependencies - for now as long we don't understand them (Closes: #558103) + in the library by default, but try to honour them in apt-get + as we have some sort of MultiArch support ready (Closes: #558103) * apt-pkg/contrib/mmap.{cc,h}: - - extend it to have a growable flag - unused now but maybe... + - extend it to have a growable flag - unused now but maybe… * apt-pkg/pkgcache.h: - use long instead of short for {Ver,Desc}File size, patch from Víctor Manuel Jáquez Leal, thanks! (Closes: #538917) -- cgit v1.2.3 From d44b437bd2897bf7fbfbde07a4511c6f7b9ef6a2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 15 Feb 2010 13:02:27 +0100 Subject: * buildlib/apti18n.h.in, po/makefile: - add ngettext support with P_() --- buildlib/apti18n.h.in | 3 +++ cmdline/apt-get.cc | 12 +++++++----- debian/changelog | 2 ++ po/makefile | 1 + 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/buildlib/apti18n.h.in b/buildlib/apti18n.h.in index e7beceb09..6928d626c 100644 --- a/buildlib/apti18n.h.in +++ b/buildlib/apti18n.h.in @@ -11,8 +11,10 @@ # include # ifdef APT_DOMAIN # define _(x) dgettext(APT_DOMAIN,x) +# define P_(msg,plural,n) dngettext(APT_DOMAIN,msg,plural,n) # else # define _(x) gettext(x) +# define P_(msg,plural,n) ngettext(msg,plural,n) # endif # define N_(x) x #else @@ -21,5 +23,6 @@ # define textdomain(a) # define bindtextdomain(a, b) # define _(x) x +# define P_(msg,plural,n) (n == 1 ? msg : plural) # define N_(x) x #endif diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 216383bc6..c8c733716 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1526,10 +1526,9 @@ bool DoAutomaticRemove(CacheFile &Cache) // only show stuff in the list that is not yet marked for removal if(Cache[Pkg].Delete() == false) { + ++autoRemoveCount; // we don't need to fill the strings if we don't need them - if (smallList == true) - ++autoRemoveCount; - else + if (smallList == false) { autoremovelist += string(Pkg.Name()) + " "; autoremoveversions += string(Cache[Pkg].CandVersion) + "\n"; @@ -1542,9 +1541,12 @@ bool DoAutomaticRemove(CacheFile &Cache) if (doAutoRemove == false && (autoremovelist.empty() == false || autoRemoveCount != 0)) { if (smallList == false) - ShowList(c1out, _("The following packages were automatically installed and are no longer required:"), autoremovelist, autoremoveversions); + ShowList(c1out, P_("The following package is automatically installed and is no longer required:", + "The following packages were automatically installed and are no longer required:", + autoRemoveCount), autoremovelist, autoremoveversions); else - ioprintf(c1out, _("%lu packages were automatically installed and are no longer required.\n"), autoRemoveCount); + ioprintf(c1out, P_("%lu package was automatically installed and is no longer required.\n", + "%lu packages were automatically installed and are no longer required.\n", autoRemoveCount), autoRemoveCount); c1out << _("Use 'apt-get autoremove' to remove them.") << std::endl; } // Now see if we had destroyed anything (if we had done anything) diff --git a/debian/changelog b/debian/changelog index 948846a6c..f328b11a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,8 @@ apt (0.7.26) UNRELEASED; urgency=low * apt-pkg/deb/dpkgpm.cc: - stdin redirected to /dev/null takes all CPU (Closes: #569488) Thanks to Aurelien Jarno for providing (again) a patch! + * buildlib/apti18n.h.in, po/makefile: + - add ngettext support with P_() [ Ivan Masár ] * Slovak translation update. Closes: #568294 diff --git a/po/makefile b/po/makefile index 07dc51c07..9f8b7b22e 100644 --- a/po/makefile +++ b/po/makefile @@ -37,6 +37,7 @@ $(POTFILES) : $(PO)/%.pot : cat $(PO)/domains/$*/*.srclist > $(PO)/POTFILES_$*.in $(XGETTEXT) --default-domain=$* --directory=$(BASE) \ --add-comments --foreign --keyword=_ --keyword=N_ \ + --keyword=P_:1,2 \ --files-from=$(PO)/POTFILES_$*.in -o $(PO)/domains/$*/c.pot rm -f $(PO)/POTFILES_$*.in $(MSGCOMM) --more-than=0 $(PO)/domains/$*/c.pot $(PO)/domains/$*/sh.pot --output=$@ -- cgit v1.2.3 From 1a31359bfe4fdbf9ac1a25ab0b9f013d37099ac4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 15 Feb 2010 13:05:53 +0100 Subject: * aptconfiguration.cc: - include all existing Translation files in the Cache (Closes: 564137) Previously if APT was executed with a different LC_* all these invocations needed to rebuild the Cache as too many files were included or missing: Now the lists-directory is checked for Translation-files and all these included in getLanguages() regardless of the environment setting (after a "none" so APT will not use them for displaying information). --- apt-pkg/aptconfiguration.cc | 78 ++++++++++++++++++++++++++++++++++++---- apt-pkg/deb/debmetaindex.cc | 5 ++- debian/changelog | 2 ++ test/libapt/getlanguages_test.cc | 22 ++++++++++-- test/libapt/run-tests.sh | 7 ++++ 5 files changed, 105 insertions(+), 9 deletions(-) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index f1989599b..429219cbd 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -14,9 +14,12 @@ #include #include -#include -#include +#include +#include + #include +#include +#include /*}}}*/ namespace APT { // getCompressionTypes - Return Vector of usbale compressiontypes /*{{{*/ @@ -119,6 +122,37 @@ std::vector const Configuration::getLanguages(bool const &All, } } + // Include all Language codes we have a Translation file for in /var/lib/apt/lists + // so they will be all included in the Cache. + std::vector builtin; + DIR *D = opendir(_config->FindDir("Dir::State::lists").c_str()); + if (D != 0) { + builtin.push_back("none"); + for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D)) { + string const name = Ent->d_name; + size_t const foundDash = name.rfind("-"); + size_t const foundUnderscore = name.rfind("_"); + if (foundDash == string::npos || foundUnderscore == string::npos || + foundDash <= foundUnderscore || + name.substr(foundUnderscore+1, foundDash-(foundUnderscore+1)) != "Translation") + continue; + string const c = name.substr(foundDash+1); + if (unlikely(c.empty() == true) || c == "en") + continue; + // Skip unusual files, like backups or that alike + string::const_iterator s = c.begin(); + for (;s != c.end(); ++s) { + if (isalpha(*s) == 0) + break; + } + if (s != c.end()) + continue; + if (std::find(builtin.begin(), builtin.end(), c) != builtin.end()) + continue; + builtin.push_back(c); + } + } + // get the environment language codes: LC_MESSAGES (and later LANGUAGE) // we extract both, a long and a short code and then we will // check if we actually need both (rare) or if the short is enough @@ -134,7 +168,11 @@ std::vector const Configuration::getLanguages(bool const &All, if (envLong == "C") { codes.push_back("en"); allCodes = codes; - return codes; + allCodes.insert(allCodes.end(), builtin.begin(), builtin.end()); + if (All == true) + return allCodes; + else + return codes; } // to save the servers from unneeded queries, we only try also long codes @@ -159,8 +197,16 @@ std::vector const Configuration::getLanguages(bool const &All, if (oldAcquire.empty() == false && oldAcquire != "environment") { if (oldAcquire != "none") codes.push_back(oldAcquire); + codes.push_back("en"); allCodes = codes; - return codes; + for (std::vector::const_iterator b = builtin.begin(); + b != builtin.end(); ++b) + if (std::find(allCodes.begin(), allCodes.end(), *b) == allCodes.end()) + allCodes.push_back(*b); + if (All == true) + return allCodes; + else + return codes; } // It is very likely we will need to environment codes later, @@ -207,7 +253,14 @@ std::vector const Configuration::getLanguages(bool const &All, } else if (forceLang != "none") codes.push_back(forceLang); allCodes = codes; - return codes; + for (std::vector::const_iterator b = builtin.begin(); + b != builtin.end(); ++b) + if (std::find(allCodes.begin(), allCodes.end(), *b) == allCodes.end()) + allCodes.push_back(*b); + if (All == true) + return allCodes; + else + return codes; } std::vector const lang = _config->FindVector("Acquire::Languages"); @@ -217,7 +270,14 @@ std::vector const Configuration::getLanguages(bool const &All, if (envShort != "en") codes.push_back("en"); allCodes = codes; - return codes; + for (std::vector::const_iterator b = builtin.begin(); + b != builtin.end(); ++b) + if (std::find(allCodes.begin(), allCodes.end(), *b) == allCodes.end()) + allCodes.push_back(*b); + if (All == true) + return allCodes; + else + return codes; } // the configs define the order, so add the environment @@ -245,6 +305,12 @@ std::vector const Configuration::getLanguages(bool const &All, codes.push_back(*l); allCodes.push_back(*l); } + + for (std::vector::const_iterator b = builtin.begin(); + b != builtin.end(); ++b) + if (std::find(allCodes.begin(), allCodes.end(), *b) == allCodes.end()) + allCodes.push_back(*b); + if (All == true) return allCodes; else diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index eb01a0156..0e4e6df9e 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -214,6 +214,7 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const s != sections.end(); ++s) for (set::const_iterator l = s->second.begin(); l != s->second.end(); l++) { + if (*l == "none") continue; debTranslationsIndex i = debTranslationsIndex(URI,Dist,s->first,(*l).c_str()); i.GetIndexes(Owner); } @@ -268,8 +269,10 @@ vector *debReleaseIndex::GetIndexFiles() { for (map >::const_iterator s = sections.begin(); s != sections.end(); ++s) for (set::const_iterator l = s->second.begin(); - l != s->second.end(); l++) + l != s->second.end(); l++) { + if (*l == "none") continue; Indexes->push_back(new debTranslationsIndex(URI,Dist,s->first,(*l).c_str())); + } return Indexes; } diff --git a/debian/changelog b/debian/changelog index f328b11a7..fdce01098 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,8 @@ apt (0.7.26) UNRELEASED; urgency=low Thanks to Aurelien Jarno for providing (again) a patch! * buildlib/apti18n.h.in, po/makefile: - add ngettext support with P_() + * aptconfiguration.cc: + - include all existing Translation files in the Cache (Closes: 564137) [ Ivan Masár ] * Slovak translation update. Closes: #568294 diff --git a/test/libapt/getlanguages_test.cc b/test/libapt/getlanguages_test.cc index fb7afb4ef..0db190b50 100644 --- a/test/libapt/getlanguages_test.cc +++ b/test/libapt/getlanguages_test.cc @@ -16,9 +16,15 @@ void dumpVector(std::vector vec) { int main(int argc,char *argv[]) { + if (argc != 2) { + std::cout << "One parameter expected - given " << argc << std::endl; + return 100; + } + char const* env[2]; env[0] = "de_DE.UTF-8"; env[1] = ""; + std::vector vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 2); equals(vec[0], "de"); @@ -87,6 +93,16 @@ int main(int argc,char *argv[]) equals(vec[0], "de"); equals(vec[1], "en"); + _config->Set("Dir::State::lists", argv[1]); + vec = APT::Configuration::getLanguages(true, false, env); + equals(vec.size(), 5); + equals(vec[0], "de"); + equals(vec[1], "en"); + equals(vec[2], "none"); + equals(vec[3], "pt"); + equals(vec[4], "tr"); + + _config->Set("Dir::State::lists", "/non-existing-dir"); _config->Set("Acquire::Languages::1", "none"); env[0] = "de_DE.UTF-8"; vec = APT::Configuration::getLanguages(false, false, env); @@ -113,12 +129,14 @@ int main(int argc,char *argv[]) _config->Set("APT::Acquire::Translation", "ast_DE"); env[0] = "de_DE.UTF-8"; vec = APT::Configuration::getLanguages(true, false, env); - equals(vec.size(), 1); + equals(vec.size(), 2); equals(vec[0], "ast_DE"); + equals(vec[1], "en"); _config->Set("APT::Acquire::Translation", "none"); env[0] = "de_DE.UTF-8"; vec = APT::Configuration::getLanguages(true, false, env); - equals(vec.size(), 0); + equals(vec.size(), 1); + equals(vec[0], "en"); return 0; } diff --git a/test/libapt/run-tests.sh b/test/libapt/run-tests.sh index 1fcfb6861..f9df1af5f 100755 --- a/test/libapt/run-tests.sh +++ b/test/libapt/run-tests.sh @@ -39,6 +39,13 @@ do "${tmppath}/01invalíd" ln -s "${tmppath}/anormalfile" "${tmppath}/linkedfile.list" ln -s "${tmppath}/non-existing-file" "${tmppath}/brokenlink.list" + elif [ $name = "getLanguages${EXT}" ]; then + echo "Prepare Testarea for \033[1;35m$name\033[0m ..." + tmppath=$(mktemp -d) + touch "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-tr" \ + "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-pt" \ + "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-se~" \ + "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-st.bak" fi echo -n "Testing with \033[1;35m${name}\033[0m ... " -- cgit v1.2.3 From d6b69b51004b9418478c8d5d5a5c59d5813f1289 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 16 Feb 2010 22:05:10 +0100 Subject: * debian/control: - update with no changes to debian policy 3.8.4 --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fdce01098..9cc632c37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,8 @@ apt (0.7.26) UNRELEASED; urgency=low - add ngettext support with P_() * aptconfiguration.cc: - include all existing Translation files in the Cache (Closes: 564137) + * debian/control: + - update with no changes to debian policy 3.8.4 [ Ivan Masár ] * Slovak translation update. Closes: #568294 diff --git a/debian/control b/debian/control index d756871d1..de2bf6544 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: APT Development Team Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Luca Bruno , Julian Andres Klode -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ -- cgit v1.2.3 From f1a5db64ad03910c2a401af8baa80fe2354beaa7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 17 Feb 2010 22:05:15 +0100 Subject: add a note about the uncomplete toolchain to sound a bit more scary --- README.MultiArch | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.MultiArch b/README.MultiArch index 92491631e..b2964ac38 100644 --- a/README.MultiArch +++ b/README.MultiArch @@ -7,6 +7,13 @@ usage guide - you have been warned. It is assumed that the reader has at least a bit of knowledge about APT internals, dependency relations and the MultiArch spec [0]. +Note also that the toolchain isn't ready yet, e.g. while you can simulate +the installation of MultiArch packages they will more sooner than later +cause enormous problems if really installed as dpkg can't handle MultiArch +yet (no, --force-{overwrite,architecture} aren't good options here). +Other parts of the big picture are missing and/or untested too. +You have been warned! + The implementation is focused on NOT breaking existing singleArch-only applications and/or systems as this is the current status-quo for all -- cgit v1.2.3 From a1af1f3b1b7700d1108ee7648bce7b9d2c2c506b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 17 Feb 2010 22:09:02 +0100 Subject: * doc/apt_preferences.5.xml: - explicitly warn against careless use (Closes: #567669) --- debian/changelog | 2 ++ doc/apt_preferences.5.xml | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9cc632c37..8a4e2ac20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,8 @@ apt (0.7.26) UNRELEASED; urgency=low - include all existing Translation files in the Cache (Closes: 564137) * debian/control: - update with no changes to debian policy 3.8.4 + * doc/apt_preferences.5.xml: + - explicitly warn against careless use (Closes: #567669) [ Ivan Masár ] * Slovak translation update. Closes: #568294 diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 9a4791c08..3d7896226 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -14,7 +14,7 @@ &apt-email; &apt-product; - 04 May 2009 + 16 February 2010 @@ -53,6 +53,14 @@ earliest in the &sources-list; file. The APT preferences file does not affect the choice of instance, only the choice of version. +Preferences are a strong power in the hands of a system administrator +but they can become also their biggest nightmare if used without care! +APT will not questioning the preferences so wrong settings will therefore +lead to uninstallable packages or wrong decisions while upgrading packages. +Even more problems will arise if multiply distribution releases are mixed +without a good understanding of the following paragraphs. +You have been warned. + Note that the files in the /etc/apt/preferences.d directory are parsed in alphanumeric ascending order and need to obey the following naming convention: The files have no or "pref" -- cgit v1.2.3 From 897165afb4681cff0e3a4bcb65f21b6d67718fbe Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 18 Feb 2010 00:04:26 +0100 Subject: * apt-pkg/deb/dpkgpm.cc: - stdin redirected to /dev/null takes all CPU (Closes: #569488) Thanks to Aurelien Jarno for providing (again) a patch! --- apt-pkg/deb/dpkgpm.cc | 2 +- debian/changelog | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 565f01b84..3dca2b209 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1005,7 +1005,7 @@ bool pkgDPkgPM::Go(int OutStatusFd) // wait for input or output here FD_ZERO(&rfds); - if (!stdin_is_dev_null) + if (master >= 0 && !stdin_is_dev_null) FD_SET(0, &rfds); FD_SET(_dpkgin, &rfds); if(master >= 0) diff --git a/debian/changelog b/debian/changelog index df16a69dd..baa1fff93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,9 @@ apt (0.7.26) UNRELEASED; urgency=low - add APT::FTPArchive::AlwaysStat to disable the too aggressive caching if versions are build multiply times (not recommend) Patch by Christoph Goehre, thanks! (Closes: #463260) + * apt-pkg/deb/dpkgpm.cc: + - stdin redirected to /dev/null takes all CPU (Closes: #569488) + Thanks to Aurelien Jarno for providing (again) a patch! [ Ivan Masár ] * Slovak translation update. Closes: #568294 -- cgit v1.2.3 From 319810767180e5c57c296b06c93e3ebec9f36a8e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 18 Feb 2010 00:05:14 +0100 Subject: - add --arch option for apt-ftparchive packages and contents commands - if an arch is given accept only *_all.deb and *_arch.deb instead of *.deb. Thanks Stephan Bosch for the patch! (Closes: #319710) --- debian/changelog | 3 +++ doc/apt-ftparchive.1.xml | 12 ++++++++++-- ftparchive/apt-ftparchive.cc | 7 ++++--- ftparchive/writer.cc | 30 ++++++++++++++---------------- ftparchive/writer.h | 6 +++--- 5 files changed, 34 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index baa1fff93..10cccda47 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,9 @@ apt (0.7.26) UNRELEASED; urgency=low - allow also to skip the last patch if target is reached, thanks Bernhard R. Link! (Closes: #545699) * ftparchive/writer.{cc,h}: + - add --arch option for packages and contents commands + - if an arch is given accept only *_all.deb and *_arch.deb instead + of *.deb. Thanks Stephan Bosch for the patch! (Closes: #319710) - add APT::FTPArchive::AlwaysStat to disable the too aggressive caching if versions are build multiply times (not recommend) Patch by Christoph Goehre, thanks! (Closes: #463260) diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index eb61eae51..f88dbe631 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -39,6 +39,7 @@ + @@ -542,11 +543,18 @@ for i in Sections do Make the caching databases read only. Configuration Item: APT::FTPArchive::ReadOnlyDB. - + + + + Accept in the packages and contents + commands only package files matching *_arch.deb or + *_all.deb instead of all package files in the given path. + Configuration Item: APT::FTPArchive::Architecture. + - &apt-ftparchive; caches as much as possible of metadata in it is cachedb. If packages + &apt-ftparchive; caches as much as possible of metadata in a cachedb. If packages are recompiled and/or republished with the same version again, this will lead to problems as the now outdated cached metadata like size and checksums will be used. With this option enabled this will no longer happen as it will be checked if the file was changed. diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index 5b6b3940c..f1a182e52 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -333,7 +333,7 @@ bool PackageMap::GenContents(Configuration &Setup, gettimeofday(&StartTime,0); // Create a package writer object. - ContentsWriter Contents(""); + ContentsWriter Contents("", Arch); if (PkgExt.empty() == false && Contents.SetExts(PkgExt) == false) return _error->Error(_("Package extension list is too long")); if (_error->PendingError() == true) @@ -606,7 +606,7 @@ bool SimpleGenPackages(CommandLine &CmdL) // Create a package writer object. PackagesWriter Packages(_config->Find("APT::FTPArchive::DB"), - Override, ""); + Override, "", _config->Find("APT::FTPArchive::Architecture")); if (_error->PendingError() == true) return false; @@ -629,7 +629,7 @@ bool SimpleGenContents(CommandLine &CmdL) return ShowHelp(CmdL); // Create a package writer object. - ContentsWriter Contents(_config->Find("APT::FTPArchive::DB")); + ContentsWriter Contents(_config->Find("APT::FTPArchive::DB"), _config->Find("APT::FTPArchive::Architecture")); if (_error->PendingError() == true) return false; @@ -910,6 +910,7 @@ int main(int argc, const char *argv[]) {0,"delink","APT::FTPArchive::DeLinkAct",0}, {0,"readonly","APT::FTPArchive::ReadOnlyDB",0}, {0,"contents","APT::FTPArchive::Contents",0}, + {'a',"arch","APT::FTPArchive::Architecture",CommandLine::HasArg}, {'c',"config-file",0,CommandLine::ConfigFile}, {'o',"option",0,CommandLine::ArbItem}, {0,0,0,0}}; diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 18a3de0c2..9e5b7d4f3 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -54,7 +54,7 @@ inline void SetTFRewriteData(struct TFRewriteData &tfrd, // FTWScanner::FTWScanner - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -FTWScanner::FTWScanner() +FTWScanner::FTWScanner(string const &Arch): Arch(Arch) { ErrorPrinted = false; NoLinkAct = !_config->FindB("APT::FTPArchive::DeLinkAct",true); @@ -299,12 +299,11 @@ bool FTWScanner::Delink(string &FileName,const char *OriginalPath, // --------------------------------------------------------------------- /* */ PackagesWriter::PackagesWriter(string const &DB,string const &Overrides,string const &ExtOverrides, - string const &aArch) : - Db(DB),Stats(Db.Stats), Arch(aArch) + string const &Arch) : + FTWScanner(Arch), Db(DB), Stats(Db.Stats) { Output = stdout; - SetExts(".deb .udeb .foo .bar .baz"); - AddPattern("*.deb"); + SetExts(".deb .udeb"); DeLinkLimit = 0; // Process the command line options @@ -340,17 +339,16 @@ bool FTWScanner::SetExts(string const &Vals) string::size_type Start = 0; while (Start <= Vals.length()-1) { - string::size_type Space = Vals.find(' ',Start); - string::size_type Length; - if (Space == string::npos) + string::size_type const Space = Vals.find(' ',Start); + string::size_type const Length = ((Space == string::npos) ? Vals.length() : Space) - Start; + if ( Arch.empty() == false ) { - Length = Vals.length()-Start; + AddPattern(string("*_") + Arch + Vals.substr(Start, Length)); + AddPattern(string("*_all") + Vals.substr(Start, Length)); } else - { - Length = Space-Start; - } - AddPattern(string("*") + Vals.substr(Start, Length)); + AddPattern(string("*") + Vals.substr(Start, Length)); + Start += Length + 1; } @@ -767,11 +765,11 @@ bool SourcesWriter::DoPackage(string FileName) // ContentsWriter::ContentsWriter - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -ContentsWriter::ContentsWriter(string const &DB) : - Db(DB), Stats(Db.Stats) +ContentsWriter::ContentsWriter(string const &DB, string const &Arch) : + FTWScanner(Arch), Db(DB), Stats(Db.Stats) { - AddPattern("*.deb"); + SetExts(".deb"); Output = stdout; } /*}}}*/ diff --git a/ftparchive/writer.h b/ftparchive/writer.h index 520e91dd6..af7ba4edd 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -34,6 +34,7 @@ class FTWScanner { protected: vector Patterns; + string Arch; const char *OriginalPath; bool ErrorPrinted; @@ -68,7 +69,7 @@ class FTWScanner void AddPattern(string const &Pattern) { Patterns.push_back(Pattern); }; bool SetExts(string const &Vals); - FTWScanner(); + FTWScanner(string const &Arch = string()); }; class PackagesWriter : public FTWScanner @@ -92,7 +93,6 @@ class PackagesWriter : public FTWScanner string DirStrip; FILE *Output; struct CacheDB::Stats &Stats; - string Arch; inline bool ReadOverride(string const &File) {return Over.ReadOverride(File);}; inline bool ReadExtraOverride(string const &File) @@ -125,7 +125,7 @@ class ContentsWriter : public FTWScanner void Finish() {Gen.Print(Output);}; inline bool ReadyDB(string const &DB) {return Db.ReadyDB(DB);}; - ContentsWriter(string const &DB); + ContentsWriter(string const &DB, string const &Arch = string()); virtual ~ContentsWriter() {}; }; -- cgit v1.2.3 From d7cf5923a093e89ab5aac0bf8cd1c3042997990c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 18 Feb 2010 00:30:51 +0100 Subject: dd support for the LANGUAGE environment variable --- apt-pkg/aptconfiguration.cc | 92 ++++++++++++++++++++++++++-------------- apt-pkg/aptconfiguration.h | 2 +- apt-pkg/contrib/strutl.cc | 18 ++++++++ apt-pkg/contrib/strutl.h | 1 + test/libapt/getlanguages_test.cc | 61 ++++++++++++++++++++------ 5 files changed, 127 insertions(+), 47 deletions(-) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 899004d9f..9fd51ad5a 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -8,9 +8,11 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#include #include #include +#include +#include +#include #include #include @@ -96,7 +98,7 @@ const Configuration::getCompressionTypes(bool const &Cached) { will result in "de_DE, de, en". The special word "none" is the stopcode for the not-All code vector */ std::vector const Configuration::getLanguages(bool const &All, - bool const &Cached, char const * const Locale) { + bool const &Cached, char const ** const Locale) { using std::string; // The detection is boring and has a lot of cornercases, @@ -117,27 +119,29 @@ std::vector const Configuration::getLanguages(bool const &All, } } - // get the environment language code + // get the environment language codes: LC_MESSAGES (and later LANGUAGE) // we extract both, a long and a short code and then we will // check if we actually need both (rare) or if the short is enough - string const envMsg = string(Locale == 0 ? std::setlocale(LC_MESSAGES, NULL) : Locale); + string const envMsg = string(Locale == 0 ? std::setlocale(LC_MESSAGES, NULL) : *Locale); size_t const lenShort = (envMsg.find('_') != string::npos) ? envMsg.find('_') : 2; - size_t const lenLong = (envMsg.find('.') != string::npos) ? envMsg.find('.') : (lenShort + 3); + size_t const lenLong = (envMsg.find_first_of(".@") != string::npos) ? envMsg.find_first_of(".@") : (lenShort + 3); string envLong = envMsg.substr(0,lenLong); string const envShort = envLong.substr(0,lenShort); - bool envLongIncluded = true, envShortIncluded = false; + bool envLongIncluded = true; // first cornercase: LANG=C, so we use only "en" Translation if (envLong == "C") { codes.push_back("en"); + allCodes = codes; return codes; } + // to save the servers from unneeded queries, we only try also long codes + // for languages it is realistic to have a long code translation file… + // TODO: Improve translation acquire system to drop them dynamic + char const *needLong[] = { "cs", "en", "pt", "sv", "zh", NULL }; if (envLong != envShort) { - // to save the servers from unneeded queries, we only try also long codes - // for languages it is realistic to have a long code translation file... - char const *needLong[] = { "cs", "en", "pt", "sv", "zh", NULL }; for (char const **l = needLong; *l != NULL; l++) if (envShort.compare(*l) == 0) { envLongIncluded = false; @@ -155,33 +159,64 @@ std::vector const Configuration::getLanguages(bool const &All, if (oldAcquire.empty() == false && oldAcquire != "environment") { if (oldAcquire != "none") codes.push_back(oldAcquire); + allCodes = codes; return codes; } + // It is very likely we will need to environment codes later, + // so let us generate them now from LC_MESSAGES and LANGUAGE + std::vector environment; + // take care of LC_MESSAGES + if (envLongIncluded == false) + environment.push_back(envLong); + environment.push_back(envShort); + // take care of LANGUAGE + string envLang = Locale == 0 ? getenv("LANGUAGE") : *(Locale+1); + if (envLang.empty() == false) { + std::vector env = ExplodeString(envLang,':'); + short addedLangs = 0; // add a maximum of 3 fallbacks from the environment + for (std::vector::const_iterator e = env.begin(); + e != env.end() && addedLangs < 3; ++e) { + if (unlikely(e->empty() == true) || *e == "en") + continue; + if (*e == envLong || *e == envShort) + continue; + if (std::find(environment.begin(), environment.end(), *e) != environment.end()) + continue; + if (e->find('_') != string::npos) { + // Drop LongCodes here - ShortCodes are also included + string const shorty = e->substr(0, e->find('_')); + char const **n = needLong; + for (; *n != NULL; ++n) + if (shorty == *n) + break; + if (*n == NULL) + continue; + } + ++addedLangs; + environment.push_back(*e); + } + } + // Support settings like Acquire::Translation=none on the command line to // override the configuration settings vector of languages. string const forceLang = _config->Find("Acquire::Languages",""); if (forceLang.empty() == false) { if (forceLang == "environment") { - if (envLongIncluded == false) - codes.push_back(envLong); - if (envShortIncluded == false) - codes.push_back(envShort); - return codes; + codes = environment; } else if (forceLang != "none") codes.push_back(forceLang); + allCodes = codes; return codes; } std::vector const lang = _config->FindVector("Acquire::Languages"); // the default setting -> "environment, en" if (lang.empty() == true) { - if (envLongIncluded == false) - codes.push_back(envLong); - if (envShortIncluded == false) - codes.push_back(envShort); + codes = environment; if (envShort != "en") codes.push_back("en"); + allCodes = codes; return codes; } @@ -191,26 +226,19 @@ std::vector const Configuration::getLanguages(bool const &All, for (std::vector::const_iterator l = lang.begin(); l != lang.end(); l++) { if (*l == "environment") { - if (envLongIncluded == true && envShortIncluded == true) - continue; - if (envLongIncluded == false) { - envLongIncluded = true; - if (noneSeen == false) - codes.push_back(envLong); - allCodes.push_back(envLong); - } - if (envShortIncluded == false) { - envShortIncluded = true; + for (std::vector::const_iterator e = environment.begin(); + e != environment.end(); ++e) { + if (std::find(allCodes.begin(), allCodes.end(), *e) != allCodes.end()) + continue; if (noneSeen == false) - codes.push_back(envShort); - allCodes.push_back(envShort); + codes.push_back(*e); + allCodes.push_back(*e); } continue; } else if (*l == "none") { noneSeen = true; continue; - } else if ((envLongIncluded == true && *l == envLong) || - (envShortIncluded == true && *l == envShort)) + } else if (std::find(allCodes.begin(), allCodes.end(), *l) != allCodes.end()) continue; if (noneSeen == false) diff --git a/apt-pkg/aptconfiguration.h b/apt-pkg/aptconfiguration.h index f2f04a39b..2ba1b3825 100644 --- a/apt-pkg/aptconfiguration.h +++ b/apt-pkg/aptconfiguration.h @@ -64,7 +64,7 @@ public: /*{{{*/ * \return a vector of (all) Language Codes in the prefered usage order */ std::vector static const getLanguages(bool const &All = false, - bool const &Cached = true, char const * const Locale = 0); + bool const &Cached = true, char const ** const Locale = 0); /*}}}*/ }; diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 2913fbf44..3bbaf5f30 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -1000,6 +1000,24 @@ bool TokSplitString(char Tok,char *Input,char **List, return true; } /*}}}*/ +// ExplodeString - Split a string up into a vector /*{{{*/ +// --------------------------------------------------------------------- +/* This can be used to split a given string up into a vector, so the + propose is the same as in the method above and this one is a bit slower + also, but the advantage is that we an iteratable vector */ +vector ExplodeString(string const &haystack, char const &split) +{ + string::const_iterator start = haystack.begin(); + string::const_iterator end = start; + vector exploded; + do { + for (; end != haystack.end() && *end != split; ++end); + exploded.push_back(string(start, end)); + start = end + 1; + } while (end != haystack.end() && (++end) != haystack.end()); + return exploded; +} + /*}}}*/ // RegexChoice - Simple regex list/list matcher /*{{{*/ // --------------------------------------------------------------------- /* */ diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index 2b2e147fb..d65f975d2 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -59,6 +59,7 @@ bool StrToNum(const char *Str,unsigned long &Res,unsigned Len,unsigned Base = 0) bool Hex2Num(const string &Str,unsigned char *Num,unsigned int Length); bool TokSplitString(char Tok,char *Input,char **List, unsigned long ListMax); +vector ExplodeString(string const &haystack, char const &split); void ioprintf(ostream &out,const char *format,...) APT_FORMAT2; void strprintf(string &out,const char *format,...) APT_FORMAT2; char *safe_snprintf(char *Buffer,char *End,const char *Format,...) APT_FORMAT3; diff --git a/test/libapt/getlanguages_test.cc b/test/libapt/getlanguages_test.cc index fd3c8269f..fb7afb4ef 100644 --- a/test/libapt/getlanguages_test.cc +++ b/test/libapt/getlanguages_test.cc @@ -16,75 +16,108 @@ void dumpVector(std::vector vec) { int main(int argc,char *argv[]) { - std::vector vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); + char const* env[2]; + env[0] = "de_DE.UTF-8"; + env[1] = ""; + std::vector vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 2); equals(vec[0], "de"); equals(vec[1], "en"); // Special: Check if the cache is actually in use - vec = APT::Configuration::getLanguages(false, true, "en_GB.UTF-8"); + env[0] = "en_GB.UTF-8"; + vec = APT::Configuration::getLanguages(false, true, env); equals(vec.size(), 2); equals(vec[0], "de"); equals(vec[1], "en"); - vec = APT::Configuration::getLanguages(false, false, "en_GB.UTF-8"); + env[0] = "en_GB.UTF-8"; + vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 2); equals(vec[0], "en_GB"); equals(vec[1], "en"); - vec = APT::Configuration::getLanguages(false, false, "pt_PR.UTF-8"); + env[0] = "tr_DE@euro"; + vec = APT::Configuration::getLanguages(false, false, env); + equals(vec.size(), 2); + equals(vec[0], "tr"); + equals(vec[1], "en"); + + env[0] = "de_NO"; + env[1] = "se_NO:en_GB:nb_NO:nb:no_NO:no:nn_NO:nn:da:sv:en"; + vec = APT::Configuration::getLanguages(false, false, env); + equals(vec.size(), 5); + equals(vec[0], "de"); + equals(vec[1], "en_GB"); + equals(vec[2], "nb"); + equals(vec[3], "no"); + equals(vec[4], "en"); + + env[0] = "pt_PR.UTF-8"; + env[1] = ""; + vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 3); equals(vec[0], "pt_PR"); equals(vec[1], "pt"); equals(vec[2], "en"); - vec = APT::Configuration::getLanguages(false, false, "ast_DE.UTF-8"); // bogus, but syntactical correct + env[0] = "ast_DE.UTF-8"; + vec = APT::Configuration::getLanguages(false, false, env); // bogus, but syntactical correct equals(vec.size(), 2); equals(vec[0], "ast"); equals(vec[1], "en"); - vec = APT::Configuration::getLanguages(false, false, "C"); + env[0] = "C"; + vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 1); equals(vec[0], "en"); _config->Set("Acquire::Languages::1", "environment"); _config->Set("Acquire::Languages::2", "en"); - vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); + env[0] = "de_DE.UTF-8"; + vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 2); equals(vec[0], "de"); equals(vec[1], "en"); _config->Set("Acquire::Languages::3", "de"); - vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); + env[0] = "de_DE.UTF-8"; + vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 2); equals(vec[0], "de"); equals(vec[1], "en"); _config->Set("Acquire::Languages::1", "none"); - vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); + env[0] = "de_DE.UTF-8"; + vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 0); - vec = APT::Configuration::getLanguages(true, false, "de_DE.UTF-8"); + env[0] = "de_DE.UTF-8"; + vec = APT::Configuration::getLanguages(true, false, env); equals(vec[0], "en"); equals(vec[1], "de"); _config->Set("Acquire::Languages::1", "fr"); _config->Set("Acquire::Languages", "de_DE"); - vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); + env[0] = "de_DE.UTF-8"; + vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 1); equals(vec[0], "de_DE"); _config->Set("Acquire::Languages", "none"); - vec = APT::Configuration::getLanguages(true, false, "de_DE.UTF-8"); + env[0] = "de_DE.UTF-8"; + vec = APT::Configuration::getLanguages(true, false, env); equals(vec.size(), 0); _config->Set("Acquire::Languages", ""); //FIXME: Remove support for this deprecated setting _config->Set("APT::Acquire::Translation", "ast_DE"); - vec = APT::Configuration::getLanguages(true, false, "de_DE.UTF-8"); + env[0] = "de_DE.UTF-8"; + vec = APT::Configuration::getLanguages(true, false, env); equals(vec.size(), 1); equals(vec[0], "ast_DE"); _config->Set("APT::Acquire::Translation", "none"); - vec = APT::Configuration::getLanguages(true, false, "de_DE.UTF-8"); + env[0] = "de_DE.UTF-8"; + vec = APT::Configuration::getLanguages(true, false, env); equals(vec.size(), 0); return 0; -- cgit v1.2.3 From f0f2f956957af36389790fd47899a1f65302b21c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 18 Feb 2010 00:31:49 +0100 Subject: * buildlib/apti18n.h.in, po/makefile: - add ngettext support with P_() --- buildlib/apti18n.h.in | 3 +++ cmdline/apt-get.cc | 12 +++++++----- debian/changelog | 2 ++ po/makefile | 1 + 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/buildlib/apti18n.h.in b/buildlib/apti18n.h.in index e7beceb09..6928d626c 100644 --- a/buildlib/apti18n.h.in +++ b/buildlib/apti18n.h.in @@ -11,8 +11,10 @@ # include # ifdef APT_DOMAIN # define _(x) dgettext(APT_DOMAIN,x) +# define P_(msg,plural,n) dngettext(APT_DOMAIN,msg,plural,n) # else # define _(x) gettext(x) +# define P_(msg,plural,n) ngettext(msg,plural,n) # endif # define N_(x) x #else @@ -21,5 +23,6 @@ # define textdomain(a) # define bindtextdomain(a, b) # define _(x) x +# define P_(msg,plural,n) (n == 1 ? msg : plural) # define N_(x) x #endif diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 34ae2fed9..5a814e255 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1504,10 +1504,9 @@ bool DoAutomaticRemove(CacheFile &Cache) // only show stuff in the list that is not yet marked for removal if(Cache[Pkg].Delete() == false) { + ++autoRemoveCount; // we don't need to fill the strings if we don't need them - if (smallList == true) - ++autoRemoveCount; - else + if (smallList == false) { autoremovelist += string(Pkg.Name()) + " "; autoremoveversions += string(Cache[Pkg].CandVersion) + "\n"; @@ -1520,9 +1519,12 @@ bool DoAutomaticRemove(CacheFile &Cache) if (doAutoRemove == false && (autoremovelist.empty() == false || autoRemoveCount != 0)) { if (smallList == false) - ShowList(c1out, _("The following packages were automatically installed and are no longer required:"), autoremovelist, autoremoveversions); + ShowList(c1out, P_("The following package is automatically installed and is no longer required:", + "The following packages were automatically installed and are no longer required:", + autoRemoveCount), autoremovelist, autoremoveversions); else - ioprintf(c1out, _("%lu packages were automatically installed and are no longer required.\n"), autoRemoveCount); + ioprintf(c1out, P_("%lu package was automatically installed and is no longer required.\n", + "%lu packages were automatically installed and are no longer required.\n", autoRemoveCount), autoRemoveCount); c1out << _("Use 'apt-get autoremove' to remove them.") << std::endl; } // Now see if we had destroyed anything (if we had done anything) diff --git a/debian/changelog b/debian/changelog index 10cccda47..47fe7adf9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,8 @@ apt (0.7.26) UNRELEASED; urgency=low * apt-pkg/deb/dpkgpm.cc: - stdin redirected to /dev/null takes all CPU (Closes: #569488) Thanks to Aurelien Jarno for providing (again) a patch! + * buildlib/apti18n.h.in, po/makefile: + - add ngettext support with P_() [ Ivan Masár ] * Slovak translation update. Closes: #568294 diff --git a/po/makefile b/po/makefile index 07dc51c07..9f8b7b22e 100644 --- a/po/makefile +++ b/po/makefile @@ -37,6 +37,7 @@ $(POTFILES) : $(PO)/%.pot : cat $(PO)/domains/$*/*.srclist > $(PO)/POTFILES_$*.in $(XGETTEXT) --default-domain=$* --directory=$(BASE) \ --add-comments --foreign --keyword=_ --keyword=N_ \ + --keyword=P_:1,2 \ --files-from=$(PO)/POTFILES_$*.in -o $(PO)/domains/$*/c.pot rm -f $(PO)/POTFILES_$*.in $(MSGCOMM) --more-than=0 $(PO)/domains/$*/c.pot $(PO)/domains/$*/sh.pot --output=$@ -- cgit v1.2.3 From 3f2d77b5e02c5749a78ad9852c01cfad4ce0fda1 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 18 Feb 2010 00:35:25 +0100 Subject: * aptconfiguration.cc: - include all existing Translation files in the Cache (Closes: 564137) Previously if APT was executed with a different LC_* all these invocations needed to rebuild the Cache as too many files were included or missing: Now the lists-directory is checked for Translation-files and all these will be included in getLanguages() regardless of the environment setting (after a "none" so APT will not use them for displaying information). --- apt-pkg/aptconfiguration.cc | 78 ++++++++++++++++++++++++++++++++++++---- apt-pkg/deb/debmetaindex.cc | 5 ++- debian/changelog | 2 ++ test/libapt/getlanguages_test.cc | 22 ++++++++++-- test/libapt/run-tests.sh | 7 ++++ 5 files changed, 105 insertions(+), 9 deletions(-) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 9fd51ad5a..b5f29472d 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -14,9 +14,12 @@ #include #include -#include -#include +#include +#include + #include +#include +#include /*}}}*/ namespace APT { // getCompressionTypes - Return Vector of usbale compressiontypes /*{{{*/ @@ -119,6 +122,37 @@ std::vector const Configuration::getLanguages(bool const &All, } } + // Include all Language codes we have a Translation file for in /var/lib/apt/lists + // so they will be all included in the Cache. + std::vector builtin; + DIR *D = opendir(_config->FindDir("Dir::State::lists").c_str()); + if (D != 0) { + builtin.push_back("none"); + for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D)) { + string const name = Ent->d_name; + size_t const foundDash = name.rfind("-"); + size_t const foundUnderscore = name.rfind("_"); + if (foundDash == string::npos || foundUnderscore == string::npos || + foundDash <= foundUnderscore || + name.substr(foundUnderscore+1, foundDash-(foundUnderscore+1)) != "Translation") + continue; + string const c = name.substr(foundDash+1); + if (unlikely(c.empty() == true) || c == "en") + continue; + // Skip unusual files, like backups or that alike + string::const_iterator s = c.begin(); + for (;s != c.end(); ++s) { + if (isalpha(*s) == 0) + break; + } + if (s != c.end()) + continue; + if (std::find(builtin.begin(), builtin.end(), c) != builtin.end()) + continue; + builtin.push_back(c); + } + } + // get the environment language codes: LC_MESSAGES (and later LANGUAGE) // we extract both, a long and a short code and then we will // check if we actually need both (rare) or if the short is enough @@ -134,7 +168,11 @@ std::vector const Configuration::getLanguages(bool const &All, if (envLong == "C") { codes.push_back("en"); allCodes = codes; - return codes; + allCodes.insert(allCodes.end(), builtin.begin(), builtin.end()); + if (All == true) + return allCodes; + else + return codes; } // to save the servers from unneeded queries, we only try also long codes @@ -159,8 +197,16 @@ std::vector const Configuration::getLanguages(bool const &All, if (oldAcquire.empty() == false && oldAcquire != "environment") { if (oldAcquire != "none") codes.push_back(oldAcquire); + codes.push_back("en"); allCodes = codes; - return codes; + for (std::vector::const_iterator b = builtin.begin(); + b != builtin.end(); ++b) + if (std::find(allCodes.begin(), allCodes.end(), *b) == allCodes.end()) + allCodes.push_back(*b); + if (All == true) + return allCodes; + else + return codes; } // It is very likely we will need to environment codes later, @@ -207,7 +253,14 @@ std::vector const Configuration::getLanguages(bool const &All, } else if (forceLang != "none") codes.push_back(forceLang); allCodes = codes; - return codes; + for (std::vector::const_iterator b = builtin.begin(); + b != builtin.end(); ++b) + if (std::find(allCodes.begin(), allCodes.end(), *b) == allCodes.end()) + allCodes.push_back(*b); + if (All == true) + return allCodes; + else + return codes; } std::vector const lang = _config->FindVector("Acquire::Languages"); @@ -217,7 +270,14 @@ std::vector const Configuration::getLanguages(bool const &All, if (envShort != "en") codes.push_back("en"); allCodes = codes; - return codes; + for (std::vector::const_iterator b = builtin.begin(); + b != builtin.end(); ++b) + if (std::find(allCodes.begin(), allCodes.end(), *b) == allCodes.end()) + allCodes.push_back(*b); + if (All == true) + return allCodes; + else + return codes; } // the configs define the order, so add the environment @@ -245,6 +305,12 @@ std::vector const Configuration::getLanguages(bool const &All, codes.push_back(*l); allCodes.push_back(*l); } + + for (std::vector::const_iterator b = builtin.begin(); + b != builtin.end(); ++b) + if (std::find(allCodes.begin(), allCodes.end(), *b) == allCodes.end()) + allCodes.push_back(*b); + if (All == true) return allCodes; else diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 8f28f053b..520e94a80 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -181,6 +181,7 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool GetAll) const for (vector::const_iterator l = lang.begin(); l != lang.end(); l++) { + if (*l == "none") continue; debTranslationsIndex i = debTranslationsIndex(URI,Dist,(*I)->Section,(*l).c_str()); i.GetIndexes(Owner); } @@ -219,8 +220,10 @@ vector *debReleaseIndex::GetIndexFiles() Indexes->push_back(new debPackagesIndex (URI, Dist, (*I)->Section, IsTrusted())); for (vector::const_iterator l = lang.begin(); - l != lang.end(); l++) + l != lang.end(); l++) { + if (*l == "none") continue; Indexes->push_back(new debTranslationsIndex(URI,Dist,(*I)->Section,(*l).c_str())); + } } } diff --git a/debian/changelog b/debian/changelog index 47fe7adf9..d929fc18b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,8 @@ apt (0.7.26) UNRELEASED; urgency=low Thanks to Aurelien Jarno for providing (again) a patch! * buildlib/apti18n.h.in, po/makefile: - add ngettext support with P_() + * aptconfiguration.cc: + - include all existing Translation files in the Cache (Closes: 564137) [ Ivan Masár ] * Slovak translation update. Closes: #568294 diff --git a/test/libapt/getlanguages_test.cc b/test/libapt/getlanguages_test.cc index fb7afb4ef..0db190b50 100644 --- a/test/libapt/getlanguages_test.cc +++ b/test/libapt/getlanguages_test.cc @@ -16,9 +16,15 @@ void dumpVector(std::vector vec) { int main(int argc,char *argv[]) { + if (argc != 2) { + std::cout << "One parameter expected - given " << argc << std::endl; + return 100; + } + char const* env[2]; env[0] = "de_DE.UTF-8"; env[1] = ""; + std::vector vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 2); equals(vec[0], "de"); @@ -87,6 +93,16 @@ int main(int argc,char *argv[]) equals(vec[0], "de"); equals(vec[1], "en"); + _config->Set("Dir::State::lists", argv[1]); + vec = APT::Configuration::getLanguages(true, false, env); + equals(vec.size(), 5); + equals(vec[0], "de"); + equals(vec[1], "en"); + equals(vec[2], "none"); + equals(vec[3], "pt"); + equals(vec[4], "tr"); + + _config->Set("Dir::State::lists", "/non-existing-dir"); _config->Set("Acquire::Languages::1", "none"); env[0] = "de_DE.UTF-8"; vec = APT::Configuration::getLanguages(false, false, env); @@ -113,12 +129,14 @@ int main(int argc,char *argv[]) _config->Set("APT::Acquire::Translation", "ast_DE"); env[0] = "de_DE.UTF-8"; vec = APT::Configuration::getLanguages(true, false, env); - equals(vec.size(), 1); + equals(vec.size(), 2); equals(vec[0], "ast_DE"); + equals(vec[1], "en"); _config->Set("APT::Acquire::Translation", "none"); env[0] = "de_DE.UTF-8"; vec = APT::Configuration::getLanguages(true, false, env); - equals(vec.size(), 0); + equals(vec.size(), 1); + equals(vec[0], "en"); return 0; } diff --git a/test/libapt/run-tests.sh b/test/libapt/run-tests.sh index 1fcfb6861..f9df1af5f 100755 --- a/test/libapt/run-tests.sh +++ b/test/libapt/run-tests.sh @@ -39,6 +39,13 @@ do "${tmppath}/01invalíd" ln -s "${tmppath}/anormalfile" "${tmppath}/linkedfile.list" ln -s "${tmppath}/non-existing-file" "${tmppath}/brokenlink.list" + elif [ $name = "getLanguages${EXT}" ]; then + echo "Prepare Testarea for \033[1;35m$name\033[0m ..." + tmppath=$(mktemp -d) + touch "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-tr" \ + "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-pt" \ + "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-se~" \ + "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-st.bak" fi echo -n "Testing with \033[1;35m${name}\033[0m ... " -- cgit v1.2.3 From 4a0cfd1573a4fd9e26f08b8c6929a27303611bcb Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 18 Feb 2010 00:37:00 +0100 Subject: * debian/control: - update with no changes to debian policy 3.8.4 --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d929fc18b..b91bbdfd3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,8 @@ apt (0.7.26) UNRELEASED; urgency=low - add ngettext support with P_() * aptconfiguration.cc: - include all existing Translation files in the Cache (Closes: 564137) + * debian/control: + - update with no changes to debian policy 3.8.4 [ Ivan Masár ] * Slovak translation update. Closes: #568294 diff --git a/debian/control b/debian/control index d756871d1..de2bf6544 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: APT Development Team Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Luca Bruno , Julian Andres Klode -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ -- cgit v1.2.3 From d9dedf304b384763278f5b39aa0dc29e112185c3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 18 Feb 2010 00:37:52 +0100 Subject: * doc/apt_preferences.5.xml: - explicitly warn against careless use (Closes: #567669) --- debian/changelog | 2 ++ doc/apt_preferences.5.xml | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b91bbdfd3..f0ab5025b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,8 @@ apt (0.7.26) UNRELEASED; urgency=low - include all existing Translation files in the Cache (Closes: 564137) * debian/control: - update with no changes to debian policy 3.8.4 + * doc/apt_preferences.5.xml: + - explicitly warn against careless use (Closes: #567669) [ Ivan Masár ] * Slovak translation update. Closes: #568294 diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 9a4791c08..3d7896226 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -14,7 +14,7 @@ &apt-email; &apt-product; - 04 May 2009 + 16 February 2010 @@ -53,6 +53,14 @@ earliest in the &sources-list; file. The APT preferences file does not affect the choice of instance, only the choice of version. +Preferences are a strong power in the hands of a system administrator +but they can become also their biggest nightmare if used without care! +APT will not questioning the preferences so wrong settings will therefore +lead to uninstallable packages or wrong decisions while upgrading packages. +Even more problems will arise if multiply distribution releases are mixed +without a good understanding of the following paragraphs. +You have been warned. + Note that the files in the /etc/apt/preferences.d directory are parsed in alphanumeric ascending order and need to obey the following naming convention: The files have no or "pref" -- cgit v1.2.3 From b7044b4b7483259f6dbca4fce56320dbde6da02a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 18 Feb 2010 00:55:35 +0100 Subject: doesn't use a default separator in ExplodeString (halfway losted in merge) --- apt-pkg/deb/debmetaindex.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 0e4e6df9e..947a7f04b 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -313,7 +313,7 @@ class debSLTypeDebian : public pkgSourceList::Type { map::const_iterator const arch = Options.find("arch"); vector const Archs = - (arch != Options.end()) ? ExplodeString(arch->second) : + (arch != Options.end()) ? ExplodeString(arch->second, ',') : APT::Configuration::getArchitectures(); for (vector::const_iterator I = List.begin(); -- cgit v1.2.3 From 44c8b5dff8871485d071f92cd154dc1c14c3c015 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 18 Feb 2010 01:37:59 +0100 Subject: we break the ABI, so let use increase the ABI number :) (This is the revert of the glibc-abi-compatibility-hack) --- apt-inst/makefile | 2 +- apt-pkg/init.h | 2 +- buildlib/library.mak | 14 +++++++------- buildlib/libversion.mak | 7 ------- debian/rules | 14 +++++++------- 5 files changed, 16 insertions(+), 23 deletions(-) diff --git a/apt-inst/makefile b/apt-inst/makefile index abc8c3fd9..785dc62ba 100644 --- a/apt-inst/makefile +++ b/apt-inst/makefile @@ -14,7 +14,7 @@ include ../buildlib/libversion.mak # The library name LIBRARY=apt-inst -MAJOR=1.1 +MAJOR=1.2 MINOR=0 SLIBS=$(PTHREADLIB) -lapt-pkg APT_DOMAIN:=libapt-inst$(MAJOR) diff --git a/apt-pkg/init.h b/apt-pkg/init.h index f0757f644..b3e4b147f 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -22,7 +22,7 @@ // Non-ABI-Breaks should only increase RELEASE number. // See also buildlib/libversion.mak #define APT_PKG_MAJOR 4 -#define APT_PKG_MINOR 8 +#define APT_PKG_MINOR 9 #define APT_PKG_RELEASE 0 extern const char *pkgVersion; diff --git a/buildlib/library.mak b/buildlib/library.mak index 2a4bb782a..029e87463 100644 --- a/buildlib/library.mak +++ b/buildlib/library.mak @@ -16,11 +16,11 @@ # See defaults.mak for information about LOCAL # Some local definitions -LOCAL := lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR) +LOCAL := lib$(LIBRARY).so.$(MAJOR).$(MINOR) $(LOCAL)-OBJS := $(addprefix $(OBJ)/,$(addsuffix .opic,$(notdir $(basename $(SOURCE))))) $(LOCAL)-DEP := $(addprefix $(DEP)/,$(addsuffix .opic.d,$(notdir $(basename $(SOURCE))))) $(LOCAL)-HEADERS := $(addprefix $(INCLUDE)/,$(HEADERS)) -$(LOCAL)-SONAME := lib$(LIBRARY)$(LIBEXT).so.$(MAJOR) +$(LOCAL)-SONAME := lib$(LIBRARY).so.$(MAJOR) $(LOCAL)-SLIBS := $(SLIBS) $(LOCAL)-LIBRARY := $(LIBRARY) @@ -29,7 +29,7 @@ include $(PODOMAIN_H) # Install the command hooks headers: $($(LOCAL)-HEADERS) -library: $(LIB)/lib$(LIBRARY).so $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR) +library: $(LIB)/lib$(LIBRARY).so $(LIB)/lib$(LIBRARY).so.$(MAJOR) clean: clean/$(LOCAL) veryclean: veryclean/$(LOCAL) @@ -44,14 +44,14 @@ veryclean/$(LOCAL): clean/$(LOCAL) -rm -f $($(@F)-HEADERS) $(LIB)/lib$($(@F)-LIBRARY)*.so* # Build rules for the two symlinks -.PHONY: $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR) $(LIB)/lib$(LIBRARY).so -$(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR): $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR) +.PHONY: $(LIB)/lib$(LIBRARY).so.$(MAJOR) $(LIB)/lib$(LIBRARY).so +$(LIB)/lib$(LIBRARY).so.$(MAJOR): $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR) ln -sf $( /dev/null echo Building shared library $@ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(PICFLAGS) $(LFLAGS) $(LFLAGS_SO)\ diff --git a/buildlib/libversion.mak b/buildlib/libversion.mak index 26ca86ced..796c956e7 100644 --- a/buildlib/libversion.mak +++ b/buildlib/libversion.mak @@ -12,10 +12,3 @@ LIBAPTPKG_RELEASE=$(shell grep -E '^\#define APT_PKG_RELEASE' $(BASE)/apt-pkg/in # The versionnumber is extracted from apt-inst/makefile - see also there. LIBAPTINST_MAJOR=$(shell egrep '^MAJOR=' $(BASE)/apt-inst/makefile |cut -d '=' -f 2) LIBAPTINST_MINOR=$(shell egrep '^MINOR=' $(BASE)/apt-inst/makefile |cut -d '=' -f 2) - -# FIXME: In previous releases this lovely variable includes -# the detected libc and libdc++ version. As this is bogus we -# want to drop this, but this a ABI break. -# And we don't want to do this now. So we hardcode a value here, -# and drop it later on (hopefully as fast as possible). -LIBEXT=-libc6.9-6 diff --git a/debian/rules b/debian/rules index 37c96ef20..f179baa37 100755 --- a/debian/rules +++ b/debian/rules @@ -78,21 +78,21 @@ APT_UTILS=ftparchive sortpkgs extracttemplates include buildlib/libversion.mak # Determine which package we should provide in the control files -LIBAPTPKG_PROVIDE=libapt-pkg$(LIBEXT)-$(LIBAPTPKG_MAJOR) -LIBAPTINST_PROVIDE=libapt-inst$(LIBEXT)-$(LIBAPTINST_MAJOR) +LIBAPTPKG_PROVIDE=libapt-pkg-$(LIBAPTPKG_MAJOR) +LIBAPTINST_PROVIDE=libapt-inst-$(LIBAPTINST_MAJOR) debian/shlibs.local: apt-pkg/makefile # We have 3 shlibs.local files.. One for 'apt', one for 'apt-utils' and # one for the rest of the packages. This ensures that each package gets # the right overrides.. rm -rf $@ $@.apt $@.apt-utils - echo "libapt-pkg$(LIBEXT) $(LIBAPTPKG_MAJOR)" > $@.apt + echo "libapt-pkg $(LIBAPTPKG_MAJOR)" > $@.apt - echo "libapt-pkg$(LIBEXT) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils - echo "libapt-inst$(LIBEXT) $(LIBAPTINST_MAJOR)" >> $@.apt-utils + echo "libapt-pkg $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils + echo "libapt-inst $(LIBAPTINST_MAJOR)" >> $@.apt-utils - echo "libapt-pkg$(LIBEXT) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@ - echo "libapt-inst$(LIBEXT) $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@ + echo "libapt-pkg $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@ + echo "libapt-inst $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@ build: build/build-stamp build-doc: build/build-doc-stamp -- cgit v1.2.3 From 503a2291469474f1af94e79931e3b00c24240cb0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 18 Feb 2010 01:59:50 +0100 Subject: * debian/rules: - remove creation of empty dir /usr/share/apt --- debian/changelog | 2 ++ debian/rules | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f0ab5025b..856e356b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,8 @@ apt (0.7.26) UNRELEASED; urgency=low - update with no changes to debian policy 3.8.4 * doc/apt_preferences.5.xml: - explicitly warn against careless use (Closes: #567669) + * debian/rules: + - remove creation of empty dir /usr/share/apt [ Ivan Masár ] * Slovak translation update. Closes: #568294 diff --git a/debian/rules b/debian/rules index f179baa37..ab384b123 100755 --- a/debian/rules +++ b/debian/rules @@ -190,7 +190,7 @@ apt: build build-doc debian/shlibs.local dh_testdir -p$@ dh_testroot -p$@ dh_clean -p$@ -k - dh_installdirs -p$@ /usr/share/bug/$@ /usr/share/$@ + dh_installdirs -p$@ # # apt install # -- cgit v1.2.3 From 3c5a611808e7af5aec4c2ab12ce0bce79f74928d Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 18 Feb 2010 02:15:23 +0100 Subject: * doc/apt-cdrom.8.xml: - fix typo spotted by lintian: proc(c)eed --- debian/changelog | 2 ++ doc/apt-cdrom.8.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 856e356b7..dbeed4502 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,8 @@ apt (0.7.26) UNRELEASED; urgency=low - explicitly warn against careless use (Closes: #567669) * debian/rules: - remove creation of empty dir /usr/share/apt + * doc/apt-cdrom.8.xml: + - fix typo spotted by lintian: proc(c)eed [ Ivan Masár ] * Slovak translation update. Closes: #568294 diff --git a/doc/apt-cdrom.8.xml b/doc/apt-cdrom.8.xml index e57942610..423569fc1 100644 --- a/doc/apt-cdrom.8.xml +++ b/doc/apt-cdrom.8.xml @@ -65,7 +65,7 @@ add add is used to add a new disc to the source list. It will unmount the - CDROM device, prompt for a disk to be inserted and then procceed to + CDROM device, prompt for a disk to be inserted and then proceed to scan it and copy the index files. If the disc does not have a proper disk directory you will be prompted for a descriptive title. -- cgit v1.2.3 From 0fd68707605f42741574304e5d51582fe298a4b0 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 18 Feb 2010 21:06:47 +0100 Subject: refreshed po/ doc/po files --- debian/changelog | 4 +- doc/po/apt-doc.pot | 538 +++++++++++++++++++++++++----------------------- doc/po/de.po | 584 ++++++++++++++++++++++++++++++----------------------- doc/po/es.po | 577 +++++++++++++++++++++++++++++----------------------- doc/po/fr.po | 583 +++++++++++++++++++++++++++++----------------------- doc/po/it.po | 541 ++++++++++++++++++++++++++----------------------- doc/po/ja.po | 563 ++++++++++++++++++++++++++++----------------------- doc/po/pl.po | 541 ++++++++++++++++++++++++++----------------------- doc/po/pt_BR.po | 543 ++++++++++++++++++++++++++----------------------- po/ar.po | 353 +++++++++++++++++--------------- po/ast.po | 367 +++++++++++++++++---------------- po/bg.po | 367 +++++++++++++++++---------------- po/bs.po | 351 +++++++++++++++++--------------- po/ca.po | 367 +++++++++++++++++---------------- po/cs.po | 367 +++++++++++++++++---------------- po/cy.po | 365 +++++++++++++++++---------------- po/da.po | 366 +++++++++++++++++---------------- po/de.po | 367 +++++++++++++++++---------------- po/dz.po | 368 +++++++++++++++++---------------- po/el.po | 367 +++++++++++++++++---------------- po/en_GB.po | 367 +++++++++++++++++---------------- po/es.po | 367 +++++++++++++++++---------------- po/eu.po | 367 +++++++++++++++++---------------- po/fi.po | 367 +++++++++++++++++---------------- po/gl.po | 367 +++++++++++++++++---------------- po/hu.po | 367 +++++++++++++++++---------------- po/it.po | 1 - po/ja.po | 367 +++++++++++++++++---------------- po/km.po | 368 +++++++++++++++++---------------- po/ko.po | 367 +++++++++++++++++---------------- po/ku.po | 360 +++++++++++++++++---------------- po/lt.po | 364 +++++++++++++++++---------------- po/mr.po | 367 +++++++++++++++++---------------- po/nb.po | 367 +++++++++++++++++---------------- po/ne.po | 367 +++++++++++++++++---------------- po/nl.po | 367 +++++++++++++++++---------------- po/nn.po | 365 +++++++++++++++++---------------- po/pl.po | 367 +++++++++++++++++---------------- po/pt.po | 367 +++++++++++++++++---------------- po/pt_BR.po | 367 +++++++++++++++++---------------- po/ro.po | 367 +++++++++++++++++---------------- po/ru.po | 388 ++++++++++++++++++----------------- po/sk.po | 4 - po/sl.po | 365 +++++++++++++++++---------------- po/sv.po | 367 +++++++++++++++++---------------- po/th.po | 367 +++++++++++++++++---------------- po/tl.po | 366 +++++++++++++++++---------------- po/uk.po | 365 +++++++++++++++++---------------- po/vi.po | 367 +++++++++++++++++---------------- po/zh_CN.po | 366 +++++++++++++++++---------------- po/zh_TW.po | 367 +++++++++++++++++---------------- 51 files changed, 10234 insertions(+), 8897 deletions(-) diff --git a/debian/changelog b/debian/changelog index 69edf559b..558fd8b10 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.26) UNRELEASED; urgency=low +apt (0.7.26~exp1) experimental; urgency=low [ David Kalnischkies ] * [BREAK] add possibility to download and use multiply @@ -60,7 +60,7 @@ apt (0.7.26) UNRELEASED; urgency=low useful when using several different archives on the same host. (Closes: #329814, LP: #22354) - -- Michael Vogt Fri, 18 Dec 2009 16:54:18 +0100 + -- Michael Vogt Thu, 18 Feb 2010 16:11:39 +0100 apt (0.7.25.3) unstable; urgency=low diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 40ed1f589..f3b50640c 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-01-20 12:18+0100\n" +"POT-Creation-Date: 2010-02-18 20:53+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -894,7 +894,7 @@ msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 sources.list.5.xml:33 +#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125 apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 sources.list.5.xml:33 msgid "Description" msgstr "" @@ -1284,7 +1284,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 +#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 msgid "options" msgstr "" @@ -1307,7 +1307,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376 apt-sortpkgs.1.xml:58 +#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376 apt-sortpkgs.1.xml:58 msgid "<option>-s</option>" msgstr "" @@ -1327,12 +1327,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>-q</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>--quiet</option>" msgstr "" @@ -1381,7 +1381,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 +#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548 msgid "<option>-a</option>" msgstr "" @@ -1477,12 +1477,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 apt-sortpkgs.1.xml:64 +#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:554 apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1035 apt_preferences.5.xml:622 +#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1035 apt_preferences.5.xml:630 msgid "Files" msgstr "" @@ -1492,7 +1492,7 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 sources.list.5.xml:233 +#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637 sources.list.5.xml:233 msgid "See Also" msgstr "" @@ -1502,7 +1502,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 +#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "" @@ -1566,7 +1566,7 @@ msgstr "" #: apt-cdrom.8.xml:66 msgid "" "<literal>add</literal> is used to add a new disc to the source list. It will " -"unmount the CDROM device, prompt for a disk to be inserted and then procceed " +"unmount the CDROM device, prompt for a disk to be inserted and then proceed " "to scan it and copy the index files. If the disc does not have a proper " "<filename>disk</filename> directory you will be prompted for a descriptive " "title." @@ -1606,7 +1606,7 @@ msgid "Options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328 +#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328 msgid "<option>-d</option>" msgstr "" @@ -1750,7 +1750,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:53 apt-ftparchive.1.xml:71 +#: apt-config.8.xml:53 apt-ftparchive.1.xml:72 msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given " "one of the commands below must be present." @@ -1801,7 +1801,7 @@ msgid "Just show the contents of the configuration space." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 apt-sortpkgs.1.xml:70 +#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593 apt-sortpkgs.1.xml:70 msgid "&apt-conf;" msgstr "" @@ -1910,7 +1910,8 @@ msgid "" "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " "<arg><option>--readonly</option></arg> " -"<arg><option>--contents</option></arg> <arg><option>-o " +"<arg><option>--contents</option></arg> <arg><option>--arch " +"<replaceable>architecture</replaceable></option></arg> <arg><option>-o " "<replaceable>config</replaceable>=<replaceable>string</replaceable></option></arg> " "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group " "choice=\"req\"> <arg>packages<arg choice=\"plain\" " @@ -1929,7 +1930,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:56 +#: apt-ftparchive.1.xml:57 msgid "" "<command>apt-ftparchive</command> is the command line tool that generates " "the index files that APT uses to access a distribution source. The index " @@ -1938,7 +1939,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:60 +#: apt-ftparchive.1.xml:61 msgid "" "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; " "program, incorporating its entire functionality via the " @@ -1948,7 +1949,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:66 +#: apt-ftparchive.1.xml:67 msgid "" "Internally <command>apt-ftparchive</command> can make use of binary " "databases to cache the contents of a .deb file and it does not rely on any " @@ -1958,12 +1959,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:75 +#: apt-ftparchive.1.xml:76 msgid "packages" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:77 +#: apt-ftparchive.1.xml:78 msgid "" "The packages command generates a package file from a directory tree. It " "takes the given directory and recursively searches it for .deb files, " @@ -1972,17 +1973,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106 +#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107 msgid "The option <option>--db</option> can be used to specify a binary caching DB." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:85 +#: apt-ftparchive.1.xml:86 msgid "sources" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:87 +#: apt-ftparchive.1.xml:88 msgid "" "The <literal>sources</literal> command generates a source index file from a " "directory tree. It takes the given directory and recursively searches it " @@ -1991,7 +1992,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:92 +#: apt-ftparchive.1.xml:93 msgid "" "If an override file is specified then a source override file will be looked " "for with an extension of .src. The --source-override option can be used to " @@ -1999,12 +2000,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:97 +#: apt-ftparchive.1.xml:98 msgid "contents" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:99 +#: apt-ftparchive.1.xml:100 msgid "" "The <literal>contents</literal> command generates a contents file from a " "directory tree. It takes the given directory and recursively searches it for " @@ -2015,12 +2016,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:109 +#: apt-ftparchive.1.xml:110 msgid "release" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:111 +#: apt-ftparchive.1.xml:112 msgid "" "The <literal>release</literal> command generates a Release file from a " "directory tree. It recursively searches the given directory for Packages, " @@ -2030,7 +2031,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:118 +#: apt-ftparchive.1.xml:119 msgid "" "Values for the additional metadata fields in the Release file are taken from " "the corresponding variables under " @@ -2044,12 +2045,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:128 +#: apt-ftparchive.1.xml:129 msgid "generate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:130 +#: apt-ftparchive.1.xml:131 msgid "" "The <literal>generate</literal> command is designed to be runnable from a " "cron script and builds indexes according to the given config file. The " @@ -2059,24 +2060,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:137 apt-get.8.xml:292 +#: apt-ftparchive.1.xml:138 apt-get.8.xml:292 msgid "clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:139 +#: apt-ftparchive.1.xml:140 msgid "" "The <literal>clean</literal> command tidies the databases used by the given " "configuration file by removing any records that are no longer necessary." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:145 +#: apt-ftparchive.1.xml:146 msgid "The Generate Configuration" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:147 +#: apt-ftparchive.1.xml:148 msgid "" "The <literal>generate</literal> command uses a configuration file to " "describe the archives that are going to be generated. It follows the typical " @@ -2087,17 +2088,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:155 +#: apt-ftparchive.1.xml:156 msgid "The generate configuration has 4 separate sections, each described below." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:157 +#: apt-ftparchive.1.xml:158 msgid "Dir Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:159 +#: apt-ftparchive.1.xml:160 msgid "" "The <literal>Dir</literal> section defines the standard directories needed " "to locate the files required during the generation process. These " @@ -2106,12 +2107,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:164 +#: apt-ftparchive.1.xml:165 msgid "ArchiveDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:166 +#: apt-ftparchive.1.xml:167 msgid "" "Specifies the root of the FTP archive, in a standard Debian configuration " "this is the directory that contains the <filename>ls-LR</filename> and dist " @@ -2119,44 +2120,44 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:171 +#: apt-ftparchive.1.xml:172 msgid "OverrideDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:173 +#: apt-ftparchive.1.xml:174 msgid "Specifies the location of the override files." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:176 +#: apt-ftparchive.1.xml:177 msgid "CacheDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:178 +#: apt-ftparchive.1.xml:179 msgid "Specifies the location of the cache files" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:181 +#: apt-ftparchive.1.xml:182 msgid "FileListDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:183 +#: apt-ftparchive.1.xml:184 msgid "" "Specifies the location of the file list files, if the " "<literal>FileList</literal> setting is used below." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:189 +#: apt-ftparchive.1.xml:190 msgid "Default Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:191 +#: apt-ftparchive.1.xml:192 msgid "" "The <literal>Default</literal> section specifies default values, and " "settings that control the operation of the generator. Other sections may " @@ -2164,12 +2165,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:195 +#: apt-ftparchive.1.xml:196 msgid "Packages::Compress" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:197 +#: apt-ftparchive.1.xml:198 msgid "" "Sets the default compression schemes to use for the Package index files. It " "is a string that contains a space separated list of at least one of: '.' (no " @@ -2178,60 +2179,60 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:203 +#: apt-ftparchive.1.xml:204 msgid "Packages::Extensions" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:205 +#: apt-ftparchive.1.xml:206 msgid "" "Sets the default list of file extensions that are package files. This " "defaults to '.deb'." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:209 +#: apt-ftparchive.1.xml:210 msgid "Sources::Compress" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:211 +#: apt-ftparchive.1.xml:212 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Sources files." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:215 +#: apt-ftparchive.1.xml:216 msgid "Sources::Extensions" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:217 +#: apt-ftparchive.1.xml:218 msgid "" "Sets the default list of file extensions that are source files. This " "defaults to '.dsc'." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:221 +#: apt-ftparchive.1.xml:222 msgid "Contents::Compress" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:223 +#: apt-ftparchive.1.xml:224 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Contents files." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:227 +#: apt-ftparchive.1.xml:228 msgid "DeLinkLimit" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:229 +#: apt-ftparchive.1.xml:230 msgid "" "Specifies the number of kilobytes to delink (and replace with hard links) " "per run. This is used in conjunction with the per-section " @@ -2239,24 +2240,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:234 +#: apt-ftparchive.1.xml:235 msgid "FileMode" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:236 +#: apt-ftparchive.1.xml:237 msgid "" "Specifies the mode of all created index files. It defaults to 0644. All " "index files are set to this mode with no regard to the umask." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:243 +#: apt-ftparchive.1.xml:244 msgid "TreeDefault Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:245 +#: apt-ftparchive.1.xml:246 msgid "" "Sets defaults specific to <literal>Tree</literal> sections. All of these " "variables are substitution variables and have the strings $(DIST), " @@ -2264,12 +2265,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:250 +#: apt-ftparchive.1.xml:251 msgid "MaxContentsChange" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:252 +#: apt-ftparchive.1.xml:253 msgid "" "Sets the number of kilobytes of contents files that are generated each " "day. The contents files are round-robined so that over several days they " @@ -2277,12 +2278,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:257 +#: apt-ftparchive.1.xml:258 msgid "ContentsAge" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:259 +#: apt-ftparchive.1.xml:260 msgid "" "Controls the number of days a contents file is allowed to be checked without " "changing. If this limit is passed the mtime of the contents file is " @@ -2293,60 +2294,60 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:268 +#: apt-ftparchive.1.xml:269 msgid "Directory" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:270 +#: apt-ftparchive.1.xml:271 msgid "" "Sets the top of the .deb directory tree. Defaults to " "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:274 +#: apt-ftparchive.1.xml:275 msgid "SrcDirectory" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:276 +#: apt-ftparchive.1.xml:277 msgid "" "Sets the top of the source package directory tree. Defaults to " "<filename>$(DIST)/$(SECTION)/source/</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406 +#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407 msgid "Packages" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:282 +#: apt-ftparchive.1.xml:283 msgid "" "Sets the output Packages file. Defaults to " "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411 +#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412 msgid "Sources" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:288 +#: apt-ftparchive.1.xml:289 msgid "" "Sets the output Sources file. Defaults to " "<filename>$(DIST)/$(SECTION)/source/Sources</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:292 +#: apt-ftparchive.1.xml:293 msgid "InternalPrefix" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:294 +#: apt-ftparchive.1.xml:295 msgid "" "Sets the path prefix that causes a symlink to be considered an internal link " "instead of an external link. Defaults to " @@ -2354,12 +2355,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417 +#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418 msgid "Contents" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:301 +#: apt-ftparchive.1.xml:302 msgid "" "Sets the output Contents file. Defaults to " "<filename>$(DIST)/Contents-$(ARCH)</filename>. If this setting causes " @@ -2369,34 +2370,34 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:308 +#: apt-ftparchive.1.xml:309 msgid "Contents::Header" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:310 +#: apt-ftparchive.1.xml:311 msgid "Sets header file to prepend to the contents output." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442 +#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443 msgid "BinCacheDB" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:315 +#: apt-ftparchive.1.xml:316 msgid "" "Sets the binary cache database to use for this section. Multiple sections " "can share the same database." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:319 +#: apt-ftparchive.1.xml:320 msgid "FileList" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:321 +#: apt-ftparchive.1.xml:322 msgid "" "Specifies that instead of walking the directory tree, " "<command>apt-ftparchive</command> should read the list of files from the " @@ -2404,12 +2405,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:326 +#: apt-ftparchive.1.xml:327 msgid "SourceFileList" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:328 +#: apt-ftparchive.1.xml:329 msgid "" "Specifies that instead of walking the directory tree, " "<command>apt-ftparchive</command> should read the list of files from the " @@ -2418,12 +2419,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:336 +#: apt-ftparchive.1.xml:337 msgid "Tree Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:338 +#: apt-ftparchive.1.xml:339 msgid "" "The <literal>Tree</literal> section defines a standard Debian file tree " "which consists of a base directory, then multiple sections in that base " @@ -2433,7 +2434,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:343 +#: apt-ftparchive.1.xml:344 msgid "" "The <literal>Tree</literal> section takes a scope tag which sets the " "<literal>$(DIST)</literal> variable and defines the root of the tree (the " @@ -2442,7 +2443,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:348 +#: apt-ftparchive.1.xml:349 msgid "" "All of the settings defined in the <literal>TreeDefault</literal> section " "can be use in a <literal>Tree</literal> section as well as three new " @@ -2450,7 +2451,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt-ftparchive.1.xml:354 +#: apt-ftparchive.1.xml:355 #, no-wrap msgid "" "for i in Sections do \n" @@ -2460,7 +2461,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:351 +#: apt-ftparchive.1.xml:352 msgid "" "When processing a <literal>Tree</literal> section " "<command>apt-ftparchive</command> performs an operation similar to: " @@ -2468,12 +2469,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:360 +#: apt-ftparchive.1.xml:361 msgid "Sections" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:362 +#: apt-ftparchive.1.xml:363 msgid "" "This is a space separated list of sections which appear under the " "distribution, typically this is something like <literal>main contrib " @@ -2481,12 +2482,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:367 +#: apt-ftparchive.1.xml:368 msgid "Architectures" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:369 +#: apt-ftparchive.1.xml:370 msgid "" "This is a space separated list of all the architectures that appear under " "search section. The special architecture 'source' is used to indicate that " @@ -2494,56 +2495,56 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422 +#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423 msgid "BinOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:376 +#: apt-ftparchive.1.xml:377 msgid "" "Sets the binary override file. The override file contains section, priority " "and maintainer address information." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427 +#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428 msgid "SrcOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:382 +#: apt-ftparchive.1.xml:383 msgid "" "Sets the source override file. The override file contains section " "information." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432 +#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433 msgid "ExtraOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434 +#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435 msgid "Sets the binary extra override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437 +#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438 msgid "SrcExtraOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439 +#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440 msgid "Sets the source extra override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:398 +#: apt-ftparchive.1.xml:399 msgid "BinDirectory Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:400 +#: apt-ftparchive.1.xml:401 msgid "" "The <literal>bindirectory</literal> section defines a binary directory tree " "with no special structure. The scope tag specifies the location of the " @@ -2553,64 +2554,64 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:408 +#: apt-ftparchive.1.xml:409 msgid "Sets the Packages file output." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:413 +#: apt-ftparchive.1.xml:414 msgid "" "Sets the Sources file output. At least one of <literal>Packages</literal> or " "<literal>Sources</literal> is required." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:419 +#: apt-ftparchive.1.xml:420 msgid "Sets the Contents file output. (optional)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:424 +#: apt-ftparchive.1.xml:425 msgid "Sets the binary override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:429 +#: apt-ftparchive.1.xml:430 msgid "Sets the source override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:444 +#: apt-ftparchive.1.xml:445 msgid "Sets the cache DB." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:447 +#: apt-ftparchive.1.xml:448 msgid "PathPrefix" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:449 +#: apt-ftparchive.1.xml:450 msgid "Appends a path to all the output paths." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:452 +#: apt-ftparchive.1.xml:453 msgid "FileList, SourceFileList" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:454 +#: apt-ftparchive.1.xml:455 msgid "Specifies the file list file." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:461 +#: apt-ftparchive.1.xml:462 msgid "The Binary Override File" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:462 +#: apt-ftparchive.1.xml:463 msgid "" "The binary override file is fully compatible with &dpkg-scanpackages;. It " "contains 4 fields separated by spaces. The first field is the package name, " @@ -2620,19 +2621,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:468 +#: apt-ftparchive.1.xml:469 #, no-wrap msgid "old [// oldn]* => new" msgstr "" #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:470 +#: apt-ftparchive.1.xml:471 #, no-wrap msgid "new" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:467 +#: apt-ftparchive.1.xml:468 msgid "" "The general form of the maintainer field is: <placeholder " "type=\"literallayout\" id=\"0\"/> or simply, <placeholder " @@ -2643,12 +2644,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:478 +#: apt-ftparchive.1.xml:479 msgid "The Source Override File" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:480 +#: apt-ftparchive.1.xml:481 msgid "" "The source override file is fully compatible with &dpkg-scansources;. It " "contains 2 fields separated by spaces. The first fields is the source " @@ -2656,12 +2657,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:485 +#: apt-ftparchive.1.xml:486 msgid "The Extra Override File" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:487 +#: apt-ftparchive.1.xml:488 msgid "" "The extra override file allows any arbitrary tag to be added or replaced in " "the output. It has 3 columns, the first is the package, the second is the " @@ -2669,12 +2670,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:496 +#: apt-ftparchive.1.xml:497 msgid "<option>--md5</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:498 +#: apt-ftparchive.1.xml:499 msgid "" "Generate MD5 sums. This defaults to on, when turned off the generated index " "files will not have MD5Sum fields where possible. Configuration Item: " @@ -2682,19 +2683,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:503 +#: apt-ftparchive.1.xml:504 msgid "<option>--db</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:505 +#: apt-ftparchive.1.xml:506 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:511 +#: apt-ftparchive.1.xml:512 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -2703,12 +2704,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:517 +#: apt-ftparchive.1.xml:518 msgid "<option>--delink</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:519 +#: apt-ftparchive.1.xml:520 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -2717,12 +2718,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:525 +#: apt-ftparchive.1.xml:526 msgid "<option>--contents</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:527 +#: apt-ftparchive.1.xml:528 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -2732,12 +2733,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:535 +#: apt-ftparchive.1.xml:536 msgid "<option>--source-override</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:537 +#: apt-ftparchive.1.xml:538 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: " @@ -2745,26 +2746,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:541 +#: apt-ftparchive.1.xml:542 msgid "<option>--readonly</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:543 +#: apt-ftparchive.1.xml:544 msgid "" "Make the caching databases read only. Configuration Item: " "<literal>APT::FTPArchive::ReadOnlyDB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:547 -msgid "<option>APT::FTPArchive::AlwaysStat</option>" +#: apt-ftparchive.1.xml:548 +msgid "<option>--arch</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 msgid "" -"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " +"Accept in the <literal>packages</literal> and <literal>contents</literal> " +"commands only package files matching <literal>*_arch.deb</literal> or " +"<literal>*_all.deb</literal> instead of all package files in the given " +"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:555 +msgid "<option>APT::FTPArchive::AlwaysStat</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:557 +msgid "" +"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " "will lead to problems as the now outdated cached metadata like size and " "checksums will be used. With this option enabled this will no longer happen " @@ -2776,12 +2791,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:559 +#: apt-ftparchive.1.xml:567 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:561 +#: apt-ftparchive.1.xml:569 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -2791,12 +2806,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 sources.list.5.xml:193 +#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477 sources.list.5.xml:193 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:579 +#: apt-ftparchive.1.xml:587 #, no-wrap msgid "" "<command>apt-ftparchive</command> packages " @@ -2805,14 +2820,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:575 +#: apt-ftparchive.1.xml:583 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:589 +#: apt-ftparchive.1.xml:597 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -5875,7 +5890,7 @@ msgstr "" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt_preferences.5.xml:13 -msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" +msgid "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>" msgstr "" #. type: Content of: <refentry><refnamediv><refname> @@ -5923,6 +5938,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 msgid "" +"Preferences are a strong power in the hands of a system administrator but " +"they can become also their biggest nightmare if used without care! APT will " +"not questioning the preferences so wrong settings will therefore lead to " +"uninstallable packages or wrong decisions while upgrading packages. Even " +"more problems will arise if multiply distribution releases are mixed without " +"a good understanding of the following paragraphs. You have been warned." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:64 +msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " "following naming convention: The files have no or " @@ -5932,12 +5958,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:63 +#: apt_preferences.5.xml:71 msgid "APT's Default Priority Assignments" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:86 #, no-wrap msgid "" "<command>apt-get install -t testing " @@ -5945,13 +5971,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:81 +#: apt_preferences.5.xml:89 #, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:65 +#: apt_preferences.5.xml:73 msgid "" "If there is no preferences file or if there is no entry in the file that " "applies to a particular version then the priority assigned to that version " @@ -5968,39 +5994,39 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:90 +#: apt_preferences.5.xml:98 msgid "priority 100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:91 +#: apt_preferences.5.xml:99 msgid "to the version that is already installed (if any)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:95 +#: apt_preferences.5.xml:103 msgid "priority 500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:96 +#: apt_preferences.5.xml:104 msgid "" "to the versions that are not installed and do not belong to the target " "release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:100 +#: apt_preferences.5.xml:108 msgid "priority 990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:101 +#: apt_preferences.5.xml:109 msgid "to the versions that are not installed and belong to the target release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:85 +#: apt_preferences.5.xml:93 msgid "" "If the target release has been specified then APT uses the following " "algorithm to set the priorities of the versions of a package. Assign: " @@ -6008,7 +6034,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:106 +#: apt_preferences.5.xml:114 msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " @@ -6016,14 +6042,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:110 +#: apt_preferences.5.xml:118 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 +#: apt_preferences.5.xml:121 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -6033,19 +6059,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:119 +#: apt_preferences.5.xml:127 msgid "Install the highest priority version." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:120 +#: apt_preferences.5.xml:128 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:123 +#: apt_preferences.5.xml:131 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the " @@ -6053,7 +6079,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:137 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@ -6064,7 +6090,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:136 +#: apt_preferences.5.xml:144 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@ -6074,7 +6100,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:141 +#: apt_preferences.5.xml:149 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@ -6086,12 +6112,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:150 +#: apt_preferences.5.xml:158 msgid "The Effect of APT Preferences" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:152 +#: apt_preferences.5.xml:160 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -6100,7 +6126,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:166 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@ -6110,7 +6136,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:165 +#: apt_preferences.5.xml:173 #, no-wrap msgid "" "Package: perl\n" @@ -6119,7 +6145,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:171 +#: apt_preferences.5.xml:179 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@ -6129,7 +6155,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:177 +#: apt_preferences.5.xml:185 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@ -6137,7 +6163,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:182 +#: apt_preferences.5.xml:190 #, no-wrap msgid "" "Package: *\n" @@ -6146,7 +6172,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:187 +#: apt_preferences.5.xml:195 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " "This should not be confused with the Origin of a distribution as specified " @@ -6156,7 +6182,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:193 +#: apt_preferences.5.xml:201 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is " @@ -6164,7 +6190,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:197 +#: apt_preferences.5.xml:205 #, no-wrap msgid "" "Package: *\n" @@ -6173,7 +6199,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:202 +#: apt_preferences.5.xml:210 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is " @@ -6181,7 +6207,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:206 +#: apt_preferences.5.xml:214 #, no-wrap msgid "" "Package: *\n" @@ -6190,7 +6216,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:211 +#: apt_preferences.5.xml:219 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -6198,7 +6224,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:216 +#: apt_preferences.5.xml:224 #, no-wrap msgid "" "Package: *\n" @@ -6207,82 +6233,82 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:227 +#: apt_preferences.5.xml:235 msgid "How APT Interprets Priorities" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:235 +#: apt_preferences.5.xml:243 msgid "P > 1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:236 +#: apt_preferences.5.xml:244 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:248 msgid "990 < P <=1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:241 +#: apt_preferences.5.xml:249 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:254 msgid "500 < P <=990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:247 +#: apt_preferences.5.xml:255 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:260 msgid "100 < P <=500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:253 +#: apt_preferences.5.xml:261 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:258 +#: apt_preferences.5.xml:266 msgid "0 < P <=100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:259 +#: apt_preferences.5.xml:267 msgid "" "causes a version to be installed only if there is no installed version of " "the package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:263 +#: apt_preferences.5.xml:271 msgid "P < 0" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:264 +#: apt_preferences.5.xml:272 msgid "prevents the version from being installed" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:230 +#: apt_preferences.5.xml:238 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -6290,7 +6316,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:269 +#: apt_preferences.5.xml:277 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -6299,14 +6325,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:275 +#: apt_preferences.5.xml:283 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:279 +#: apt_preferences.5.xml:287 #, no-wrap msgid "" "Package: perl\n" @@ -6323,12 +6349,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:300 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:294 +#: apt_preferences.5.xml:302 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -6338,7 +6364,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:299 +#: apt_preferences.5.xml:307 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -6346,7 +6372,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:303 +#: apt_preferences.5.xml:311 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an " @@ -6355,12 +6381,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:313 +#: apt_preferences.5.xml:321 msgid "Determination of Package Version and Distribution Properties" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:315 +#: apt_preferences.5.xml:323 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -6368,27 +6394,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:327 +#: apt_preferences.5.xml:335 msgid "the <literal>Package:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:328 +#: apt_preferences.5.xml:336 msgid "gives the package name" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 +#: apt_preferences.5.xml:339 apt_preferences.5.xml:389 msgid "the <literal>Version:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:332 +#: apt_preferences.5.xml:340 msgid "gives the version number for the named package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:319 +#: apt_preferences.5.xml:327 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>: " @@ -6400,12 +6426,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:348 +#: apt_preferences.5.xml:356 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:349 +#: apt_preferences.5.xml:357 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -6416,18 +6442,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:367 #, no-wrap msgid "Pin: release a=stable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:365 +#: apt_preferences.5.xml:373 msgid "the <literal>Codename:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:366 +#: apt_preferences.5.xml:374 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: squeeze\" specifies that all of the " @@ -6438,13 +6464,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:383 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:382 +#: apt_preferences.5.xml:390 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -6455,7 +6481,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:391 +#: apt_preferences.5.xml:399 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -6464,12 +6490,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:400 +#: apt_preferences.5.xml:408 msgid "the <literal>Component:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:401 +#: apt_preferences.5.xml:409 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -6481,18 +6507,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:410 +#: apt_preferences.5.xml:418 #, no-wrap msgid "Pin: release c=main\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:424 msgid "the <literal>Origin:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:417 +#: apt_preferences.5.xml:425 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is " @@ -6501,18 +6527,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:423 +#: apt_preferences.5.xml:431 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:437 msgid "the <literal>Label:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:430 +#: apt_preferences.5.xml:438 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is " @@ -6521,13 +6547,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:444 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:337 +#: apt_preferences.5.xml:345 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -6541,7 +6567,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:443 +#: apt_preferences.5.xml:451 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -6556,12 +6582,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:456 +#: apt_preferences.5.xml:464 msgid "Optional Lines in an APT Preferences Record" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:458 +#: apt_preferences.5.xml:466 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -6569,7 +6595,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:462 +#: apt_preferences.5.xml:470 msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " "optional. If omitted, APT assigns a priority of 1 less than the last value " @@ -6578,12 +6604,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:471 +#: apt_preferences.5.xml:479 msgid "Tracking Stable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:479 +#: apt_preferences.5.xml:487 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -6598,7 +6624,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:473 +#: apt_preferences.5.xml:481 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -6608,7 +6634,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 apt_preferences.5.xml:600 +#: apt_preferences.5.xml:504 apt_preferences.5.xml:550 apt_preferences.5.xml:608 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -6617,7 +6643,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:491 +#: apt_preferences.5.xml:499 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -6626,13 +6652,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:508 +#: apt_preferences.5.xml:516 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:502 +#: apt_preferences.5.xml:510 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -6641,12 +6667,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:514 +#: apt_preferences.5.xml:522 msgid "Tracking Testing or Unstable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:523 +#: apt_preferences.5.xml:531 #, no-wrap msgid "" "Package: *\n" @@ -6663,7 +6689,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:524 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -6674,7 +6700,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:537 +#: apt_preferences.5.xml:545 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -6683,13 +6709,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:565 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:548 +#: apt_preferences.5.xml:556 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -6701,12 +6727,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:564 +#: apt_preferences.5.xml:572 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:578 +#: apt_preferences.5.xml:586 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package " @@ -6728,7 +6754,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:566 +#: apt_preferences.5.xml:574 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -6743,7 +6769,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:595 +#: apt_preferences.5.xml:603 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -6752,13 +6778,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:615 +#: apt_preferences.5.xml:623 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:606 +#: apt_preferences.5.xml:614 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -6770,12 +6796,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:624 +#: apt_preferences.5.xml:632 msgid "&file-preferences;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:630 +#: apt_preferences.5.xml:638 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "" diff --git a/doc/po/de.po b/doc/po/de.po index f9d374a6d..99d56bed3 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.7.24\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2010-01-20 12:18+0100\n" +"POT-Creation-Date: 2010-02-18 20:53+0100\n" "PO-Revision-Date: 2009-12-31 17:41+GMT\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -1217,7 +1217,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 -#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 +#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125 #: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 #: sources.list.5.xml:33 @@ -1750,7 +1750,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 -#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 +#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 #: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 msgid "options" msgstr "Optionen" @@ -1778,7 +1778,7 @@ msgstr "" "pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376 +#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376 #: apt-sortpkgs.1.xml:58 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1806,12 +1806,12 @@ msgstr "" "srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1870,7 +1870,7 @@ msgstr "" "Konfigurationselement: <literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 +#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1987,14 +1987,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 -#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 +#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:554 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:630 msgid "Files" msgstr "Dateien" @@ -2005,9 +2005,9 @@ msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 +#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637 #: sources.list.5.xml:233 msgid "See Also" msgstr "Siehe auch" @@ -2019,7 +2019,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 +#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:575 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "Diagnose" @@ -2099,9 +2099,16 @@ msgstr "add" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:66 +#, fuzzy +#| msgid "" +#| "<literal>add</literal> is used to add a new disc to the source list. It " +#| "will unmount the CDROM device, prompt for a disk to be inserted and then " +#| "procceed to scan it and copy the index files. If the disc does not have a " +#| "proper <filename>disk</filename> directory you will be prompted for a " +#| "descriptive title." msgid "" "<literal>add</literal> is used to add a new disc to the source list. It will " -"unmount the CDROM device, prompt for a disk to be inserted and then procceed " +"unmount the CDROM device, prompt for a disk to be inserted and then proceed " "to scan it and copy the index files. If the disc does not have a proper " "<filename>disk</filename> directory you will be prompted for a descriptive " "title." @@ -2154,7 +2161,7 @@ msgid "Options" msgstr "Optionen" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328 +#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328 msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -2330,7 +2337,7 @@ msgstr "" "Anwendungen zu benutzen ist." #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:53 apt-ftparchive.1.xml:71 +#: apt-config.8.xml:53 apt-ftparchive.1.xml:72 msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given " "one of the commands below must be present." @@ -2397,7 +2404,7 @@ msgid "Just show the contents of the configuration space." msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt." #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 +#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593 #: apt-sortpkgs.1.xml:70 msgid "&apt-conf;" msgstr "&apt-conf;" @@ -2528,10 +2535,32 @@ msgstr "Hilfsprogramm zum Generieren von Indexdateien" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-ftparchive.1.xml:36 +#, fuzzy +#| msgid "" +#| "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " +#| "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " +#| "<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +#| "arg> <arg><option>-o <replaceable>config</" +#| "replaceable>=<replaceable>string</replaceable></option></arg> " +#| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group " +#| "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat" +#| "\"><replaceable>path</replaceable></arg><arg><replaceable>override</" +#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +#| "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</" +#| "replaceable></arg><arg><replaceable>override</" +#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +#| "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></" +#| "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</" +#| "replaceable></arg></arg> <arg>generate <arg choice=\"plain" +#| "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep=" +#| "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg " +#| "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </" +#| "group>" msgid "" "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " "<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></" "arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</" "replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></" "option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=" @@ -2568,7 +2597,7 @@ msgstr "" "arg></group>" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:56 +#: apt-ftparchive.1.xml:57 msgid "" "<command>apt-ftparchive</command> is the command line tool that generates " "the index files that APT uses to access a distribution source. The index " @@ -2581,7 +2610,7 @@ msgstr "" "Inhalts dieser Stelle generiert werden." #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:60 +#: apt-ftparchive.1.xml:61 msgid "" "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; " "program, incorporating its entire functionality via the <literal>packages</" @@ -2595,7 +2624,7 @@ msgstr "" "für ein komplettes Archiv zu »skripten«." #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:66 +#: apt-ftparchive.1.xml:67 msgid "" "Internally <command>apt-ftparchive</command> can make use of binary " "databases to cache the contents of a .deb file and it does not rely on any " @@ -2611,12 +2640,12 @@ msgstr "" "Ausgabedateien erzeugt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:75 +#: apt-ftparchive.1.xml:76 msgid "packages" msgstr "packages" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:77 +#: apt-ftparchive.1.xml:78 msgid "" "The packages command generates a package file from a directory tree. It " "takes the given directory and recursively searches it for .deb files, " @@ -2629,7 +2658,7 @@ msgstr "" "Befehl entspricht etwa &dpkg-scanpackages;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106 +#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107 msgid "" "The option <option>--db</option> can be used to specify a binary caching DB." msgstr "" @@ -2637,12 +2666,12 @@ msgstr "" "Zwischenspeichern von Programmen anzugeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:85 +#: apt-ftparchive.1.xml:86 msgid "sources" msgstr "sources" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:87 +#: apt-ftparchive.1.xml:88 msgid "" "The <literal>sources</literal> command generates a source index file from a " "directory tree. It takes the given directory and recursively searches it " @@ -2655,7 +2684,7 @@ msgstr "" "stdout ausgibt. Dieser Befehl entspricht etwa &dpkg-scansources;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:92 +#: apt-ftparchive.1.xml:93 msgid "" "If an override file is specified then a source override file will be looked " "for with an extension of .src. The --source-override option can be used to " @@ -2666,12 +2695,12 @@ msgstr "" "benutzt werden, um die Quellen-Override-Datei, die benutzt wird, zu ändern." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:97 +#: apt-ftparchive.1.xml:98 msgid "contents" msgstr "contents" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:99 +#: apt-ftparchive.1.xml:100 msgid "" "The <literal>contents</literal> command generates a contents file from a " "directory tree. It takes the given directory and recursively searches it " @@ -2689,12 +2718,12 @@ msgstr "" "getrennt in der Ausgabe." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:109 +#: apt-ftparchive.1.xml:110 msgid "release" msgstr "release" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:111 +#: apt-ftparchive.1.xml:112 msgid "" "The <literal>release</literal> command generates a Release file from a " "directory tree. It recursively searches the given directory for Packages, " @@ -2709,7 +2738,7 @@ msgstr "" "stdout, die einen MD5- und SHA1-Hash für jede Datei enthält." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:118 +#: apt-ftparchive.1.xml:119 msgid "" "Values for the additional metadata fields in the Release file are taken from " "the corresponding variables under <literal>APT::FTPArchive::Release</" @@ -2729,12 +2758,12 @@ msgstr "" "<literal>Description</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:128 +#: apt-ftparchive.1.xml:129 msgid "generate" msgstr "generate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:130 +#: apt-ftparchive.1.xml:131 msgid "" "The <literal>generate</literal> command is designed to be runnable from a " "cron script and builds indexes according to the given config file. The " @@ -2750,12 +2779,12 @@ msgstr "" "Verwaltung der erforderlichen Einstellungen bereitstellt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:137 apt-get.8.xml:292 +#: apt-ftparchive.1.xml:138 apt-get.8.xml:292 msgid "clean" msgstr "clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:139 +#: apt-ftparchive.1.xml:140 msgid "" "The <literal>clean</literal> command tidies the databases used by the given " "configuration file by removing any records that are no longer necessary." @@ -2765,12 +2794,12 @@ msgstr "" "Datensätze entfernt." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:145 +#: apt-ftparchive.1.xml:146 msgid "The Generate Configuration" msgstr "Die Generate-Konfiguration" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:147 +#: apt-ftparchive.1.xml:148 msgid "" "The <literal>generate</literal> command uses a configuration file to " "describe the archives that are going to be generated. It follows the typical " @@ -2788,7 +2817,7 @@ msgstr "" "wenn die Markierung »scope« behandelt wird." #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:155 +#: apt-ftparchive.1.xml:156 msgid "" "The generate configuration has 4 separate sections, each described below." msgstr "" @@ -2796,12 +2825,12 @@ msgstr "" "unterhalb beschrieben" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:157 +#: apt-ftparchive.1.xml:158 msgid "Dir Section" msgstr "Dir-Abschnitt" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:159 +#: apt-ftparchive.1.xml:160 msgid "" "The <literal>Dir</literal> section defines the standard directories needed " "to locate the files required during the generation process. These " @@ -2815,12 +2844,12 @@ msgstr "" "absoluten Pfad zu bilden." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:164 +#: apt-ftparchive.1.xml:165 msgid "ArchiveDir" msgstr "ArchiveDir" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:166 +#: apt-ftparchive.1.xml:167 msgid "" "Specifies the root of the FTP archive, in a standard Debian configuration " "this is the directory that contains the <filename>ls-LR</filename> and dist " @@ -2831,32 +2860,32 @@ msgstr "" "enthält." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:171 +#: apt-ftparchive.1.xml:172 msgid "OverrideDir" msgstr "OverrideDir" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:173 +#: apt-ftparchive.1.xml:174 msgid "Specifies the location of the override files." msgstr "Gibt den Ort der Override-Dateien an" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:176 +#: apt-ftparchive.1.xml:177 msgid "CacheDir" msgstr "CacheDir" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:178 +#: apt-ftparchive.1.xml:179 msgid "Specifies the location of the cache files" msgstr "Gibt den Ort der Zwischenspeicherdateien an" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:181 +#: apt-ftparchive.1.xml:182 msgid "FileListDir" msgstr "FileListDir" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:183 +#: apt-ftparchive.1.xml:184 msgid "" "Specifies the location of the file list files, if the <literal>FileList</" "literal> setting is used below." @@ -2865,12 +2894,12 @@ msgstr "" "unterhalb gesetzt ist." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:189 +#: apt-ftparchive.1.xml:190 msgid "Default Section" msgstr "Vorgabe-Abschnitt" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:191 +#: apt-ftparchive.1.xml:192 msgid "" "The <literal>Default</literal> section specifies default values, and " "settings that control the operation of the generator. Other sections may " @@ -2881,12 +2910,12 @@ msgstr "" "können diese Vorgaben mit einer Einstellung pro Abschnitt überschreiben." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:195 +#: apt-ftparchive.1.xml:196 msgid "Packages::Compress" msgstr "Packages::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:197 +#: apt-ftparchive.1.xml:198 msgid "" "Sets the default compression schemes to use for the Package index files. It " "is a string that contains a space separated list of at least one of: '.' (no " @@ -2899,12 +2928,12 @@ msgstr "" "»gzip« und »bzip2«. Die Vorgabe für alle Kompressionsschemata ist ». gzip«." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:203 +#: apt-ftparchive.1.xml:204 msgid "Packages::Extensions" msgstr "Packages::Extensions" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:205 +#: apt-ftparchive.1.xml:206 msgid "" "Sets the default list of file extensions that are package files. This " "defaults to '.deb'." @@ -2913,12 +2942,12 @@ msgstr "" "Vorgabe ist ».deb«." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:209 +#: apt-ftparchive.1.xml:210 msgid "Sources::Compress" msgstr "Sources::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:211 +#: apt-ftparchive.1.xml:212 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Sources files." @@ -2927,12 +2956,12 @@ msgstr "" "Kompression der Quelldateien steuert." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:215 +#: apt-ftparchive.1.xml:216 msgid "Sources::Extensions" msgstr "Sources::Extensions" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:217 +#: apt-ftparchive.1.xml:218 msgid "" "Sets the default list of file extensions that are source files. This " "defaults to '.dsc'." @@ -2941,12 +2970,12 @@ msgstr "" "Vorgabe ist ».dsc«." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:221 +#: apt-ftparchive.1.xml:222 msgid "Contents::Compress" msgstr "Contents::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:223 +#: apt-ftparchive.1.xml:224 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Contents files." @@ -2955,12 +2984,12 @@ msgstr "" "Kompression der Inhaltsdateien steuert." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:227 +#: apt-ftparchive.1.xml:228 msgid "DeLinkLimit" msgstr "DeLinkLimit" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:229 +#: apt-ftparchive.1.xml:230 msgid "" "Specifies the number of kilobytes to delink (and replace with hard links) " "per run. This is used in conjunction with the per-section <literal>External-" @@ -2971,12 +3000,12 @@ msgstr "" "<literal>External-Links</literal>-Einstellung pro Abschnitt benutzt." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:234 +#: apt-ftparchive.1.xml:235 msgid "FileMode" msgstr "FileMode" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:236 +#: apt-ftparchive.1.xml:237 msgid "" "Specifies the mode of all created index files. It defaults to 0644. All " "index files are set to this mode with no regard to the umask." @@ -2985,12 +3014,12 @@ msgstr "" "Indexdateien werden ohne Beachtung von umask auf diese Rechte gesetzt." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:243 +#: apt-ftparchive.1.xml:244 msgid "TreeDefault Section" msgstr "TreeDefault-Abschnitt" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:245 +#: apt-ftparchive.1.xml:246 msgid "" "Sets defaults specific to <literal>Tree</literal> sections. All of these " "variables are substitution variables and have the strings $(DIST), " @@ -3001,12 +3030,12 @@ msgstr "" "$(SECTION) und $(ARCH) durch ihre jeweiligen Werte ersetzt." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:250 +#: apt-ftparchive.1.xml:251 msgid "MaxContentsChange" msgstr "MaxContentsChange" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:252 +#: apt-ftparchive.1.xml:253 msgid "" "Sets the number of kilobytes of contents files that are generated each day. " "The contents files are round-robined so that over several days they will all " @@ -3017,12 +3046,12 @@ msgstr "" "Tage alle neu gebildet werden." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:257 +#: apt-ftparchive.1.xml:258 msgid "ContentsAge" msgstr "ContentsAge" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:259 +#: apt-ftparchive.1.xml:260 msgid "" "Controls the number of days a contents file is allowed to be checked without " "changing. If this limit is passed the mtime of the contents file is updated. " @@ -3040,12 +3069,12 @@ msgstr "" "eine neue Datei benötigen. Die Vorgabe ist 10, die Einheiten sind Tage." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:268 +#: apt-ftparchive.1.xml:269 msgid "Directory" msgstr "Directory" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:270 +#: apt-ftparchive.1.xml:271 msgid "" "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/" "$(SECTION)/binary-$(ARCH)/</filename>" @@ -3054,12 +3083,12 @@ msgstr "" "$(SECTION)/binary-$(ARCH)/</filename>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:274 +#: apt-ftparchive.1.xml:275 msgid "SrcDirectory" msgstr "SrcDirectory" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:276 +#: apt-ftparchive.1.xml:277 msgid "" "Sets the top of the source package directory tree. Defaults to <filename>" "$(DIST)/$(SECTION)/source/</filename>" @@ -3068,12 +3097,12 @@ msgstr "" "$(DIST)/$(SECTION)/source/</filename>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406 +#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407 msgid "Packages" msgstr "Packages" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:282 +#: apt-ftparchive.1.xml:283 msgid "" "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" "binary-$(ARCH)/Packages</filename>" @@ -3082,12 +3111,12 @@ msgstr "" "binary-$(ARCH)/Packages</filename>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411 +#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412 msgid "Sources" msgstr "Sources" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:288 +#: apt-ftparchive.1.xml:289 #, fuzzy #| msgid "" #| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" @@ -3100,12 +3129,12 @@ msgstr "" "source/Sources</filename>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:292 +#: apt-ftparchive.1.xml:293 msgid "InternalPrefix" msgstr "InternalPrefix" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:294 +#: apt-ftparchive.1.xml:295 msgid "" "Sets the path prefix that causes a symlink to be considered an internal link " "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</" @@ -3116,12 +3145,12 @@ msgstr "" "<filename>$(DIST)/$(SECTION)/</filename>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417 +#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418 msgid "Contents" msgstr "Contents" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:301 +#: apt-ftparchive.1.xml:302 msgid "" "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)" "</filename>. If this setting causes multiple Packages files to map onto a " @@ -3135,22 +3164,22 @@ msgstr "" "automatisch integrieren." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:308 +#: apt-ftparchive.1.xml:309 msgid "Contents::Header" msgstr "Contents::Header" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:310 +#: apt-ftparchive.1.xml:311 msgid "Sets header file to prepend to the contents output." msgstr "Setzt die Kopfdatendatei, um sie der Inhaltsausgabe voranzustellen." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442 +#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443 msgid "BinCacheDB" msgstr "BinCacheDB" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:315 +#: apt-ftparchive.1.xml:316 msgid "" "Sets the binary cache database to use for this section. Multiple sections " "can share the same database." @@ -3159,12 +3188,12 @@ msgstr "" "Abschnitt. Mehrere Abschnitte können sich die gleiche Datenbank teilen." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:319 +#: apt-ftparchive.1.xml:320 msgid "FileList" msgstr "FileList" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:321 +#: apt-ftparchive.1.xml:322 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " @@ -3175,12 +3204,12 @@ msgstr "" "Relativen Dateinamen wird das Archivverzeichnis vorangestellt." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:326 +#: apt-ftparchive.1.xml:327 msgid "SourceFileList" msgstr "SourceFileList" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:328 +#: apt-ftparchive.1.xml:329 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " @@ -3193,12 +3222,12 @@ msgstr "" "benutzt, wenn Quellindizes verarbeitet werden." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:336 +#: apt-ftparchive.1.xml:337 msgid "Tree Section" msgstr "Tree-Abschnitt" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:338 +#: apt-ftparchive.1.xml:339 msgid "" "The <literal>Tree</literal> section defines a standard Debian file tree " "which consists of a base directory, then multiple sections in that base " @@ -3213,7 +3242,7 @@ msgstr "" "<literal>Directory</literal>-Ersetzungsvariable definiert." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:343 +#: apt-ftparchive.1.xml:344 msgid "" "The <literal>Tree</literal> section takes a scope tag which sets the " "<literal>$(DIST)</literal> variable and defines the root of the tree (the " @@ -3227,7 +3256,7 @@ msgstr "" "filename>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:348 +#: apt-ftparchive.1.xml:349 msgid "" "All of the settings defined in the <literal>TreeDefault</literal> section " "can be use in a <literal>Tree</literal> section as well as three new " @@ -3238,7 +3267,7 @@ msgstr "" "Variablen benutzt werden." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt-ftparchive.1.xml:354 +#: apt-ftparchive.1.xml:355 #, fuzzy, no-wrap #| msgid "" #| "for i in Sections do \n" @@ -3255,7 +3284,7 @@ msgstr "" " Generiere for DIST=Geltungsbereich SECTION=i ARCH=j\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:351 +#: apt-ftparchive.1.xml:352 #, fuzzy #| msgid "" #| "When processing a <literal>Tree</literal> section <command>apt-" @@ -3269,12 +3298,12 @@ msgstr "" "<command>apt-ftparchive</command> eine Operation aus, die folgender ähnelt:" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:360 +#: apt-ftparchive.1.xml:361 msgid "Sections" msgstr "Abschnitte" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:362 +#: apt-ftparchive.1.xml:363 msgid "" "This is a space separated list of sections which appear under the " "distribution, typically this is something like <literal>main contrib non-" @@ -3285,12 +3314,12 @@ msgstr "" "non-free</literal>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:367 +#: apt-ftparchive.1.xml:368 msgid "Architectures" msgstr "Architekturen" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:369 +#: apt-ftparchive.1.xml:370 msgid "" "This is a space separated list of all the architectures that appear under " "search section. The special architecture 'source' is used to indicate that " @@ -3301,12 +3330,12 @@ msgstr "" "benutzt, um anzugeben, dass dieser Baum ein Quellarchiv besitzt." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422 +#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423 msgid "BinOverride" msgstr "BinOverride" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:376 +#: apt-ftparchive.1.xml:377 msgid "" "Sets the binary override file. The override file contains section, priority " "and maintainer address information." @@ -3315,12 +3344,12 @@ msgstr "" "Priorität und Adressinformationen des Betreuers." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427 +#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428 msgid "SrcOverride" msgstr "SrcOverride" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:382 +#: apt-ftparchive.1.xml:383 msgid "" "Sets the source override file. The override file contains section " "information." @@ -3329,32 +3358,32 @@ msgstr "" "Abschnittsinformationen." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432 +#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433 msgid "ExtraOverride" msgstr "ExtraOverride" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434 +#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435 msgid "Sets the binary extra override file." msgstr "Setzt die zusätzliche Programm-Override-Datei." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437 +#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438 msgid "SrcExtraOverride" msgstr "SrcExtraOverride" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439 +#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440 msgid "Sets the source extra override file." msgstr "Setzt die zusätzliche Quell-Override-Datei." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:398 +#: apt-ftparchive.1.xml:399 msgid "BinDirectory Section" msgstr "BinDirectory-Abschnitt" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:400 +#: apt-ftparchive.1.xml:401 msgid "" "The <literal>bindirectory</literal> section defines a binary directory tree " "with no special structure. The scope tag specifies the location of the " @@ -3369,12 +3398,12 @@ msgstr "" "<literal>Abschnitt</literal><literal>Architektur</literal> ähnlich." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:408 +#: apt-ftparchive.1.xml:409 msgid "Sets the Packages file output." msgstr "Setzt die Packages-Dateiausgabe." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:413 +#: apt-ftparchive.1.xml:414 msgid "" "Sets the Sources file output. At least one of <literal>Packages</literal> or " "<literal>Sources</literal> is required." @@ -3383,52 +3412,52 @@ msgstr "" "<literal>Sources</literal> ist erforderlich." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:419 +#: apt-ftparchive.1.xml:420 msgid "Sets the Contents file output. (optional)" msgstr "Setzt die Contents-Dateiausgabe. (optional)" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:424 +#: apt-ftparchive.1.xml:425 msgid "Sets the binary override file." msgstr "Setzt die Programm-Override-Datei." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:429 +#: apt-ftparchive.1.xml:430 msgid "Sets the source override file." msgstr "Setzt die Quell-Override-Datei." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:444 +#: apt-ftparchive.1.xml:445 msgid "Sets the cache DB." msgstr "Setzt die Zwischenspeicherdatenbank." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:447 +#: apt-ftparchive.1.xml:448 msgid "PathPrefix" msgstr "PathPrefix" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:449 +#: apt-ftparchive.1.xml:450 msgid "Appends a path to all the output paths." msgstr "Hängt einen Pfad an alle Ausgabepfade an." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:452 +#: apt-ftparchive.1.xml:453 msgid "FileList, SourceFileList" msgstr "FileList, SourceFileList" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:454 +#: apt-ftparchive.1.xml:455 msgid "Specifies the file list file." msgstr "Gibt die Dateilistendatei an." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:461 +#: apt-ftparchive.1.xml:462 msgid "The Binary Override File" msgstr "Die Programm-Override-Datei " #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:462 +#: apt-ftparchive.1.xml:463 msgid "" "The binary override file is fully compatible with &dpkg-scanpackages;. It " "contains 4 fields separated by spaces. The first field is the package name, " @@ -3443,19 +3472,19 @@ msgstr "" "und das letzte Feld ist das Betreuerumsetzungsfeld." #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:468 +#: apt-ftparchive.1.xml:469 #, no-wrap msgid "old [// oldn]* => new" msgstr "alt [// oldn]* => neu" #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:470 +#: apt-ftparchive.1.xml:471 #, no-wrap msgid "new" msgstr "neu" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:467 +#: apt-ftparchive.1.xml:468 msgid "" "The general form of the maintainer field is: <placeholder type=" "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" " @@ -3472,12 +3501,12 @@ msgstr "" "bedingungslos." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:478 +#: apt-ftparchive.1.xml:479 msgid "The Source Override File" msgstr "Die Quell-Override-Datei" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:480 +#: apt-ftparchive.1.xml:481 msgid "" "The source override file is fully compatible with &dpkg-scansources;. It " "contains 2 fields separated by spaces. The first fields is the source " @@ -3488,12 +3517,12 @@ msgstr "" "Quellpaketname, das zweite ist der Abschnitt, dem er zugeordnet ist." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:485 +#: apt-ftparchive.1.xml:486 msgid "The Extra Override File" msgstr "Die zusätzlich Override-Datei" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:487 +#: apt-ftparchive.1.xml:488 msgid "" "The extra override file allows any arbitrary tag to be added or replaced in " "the output. It has 3 columns, the first is the package, the second is the " @@ -3505,12 +3534,12 @@ msgstr "" "ist der neue Wert." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:496 +#: apt-ftparchive.1.xml:497 msgid "<option>--md5</option>" msgstr "<option>--md5</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:498 +#: apt-ftparchive.1.xml:499 msgid "" "Generate MD5 sums. This defaults to on, when turned off the generated index " "files will not have MD5Sum fields where possible. Configuration Item: " @@ -3521,12 +3550,12 @@ msgstr "" "ist. Konfigurationselement: <literal>APT::FTPArchive::MD5</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:503 +#: apt-ftparchive.1.xml:504 msgid "<option>--db</option>" msgstr "<option>--db</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:505 +#: apt-ftparchive.1.xml:506 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." @@ -3536,7 +3565,7 @@ msgstr "" "DB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:511 +#: apt-ftparchive.1.xml:512 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -3550,12 +3579,12 @@ msgstr "" "Konfigurationselement: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:517 +#: apt-ftparchive.1.xml:518 msgid "<option>--delink</option>" msgstr "<option>--delink</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:519 +#: apt-ftparchive.1.xml:520 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -3569,12 +3598,12 @@ msgstr "" "DeLinkAct</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:525 +#: apt-ftparchive.1.xml:526 msgid "<option>--contents</option>" msgstr "<option>--contents</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:527 +#: apt-ftparchive.1.xml:528 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -3590,12 +3619,12 @@ msgstr "" "Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:535 +#: apt-ftparchive.1.xml:536 msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:537 +#: apt-ftparchive.1.xml:538 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -3606,12 +3635,12 @@ msgstr "" "SourceOverride</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:541 +#: apt-ftparchive.1.xml:542 msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:543 +#: apt-ftparchive.1.xml:544 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@ -3620,16 +3649,43 @@ msgstr "" "<literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:547 +#: apt-ftparchive.1.xml:548 +#, fuzzy +#| msgid "<option>-a</option>" +msgid "<option>--arch</option>" +msgstr "<option>-a</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:549 +#, fuzzy +#| msgid "" +#| "If the command is either <literal>install</literal> or <literal>remove</" +#| "literal>, then this option acts like running <literal>autoremove</" +#| "literal> command, removing the unused dependency packages. Configuration " +#| "Item: <literal>APT::Get::AutomaticRemove</literal>." +msgid "" +"Accept in the <literal>packages</literal> and <literal>contents</literal> " +"commands only package files matching <literal>*_arch.deb</literal> or " +"<literal>*_all.deb</literal> instead of all package files in the given " +"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>." +msgstr "" +"Wenn der Befehl entweder <literal>install</literal> oder <literal>remove</" +"literal> lautet, dann bewirkt diese Option wie das Ausführen des " +"<literal>autoremove</literal>-Befehls das Entfernen der nicht benutzten " +"Abhhängigkeitspakete. Konfigurationselement: <literal>APT::Get::" +"AutomaticRemove</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:555 #, fuzzy #| msgid "<option>APT::FTPArchive::LongDescription</option>" msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:549 +#: apt-ftparchive.1.xml:557 msgid "" -"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " +"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " "will lead to problems as the now outdated cached metadata like size and " "checksums will be used. With this option enabled this will no longer happen " @@ -3641,12 +3697,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:559 +#: apt-ftparchive.1.xml:567 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:561 +#: apt-ftparchive.1.xml:569 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -3661,19 +3717,19 @@ msgstr "" "Dateien mit <command>apt-ftparchive</command> zu erstellen." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 +#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477 #: sources.list.5.xml:193 msgid "Examples" msgstr "Beispiele" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:579 +#: apt-ftparchive.1.xml:587 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> Pakete <replaceable>Verzeichnis</replaceable> | <command>gzip</command> > <filename>Pakete.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:575 +#: apt-ftparchive.1.xml:583 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3683,7 +3739,7 @@ msgstr "" ">" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:589 +#: apt-ftparchive.1.xml:597 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -7930,7 +7986,10 @@ msgstr "&apt-cache;, &apt-config;, &apt-preferences;." #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt_preferences.5.xml:13 -msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" +#, fuzzy +#| msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" +msgid "" +"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>" msgstr "&apt-author.team; &apt-email; &apt-product; <date>04. Mai 2009</date>" #. type: Content of: <refentry><refnamediv><refname> @@ -7997,6 +8056,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 msgid "" +"Preferences are a strong power in the hands of a system administrator but " +"they can become also their biggest nightmare if used without care! APT will " +"not questioning the preferences so wrong settings will therefore lead to " +"uninstallable packages or wrong decisions while upgrading packages. Even " +"more problems will arise if multiply distribution releases are mixed without " +"a good understanding of the following paragraphs. You have been warned." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:64 +msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " "following naming convention: The files have no or \"<literal>pref</literal>" @@ -8006,24 +8076,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:63 +#: apt_preferences.5.xml:71 msgid "APT's Default Priority Assignments" msgstr "APTs Standardprioritätszuweisungen" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:86 #, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "<command>apt-get install -t testing <replaceable>irgendein_Paket</replaceable></command>\n" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:81 +#: apt_preferences.5.xml:89 #, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "APT::Default-Release \"stable\";\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:65 +#: apt_preferences.5.xml:73 msgid "" "If there is no preferences file or if there is no entry in the file that " "applies to a particular version then the priority assigned to that version " @@ -8051,22 +8121,22 @@ msgstr "" "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:90 +#: apt_preferences.5.xml:98 msgid "priority 100" msgstr "Priorität 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:91 +#: apt_preferences.5.xml:99 msgid "to the version that is already installed (if any)." msgstr "zu der Version, die bereits installiert ist (wenn vorhanden)." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:95 +#: apt_preferences.5.xml:103 msgid "priority 500" msgstr "Priorität 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:96 +#: apt_preferences.5.xml:104 msgid "" "to the versions that are not installed and do not belong to the target " "release." @@ -8075,19 +8145,19 @@ msgstr "" "gehören." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:100 +#: apt_preferences.5.xml:108 msgid "priority 990" msgstr "Priorität 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:101 +#: apt_preferences.5.xml:109 msgid "" "to the versions that are not installed and belong to the target release." msgstr "" "zu den Versionen, die nicht installiert sind und zum Ziel-Release gehören." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:85 +#: apt_preferences.5.xml:93 msgid "" "If the target release has been specified then APT uses the following " "algorithm to set the priorities of the versions of a package. Assign: " @@ -8098,7 +8168,7 @@ msgstr "" "Zuweisung: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:106 +#: apt_preferences.5.xml:114 msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " @@ -8109,7 +8179,7 @@ msgstr "" "installierten Paketversionen eine Priorität von 500 zu." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:110 +#: apt_preferences.5.xml:118 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." @@ -8119,7 +8189,7 @@ msgstr "" "ist." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 +#: apt_preferences.5.xml:121 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -8135,12 +8205,12 @@ msgstr "" "Downgrading eines Paketes riskant sein kann.)" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:119 +#: apt_preferences.5.xml:127 msgid "Install the highest priority version." msgstr "Die Version mit der höchsten Priorität installieren." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:120 +#: apt_preferences.5.xml:128 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." @@ -8149,7 +8219,7 @@ msgstr "" "aktuellste installiert (das ist die mit der höheren Versionsnummer)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:123 +#: apt_preferences.5.xml:131 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@ -8161,7 +8231,7 @@ msgstr "" "installierte installiert." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:137 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@ -8177,7 +8247,7 @@ msgstr "" "upgrade</command> ausgeführt wird." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:136 +#: apt_preferences.5.xml:144 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@ -8191,7 +8261,7 @@ msgstr "" "upgrade</command> ausgeführt wird." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:141 +#: apt_preferences.5.xml:149 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@ -8211,12 +8281,12 @@ msgstr "" "hat." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:150 +#: apt_preferences.5.xml:158 msgid "The Effect of APT Preferences" msgstr "Die Auswirkungen von APT-Einstellungen" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:152 +#: apt_preferences.5.xml:160 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -8230,7 +8300,7 @@ msgstr "" "allgemeine Gestalt." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:166 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@ -8246,7 +8316,7 @@ msgstr "" "können durch Leerzeichen getrennt werden." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:165 +#: apt_preferences.5.xml:173 #, no-wrap msgid "" "Package: perl\n" @@ -8258,7 +8328,7 @@ msgstr "" "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:171 +#: apt_preferences.5.xml:179 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@ -8273,7 +8343,7 @@ msgstr "" "ausgebildeten Domänennamen identifiziert wird, eine Priorität zu." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:177 +#: apt_preferences.5.xml:185 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@ -8284,7 +8354,7 @@ msgstr "" "Paketversionen eine hohe Priorität zu, die lokal liegen." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:182 +#: apt_preferences.5.xml:190 #, no-wrap msgid "" "Package: *\n" @@ -8296,7 +8366,7 @@ msgstr "" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:187 +#: apt_preferences.5.xml:195 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " "This should not be confused with the Origin of a distribution as specified " @@ -8312,7 +8382,7 @@ msgstr "" "wie »Debian« oder »Ximian«." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:193 +#: apt_preferences.5.xml:201 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -8323,7 +8393,7 @@ msgstr "" "Priorität zu." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:197 +#: apt_preferences.5.xml:205 #, no-wrap msgid "" "Package: *\n" @@ -8335,7 +8405,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:202 +#: apt_preferences.5.xml:210 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>squeeze</literal>" @@ -8346,7 +8416,7 @@ msgstr "" "zu." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:206 +#: apt_preferences.5.xml:214 #, no-wrap msgid "" "Package: *\n" @@ -8358,7 +8428,7 @@ msgstr "" "Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:211 +#: apt_preferences.5.xml:219 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -8369,7 +8439,7 @@ msgstr "" "Nummer »<literal>3.0</literal>« ist, eine hohe Priorität zu." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:216 +#: apt_preferences.5.xml:224 #, no-wrap msgid "" "Package: *\n" @@ -8381,17 +8451,17 @@ msgstr "" "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:227 +#: apt_preferences.5.xml:235 msgid "How APT Interprets Priorities" msgstr "Wie APT Prioritäten interpretiert" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:235 +#: apt_preferences.5.xml:243 msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:236 +#: apt_preferences.5.xml:244 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@ -8400,12 +8470,12 @@ msgstr "" "des Pakets durchführt" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:248 msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:241 +#: apt_preferences.5.xml:249 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@ -8414,12 +8484,12 @@ msgstr "" "Ziel-Release kommt, außer wenn die installierte Version aktueller ist" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:254 msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:247 +#: apt_preferences.5.xml:255 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" @@ -8429,12 +8499,12 @@ msgstr "" "neuer ist" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:260 msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:253 +#: apt_preferences.5.xml:261 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" @@ -8444,12 +8514,12 @@ msgstr "" "installierte Version neuer ist" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:258 +#: apt_preferences.5.xml:266 msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:259 +#: apt_preferences.5.xml:267 msgid "" "causes a version to be installed only if there is no installed version of " "the package" @@ -8458,17 +8528,17 @@ msgstr "" "installierte Version des Pakets gibt" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:263 +#: apt_preferences.5.xml:271 msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:264 +#: apt_preferences.5.xml:272 msgid "prevents the version from being installed" msgstr "verhindert das Installieren der Version" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:230 +#: apt_preferences.5.xml:238 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -8479,7 +8549,7 @@ msgstr "" "(grob gesagt): <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:269 +#: apt_preferences.5.xml:277 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -8493,7 +8563,7 @@ msgstr "" "erste dieser Datensätze die Priorität der Paketversion fest." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:275 +#: apt_preferences.5.xml:283 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@ -8502,7 +8572,7 @@ msgstr "" "bereits gezeigten Datensätze:" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:279 +#: apt_preferences.5.xml:287 #, no-wrap msgid "" "Package: perl\n" @@ -8530,12 +8600,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:300 msgid "Then:" msgstr "Dann:" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:294 +#: apt_preferences.5.xml:302 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -8550,7 +8620,7 @@ msgstr "" "dann wird von <literal>perl</literal> ein Downgrade durchgeführt." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:299 +#: apt_preferences.5.xml:307 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -8561,7 +8631,7 @@ msgstr "" "sogar wenn diese Versionen zum Ziel-Release gehören." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:303 +#: apt_preferences.5.xml:311 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -8575,12 +8645,12 @@ msgstr "" "Pakets installiert ist." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:313 +#: apt_preferences.5.xml:321 msgid "Determination of Package Version and Distribution Properties" msgstr "Festlegung von Paketversion und Distributions-Eigenschaften" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:315 +#: apt_preferences.5.xml:323 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -8591,27 +8661,27 @@ msgstr "" "bereitstellen, um die an diesem Ort verfügbaren Pakete zu beschreiben." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:327 +#: apt_preferences.5.xml:335 msgid "the <literal>Package:</literal> line" msgstr "die <literal>Package:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:328 +#: apt_preferences.5.xml:336 msgid "gives the package name" msgstr "gibt den Paketnamen an" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 +#: apt_preferences.5.xml:339 apt_preferences.5.xml:389 msgid "the <literal>Version:</literal> line" msgstr "die <literal>Version:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:332 +#: apt_preferences.5.xml:340 msgid "gives the version number for the named package" msgstr "gibt die Versionsnummer für das genannte Paket an" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:319 +#: apt_preferences.5.xml:327 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -8632,12 +8702,12 @@ msgstr "" "Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:348 +#: apt_preferences.5.xml:356 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:349 +#: apt_preferences.5.xml:357 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -8654,18 +8724,18 @@ msgstr "" "folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:367 #, no-wrap msgid "Pin: release a=stable\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:365 +#: apt_preferences.5.xml:373 msgid "the <literal>Codename:</literal> line" msgstr "die <literal>Codename:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:366 +#: apt_preferences.5.xml:374 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: squeeze\" specifies that all of the " @@ -8681,13 +8751,13 @@ msgstr "" "die folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:383 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "Pin: release n=squeeze\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:382 +#: apt_preferences.5.xml:390 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -8703,7 +8773,7 @@ msgstr "" "eine der folgenden Zeilen benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:391 +#: apt_preferences.5.xml:399 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -8715,12 +8785,12 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:400 +#: apt_preferences.5.xml:408 msgid "the <literal>Component:</literal> line" msgstr "die <literal>Component:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:401 +#: apt_preferences.5.xml:409 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -8738,18 +8808,18 @@ msgstr "" "Zeilen benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:410 +#: apt_preferences.5.xml:418 #, no-wrap msgid "Pin: release c=main\n" msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:424 msgid "the <literal>Origin:</literal> line" msgstr "die <literal>Origin:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:417 +#: apt_preferences.5.xml:425 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8761,18 +8831,18 @@ msgstr "" "in der APT-Einstellungsdatei anzugeben würde die folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:423 +#: apt_preferences.5.xml:431 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:437 msgid "the <literal>Label:</literal> line" msgstr "die <literal>Label:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:430 +#: apt_preferences.5.xml:438 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8785,13 +8855,13 @@ msgstr "" "die folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:444 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:337 +#: apt_preferences.5.xml:345 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -8813,7 +8883,7 @@ msgstr "" "relevant: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:443 +#: apt_preferences.5.xml:451 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -8839,12 +8909,12 @@ msgstr "" "Distribution heruntergeladen wurde." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:456 +#: apt_preferences.5.xml:464 msgid "Optional Lines in an APT Preferences Record" msgstr "Optionale Zeilen in einem APT-Einstellungsdatensatz" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:458 +#: apt_preferences.5.xml:466 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -8855,7 +8925,7 @@ msgstr "" "anfangen. Dieses stellt einen Platz für Kommentare bereit." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:462 +#: apt_preferences.5.xml:470 msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " "optional. If omitted, APT assigns a priority of 1 less than the last value " @@ -8869,12 +8939,12 @@ msgstr "" "anfängt." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:471 +#: apt_preferences.5.xml:479 msgid "Tracking Stable" msgstr "Stable verfolgen" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:479 +#: apt_preferences.5.xml:487 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -8898,7 +8968,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:473 +#: apt_preferences.5.xml:481 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8913,8 +8983,8 @@ msgstr "" "Distribution gehören. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 -#: apt_preferences.5.xml:600 +#: apt_preferences.5.xml:504 apt_preferences.5.xml:550 +#: apt_preferences.5.xml:608 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -8926,7 +8996,7 @@ msgstr "" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:491 +#: apt_preferences.5.xml:499 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8939,13 +9009,13 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:508 +#: apt_preferences.5.xml:516 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "apt-get install <replaceable>Paket</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:502 +#: apt_preferences.5.xml:510 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -8959,12 +9029,12 @@ msgstr "" "\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:514 +#: apt_preferences.5.xml:522 msgid "Tracking Testing or Unstable" msgstr "Testing oder Unstable verfolgen" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:523 +#: apt_preferences.5.xml:531 #, no-wrap msgid "" "Package: *\n" @@ -8992,7 +9062,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:524 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -9009,7 +9079,7 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:537 +#: apt_preferences.5.xml:545 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -9022,13 +9092,13 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:565 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "apt-get install <replaceable>Paket</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:548 +#: apt_preferences.5.xml:556 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -9048,12 +9118,12 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:564 +#: apt_preferences.5.xml:572 msgid "Tracking the evolution of a codename release" msgstr "Die Entwicklung eines Codename-Releases verfolgen" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:578 +#: apt_preferences.5.xml:586 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -9087,7 +9157,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:566 +#: apt_preferences.5.xml:574 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -9113,7 +9183,7 @@ msgstr "" "benutzen. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:595 +#: apt_preferences.5.xml:603 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -9126,13 +9196,13 @@ msgstr "" "durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:615 +#: apt_preferences.5.xml:623 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "apt-get install <replaceable>Paket</replaceable>/sid\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:606 +#: apt_preferences.5.xml:614 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -9152,12 +9222,12 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:624 +#: apt_preferences.5.xml:632 msgid "&file-preferences;" msgstr "&file-preferences;" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:630 +#: apt_preferences.5.xml:638 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" diff --git a/doc/po/es.po b/doc/po/es.po index 533978695..c162dca97 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" -"POT-Creation-Date: 2010-01-20 12:18+0100\n" +"POT-Creation-Date: 2010-02-18 20:53+0100\n" "PO-Revision-Date: 2004-09-20 17:05+0000\n" "Last-Translator: Rubén Porras Campo <nahoo@inicia.es>\n" "Language-Team: <debian-l10n-spanish@lists.debian.org>\n" @@ -865,7 +865,7 @@ msgstr "" #. type: Plain text #: apt.ent:380 -#, no-wrap, fuzzy +#, fuzzy, no-wrap msgid "" "<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n" " to the translation in the past, who is responsible now and maybe further information\n" @@ -989,7 +989,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 -#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 +#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125 #: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 #: sources.list.5.xml:33 @@ -1580,7 +1580,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 -#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 +#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 #: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 #, fuzzy msgid "options" @@ -1611,7 +1611,7 @@ msgstr "" "configuración: <literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376 +#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376 #: apt-sortpkgs.1.xml:58 #, fuzzy msgid "<option>-s</option>" @@ -1641,13 +1641,13 @@ msgstr "" "configuración: <literal>Dir::Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 #, fuzzy msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 #, fuzzy msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1714,7 +1714,7 @@ msgstr "" "configuración: <literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 +#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548 #, fuzzy msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1846,7 +1846,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 -#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 +#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:554 #: apt-sortpkgs.1.xml:64 #, fuzzy msgid "&apt-commonoptions;" @@ -1857,7 +1857,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:630 #, fuzzy msgid "Files" msgstr "Ficheros" @@ -1869,9 +1869,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 +#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637 #: sources.list.5.xml:233 #, fuzzy msgid "See Also" @@ -1918,7 +1918,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 +#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:575 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 #, fuzzy msgid "Diagnostics" @@ -2011,7 +2011,7 @@ msgstr "add" #, fuzzy msgid "" "<literal>add</literal> is used to add a new disc to the source list. It will " -"unmount the CDROM device, prompt for a disk to be inserted and then procceed " +"unmount the CDROM device, prompt for a disk to be inserted and then proceed " "to scan it and copy the index files. If the disc does not have a proper " "<filename>disk</filename> directory you will be prompted for a descriptive " "title." @@ -2068,7 +2068,7 @@ msgid "Options" msgstr "Opciones" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328 +#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328 #, fuzzy msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -2269,7 +2269,7 @@ msgstr "" "scripts." #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:53 apt-ftparchive.1.xml:71 +#: apt-config.8.xml:53 apt-ftparchive.1.xml:72 #, fuzzy msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given " @@ -2344,7 +2344,7 @@ msgid "Just show the contents of the configuration space." msgstr "Sólo muestra el contenido del espacio de configuración." #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 +#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593 #: apt-sortpkgs.1.xml:70 #, fuzzy msgid "&apt-conf;" @@ -2470,10 +2470,12 @@ msgstr "" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-ftparchive.1.xml:36 +#, fuzzy msgid "" "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " "<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></" "arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</" "replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></" "option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=" @@ -2489,9 +2491,36 @@ msgid "" "\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice=" "\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>" msgstr "" +"<arg rep=\"norepeat\" choice=\"opt\">add <arg rep=\"repeat\" choice=\"plain" +"\"><replaceable>fichero</replaceable></arg></arg>\n" +"<arg rep=\"norepeat\" choice=\"opt\">gencaches</arg>\n" +"<arg rep=\"norepeat\" choice=\"opt\">showpkg <arg rep=\"repeat\" choice=" +"\"plain\"><replaceable>paquete</replaceable></arg></arg>\n" +"<arg rep=\"norepeat\" choice=\"opt\">showsrc <arg rep=\"repeat\" choice=" +"\"plain\"><replaceable>paquete</replaceable></arg></arg>\n" +"<arg rep=\"norepeat\" choice=\"opt\">stats</arg>\n" +"<arg rep=\"norepeat\" choice=\"opt\">dump</arg>\n" +"<arg rep=\"norepeat\" choice=\"opt\">dumpavail</arg>\n" +"<arg rep=\"norepeat\" choice=\"opt\">unmet</arg>\n" +"<arg rep=\"norepeat\" choice=\"opt\">search <arg rep=\"norepeat\" choice=" +"\"plain\"><replaceable>expresión regular</replaceable></arg></arg>\n" +"<arg rep=\"norepeat\" choice=\"opt\">show <arg rep=\"repeat\" choice=\"plain" +"\"><replaceable>paquete</replaceable></arg></arg>\n" +"<arg rep=\"norepeat\" choice=\"opt\">depends <arg rep=\"repeat\" choice=" +"\"plain\"><replaceable>paquete</replaceable></arg></arg>\n" +"<arg rep=\"norepeat\" choice=\"opt\">rdepends <arg rep=\"repeat\" choice=" +"\"plain\"><replaceable>pkg</replaceable></arg></arg>\n" +"<arg rep=\"norepeat\" choice=\"opt\">pkgnames <arg rep=\"norepeat\" choice=" +"\"plain\"><replaceable>prefijo</replaceable></arg></arg>\n" +"<arg rep=\"norepeat\" choice=\"opt\">dotty <arg rep=\"repeat\" choice=\"plain" +"\"><replaceable>paquete</replaceable></arg></arg>\n" +"<arg rep=\"norepeat\" choice=\"opt\">policy <arg rep=\"repeat\" choice=" +"\"plain\"><replaceable>paquetes</replaceable></arg></arg>\n" +"<arg rep=\"norepeat\" choice=\"opt\">madison <arg rep=\"repeat\" choice=" +"\"plain\"><replaceable>paquetes</replaceable></arg></arg>" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:56 +#: apt-ftparchive.1.xml:57 msgid "" "<command>apt-ftparchive</command> is the command line tool that generates " "the index files that APT uses to access a distribution source. The index " @@ -2500,7 +2529,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:60 +#: apt-ftparchive.1.xml:61 msgid "" "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; " "program, incorporating its entire functionality via the <literal>packages</" @@ -2510,7 +2539,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:66 +#: apt-ftparchive.1.xml:67 msgid "" "Internally <command>apt-ftparchive</command> can make use of binary " "databases to cache the contents of a .deb file and it does not rely on any " @@ -2520,12 +2549,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:75 +#: apt-ftparchive.1.xml:76 msgid "packages" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:77 +#: apt-ftparchive.1.xml:78 msgid "" "The packages command generates a package file from a directory tree. It " "takes the given directory and recursively searches it for .deb files, " @@ -2534,19 +2563,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106 +#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107 msgid "" "The option <option>--db</option> can be used to specify a binary caching DB." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:85 +#: apt-ftparchive.1.xml:86 #, fuzzy msgid "sources" msgstr "source" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:87 +#: apt-ftparchive.1.xml:88 msgid "" "The <literal>sources</literal> command generates a source index file from a " "directory tree. It takes the given directory and recursively searches it " @@ -2555,7 +2584,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:92 +#: apt-ftparchive.1.xml:93 msgid "" "If an override file is specified then a source override file will be looked " "for with an extension of .src. The --source-override option can be used to " @@ -2563,12 +2592,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:97 +#: apt-ftparchive.1.xml:98 msgid "contents" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:99 +#: apt-ftparchive.1.xml:100 msgid "" "The <literal>contents</literal> command generates a contents file from a " "directory tree. It takes the given directory and recursively searches it " @@ -2579,12 +2608,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:109 +#: apt-ftparchive.1.xml:110 msgid "release" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:111 +#: apt-ftparchive.1.xml:112 msgid "" "The <literal>release</literal> command generates a Release file from a " "directory tree. It recursively searches the given directory for Packages, " @@ -2594,7 +2623,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:118 +#: apt-ftparchive.1.xml:119 msgid "" "Values for the additional metadata fields in the Release file are taken from " "the corresponding variables under <literal>APT::FTPArchive::Release</" @@ -2606,12 +2635,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:128 +#: apt-ftparchive.1.xml:129 msgid "generate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:130 +#: apt-ftparchive.1.xml:131 msgid "" "The <literal>generate</literal> command is designed to be runnable from a " "cron script and builds indexes according to the given config file. The " @@ -2621,25 +2650,25 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:137 apt-get.8.xml:292 +#: apt-ftparchive.1.xml:138 apt-get.8.xml:292 #, fuzzy msgid "clean" msgstr "clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:139 +#: apt-ftparchive.1.xml:140 msgid "" "The <literal>clean</literal> command tidies the databases used by the given " "configuration file by removing any records that are no longer necessary." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:145 +#: apt-ftparchive.1.xml:146 msgid "The Generate Configuration" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:147 +#: apt-ftparchive.1.xml:148 msgid "" "The <literal>generate</literal> command uses a configuration file to " "describe the archives that are going to be generated. It follows the typical " @@ -2650,19 +2679,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:155 +#: apt-ftparchive.1.xml:156 msgid "" "The generate configuration has 4 separate sections, each described below." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:157 +#: apt-ftparchive.1.xml:158 #, fuzzy msgid "Dir Section" msgstr "Descripción" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:159 +#: apt-ftparchive.1.xml:160 msgid "" "The <literal>Dir</literal> section defines the standard directories needed " "to locate the files required during the generation process. These " @@ -2671,13 +2700,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:164 +#: apt-ftparchive.1.xml:165 #, fuzzy msgid "ArchiveDir" msgstr "Arquitectura" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:166 +#: apt-ftparchive.1.xml:167 msgid "" "Specifies the root of the FTP archive, in a standard Debian configuration " "this is the directory that contains the <filename>ls-LR</filename> and dist " @@ -2685,46 +2714,46 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:171 +#: apt-ftparchive.1.xml:172 msgid "OverrideDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:173 +#: apt-ftparchive.1.xml:174 msgid "Specifies the location of the override files." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:176 +#: apt-ftparchive.1.xml:177 #, fuzzy msgid "CacheDir" msgstr "check" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:178 +#: apt-ftparchive.1.xml:179 msgid "Specifies the location of the cache files" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:181 +#: apt-ftparchive.1.xml:182 #, fuzzy msgid "FileListDir" msgstr "Ficheros" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:183 +#: apt-ftparchive.1.xml:184 msgid "" "Specifies the location of the file list files, if the <literal>FileList</" "literal> setting is used below." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:189 +#: apt-ftparchive.1.xml:190 msgid "Default Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:191 +#: apt-ftparchive.1.xml:192 msgid "" "The <literal>Default</literal> section specifies default values, and " "settings that control the operation of the generator. Other sections may " @@ -2732,12 +2761,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:195 +#: apt-ftparchive.1.xml:196 msgid "Packages::Compress" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:197 +#: apt-ftparchive.1.xml:198 msgid "" "Sets the default compression schemes to use for the Package index files. It " "is a string that contains a space separated list of at least one of: '.' (no " @@ -2746,60 +2775,60 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:203 +#: apt-ftparchive.1.xml:204 msgid "Packages::Extensions" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:205 +#: apt-ftparchive.1.xml:206 msgid "" "Sets the default list of file extensions that are package files. This " "defaults to '.deb'." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:209 +#: apt-ftparchive.1.xml:210 msgid "Sources::Compress" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:211 +#: apt-ftparchive.1.xml:212 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Sources files." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:215 +#: apt-ftparchive.1.xml:216 msgid "Sources::Extensions" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:217 +#: apt-ftparchive.1.xml:218 msgid "" "Sets the default list of file extensions that are source files. This " "defaults to '.dsc'." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:221 +#: apt-ftparchive.1.xml:222 msgid "Contents::Compress" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:223 +#: apt-ftparchive.1.xml:224 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Contents files." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:227 +#: apt-ftparchive.1.xml:228 msgid "DeLinkLimit" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:229 +#: apt-ftparchive.1.xml:230 msgid "" "Specifies the number of kilobytes to delink (and replace with hard links) " "per run. This is used in conjunction with the per-section <literal>External-" @@ -2807,25 +2836,25 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:234 +#: apt-ftparchive.1.xml:235 #, fuzzy msgid "FileMode" msgstr "Ficheros" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:236 +#: apt-ftparchive.1.xml:237 msgid "" "Specifies the mode of all created index files. It defaults to 0644. All " "index files are set to this mode with no regard to the umask." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:243 +#: apt-ftparchive.1.xml:244 msgid "TreeDefault Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:245 +#: apt-ftparchive.1.xml:246 msgid "" "Sets defaults specific to <literal>Tree</literal> sections. All of these " "variables are substitution variables and have the strings $(DIST), " @@ -2833,12 +2862,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:250 +#: apt-ftparchive.1.xml:251 msgid "MaxContentsChange" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:252 +#: apt-ftparchive.1.xml:253 msgid "" "Sets the number of kilobytes of contents files that are generated each day. " "The contents files are round-robined so that over several days they will all " @@ -2846,12 +2875,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:257 +#: apt-ftparchive.1.xml:258 msgid "ContentsAge" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:259 +#: apt-ftparchive.1.xml:260 msgid "" "Controls the number of days a contents file is allowed to be checked without " "changing. If this limit is passed the mtime of the contents file is updated. " @@ -2862,63 +2891,63 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:268 +#: apt-ftparchive.1.xml:269 #, fuzzy msgid "Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:270 +#: apt-ftparchive.1.xml:271 msgid "" "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/" "$(SECTION)/binary-$(ARCH)/</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:274 +#: apt-ftparchive.1.xml:275 #, fuzzy msgid "SrcDirectory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:276 +#: apt-ftparchive.1.xml:277 msgid "" "Sets the top of the source package directory tree. Defaults to <filename>" "$(DIST)/$(SECTION)/source/</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406 +#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407 msgid "Packages" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:282 +#: apt-ftparchive.1.xml:283 msgid "" "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" "binary-$(ARCH)/Packages</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411 +#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412 #, fuzzy msgid "Sources" msgstr "Source-Symlinks" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:288 +#: apt-ftparchive.1.xml:289 msgid "" "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/" "source/Sources</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:292 +#: apt-ftparchive.1.xml:293 msgid "InternalPrefix" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:294 +#: apt-ftparchive.1.xml:295 msgid "" "Sets the path prefix that causes a symlink to be considered an internal link " "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</" @@ -2926,12 +2955,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417 +#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418 msgid "Contents" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:301 +#: apt-ftparchive.1.xml:302 msgid "" "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)" "</filename>. If this setting causes multiple Packages files to map onto a " @@ -2940,36 +2969,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:308 +#: apt-ftparchive.1.xml:309 msgid "Contents::Header" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:310 +#: apt-ftparchive.1.xml:311 msgid "Sets header file to prepend to the contents output." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442 +#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443 #, fuzzy msgid "BinCacheDB" msgstr "check" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:315 +#: apt-ftparchive.1.xml:316 msgid "" "Sets the binary cache database to use for this section. Multiple sections " "can share the same database." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:319 +#: apt-ftparchive.1.xml:320 #, fuzzy msgid "FileList" msgstr "Ficheros" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:321 +#: apt-ftparchive.1.xml:322 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " @@ -2977,13 +3006,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:326 +#: apt-ftparchive.1.xml:327 #, fuzzy msgid "SourceFileList" msgstr "source" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:328 +#: apt-ftparchive.1.xml:329 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " @@ -2992,12 +3021,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:336 +#: apt-ftparchive.1.xml:337 msgid "Tree Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:338 +#: apt-ftparchive.1.xml:339 msgid "" "The <literal>Tree</literal> section defines a standard Debian file tree " "which consists of a base directory, then multiple sections in that base " @@ -3007,7 +3036,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:343 +#: apt-ftparchive.1.xml:344 msgid "" "The <literal>Tree</literal> section takes a scope tag which sets the " "<literal>$(DIST)</literal> variable and defines the root of the tree (the " @@ -3016,7 +3045,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:348 +#: apt-ftparchive.1.xml:349 msgid "" "All of the settings defined in the <literal>TreeDefault</literal> section " "can be use in a <literal>Tree</literal> section as well as three new " @@ -3024,7 +3053,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt-ftparchive.1.xml:354 +#: apt-ftparchive.1.xml:355 #, no-wrap msgid "" "for i in Sections do \n" @@ -3034,7 +3063,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:351 +#: apt-ftparchive.1.xml:352 msgid "" "When processing a <literal>Tree</literal> section <command>apt-ftparchive</" "command> performs an operation similar to: <placeholder type=\"programlisting" @@ -3042,13 +3071,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:360 +#: apt-ftparchive.1.xml:361 #, fuzzy msgid "Sections" msgstr "Opciones" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:362 +#: apt-ftparchive.1.xml:363 msgid "" "This is a space separated list of sections which appear under the " "distribution, typically this is something like <literal>main contrib non-" @@ -3056,13 +3085,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:367 +#: apt-ftparchive.1.xml:368 #, fuzzy msgid "Architectures" msgstr "Arquitectura" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:369 +#: apt-ftparchive.1.xml:370 msgid "" "This is a space separated list of all the architectures that appear under " "search section. The special architecture 'source' is used to indicate that " @@ -3070,57 +3099,57 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422 +#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423 msgid "BinOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:376 +#: apt-ftparchive.1.xml:377 msgid "" "Sets the binary override file. The override file contains section, priority " "and maintainer address information." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427 +#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428 msgid "SrcOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:382 +#: apt-ftparchive.1.xml:383 msgid "" "Sets the source override file. The override file contains section " "information." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432 +#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433 msgid "ExtraOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434 +#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435 msgid "Sets the binary extra override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437 +#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438 msgid "SrcExtraOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439 +#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440 msgid "Sets the source extra override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:398 +#: apt-ftparchive.1.xml:399 #, fuzzy msgid "BinDirectory Section" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:400 +#: apt-ftparchive.1.xml:401 msgid "" "The <literal>bindirectory</literal> section defines a binary directory tree " "with no special structure. The scope tag specifies the location of the " @@ -3130,64 +3159,64 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:408 +#: apt-ftparchive.1.xml:409 msgid "Sets the Packages file output." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:413 +#: apt-ftparchive.1.xml:414 msgid "" "Sets the Sources file output. At least one of <literal>Packages</literal> or " "<literal>Sources</literal> is required." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:419 +#: apt-ftparchive.1.xml:420 msgid "Sets the Contents file output. (optional)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:424 +#: apt-ftparchive.1.xml:425 msgid "Sets the binary override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:429 +#: apt-ftparchive.1.xml:430 msgid "Sets the source override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:444 +#: apt-ftparchive.1.xml:445 msgid "Sets the cache DB." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:447 +#: apt-ftparchive.1.xml:448 msgid "PathPrefix" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:449 +#: apt-ftparchive.1.xml:450 msgid "Appends a path to all the output paths." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:452 +#: apt-ftparchive.1.xml:453 msgid "FileList, SourceFileList" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:454 +#: apt-ftparchive.1.xml:455 msgid "Specifies the file list file." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:461 +#: apt-ftparchive.1.xml:462 msgid "The Binary Override File" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:462 +#: apt-ftparchive.1.xml:463 msgid "" "The binary override file is fully compatible with &dpkg-scanpackages;. It " "contains 4 fields separated by spaces. The first field is the package name, " @@ -3197,19 +3226,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:468 +#: apt-ftparchive.1.xml:469 #, no-wrap msgid "old [// oldn]* => new" msgstr "" #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:470 +#: apt-ftparchive.1.xml:471 #, no-wrap msgid "new" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:467 +#: apt-ftparchive.1.xml:468 msgid "" "The general form of the maintainer field is: <placeholder type=" "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" " @@ -3220,12 +3249,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:478 +#: apt-ftparchive.1.xml:479 msgid "The Source Override File" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:480 +#: apt-ftparchive.1.xml:481 msgid "" "The source override file is fully compatible with &dpkg-scansources;. It " "contains 2 fields separated by spaces. The first fields is the source " @@ -3233,12 +3262,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:485 +#: apt-ftparchive.1.xml:486 msgid "The Extra Override File" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:487 +#: apt-ftparchive.1.xml:488 msgid "" "The extra override file allows any arbitrary tag to be added or replaced in " "the output. It has 3 columns, the first is the package, the second is the " @@ -3246,13 +3275,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:496 +#: apt-ftparchive.1.xml:497 #, fuzzy msgid "<option>--md5</option>" msgstr "<option>-d</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:498 +#: apt-ftparchive.1.xml:499 msgid "" "Generate MD5 sums. This defaults to on, when turned off the generated index " "files will not have MD5Sum fields where possible. Configuration Item: " @@ -3260,13 +3289,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:503 +#: apt-ftparchive.1.xml:504 #, fuzzy msgid "<option>--db</option>" msgstr "<option>-d</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:505 +#: apt-ftparchive.1.xml:506 #, fuzzy msgid "" "Use a binary caching DB. This has no effect on the generate command. " @@ -3276,7 +3305,7 @@ msgstr "" "Opción de configuración: <literal>APT::Cache::NamesOnly</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:511 +#: apt-ftparchive.1.xml:512 #, fuzzy msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " @@ -3291,13 +3320,13 @@ msgstr "" "Opción de configuración: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:517 +#: apt-ftparchive.1.xml:518 #, fuzzy msgid "<option>--delink</option>" msgstr "<option>-d</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:519 +#: apt-ftparchive.1.xml:520 #, fuzzy msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " @@ -3311,13 +3340,13 @@ msgstr "" "Cache::Generate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:525 +#: apt-ftparchive.1.xml:526 #, fuzzy msgid "<option>--contents</option>" msgstr "<option>--recon</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:527 +#: apt-ftparchive.1.xml:528 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -3327,13 +3356,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:535 +#: apt-ftparchive.1.xml:536 #, fuzzy msgid "<option>--source-override</option>" msgstr "<option>--force-yes</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:537 +#: apt-ftparchive.1.xml:538 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -3341,13 +3370,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:541 +#: apt-ftparchive.1.xml:542 #, fuzzy msgid "<option>--readonly</option>" msgstr "<option>--recon</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:543 +#: apt-ftparchive.1.xml:544 #, fuzzy msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" @@ -3357,15 +3386,35 @@ msgstr "" "Opción de configuración: <literal>APT::Cache::NamesOnly</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:547 +#: apt-ftparchive.1.xml:548 +#, fuzzy +msgid "<option>--arch</option>" +msgstr "<option>-a</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:549 +#, fuzzy +msgid "" +"Accept in the <literal>packages</literal> and <literal>contents</literal> " +"commands only package files matching <literal>*_arch.deb</literal> or " +"<literal>*_all.deb</literal> instead of all package files in the given " +"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>." +msgstr "" +"No actualiza los paquetes. Cuando se usa juntamente con <literal>install</" +"literal>, <literal>no-upgrade</literal> evita que se actualicen los paquetes " +"listados en la línea de órdenes si ya están previamente instalados. Opción " +"de Configuración: <literal>APT::Get::Upgrade</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:555 #, fuzzy msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>--all-versions</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:549 +#: apt-ftparchive.1.xml:557 msgid "" -"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " +"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " "will lead to problems as the now outdated cached metadata like size and " "checksums will be used. With this option enabled this will no longer happen " @@ -3377,13 +3426,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:559 +#: apt-ftparchive.1.xml:567 #, fuzzy msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>--all-versions</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:561 +#: apt-ftparchive.1.xml:569 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -3393,27 +3442,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 +#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477 #: sources.list.5.xml:193 #, fuzzy msgid "Examples" msgstr "Ejemplos" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:579 +#: apt-ftparchive.1.xml:587 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:575 +#: apt-ftparchive.1.xml:583 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:589 +#: apt-ftparchive.1.xml:597 #, fuzzy msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " @@ -7178,7 +7227,8 @@ msgstr "&apt-cache; &apt-conf;" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt_preferences.5.xml:13 -msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" +msgid "" +"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>" msgstr "" #. type: Content of: <refentry><refnamediv><refname> @@ -7245,6 +7295,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 msgid "" +"Preferences are a strong power in the hands of a system administrator but " +"they can become also their biggest nightmare if used without care! APT will " +"not questioning the preferences so wrong settings will therefore lead to " +"uninstallable packages or wrong decisions while upgrading packages. Even " +"more problems will arise if multiply distribution releases are mixed without " +"a good understanding of the following paragraphs. You have been warned." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:64 +msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " "following naming convention: The files have no or \"<literal>pref</literal>" @@ -7254,13 +7315,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:63 +#: apt_preferences.5.xml:71 #, fuzzy msgid "APT's Default Priority Assignments" msgstr "¿Cómo asigna APT las prioridades?" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:86 #, fuzzy, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "" @@ -7268,7 +7329,7 @@ msgstr "" "<command>apt-get install -t testing <replaceable>paquete</replaceable></command>\n" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:81 +#: apt_preferences.5.xml:89 #, fuzzy, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "" @@ -7276,7 +7337,7 @@ msgstr "" "APT::Default-Release \"stable\";\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:65 +#: apt_preferences.5.xml:73 #, fuzzy msgid "" "If there is no preferences file or if there is no entry in the file that " @@ -7301,25 +7362,25 @@ msgstr "" "(<filename>/etc/apt/apt.conf</filename>). Por ejemplo," #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:90 +#: apt_preferences.5.xml:98 #, fuzzy msgid "priority 100" msgstr "prioridad 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:91 +#: apt_preferences.5.xml:99 #, fuzzy msgid "to the version that is already installed (if any)." msgstr "a la versión instalada (si existe)." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:95 +#: apt_preferences.5.xml:103 #, fuzzy msgid "priority 500" msgstr "prioridad 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:96 +#: apt_preferences.5.xml:104 #, fuzzy msgid "" "to the versions that are not installed and do not belong to the target " @@ -7328,13 +7389,13 @@ msgstr "" "a la versión que ni está instalada ni pertenece a la distribución objetivo." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:100 +#: apt_preferences.5.xml:108 #, fuzzy msgid "priority 990" msgstr "prioridad 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:101 +#: apt_preferences.5.xml:109 #, fuzzy msgid "" "to the versions that are not installed and belong to the target release." @@ -7343,7 +7404,7 @@ msgstr "" "distribución objetivo." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:85 +#: apt_preferences.5.xml:93 #, fuzzy msgid "" "If the target release has been specified then APT uses the following " @@ -7355,7 +7416,7 @@ msgstr "" "Asigna:" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:106 +#: apt_preferences.5.xml:114 #, fuzzy msgid "" "If the target release has not been specified then APT simply assigns " @@ -7366,7 +7427,7 @@ msgstr "" "todas las versiones de los paquetes instalados y 500 al resto." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:110 +#: apt_preferences.5.xml:118 #, fuzzy msgid "" "APT then applies the following rules, listed in order of precedence, to " @@ -7376,7 +7437,7 @@ msgstr "" "determinar qué versión del paquete debe instalar." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 +#: apt_preferences.5.xml:121 #, fuzzy msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " @@ -7393,13 +7454,13 @@ msgstr "" "ser peligroso)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:119 +#: apt_preferences.5.xml:127 #, fuzzy msgid "Install the highest priority version." msgstr "Instalar la versión de mayor prioridad." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:120 +#: apt_preferences.5.xml:128 #, fuzzy msgid "" "If two or more versions have the same priority, install the most recent one " @@ -7409,7 +7470,7 @@ msgstr "" "(esto es, la que tiene un número de versión mayor)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:123 +#: apt_preferences.5.xml:131 #, fuzzy msgid "" "If two or more versions have the same priority and version number but either " @@ -7421,7 +7482,7 @@ msgstr "" "<literal>--reinstall</literal> se instala la que no está instalada." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:137 #, fuzzy msgid "" "In a typical situation, the installed version of a package (priority 100) " @@ -7437,7 +7498,7 @@ msgstr "" "get upgrade</command>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:136 +#: apt_preferences.5.xml:144 #, fuzzy msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " @@ -7452,7 +7513,7 @@ msgstr "" "get upgrade</command>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:141 +#: apt_preferences.5.xml:149 #, fuzzy msgid "" "Sometimes the installed version of a package is more recent than the version " @@ -7472,13 +7533,13 @@ msgstr "" "mayor que la versión instalada." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:150 +#: apt_preferences.5.xml:158 #, fuzzy msgid "The Effect of APT Preferences" msgstr "El efecto de las preferencias sobre APT" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:152 +#: apt_preferences.5.xml:160 #, fuzzy msgid "" "The APT preferences file allows the system administrator to control the " @@ -7492,7 +7553,7 @@ msgstr "" "registros pueden tener una o dos formas: una específica y otra general." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:166 #, fuzzy msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " @@ -7508,7 +7569,7 @@ msgstr "" "\"<literal>5.8</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:165 +#: apt_preferences.5.xml:173 #, fuzzy, no-wrap msgid "" "Package: perl\n" @@ -7521,7 +7582,7 @@ msgstr "" "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:171 +#: apt_preferences.5.xml:179 #, fuzzy msgid "" "The general form assigns a priority to all of the package versions in a " @@ -7537,7 +7598,7 @@ msgstr "" "nombre de dominio." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:177 +#: apt_preferences.5.xml:185 #, fuzzy msgid "" "This general-form entry in the APT preferences file applies only to groups " @@ -7549,7 +7610,7 @@ msgstr "" "prioridad alta a todas las versiones disponibles desde un sitio local." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:182 +#: apt_preferences.5.xml:190 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -7562,7 +7623,7 @@ msgstr "" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:187 +#: apt_preferences.5.xml:195 #, fuzzy msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " @@ -7579,7 +7640,7 @@ msgstr "" "\"Debian\" o \"Ximian\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:193 +#: apt_preferences.5.xml:201 #, fuzzy msgid "" "The following record assigns a low priority to all package versions " @@ -7591,7 +7652,7 @@ msgstr "" "Archivo \"<literal>unstable</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:197 +#: apt_preferences.5.xml:205 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -7604,7 +7665,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:202 +#: apt_preferences.5.xml:210 #, fuzzy msgid "" "The following record assigns a high priority to all package versions " @@ -7616,7 +7677,7 @@ msgstr "" "Archivo \"<literal>unstable</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:206 +#: apt_preferences.5.xml:214 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -7629,7 +7690,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:211 +#: apt_preferences.5.xml:219 #, fuzzy msgid "" "The following record assigns a high priority to all package versions " @@ -7642,7 +7703,7 @@ msgstr "" "literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:216 +#: apt_preferences.5.xml:224 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -7655,19 +7716,19 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:227 +#: apt_preferences.5.xml:235 #, fuzzy msgid "How APT Interprets Priorities" msgstr "¿Cómo interpreta APT las prioridades?" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:235 +#: apt_preferences.5.xml:243 #, fuzzy msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:236 +#: apt_preferences.5.xml:244 #, fuzzy msgid "" "causes a version to be installed even if this constitutes a downgrade of the " @@ -7677,13 +7738,13 @@ msgstr "" "el sistema." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:248 #, fuzzy msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:241 +#: apt_preferences.5.xml:249 #, fuzzy msgid "" "causes a version to be installed even if it does not come from the target " @@ -7693,13 +7754,13 @@ msgstr "" "que la versión instalada sea más reciente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:254 #, fuzzy msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:247 +#: apt_preferences.5.xml:255 #, fuzzy msgid "" "causes a version to be installed unless there is a version available " @@ -7710,13 +7771,13 @@ msgstr "" "reciente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:260 #, fuzzy msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:253 +#: apt_preferences.5.xml:261 #, fuzzy msgid "" "causes a version to be installed unless there is a version available " @@ -7726,13 +7787,13 @@ msgstr "" "distribución o la versión instalada sea más reciente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:258 +#: apt_preferences.5.xml:266 #, fuzzy msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:259 +#: apt_preferences.5.xml:267 #, fuzzy msgid "" "causes a version to be installed only if there is no installed version of " @@ -7741,19 +7802,19 @@ msgstr "" "la versión sólo se instala si no hay ninguna versión del paquete instalado." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:263 +#: apt_preferences.5.xml:271 #, fuzzy msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:264 +#: apt_preferences.5.xml:272 #, fuzzy msgid "prevents the version from being installed" msgstr "la versión nunca se instala." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:230 +#: apt_preferences.5.xml:238 #, fuzzy msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " @@ -7764,7 +7825,7 @@ msgstr "" "números enteros. Se interpretan (en general) del siguiente modo:" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:269 +#: apt_preferences.5.xml:277 #, fuzzy msgid "" "If any specific-form records match an available package version then the " @@ -7779,7 +7840,7 @@ msgstr "" "prioridad de la versión del paquete." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:275 +#: apt_preferences.5.xml:283 #, fuzzy msgid "" "For example, suppose the APT preferences file contains the three records " @@ -7789,7 +7850,7 @@ msgstr "" "registros antes mencionados:" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:279 +#: apt_preferences.5.xml:287 #, fuzzy, no-wrap msgid "" "Package: perl\n" @@ -7818,12 +7879,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:300 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:294 +#: apt_preferences.5.xml:302 #, fuzzy msgid "" "The most recent available version of the <literal>perl</literal> package " @@ -7839,7 +7900,7 @@ msgstr "" "entonces se instala la versión5.8*." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:299 +#: apt_preferences.5.xml:307 #, fuzzy msgid "" "A version of any package other than <literal>perl</literal> that is " @@ -7851,7 +7912,7 @@ msgstr "" "versiones, incluso sobre los pertenecientes a la distribución objetivo." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:303 +#: apt_preferences.5.xml:311 #, fuzzy msgid "" "A version of a package whose origin is not the local system but some other " @@ -7865,7 +7926,7 @@ msgstr "" "versión del paquete instalado." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:313 +#: apt_preferences.5.xml:321 #, fuzzy msgid "Determination of Package Version and Distribution Properties" msgstr "" @@ -7873,7 +7934,7 @@ msgstr "" "distribución" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:315 +#: apt_preferences.5.xml:323 #, fuzzy msgid "" "The locations listed in the &sources-list; file should provide " @@ -7885,31 +7946,31 @@ msgstr "" "describen los paquetes disponibles en cada uno de los sitios." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:327 +#: apt_preferences.5.xml:335 #, fuzzy msgid "the <literal>Package:</literal> line" msgstr "La línea <literal>Package:</literal> " #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:328 +#: apt_preferences.5.xml:336 #, fuzzy msgid "gives the package name" msgstr "Indica el nombre del paquete" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 +#: apt_preferences.5.xml:339 apt_preferences.5.xml:389 #, fuzzy msgid "the <literal>Version:</literal> line" msgstr "La línea <literal>Version:</literal> " #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:332 +#: apt_preferences.5.xml:340 #, fuzzy msgid "gives the version number for the named package" msgstr "Indica el número de versión del paquete" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:319 +#: apt_preferences.5.xml:327 #, fuzzy msgid "" "The <filename>Packages</filename> file is normally found in the directory " @@ -7931,13 +7992,13 @@ msgstr "" "cada registro:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:348 +#: apt_preferences.5.xml:356 #, fuzzy msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:349 +#: apt_preferences.5.xml:357 #, fuzzy msgid "" "names the archive to which all the packages in the directory tree belong. " @@ -7956,7 +8017,7 @@ msgstr "" "preferencias de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:367 #, fuzzy, no-wrap msgid "Pin: release a=stable\n" msgstr "" @@ -7964,13 +8025,13 @@ msgstr "" "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:365 +#: apt_preferences.5.xml:373 #, fuzzy msgid "the <literal>Codename:</literal> line" msgstr "La línea <literal>Component:</literal> " #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:366 +#: apt_preferences.5.xml:374 #, fuzzy msgid "" "names the codename to which all the packages in the directory tree belong. " @@ -7988,13 +8049,13 @@ msgstr "" "preferencias de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:383 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:382 +#: apt_preferences.5.xml:390 #, fuzzy msgid "" "names the release version. For example, the packages in the tree might " @@ -8011,7 +8072,7 @@ msgstr "" "siguientes línea en el fichero de preferencias de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:391 +#: apt_preferences.5.xml:399 #, fuzzy, no-wrap msgid "" "Pin: release v=3.0\n" @@ -8024,13 +8085,13 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:400 +#: apt_preferences.5.xml:408 #, fuzzy msgid "the <literal>Component:</literal> line" msgstr "La línea <literal>Component:</literal> " #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:401 +#: apt_preferences.5.xml:409 #, fuzzy msgid "" "names the licensing component associated with the packages in the directory " @@ -8049,7 +8110,7 @@ msgstr "" "de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:410 +#: apt_preferences.5.xml:418 #, fuzzy, no-wrap msgid "Pin: release c=main\n" msgstr "" @@ -8057,13 +8118,13 @@ msgstr "" "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:424 #, fuzzy msgid "the <literal>Origin:</literal> line" msgstr "La línea <literal>Origin:</literal> " #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:417 +#: apt_preferences.5.xml:425 #, fuzzy msgid "" "names the originator of the packages in the directory tree of the " @@ -8077,7 +8138,7 @@ msgstr "" "tendrá que poner la siguiente línea en el fichero de preferencias de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:423 +#: apt_preferences.5.xml:431 #, fuzzy, no-wrap msgid "Pin: release o=Debian\n" msgstr "" @@ -8085,13 +8146,13 @@ msgstr "" "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:437 #, fuzzy msgid "the <literal>Label:</literal> line" msgstr "La línea <literal>Label:</literal> " #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:430 +#: apt_preferences.5.xml:438 #, fuzzy msgid "" "names the label of the packages in the directory tree of the " @@ -8105,7 +8166,7 @@ msgstr "" "la siguiente línea en el fichero de preferencias de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:444 #, fuzzy, no-wrap msgid "Pin: release l=Debian\n" msgstr "" @@ -8113,7 +8174,7 @@ msgstr "" "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:337 +#: apt_preferences.5.xml:345 #, fuzzy msgid "" "The <filename>Release</filename> file is normally found in the directory " @@ -8135,7 +8196,7 @@ msgstr "" "<filename>Release</filename> son relevantes para las prioridades de APT:" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:443 +#: apt_preferences.5.xml:451 #, fuzzy msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " @@ -8161,13 +8222,13 @@ msgstr "" "la distribución <literal>inestable</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:456 +#: apt_preferences.5.xml:464 #, fuzzy msgid "Optional Lines in an APT Preferences Record" msgstr "Líneas opcionales en un registro de preferencias de APT" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:458 +#: apt_preferences.5.xml:466 #, fuzzy msgid "" "Each record in the APT preferences file can optionally begin with one or " @@ -8179,7 +8240,7 @@ msgstr "" "Útil para comentarios." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:462 +#: apt_preferences.5.xml:470 #, fuzzy msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " @@ -8192,13 +8253,13 @@ msgstr "" "una línea que empieze con <literal>Pin-Priority: release ...</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:471 +#: apt_preferences.5.xml:479 #, fuzzy msgid "Tracking Stable" msgstr "Siguiendo la distribución estable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:479 +#: apt_preferences.5.xml:487 #, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -8223,7 +8284,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:473 +#: apt_preferences.5.xml:481 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a priority " @@ -8238,8 +8299,8 @@ msgstr "" "de las distribuciones <literal>Debian</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 -#: apt_preferences.5.xml:600 +#: apt_preferences.5.xml:504 apt_preferences.5.xml:550 +#: apt_preferences.5.xml:608 #, fuzzy, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -8252,7 +8313,7 @@ msgstr "" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:491 +#: apt_preferences.5.xml:499 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -8266,13 +8327,13 @@ msgstr "" "última versión <literal>estable</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:508 +#: apt_preferences.5.xml:516 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "rdepends <replaceable>paquetes(s)</replaceable>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:502 +#: apt_preferences.5.xml:510 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -8285,13 +8346,13 @@ msgstr "" "de nuevo amenos que se ejecute de nuevo la orden." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:514 +#: apt_preferences.5.xml:522 #, fuzzy msgid "Tracking Testing or Unstable" msgstr "Siguiendo la distribución de pruebas o inestable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:523 +#: apt_preferences.5.xml:531 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -8320,7 +8381,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:524 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a high priority " @@ -8337,7 +8398,7 @@ msgstr "" "de <literal>Debian</literal>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:537 +#: apt_preferences.5.xml:545 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -8351,13 +8412,13 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:565 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "rdepends <replaceable>paquetes(s)</replaceable>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:548 +#: apt_preferences.5.xml:556 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -8377,12 +8438,12 @@ msgstr "" "versión instalada." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:564 +#: apt_preferences.5.xml:572 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:578 +#: apt_preferences.5.xml:586 #, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -8412,7 +8473,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:566 +#: apt_preferences.5.xml:574 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8427,7 +8488,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:595 +#: apt_preferences.5.xml:603 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -8441,13 +8502,13 @@ msgstr "" "última versión <literal>estable</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:615 +#: apt_preferences.5.xml:623 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "rdepends <replaceable>paquetes(s)</replaceable>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:606 +#: apt_preferences.5.xml:614 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -8467,13 +8528,13 @@ msgstr "" "versión instalada." #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:624 +#: apt_preferences.5.xml:632 #, fuzzy msgid "&file-preferences;" msgstr "apt_preferences" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:630 +#: apt_preferences.5.xml:638 #, fuzzy msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-conf;, &apt-get;, &sources-list;" diff --git a/doc/po/fr.po b/doc/po/fr.po index ed881fa32..de84a2ffe 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-01-20 12:18+0100\n" +"POT-Creation-Date: 2010-02-18 20:53+0100\n" "PO-Revision-Date: 2010-01-29 19:58+0100\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -1218,7 +1218,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 -#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 +#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125 #: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 #: sources.list.5.xml:33 @@ -1752,7 +1752,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 -#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 +#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 #: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 msgid "options" msgstr "options" @@ -1779,7 +1779,7 @@ msgstr "" "<literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376 +#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376 #: apt-sortpkgs.1.xml:58 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1806,12 +1806,12 @@ msgstr "" "<literal>Dir::Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1872,7 +1872,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 +#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1992,14 +1992,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 -#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 +#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:554 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:630 msgid "Files" msgstr "Fichiers" @@ -2010,9 +2010,9 @@ msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 +#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637 #: sources.list.5.xml:233 msgid "See Also" msgstr "Voir aussi" @@ -2024,7 +2024,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;." #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 +#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:575 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "Diagnostics" @@ -2104,9 +2104,16 @@ msgstr "add" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:66 +#, fuzzy +#| msgid "" +#| "<literal>add</literal> is used to add a new disc to the source list. It " +#| "will unmount the CDROM device, prompt for a disk to be inserted and then " +#| "procceed to scan it and copy the index files. If the disc does not have a " +#| "proper <filename>disk</filename> directory you will be prompted for a " +#| "descriptive title." msgid "" "<literal>add</literal> is used to add a new disc to the source list. It will " -"unmount the CDROM device, prompt for a disk to be inserted and then procceed " +"unmount the CDROM device, prompt for a disk to be inserted and then proceed " "to scan it and copy the index files. If the disc does not have a proper " "<filename>disk</filename> directory you will be prompted for a descriptive " "title." @@ -2159,7 +2166,7 @@ msgid "Options" msgstr "Options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328 +#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328 msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -2337,7 +2344,7 @@ msgstr "" "apt.conf</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:53 apt-ftparchive.1.xml:71 +#: apt-config.8.xml:53 apt-ftparchive.1.xml:72 msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given " "one of the commands below must be present." @@ -2404,7 +2411,7 @@ msgid "Just show the contents of the configuration space." msgstr "Affiche seulement le contenu de l'espace de configuration." #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 +#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593 #: apt-sortpkgs.1.xml:70 msgid "&apt-conf;" msgstr "&apt-conf;" @@ -2534,10 +2541,32 @@ msgstr "Outil de création de fichiers d'index" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-ftparchive.1.xml:36 +#, fuzzy +#| msgid "" +#| "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " +#| "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " +#| "<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +#| "arg> <arg><option>-o <replaceable>config</" +#| "replaceable>=<replaceable>string</replaceable></option></arg> " +#| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group " +#| "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat" +#| "\"><replaceable>path</replaceable></arg><arg><replaceable>override</" +#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +#| "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</" +#| "replaceable></arg><arg><replaceable>override</" +#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +#| "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></" +#| "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</" +#| "replaceable></arg></arg> <arg>generate <arg choice=\"plain" +#| "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep=" +#| "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg " +#| "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </" +#| "group>" msgid "" "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " "<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></" "arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</" "replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></" "option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=" @@ -2574,7 +2603,7 @@ msgstr "" "replaceable></arg></arg> </group>" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:56 +#: apt-ftparchive.1.xml:57 msgid "" "<command>apt-ftparchive</command> is the command line tool that generates " "the index files that APT uses to access a distribution source. The index " @@ -2586,7 +2615,7 @@ msgstr "" "index doit être créé pour un site et basé sur le contenu de ce site." #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:60 +#: apt-ftparchive.1.xml:61 msgid "" "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; " "program, incorporating its entire functionality via the <literal>packages</" @@ -2601,7 +2630,7 @@ msgstr "" "élaborée pour « scripter » le processus de création d'une archive complète." #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:66 +#: apt-ftparchive.1.xml:67 msgid "" "Internally <command>apt-ftparchive</command> can make use of binary " "databases to cache the contents of a .deb file and it does not rely on any " @@ -2616,12 +2645,12 @@ msgstr "" "voulus." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:75 +#: apt-ftparchive.1.xml:76 msgid "packages" msgstr "packages" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:77 +#: apt-ftparchive.1.xml:78 msgid "" "The packages command generates a package file from a directory tree. It " "takes the given directory and recursively searches it for .deb files, " @@ -2635,7 +2664,7 @@ msgstr "" "équivalente à &dpkg-scanpackages;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106 +#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107 msgid "" "The option <option>--db</option> can be used to specify a binary caching DB." msgstr "" @@ -2643,12 +2672,12 @@ msgstr "" "binaire." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:85 +#: apt-ftparchive.1.xml:86 msgid "sources" msgstr "sources" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:87 +#: apt-ftparchive.1.xml:88 msgid "" "The <literal>sources</literal> command generates a source index file from a " "directory tree. It takes the given directory and recursively searches it " @@ -2662,7 +2691,7 @@ msgstr "" "équivalente à &dpkg-scansources;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:92 +#: apt-ftparchive.1.xml:93 msgid "" "If an override file is specified then a source override file will be looked " "for with an extension of .src. The --source-override option can be used to " @@ -2673,12 +2702,12 @@ msgstr "" "source-override</option> pour changer de fichier source d'« override »." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:97 +#: apt-ftparchive.1.xml:98 msgid "contents" msgstr "contents" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:99 +#: apt-ftparchive.1.xml:100 msgid "" "The <literal>contents</literal> command generates a contents file from a " "directory tree. It takes the given directory and recursively searches it " @@ -2696,12 +2725,12 @@ msgstr "" "sépare les paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:109 +#: apt-ftparchive.1.xml:110 msgid "release" msgstr "release" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:111 +#: apt-ftparchive.1.xml:112 msgid "" "The <literal>release</literal> command generates a Release file from a " "directory tree. It recursively searches the given directory for Packages, " @@ -2716,7 +2745,7 @@ msgstr "" "standard avec un résumé MD5 et un résumé SHA1 pour chaque fichier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:118 +#: apt-ftparchive.1.xml:119 msgid "" "Values for the additional metadata fields in the Release file are taken from " "the corresponding variables under <literal>APT::FTPArchive::Release</" @@ -2735,12 +2764,12 @@ msgstr "" "<literal>Components</literal>, <literal>Description</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:128 +#: apt-ftparchive.1.xml:129 msgid "generate" msgstr "generate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:130 +#: apt-ftparchive.1.xml:131 msgid "" "The <literal>generate</literal> command is designed to be runnable from a " "cron script and builds indexes according to the given config file. The " @@ -2754,12 +2783,12 @@ msgstr "" "préciser index et répertoires aussi bien que les paramètres requis." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:137 apt-get.8.xml:292 +#: apt-ftparchive.1.xml:138 apt-get.8.xml:292 msgid "clean" msgstr "clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:139 +#: apt-ftparchive.1.xml:140 msgid "" "The <literal>clean</literal> command tidies the databases used by the given " "configuration file by removing any records that are no longer necessary." @@ -2769,12 +2798,12 @@ msgstr "" "sont plus nécessaires." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:145 +#: apt-ftparchive.1.xml:146 msgid "The Generate Configuration" msgstr "Configuration de la commande generate" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:147 +#: apt-ftparchive.1.xml:148 msgid "" "The <literal>generate</literal> command uses a configuration file to " "describe the archives that are going to be generated. It follows the typical " @@ -2791,19 +2820,19 @@ msgstr "" "arborescence. Cela n'affecte que l'usage de l'étiquette de visée (scope tag)." #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:155 +#: apt-ftparchive.1.xml:156 msgid "" "The generate configuration has 4 separate sections, each described below." msgstr "" "Ce fichier de configuration possède quatre sections, décrites ci-dessous." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:157 +#: apt-ftparchive.1.xml:158 msgid "Dir Section" msgstr "La section Dir" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:159 +#: apt-ftparchive.1.xml:160 msgid "" "The <literal>Dir</literal> section defines the standard directories needed " "to locate the files required during the generation process. These " @@ -2816,12 +2845,12 @@ msgstr "" "manière à produire un chemin absolu et complet." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:164 +#: apt-ftparchive.1.xml:165 msgid "ArchiveDir" msgstr "ArchiveDir" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:166 +#: apt-ftparchive.1.xml:167 msgid "" "Specifies the root of the FTP archive, in a standard Debian configuration " "this is the directory that contains the <filename>ls-LR</filename> and dist " @@ -2832,32 +2861,32 @@ msgstr "" "filename> et les noeuds des distributions." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:171 +#: apt-ftparchive.1.xml:172 msgid "OverrideDir" msgstr "OverrideDir" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:173 +#: apt-ftparchive.1.xml:174 msgid "Specifies the location of the override files." msgstr "Indique l'emplacement des fichiers d'« override »." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:176 +#: apt-ftparchive.1.xml:177 msgid "CacheDir" msgstr "CacheDir" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:178 +#: apt-ftparchive.1.xml:179 msgid "Specifies the location of the cache files" msgstr "Indique l'emplacement des fichiers de cache." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:181 +#: apt-ftparchive.1.xml:182 msgid "FileListDir" msgstr "FileListDir" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:183 +#: apt-ftparchive.1.xml:184 msgid "" "Specifies the location of the file list files, if the <literal>FileList</" "literal> setting is used below." @@ -2866,12 +2895,12 @@ msgstr "" "sert de la valeur <literal>FileList</literal> définie plus bas)." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:189 +#: apt-ftparchive.1.xml:190 msgid "Default Section" msgstr "La section Default" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:191 +#: apt-ftparchive.1.xml:192 msgid "" "The <literal>Default</literal> section specifies default values, and " "settings that control the operation of the generator. Other sections may " @@ -2882,12 +2911,12 @@ msgstr "" "annulées dans d'autres sections (paramètrage par section)." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:195 +#: apt-ftparchive.1.xml:196 msgid "Packages::Compress" msgstr "Packages::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:197 +#: apt-ftparchive.1.xml:198 msgid "" "Sets the default compression schemes to use for the Package index files. It " "is a string that contains a space separated list of at least one of: '.' (no " @@ -2900,12 +2929,12 @@ msgstr "" "défaut, c'est la chaîne « . gzip »." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:203 +#: apt-ftparchive.1.xml:204 msgid "Packages::Extensions" msgstr "Packages::Extensions" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:205 +#: apt-ftparchive.1.xml:206 msgid "" "Sets the default list of file extensions that are package files. This " "defaults to '.deb'." @@ -2914,12 +2943,12 @@ msgstr "" "paquets. Par défaut, c'est « .deb »." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:209 +#: apt-ftparchive.1.xml:210 msgid "Sources::Compress" msgstr "Sources::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:211 +#: apt-ftparchive.1.xml:212 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Sources files." @@ -2928,12 +2957,12 @@ msgstr "" "compressés les fichiers sources." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:215 +#: apt-ftparchive.1.xml:216 msgid "Sources::Extensions" msgstr "Sources::Extensions" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:217 +#: apt-ftparchive.1.xml:218 msgid "" "Sets the default list of file extensions that are source files. This " "defaults to '.dsc'." @@ -2942,12 +2971,12 @@ msgstr "" "fichiers sources. Par défaut, c'est « .dsc »." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:221 +#: apt-ftparchive.1.xml:222 msgid "Contents::Compress" msgstr "Contents::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:223 +#: apt-ftparchive.1.xml:224 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Contents files." @@ -2956,12 +2985,12 @@ msgstr "" "compressés les fichiers « Contents »." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:227 +#: apt-ftparchive.1.xml:228 msgid "DeLinkLimit" msgstr "DeLinkLimit" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:229 +#: apt-ftparchive.1.xml:230 msgid "" "Specifies the number of kilobytes to delink (and replace with hard links) " "per run. This is used in conjunction with the per-section <literal>External-" @@ -2972,12 +3001,12 @@ msgstr "" "paramètre <literal>External-Links</literal>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:234 +#: apt-ftparchive.1.xml:235 msgid "FileMode" msgstr "FileMode" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:236 +#: apt-ftparchive.1.xml:237 msgid "" "Specifies the mode of all created index files. It defaults to 0644. All " "index files are set to this mode with no regard to the umask." @@ -2987,12 +3016,12 @@ msgstr "" "utilisateur (umasq) est ignoré." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:243 +#: apt-ftparchive.1.xml:244 msgid "TreeDefault Section" msgstr "La section TreeDefault" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:245 +#: apt-ftparchive.1.xml:246 msgid "" "Sets defaults specific to <literal>Tree</literal> sections. All of these " "variables are substitution variables and have the strings $(DIST), " @@ -3004,12 +3033,12 @@ msgstr "" "respective." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:250 +#: apt-ftparchive.1.xml:251 msgid "MaxContentsChange" msgstr "MaxContentsChange" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:252 +#: apt-ftparchive.1.xml:253 msgid "" "Sets the number of kilobytes of contents files that are generated each day. " "The contents files are round-robined so that over several days they will all " @@ -3021,12 +3050,12 @@ msgstr "" "soient reconstruits." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:257 +#: apt-ftparchive.1.xml:258 msgid "ContentsAge" msgstr "ContentsAge" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:259 +#: apt-ftparchive.1.xml:260 msgid "" "Controls the number of days a contents file is allowed to be checked without " "changing. If this limit is passed the mtime of the contents file is updated. " @@ -3044,12 +3073,12 @@ msgstr "" "nombre vaut 10, l'unité étant le jour." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:268 +#: apt-ftparchive.1.xml:269 msgid "Directory" msgstr "Directory" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:270 +#: apt-ftparchive.1.xml:271 msgid "" "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/" "$(SECTION)/binary-$(ARCH)/</filename>" @@ -3058,12 +3087,12 @@ msgstr "" "$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:274 +#: apt-ftparchive.1.xml:275 msgid "SrcDirectory" msgstr "SrcDirectory" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:276 +#: apt-ftparchive.1.xml:277 msgid "" "Sets the top of the source package directory tree. Defaults to <filename>" "$(DIST)/$(SECTION)/source/</filename>" @@ -3072,12 +3101,12 @@ msgstr "" "<filename>$(DIST)/$(SECTION)/source/</filename>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406 +#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407 msgid "Packages" msgstr "Packages" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:282 +#: apt-ftparchive.1.xml:283 msgid "" "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" "binary-$(ARCH)/Packages</filename>" @@ -3086,12 +3115,12 @@ msgstr "" "$(SECTION)/binary-$(ARCH)/Packages</filename>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411 +#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412 msgid "Sources" msgstr "Sources" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:288 +#: apt-ftparchive.1.xml:289 msgid "" "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/" "source/Sources</filename>" @@ -3100,12 +3129,12 @@ msgstr "" "$(SECTION)/source/Sources</filename>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:292 +#: apt-ftparchive.1.xml:293 msgid "InternalPrefix" msgstr "InternalPrefix" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:294 +#: apt-ftparchive.1.xml:295 msgid "" "Sets the path prefix that causes a symlink to be considered an internal link " "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</" @@ -3116,12 +3145,12 @@ msgstr "" "défaut, c'est <filename>$(DIST)/$(SECTION)/</filename>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417 +#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418 msgid "Contents" msgstr "Contents" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:301 +#: apt-ftparchive.1.xml:302 msgid "" "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)" "</filename>. If this setting causes multiple Packages files to map onto a " @@ -3134,22 +3163,22 @@ msgstr "" "ftparchive</command> les intègre automatiquement." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:308 +#: apt-ftparchive.1.xml:309 msgid "Contents::Header" msgstr "Contents::Header" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:310 +#: apt-ftparchive.1.xml:311 msgid "Sets header file to prepend to the contents output." msgstr "Indique l'en-tête à préfixer au fichier « Contents » créé." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442 +#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443 msgid "BinCacheDB" msgstr "BinCacheDB" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:315 +#: apt-ftparchive.1.xml:316 msgid "" "Sets the binary cache database to use for this section. Multiple sections " "can share the same database." @@ -3158,12 +3187,12 @@ msgstr "" "Différentes sections peuvent partager cette base de données." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:319 +#: apt-ftparchive.1.xml:320 msgid "FileList" msgstr "FileList" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:321 +#: apt-ftparchive.1.xml:322 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " @@ -3174,12 +3203,12 @@ msgstr "" "relatifs sont préfixés par le répertoire de l'archive." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:326 +#: apt-ftparchive.1.xml:327 msgid "SourceFileList" msgstr "SourceFileList" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:328 +#: apt-ftparchive.1.xml:329 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " @@ -3192,12 +3221,12 @@ msgstr "" "traiter les index de sources." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:336 +#: apt-ftparchive.1.xml:337 msgid "Tree Section" msgstr "La section Tree" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:338 +#: apt-ftparchive.1.xml:339 msgid "" "The <literal>Tree</literal> section defines a standard Debian file tree " "which consists of a base directory, then multiple sections in that base " @@ -3211,7 +3240,7 @@ msgstr "" "par la variable de substitution <literal>Directory</literal>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:343 +#: apt-ftparchive.1.xml:344 msgid "" "The <literal>Tree</literal> section takes a scope tag which sets the " "<literal>$(DIST)</literal> variable and defines the root of the tree (the " @@ -3224,7 +3253,7 @@ msgstr "" "C'est par exemple : <filename>dists/woody</filename>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:348 +#: apt-ftparchive.1.xml:349 msgid "" "All of the settings defined in the <literal>TreeDefault</literal> section " "can be use in a <literal>Tree</literal> section as well as three new " @@ -3235,7 +3264,7 @@ msgstr "" "trois nouvelles variables suivantes." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt-ftparchive.1.xml:354 +#: apt-ftparchive.1.xml:355 #, no-wrap msgid "" "for i in Sections do \n" @@ -3249,7 +3278,7 @@ msgstr "" " " #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:351 +#: apt-ftparchive.1.xml:352 msgid "" "When processing a <literal>Tree</literal> section <command>apt-ftparchive</" "command> performs an operation similar to: <placeholder type=\"programlisting" @@ -3260,12 +3289,12 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:360 +#: apt-ftparchive.1.xml:361 msgid "Sections" msgstr "Sections" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:362 +#: apt-ftparchive.1.xml:363 msgid "" "This is a space separated list of sections which appear under the " "distribution, typically this is something like <literal>main contrib non-" @@ -3276,12 +3305,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:367 +#: apt-ftparchive.1.xml:368 msgid "Architectures" msgstr "Architectures" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:369 +#: apt-ftparchive.1.xml:370 msgid "" "This is a space separated list of all the architectures that appear under " "search section. The special architecture 'source' is used to indicate that " @@ -3292,12 +3321,12 @@ msgstr "" "que l'arborescence est une arborescence de sources." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422 +#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423 msgid "BinOverride" msgstr "BinOverride" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:376 +#: apt-ftparchive.1.xml:377 msgid "" "Sets the binary override file. The override file contains section, priority " "and maintainer address information." @@ -3306,12 +3335,12 @@ msgstr "" "informations sur la section, la priorité et le responsable du paquet." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427 +#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428 msgid "SrcOverride" msgstr "SrcOverride" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:382 +#: apt-ftparchive.1.xml:383 msgid "" "Sets the source override file. The override file contains section " "information." @@ -3320,32 +3349,32 @@ msgstr "" "informations sur la section." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432 +#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433 msgid "ExtraOverride" msgstr "ExtraOverride" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434 +#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435 msgid "Sets the binary extra override file." msgstr "Indique un autre fichier d'« override » pour les binaires." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437 +#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438 msgid "SrcExtraOverride" msgstr "SrcExtraOverride" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439 +#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440 msgid "Sets the source extra override file." msgstr "Indique un autre fichier d'« override » pour les sources." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:398 +#: apt-ftparchive.1.xml:399 msgid "BinDirectory Section" msgstr "La section BinDirectory" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:400 +#: apt-ftparchive.1.xml:401 msgid "" "The <literal>bindirectory</literal> section defines a binary directory tree " "with no special structure. The scope tag specifies the location of the " @@ -3360,12 +3389,12 @@ msgstr "" "paramètrage de <literal>Section</literal><literal>Architecture</literal>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:408 +#: apt-ftparchive.1.xml:409 msgid "Sets the Packages file output." msgstr "Définit le fichier « Packages » créé." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:413 +#: apt-ftparchive.1.xml:414 msgid "" "Sets the Sources file output. At least one of <literal>Packages</literal> or " "<literal>Sources</literal> is required." @@ -3374,52 +3403,52 @@ msgstr "" "<literal>Packages</literal> ou <literal>Sources</literal> est nécessaire." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:419 +#: apt-ftparchive.1.xml:420 msgid "Sets the Contents file output. (optional)" msgstr "Définit le fichier « Contents » créé." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:424 +#: apt-ftparchive.1.xml:425 msgid "Sets the binary override file." msgstr "Définit le fichier d'« override » pour les binaires." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:429 +#: apt-ftparchive.1.xml:430 msgid "Sets the source override file." msgstr "Définit le fichier d'« override » pour les sources." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:444 +#: apt-ftparchive.1.xml:445 msgid "Sets the cache DB." msgstr "Définit la base de données cache." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:447 +#: apt-ftparchive.1.xml:448 msgid "PathPrefix" msgstr "PathPrefix" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:449 +#: apt-ftparchive.1.xml:450 msgid "Appends a path to all the output paths." msgstr "Ajoute un chemin à tous les chemins créés." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:452 +#: apt-ftparchive.1.xml:453 msgid "FileList, SourceFileList" msgstr "FileList, SourceFileList" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:454 +#: apt-ftparchive.1.xml:455 msgid "Specifies the file list file." msgstr "Définit le fichier contenant la liste des fichiers." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:461 +#: apt-ftparchive.1.xml:462 msgid "The Binary Override File" msgstr "Le fichier d'« Override » pour les binaires." #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:462 +#: apt-ftparchive.1.xml:463 msgid "" "The binary override file is fully compatible with &dpkg-scanpackages;. It " "contains 4 fields separated by spaces. The first field is the package name, " @@ -3434,19 +3463,19 @@ msgstr "" "responsable de paquet." #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:468 +#: apt-ftparchive.1.xml:469 #, no-wrap msgid "old [// oldn]* => new" msgstr "old [// oldn]* => new" #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:470 +#: apt-ftparchive.1.xml:471 #, no-wrap msgid "new" msgstr "new" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:467 +#: apt-ftparchive.1.xml:468 msgid "" "The general form of the maintainer field is: <placeholder type=" "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" " @@ -3463,12 +3492,12 @@ msgstr "" "deuxième forme remplace inconditionnellement le champ." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:478 +#: apt-ftparchive.1.xml:479 msgid "The Source Override File" msgstr "Le fichier d'« Override » pour les sources" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:480 +#: apt-ftparchive.1.xml:481 msgid "" "The source override file is fully compatible with &dpkg-scansources;. It " "contains 2 fields separated by spaces. The first fields is the source " @@ -3479,12 +3508,12 @@ msgstr "" "sa section." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:485 +#: apt-ftparchive.1.xml:486 msgid "The Extra Override File" msgstr "Le fichier supplémentaire d'« Override »" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:487 +#: apt-ftparchive.1.xml:488 msgid "" "The extra override file allows any arbitrary tag to be added or replaced in " "the output. It has 3 columns, the first is the package, the second is the " @@ -3496,12 +3525,12 @@ msgstr "" "la nouvelle valeur." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:496 +#: apt-ftparchive.1.xml:497 msgid "<option>--md5</option>" msgstr "<option>--md5</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:498 +#: apt-ftparchive.1.xml:499 msgid "" "Generate MD5 sums. This defaults to on, when turned off the generated index " "files will not have MD5Sum fields where possible. Configuration Item: " @@ -3513,12 +3542,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:503 +#: apt-ftparchive.1.xml:504 msgid "<option>--db</option>" msgstr "<option>--db</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:505 +#: apt-ftparchive.1.xml:506 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." @@ -3528,7 +3557,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:511 +#: apt-ftparchive.1.xml:512 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -3543,12 +3572,12 @@ msgstr "" "configuration : <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:517 +#: apt-ftparchive.1.xml:518 msgid "<option>--delink</option>" msgstr "<option>--delink</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:519 +#: apt-ftparchive.1.xml:520 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -3562,12 +3591,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:525 +#: apt-ftparchive.1.xml:526 msgid "<option>--contents</option>" msgstr "<option>--contents</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:527 +#: apt-ftparchive.1.xml:528 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -3583,12 +3612,12 @@ msgstr "" "de configuration : <literal>APT::FTPArchive::Contents</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:535 +#: apt-ftparchive.1.xml:536 msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:537 +#: apt-ftparchive.1.xml:538 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -3599,12 +3628,12 @@ msgstr "" "FTPArchive::SourceOverride</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:541 +#: apt-ftparchive.1.xml:542 msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:543 +#: apt-ftparchive.1.xml:544 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@ -3613,16 +3642,42 @@ msgstr "" "configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:547 +#: apt-ftparchive.1.xml:548 +#, fuzzy +#| msgid "<option>-a</option>" +msgid "<option>--arch</option>" +msgstr "<option>-a</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:549 +#, fuzzy +#| msgid "" +#| "If the command is either <literal>install</literal> or <literal>remove</" +#| "literal>, then this option acts like running <literal>autoremove</" +#| "literal> command, removing the unused dependency packages. Configuration " +#| "Item: <literal>APT::Get::AutomaticRemove</literal>." +msgid "" +"Accept in the <literal>packages</literal> and <literal>contents</literal> " +"commands only package files matching <literal>*_arch.deb</literal> or " +"<literal>*_all.deb</literal> instead of all package files in the given " +"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>." +msgstr "" +"Si la commande utilisée est soit <literal>install</literal> soit " +"<literal>remove</literal>, cette option a le même effet " +"qu'<literal>autoremove</literal> et supprime les paquets de dépendance " +"inutilisés. Élément de configuration : <literal>APT::Get::Upgrade</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:555 #, fuzzy #| msgid "<option>APT::FTPArchive::LongDescription</option>" msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:549 +#: apt-ftparchive.1.xml:557 msgid "" -"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " +"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " "will lead to problems as the now outdated cached metadata like size and " "checksums will be used. With this option enabled this will no longer happen " @@ -3634,12 +3689,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:559 +#: apt-ftparchive.1.xml:567 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:561 +#: apt-ftparchive.1.xml:569 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -3654,19 +3709,19 @@ msgstr "" "pas possible de créer ces fichiers avec <command>apt-ftparchive</command>." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 +#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477 #: sources.list.5.xml:193 msgid "Examples" msgstr "Exemples" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:579 +#: apt-ftparchive.1.xml:587 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:575 +#: apt-ftparchive.1.xml:583 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3675,7 +3730,7 @@ msgstr "" "paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:589 +#: apt-ftparchive.1.xml:597 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -7903,7 +7958,10 @@ msgstr "&apt-cache;, &apt-config;, &apt-preferences;." #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt_preferences.5.xml:13 -msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" +#, fuzzy +#| msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" +msgid "" +"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>" msgstr "&apt-author.team; &apt-email; &apt-product; <date>04 mai 2009</date>" #. type: Content of: <refentry><refnamediv><refname> @@ -7969,6 +8027,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 msgid "" +"Preferences are a strong power in the hands of a system administrator but " +"they can become also their biggest nightmare if used without care! APT will " +"not questioning the preferences so wrong settings will therefore lead to " +"uninstallable packages or wrong decisions while upgrading packages. Even " +"more problems will arise if multiply distribution releases are mixed without " +"a good understanding of the following paragraphs. You have been warned." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:64 +msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " "following naming convention: The files have no or \"<literal>pref</literal>" @@ -7978,24 +8047,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:63 +#: apt_preferences.5.xml:71 msgid "APT's Default Priority Assignments" msgstr "Priorités affectées par défaut" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:86 #, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "<command>apt-get install -t testing <replaceable>paquet</replaceable></command>\n" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:81 +#: apt_preferences.5.xml:89 #, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "APT::Default-Release \"stable\";\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:65 +#: apt_preferences.5.xml:73 msgid "" "If there is no preferences file or if there is no entry in the file that " "applies to a particular version then the priority assigned to that version " @@ -8020,22 +8089,22 @@ msgstr "" "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:90 +#: apt_preferences.5.xml:98 msgid "priority 100" msgstr "une priorité égale à 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:91 +#: apt_preferences.5.xml:99 msgid "to the version that is already installed (if any)." msgstr "est affectée à la version déjà installée (si elle existe)." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:95 +#: apt_preferences.5.xml:103 msgid "priority 500" msgstr "une priorité égale à 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:96 +#: apt_preferences.5.xml:104 msgid "" "to the versions that are not installed and do not belong to the target " "release." @@ -8044,12 +8113,12 @@ msgstr "" "pas à la distribution par défaut." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:100 +#: apt_preferences.5.xml:108 msgid "priority 990" msgstr "une priorité égale à 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:101 +#: apt_preferences.5.xml:109 msgid "" "to the versions that are not installed and belong to the target release." msgstr "" @@ -8057,7 +8126,7 @@ msgstr "" "la distribution par défaut." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:85 +#: apt_preferences.5.xml:93 msgid "" "If the target release has been specified then APT uses the following " "algorithm to set the priorities of the versions of a package. Assign: " @@ -8068,7 +8137,7 @@ msgstr "" "type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:106 +#: apt_preferences.5.xml:114 msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " @@ -8079,7 +8148,7 @@ msgstr "" "une priorité égale à 500 à tout version non installée." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:110 +#: apt_preferences.5.xml:118 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." @@ -8088,7 +8157,7 @@ msgstr "" "qu'il faut installer (par ordre de priorité) :" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 +#: apt_preferences.5.xml:121 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -8104,12 +8173,12 @@ msgstr "" "arrière." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:119 +#: apt_preferences.5.xml:127 msgid "Install the highest priority version." msgstr "Installer la version qui possède la priorité la plus haute." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:120 +#: apt_preferences.5.xml:128 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." @@ -8118,7 +8187,7 @@ msgstr "" "plus récente (c.-à-d. celle dont le numéro de version est le plus grand)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:123 +#: apt_preferences.5.xml:131 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@ -8130,7 +8199,7 @@ msgstr "" "qui n'est pas installée." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:137 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@ -8145,7 +8214,7 @@ msgstr "" "replaceable></command> ou <command>apt-get dist-upgrade</command>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:136 +#: apt_preferences.5.xml:144 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@ -8158,7 +8227,7 @@ msgstr "" "<command>apt-get upgrade</command> ne provoquent pas de retour en arrière." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:141 +#: apt_preferences.5.xml:149 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@ -8177,12 +8246,12 @@ msgstr "" "priorité que celle de la version installée." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:150 +#: apt_preferences.5.xml:158 msgid "The Effect of APT Preferences" msgstr "Conséquences des préférences" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:152 +#: apt_preferences.5.xml:160 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -8195,7 +8264,7 @@ msgstr "" "formes, une forme particulière et une forme générale." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:166 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@ -8210,7 +8279,7 @@ msgstr "" "dont le numéro de version commence par <literal>5.8</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:165 +#: apt_preferences.5.xml:173 #, no-wrap msgid "" "Package: perl\n" @@ -8222,7 +8291,7 @@ msgstr "" "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:171 +#: apt_preferences.5.xml:179 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@ -8237,7 +8306,7 @@ msgstr "" "un nom complètement qualifié." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:177 +#: apt_preferences.5.xml:185 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@ -8248,7 +8317,7 @@ msgstr "" "priorité haute à toutes les versions disponibles dans le site local." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:182 +#: apt_preferences.5.xml:190 #, no-wrap msgid "" "Package: *\n" @@ -8260,7 +8329,7 @@ msgstr "" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:187 +#: apt_preferences.5.xml:195 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " "This should not be confused with the Origin of a distribution as specified " @@ -8275,7 +8344,7 @@ msgstr "" "mais le nom d'un auteur ou d'un distributeur, comme « Debian » ou « Ximian »." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:193 +#: apt_preferences.5.xml:201 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -8286,7 +8355,7 @@ msgstr "" "<literal>unstable</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:197 +#: apt_preferences.5.xml:205 #, no-wrap msgid "" "Package: *\n" @@ -8298,7 +8367,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:202 +#: apt_preferences.5.xml:210 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>squeeze</literal>" @@ -8309,7 +8378,7 @@ msgstr "" "<literal>squeeze</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:206 +#: apt_preferences.5.xml:214 #, no-wrap msgid "" "Package: *\n" @@ -8321,7 +8390,7 @@ msgstr "" "Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:211 +#: apt_preferences.5.xml:219 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -8333,7 +8402,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:216 +#: apt_preferences.5.xml:224 #, no-wrap msgid "" "Package: *\n" @@ -8345,17 +8414,17 @@ msgstr "" "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:227 +#: apt_preferences.5.xml:235 msgid "How APT Interprets Priorities" msgstr "Méthode d'interprétation des priorités par APT" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:235 +#: apt_preferences.5.xml:243 msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:236 +#: apt_preferences.5.xml:244 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@ -8364,12 +8433,12 @@ msgstr "" "retour en arrière." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:248 msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:241 +#: apt_preferences.5.xml:249 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@ -8379,12 +8448,12 @@ msgstr "" "plus récente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:254 msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:247 +#: apt_preferences.5.xml:255 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" @@ -8393,12 +8462,12 @@ msgstr "" "distribution par défaut ou si la version installée est plus récente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:260 msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:253 +#: apt_preferences.5.xml:261 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" @@ -8407,29 +8476,29 @@ msgstr "" "autre distribution ou si la version installée est plus récente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:258 +#: apt_preferences.5.xml:266 msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:259 +#: apt_preferences.5.xml:267 msgid "" "causes a version to be installed only if there is no installed version of " "the package" msgstr "la version sera installée si aucune version du paquet n'est installée." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:263 +#: apt_preferences.5.xml:271 msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:264 +#: apt_preferences.5.xml:272 msgid "prevents the version from being installed" msgstr "cette priorité empêche l'installation de la version." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:230 +#: apt_preferences.5.xml:238 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -8440,7 +8509,7 @@ msgstr "" "<placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:269 +#: apt_preferences.5.xml:277 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -8454,7 +8523,7 @@ msgstr "" "trouvée détermine la priorité." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:275 +#: apt_preferences.5.xml:283 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@ -8463,7 +8532,7 @@ msgstr "" "entrées décrites ci-dessous :" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:279 +#: apt_preferences.5.xml:287 #, no-wrap msgid "" "Package: perl\n" @@ -8491,12 +8560,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:300 msgid "Then:" msgstr "Alors :" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:294 +#: apt_preferences.5.xml:302 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -8510,7 +8579,7 @@ msgstr "" "installée est une version 5.9*, il y aura un retour en arrière." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:299 +#: apt_preferences.5.xml:307 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -8521,7 +8590,7 @@ msgstr "" "appartenant à la distribution par défaut." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:303 +#: apt_preferences.5.xml:311 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -8534,13 +8603,13 @@ msgstr "" "paquet n'est déjà installée." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:313 +#: apt_preferences.5.xml:321 msgid "Determination of Package Version and Distribution Properties" msgstr "" "Détermination de la version des paquets et des propriétés des distributions" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:315 +#: apt_preferences.5.xml:323 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -8551,27 +8620,27 @@ msgstr "" "décrivent les paquets disponibles à cet endroit." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:327 +#: apt_preferences.5.xml:335 msgid "the <literal>Package:</literal> line" msgstr "la ligne <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:328 +#: apt_preferences.5.xml:336 msgid "gives the package name" msgstr "donne le nom du paquet" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 +#: apt_preferences.5.xml:339 apt_preferences.5.xml:389 msgid "the <literal>Version:</literal> line" msgstr "la ligne <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:332 +#: apt_preferences.5.xml:340 msgid "gives the version number for the named package" msgstr "donne le numéro de version du paquet" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:319 +#: apt_preferences.5.xml:327 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -8592,12 +8661,12 @@ msgstr "" "\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:348 +#: apt_preferences.5.xml:356 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "La ligne <literal>Archive:</literal> ou <literal>Suite:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:349 +#: apt_preferences.5.xml:357 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -8614,18 +8683,18 @@ msgstr "" "préférences demanderait cette ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:367 #, no-wrap msgid "Pin: release a=stable\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:365 +#: apt_preferences.5.xml:373 msgid "the <literal>Codename:</literal> line" msgstr "la ligne <literal>Codename:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:366 +#: apt_preferences.5.xml:374 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: squeeze\" specifies that all of the " @@ -8641,13 +8710,13 @@ msgstr "" "préférences demanderait cette ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:383 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "Pin: release n=squeeze\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:382 +#: apt_preferences.5.xml:390 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -8663,7 +8732,7 @@ msgstr "" "préférences demanderait ces lignes :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:391 +#: apt_preferences.5.xml:399 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -8675,12 +8744,12 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:400 +#: apt_preferences.5.xml:408 msgid "the <literal>Component:</literal> line" msgstr "La ligne <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:401 +#: apt_preferences.5.xml:409 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -8698,18 +8767,18 @@ msgstr "" "fichier des préférences demanderait cette ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:410 +#: apt_preferences.5.xml:418 #, no-wrap msgid "Pin: release c=main\n" msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:424 msgid "the <literal>Origin:</literal> line" msgstr "La ligne <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:417 +#: apt_preferences.5.xml:425 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8722,18 +8791,18 @@ msgstr "" "ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:423 +#: apt_preferences.5.xml:431 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:437 msgid "the <literal>Label:</literal> line" msgstr "La ligne <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:430 +#: apt_preferences.5.xml:438 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8746,13 +8815,13 @@ msgstr "" "préférences demanderait cette ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:444 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:337 +#: apt_preferences.5.xml:345 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -8774,7 +8843,7 @@ msgstr "" "déterminer les priorités : <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:443 +#: apt_preferences.5.xml:451 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -8799,12 +8868,12 @@ msgstr "" "<literal>unstable</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:456 +#: apt_preferences.5.xml:464 msgid "Optional Lines in an APT Preferences Record" msgstr "Lignes facultatives dans le fichier des préférences" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:458 +#: apt_preferences.5.xml:466 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -8815,7 +8884,7 @@ msgstr "" "commentaires." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:462 +#: apt_preferences.5.xml:470 msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " "optional. If omitted, APT assigns a priority of 1 less than the last value " @@ -8828,12 +8897,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:471 +#: apt_preferences.5.xml:479 msgid "Tracking Stable" msgstr "Méthode pour suivre Stable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:479 +#: apt_preferences.5.xml:487 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -8857,7 +8926,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:473 +#: apt_preferences.5.xml:481 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8872,8 +8941,8 @@ msgstr "" "literal>. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 -#: apt_preferences.5.xml:600 +#: apt_preferences.5.xml:504 apt_preferences.5.xml:550 +#: apt_preferences.5.xml:608 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -8885,7 +8954,7 @@ msgstr "" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:491 +#: apt_preferences.5.xml:499 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8898,13 +8967,13 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:508 +#: apt_preferences.5.xml:516 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "apt-get install <replaceable>paquet</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:502 +#: apt_preferences.5.xml:510 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -8917,12 +8986,12 @@ msgstr "" "de relancer la commande. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:514 +#: apt_preferences.5.xml:522 msgid "Tracking Testing or Unstable" msgstr "Méthode pour suivre Testing ou Unstable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:523 +#: apt_preferences.5.xml:531 #, no-wrap msgid "" "Package: *\n" @@ -8950,7 +9019,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:524 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -8967,7 +9036,7 @@ msgstr "" "<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:537 +#: apt_preferences.5.xml:545 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8980,13 +9049,13 @@ msgstr "" "type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:565 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "apt-get install <replaceable>paquet</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:548 +#: apt_preferences.5.xml:556 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -9005,12 +9074,12 @@ msgstr "" "installée. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:564 +#: apt_preferences.5.xml:572 msgid "Tracking the evolution of a codename release" msgstr "Suivre l'évolution d'une version par son nom de code" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:578 +#: apt_preferences.5.xml:586 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -9044,7 +9113,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:566 +#: apt_preferences.5.xml:574 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -9068,7 +9137,7 @@ msgstr "" "exemples précédents. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:595 +#: apt_preferences.5.xml:603 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -9081,13 +9150,13 @@ msgstr "" "type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:615 +#: apt_preferences.5.xml:623 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "apt-get install <replaceable>paquet</replaceable>/sid\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:606 +#: apt_preferences.5.xml:614 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -9106,12 +9175,12 @@ msgstr "" "type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:624 +#: apt_preferences.5.xml:632 msgid "&file-preferences;" msgstr "&file-preferences;" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:630 +#: apt_preferences.5.xml:638 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" diff --git a/doc/po/it.po b/doc/po/it.po index fd2e2994e..917e7712f 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-01-20 12:18+0100\n" +"POT-Creation-Date: 2010-02-18 20:53+0100\n" "PO-Revision-Date: 2003-04-26 23:26+0100\n" "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n" "Language-Team: <debian-l10n-italian@lists.debian.org>\n" @@ -866,7 +866,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 -#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 +#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125 #: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 #: sources.list.5.xml:33 @@ -1257,7 +1257,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 -#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 +#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 #: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 msgid "options" msgstr "" @@ -1281,7 +1281,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376 +#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376 #: apt-sortpkgs.1.xml:58 msgid "<option>-s</option>" msgstr "" @@ -1302,12 +1302,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>-q</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>--quiet</option>" msgstr "" @@ -1356,7 +1356,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 +#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548 msgid "<option>-a</option>" msgstr "" @@ -1452,14 +1452,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 -#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 +#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:554 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:630 msgid "Files" msgstr "" @@ -1470,9 +1470,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 +#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637 #: sources.list.5.xml:233 msgid "See Also" msgstr "" @@ -1484,7 +1484,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 +#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:575 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "" @@ -1549,7 +1549,7 @@ msgstr "" #: apt-cdrom.8.xml:66 msgid "" "<literal>add</literal> is used to add a new disc to the source list. It will " -"unmount the CDROM device, prompt for a disk to be inserted and then procceed " +"unmount the CDROM device, prompt for a disk to be inserted and then proceed " "to scan it and copy the index files. If the disc does not have a proper " "<filename>disk</filename> directory you will be prompted for a descriptive " "title." @@ -1589,7 +1589,7 @@ msgid "Options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328 +#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328 msgid "<option>-d</option>" msgstr "" @@ -1733,7 +1733,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:53 apt-ftparchive.1.xml:71 +#: apt-config.8.xml:53 apt-ftparchive.1.xml:72 msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given " "one of the commands below must be present." @@ -1784,7 +1784,7 @@ msgid "Just show the contents of the configuration space." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 +#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593 #: apt-sortpkgs.1.xml:70 msgid "&apt-conf;" msgstr "" @@ -1893,6 +1893,7 @@ msgid "" "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " "<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></" "arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</" "replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></" "option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=" @@ -1910,7 +1911,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:56 +#: apt-ftparchive.1.xml:57 msgid "" "<command>apt-ftparchive</command> is the command line tool that generates " "the index files that APT uses to access a distribution source. The index " @@ -1919,7 +1920,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:60 +#: apt-ftparchive.1.xml:61 msgid "" "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; " "program, incorporating its entire functionality via the <literal>packages</" @@ -1929,7 +1930,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:66 +#: apt-ftparchive.1.xml:67 msgid "" "Internally <command>apt-ftparchive</command> can make use of binary " "databases to cache the contents of a .deb file and it does not rely on any " @@ -1939,12 +1940,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:75 +#: apt-ftparchive.1.xml:76 msgid "packages" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:77 +#: apt-ftparchive.1.xml:78 msgid "" "The packages command generates a package file from a directory tree. It " "takes the given directory and recursively searches it for .deb files, " @@ -1953,18 +1954,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106 +#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107 msgid "" "The option <option>--db</option> can be used to specify a binary caching DB." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:85 +#: apt-ftparchive.1.xml:86 msgid "sources" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:87 +#: apt-ftparchive.1.xml:88 msgid "" "The <literal>sources</literal> command generates a source index file from a " "directory tree. It takes the given directory and recursively searches it " @@ -1973,7 +1974,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:92 +#: apt-ftparchive.1.xml:93 msgid "" "If an override file is specified then a source override file will be looked " "for with an extension of .src. The --source-override option can be used to " @@ -1981,12 +1982,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:97 +#: apt-ftparchive.1.xml:98 msgid "contents" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:99 +#: apt-ftparchive.1.xml:100 msgid "" "The <literal>contents</literal> command generates a contents file from a " "directory tree. It takes the given directory and recursively searches it " @@ -1997,12 +1998,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:109 +#: apt-ftparchive.1.xml:110 msgid "release" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:111 +#: apt-ftparchive.1.xml:112 msgid "" "The <literal>release</literal> command generates a Release file from a " "directory tree. It recursively searches the given directory for Packages, " @@ -2012,7 +2013,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:118 +#: apt-ftparchive.1.xml:119 msgid "" "Values for the additional metadata fields in the Release file are taken from " "the corresponding variables under <literal>APT::FTPArchive::Release</" @@ -2024,13 +2025,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:128 +#: apt-ftparchive.1.xml:129 #, fuzzy msgid "generate" msgstr "Descrizione generale" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:130 +#: apt-ftparchive.1.xml:131 msgid "" "The <literal>generate</literal> command is designed to be runnable from a " "cron script and builds indexes according to the given config file. The " @@ -2040,24 +2041,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:137 apt-get.8.xml:292 +#: apt-ftparchive.1.xml:138 apt-get.8.xml:292 msgid "clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:139 +#: apt-ftparchive.1.xml:140 msgid "" "The <literal>clean</literal> command tidies the databases used by the given " "configuration file by removing any records that are no longer necessary." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:145 +#: apt-ftparchive.1.xml:146 msgid "The Generate Configuration" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:147 +#: apt-ftparchive.1.xml:148 msgid "" "The <literal>generate</literal> command uses a configuration file to " "describe the archives that are going to be generated. It follows the typical " @@ -2068,18 +2069,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:155 +#: apt-ftparchive.1.xml:156 msgid "" "The generate configuration has 4 separate sections, each described below." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:157 +#: apt-ftparchive.1.xml:158 msgid "Dir Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:159 +#: apt-ftparchive.1.xml:160 msgid "" "The <literal>Dir</literal> section defines the standard directories needed " "to locate the files required during the generation process. These " @@ -2088,12 +2089,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:164 +#: apt-ftparchive.1.xml:165 msgid "ArchiveDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:166 +#: apt-ftparchive.1.xml:167 msgid "" "Specifies the root of the FTP archive, in a standard Debian configuration " "this is the directory that contains the <filename>ls-LR</filename> and dist " @@ -2101,44 +2102,44 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:171 +#: apt-ftparchive.1.xml:172 msgid "OverrideDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:173 +#: apt-ftparchive.1.xml:174 msgid "Specifies the location of the override files." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:176 +#: apt-ftparchive.1.xml:177 msgid "CacheDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:178 +#: apt-ftparchive.1.xml:179 msgid "Specifies the location of the cache files" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:181 +#: apt-ftparchive.1.xml:182 msgid "FileListDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:183 +#: apt-ftparchive.1.xml:184 msgid "" "Specifies the location of the file list files, if the <literal>FileList</" "literal> setting is used below." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:189 +#: apt-ftparchive.1.xml:190 msgid "Default Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:191 +#: apt-ftparchive.1.xml:192 msgid "" "The <literal>Default</literal> section specifies default values, and " "settings that control the operation of the generator. Other sections may " @@ -2146,12 +2147,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:195 +#: apt-ftparchive.1.xml:196 msgid "Packages::Compress" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:197 +#: apt-ftparchive.1.xml:198 msgid "" "Sets the default compression schemes to use for the Package index files. It " "is a string that contains a space separated list of at least one of: '.' (no " @@ -2160,60 +2161,60 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:203 +#: apt-ftparchive.1.xml:204 msgid "Packages::Extensions" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:205 +#: apt-ftparchive.1.xml:206 msgid "" "Sets the default list of file extensions that are package files. This " "defaults to '.deb'." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:209 +#: apt-ftparchive.1.xml:210 msgid "Sources::Compress" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:211 +#: apt-ftparchive.1.xml:212 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Sources files." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:215 +#: apt-ftparchive.1.xml:216 msgid "Sources::Extensions" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:217 +#: apt-ftparchive.1.xml:218 msgid "" "Sets the default list of file extensions that are source files. This " "defaults to '.dsc'." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:221 +#: apt-ftparchive.1.xml:222 msgid "Contents::Compress" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:223 +#: apt-ftparchive.1.xml:224 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Contents files." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:227 +#: apt-ftparchive.1.xml:228 msgid "DeLinkLimit" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:229 +#: apt-ftparchive.1.xml:230 msgid "" "Specifies the number of kilobytes to delink (and replace with hard links) " "per run. This is used in conjunction with the per-section <literal>External-" @@ -2221,24 +2222,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:234 +#: apt-ftparchive.1.xml:235 msgid "FileMode" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:236 +#: apt-ftparchive.1.xml:237 msgid "" "Specifies the mode of all created index files. It defaults to 0644. All " "index files are set to this mode with no regard to the umask." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:243 +#: apt-ftparchive.1.xml:244 msgid "TreeDefault Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:245 +#: apt-ftparchive.1.xml:246 msgid "" "Sets defaults specific to <literal>Tree</literal> sections. All of these " "variables are substitution variables and have the strings $(DIST), " @@ -2246,12 +2247,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:250 +#: apt-ftparchive.1.xml:251 msgid "MaxContentsChange" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:252 +#: apt-ftparchive.1.xml:253 msgid "" "Sets the number of kilobytes of contents files that are generated each day. " "The contents files are round-robined so that over several days they will all " @@ -2259,12 +2260,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:257 +#: apt-ftparchive.1.xml:258 msgid "ContentsAge" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:259 +#: apt-ftparchive.1.xml:260 msgid "" "Controls the number of days a contents file is allowed to be checked without " "changing. If this limit is passed the mtime of the contents file is updated. " @@ -2275,60 +2276,60 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:268 +#: apt-ftparchive.1.xml:269 msgid "Directory" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:270 +#: apt-ftparchive.1.xml:271 msgid "" "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/" "$(SECTION)/binary-$(ARCH)/</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:274 +#: apt-ftparchive.1.xml:275 msgid "SrcDirectory" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:276 +#: apt-ftparchive.1.xml:277 msgid "" "Sets the top of the source package directory tree. Defaults to <filename>" "$(DIST)/$(SECTION)/source/</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406 +#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407 msgid "Packages" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:282 +#: apt-ftparchive.1.xml:283 msgid "" "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" "binary-$(ARCH)/Packages</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411 +#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412 msgid "Sources" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:288 +#: apt-ftparchive.1.xml:289 msgid "" "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/" "source/Sources</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:292 +#: apt-ftparchive.1.xml:293 msgid "InternalPrefix" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:294 +#: apt-ftparchive.1.xml:295 msgid "" "Sets the path prefix that causes a symlink to be considered an internal link " "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</" @@ -2336,12 +2337,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417 +#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418 msgid "Contents" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:301 +#: apt-ftparchive.1.xml:302 msgid "" "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)" "</filename>. If this setting causes multiple Packages files to map onto a " @@ -2350,34 +2351,34 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:308 +#: apt-ftparchive.1.xml:309 msgid "Contents::Header" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:310 +#: apt-ftparchive.1.xml:311 msgid "Sets header file to prepend to the contents output." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442 +#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443 msgid "BinCacheDB" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:315 +#: apt-ftparchive.1.xml:316 msgid "" "Sets the binary cache database to use for this section. Multiple sections " "can share the same database." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:319 +#: apt-ftparchive.1.xml:320 msgid "FileList" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:321 +#: apt-ftparchive.1.xml:322 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " @@ -2385,12 +2386,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:326 +#: apt-ftparchive.1.xml:327 msgid "SourceFileList" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:328 +#: apt-ftparchive.1.xml:329 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " @@ -2399,12 +2400,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:336 +#: apt-ftparchive.1.xml:337 msgid "Tree Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:338 +#: apt-ftparchive.1.xml:339 msgid "" "The <literal>Tree</literal> section defines a standard Debian file tree " "which consists of a base directory, then multiple sections in that base " @@ -2414,7 +2415,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:343 +#: apt-ftparchive.1.xml:344 msgid "" "The <literal>Tree</literal> section takes a scope tag which sets the " "<literal>$(DIST)</literal> variable and defines the root of the tree (the " @@ -2423,7 +2424,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:348 +#: apt-ftparchive.1.xml:349 msgid "" "All of the settings defined in the <literal>TreeDefault</literal> section " "can be use in a <literal>Tree</literal> section as well as three new " @@ -2431,7 +2432,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt-ftparchive.1.xml:354 +#: apt-ftparchive.1.xml:355 #, no-wrap msgid "" "for i in Sections do \n" @@ -2441,7 +2442,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:351 +#: apt-ftparchive.1.xml:352 msgid "" "When processing a <literal>Tree</literal> section <command>apt-ftparchive</" "command> performs an operation similar to: <placeholder type=\"programlisting" @@ -2449,12 +2450,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:360 +#: apt-ftparchive.1.xml:361 msgid "Sections" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:362 +#: apt-ftparchive.1.xml:363 msgid "" "This is a space separated list of sections which appear under the " "distribution, typically this is something like <literal>main contrib non-" @@ -2462,12 +2463,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:367 +#: apt-ftparchive.1.xml:368 msgid "Architectures" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:369 +#: apt-ftparchive.1.xml:370 msgid "" "This is a space separated list of all the architectures that appear under " "search section. The special architecture 'source' is used to indicate that " @@ -2475,56 +2476,56 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422 +#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423 msgid "BinOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:376 +#: apt-ftparchive.1.xml:377 msgid "" "Sets the binary override file. The override file contains section, priority " "and maintainer address information." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427 +#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428 msgid "SrcOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:382 +#: apt-ftparchive.1.xml:383 msgid "" "Sets the source override file. The override file contains section " "information." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432 +#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433 msgid "ExtraOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434 +#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435 msgid "Sets the binary extra override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437 +#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438 msgid "SrcExtraOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439 +#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440 msgid "Sets the source extra override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:398 +#: apt-ftparchive.1.xml:399 msgid "BinDirectory Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:400 +#: apt-ftparchive.1.xml:401 msgid "" "The <literal>bindirectory</literal> section defines a binary directory tree " "with no special structure. The scope tag specifies the location of the " @@ -2534,64 +2535,64 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:408 +#: apt-ftparchive.1.xml:409 msgid "Sets the Packages file output." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:413 +#: apt-ftparchive.1.xml:414 msgid "" "Sets the Sources file output. At least one of <literal>Packages</literal> or " "<literal>Sources</literal> is required." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:419 +#: apt-ftparchive.1.xml:420 msgid "Sets the Contents file output. (optional)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:424 +#: apt-ftparchive.1.xml:425 msgid "Sets the binary override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:429 +#: apt-ftparchive.1.xml:430 msgid "Sets the source override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:444 +#: apt-ftparchive.1.xml:445 msgid "Sets the cache DB." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:447 +#: apt-ftparchive.1.xml:448 msgid "PathPrefix" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:449 +#: apt-ftparchive.1.xml:450 msgid "Appends a path to all the output paths." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:452 +#: apt-ftparchive.1.xml:453 msgid "FileList, SourceFileList" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:454 +#: apt-ftparchive.1.xml:455 msgid "Specifies the file list file." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:461 +#: apt-ftparchive.1.xml:462 msgid "The Binary Override File" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:462 +#: apt-ftparchive.1.xml:463 msgid "" "The binary override file is fully compatible with &dpkg-scanpackages;. It " "contains 4 fields separated by spaces. The first field is the package name, " @@ -2601,19 +2602,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:468 +#: apt-ftparchive.1.xml:469 #, no-wrap msgid "old [// oldn]* => new" msgstr "" #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:470 +#: apt-ftparchive.1.xml:471 #, no-wrap msgid "new" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:467 +#: apt-ftparchive.1.xml:468 msgid "" "The general form of the maintainer field is: <placeholder type=" "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" " @@ -2624,12 +2625,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:478 +#: apt-ftparchive.1.xml:479 msgid "The Source Override File" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:480 +#: apt-ftparchive.1.xml:481 msgid "" "The source override file is fully compatible with &dpkg-scansources;. It " "contains 2 fields separated by spaces. The first fields is the source " @@ -2637,12 +2638,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:485 +#: apt-ftparchive.1.xml:486 msgid "The Extra Override File" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:487 +#: apt-ftparchive.1.xml:488 msgid "" "The extra override file allows any arbitrary tag to be added or replaced in " "the output. It has 3 columns, the first is the package, the second is the " @@ -2650,12 +2651,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:496 +#: apt-ftparchive.1.xml:497 msgid "<option>--md5</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:498 +#: apt-ftparchive.1.xml:499 msgid "" "Generate MD5 sums. This defaults to on, when turned off the generated index " "files will not have MD5Sum fields where possible. Configuration Item: " @@ -2663,19 +2664,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:503 +#: apt-ftparchive.1.xml:504 msgid "<option>--db</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:505 +#: apt-ftparchive.1.xml:506 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:511 +#: apt-ftparchive.1.xml:512 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -2684,12 +2685,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:517 +#: apt-ftparchive.1.xml:518 msgid "<option>--delink</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:519 +#: apt-ftparchive.1.xml:520 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -2698,12 +2699,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:525 +#: apt-ftparchive.1.xml:526 msgid "<option>--contents</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:527 +#: apt-ftparchive.1.xml:528 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -2713,12 +2714,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:535 +#: apt-ftparchive.1.xml:536 msgid "<option>--source-override</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:537 +#: apt-ftparchive.1.xml:538 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -2726,26 +2727,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:541 +#: apt-ftparchive.1.xml:542 msgid "<option>--readonly</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:543 +#: apt-ftparchive.1.xml:544 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:547 -msgid "<option>APT::FTPArchive::AlwaysStat</option>" +#: apt-ftparchive.1.xml:548 +msgid "<option>--arch</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 msgid "" -"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " +"Accept in the <literal>packages</literal> and <literal>contents</literal> " +"commands only package files matching <literal>*_arch.deb</literal> or " +"<literal>*_all.deb</literal> instead of all package files in the given " +"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:555 +msgid "<option>APT::FTPArchive::AlwaysStat</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:557 +msgid "" +"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " "will lead to problems as the now outdated cached metadata like size and " "checksums will be used. With this option enabled this will no longer happen " @@ -2757,12 +2772,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:559 +#: apt-ftparchive.1.xml:567 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:561 +#: apt-ftparchive.1.xml:569 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -2772,26 +2787,26 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 +#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477 #: sources.list.5.xml:193 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:579 +#: apt-ftparchive.1.xml:587 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:575 +#: apt-ftparchive.1.xml:583 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:589 +#: apt-ftparchive.1.xml:597 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -5844,7 +5859,8 @@ msgstr "" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt_preferences.5.xml:13 -msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" +msgid "" +"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>" msgstr "" #. type: Content of: <refentry><refnamediv><refname> @@ -5892,6 +5908,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 msgid "" +"Preferences are a strong power in the hands of a system administrator but " +"they can become also their biggest nightmare if used without care! APT will " +"not questioning the preferences so wrong settings will therefore lead to " +"uninstallable packages or wrong decisions while upgrading packages. Even " +"more problems will arise if multiply distribution releases are mixed without " +"a good understanding of the following paragraphs. You have been warned." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:64 +msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " "following naming convention: The files have no or \"<literal>pref</literal>" @@ -5901,24 +5928,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:63 +#: apt_preferences.5.xml:71 msgid "APT's Default Priority Assignments" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:86 #, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:81 +#: apt_preferences.5.xml:89 #, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:65 +#: apt_preferences.5.xml:73 msgid "" "If there is no preferences file or if there is no entry in the file that " "applies to a particular version then the priority assigned to that version " @@ -5934,40 +5961,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:90 +#: apt_preferences.5.xml:98 msgid "priority 100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:91 +#: apt_preferences.5.xml:99 msgid "to the version that is already installed (if any)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:95 +#: apt_preferences.5.xml:103 msgid "priority 500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:96 +#: apt_preferences.5.xml:104 msgid "" "to the versions that are not installed and do not belong to the target " "release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:100 +#: apt_preferences.5.xml:108 msgid "priority 990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:101 +#: apt_preferences.5.xml:109 msgid "" "to the versions that are not installed and belong to the target release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:85 +#: apt_preferences.5.xml:93 msgid "" "If the target release has been specified then APT uses the following " "algorithm to set the priorities of the versions of a package. Assign: " @@ -5975,7 +6002,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:106 +#: apt_preferences.5.xml:114 msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " @@ -5983,14 +6010,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:110 +#: apt_preferences.5.xml:118 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 +#: apt_preferences.5.xml:121 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -6000,19 +6027,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:119 +#: apt_preferences.5.xml:127 msgid "Install the highest priority version." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:120 +#: apt_preferences.5.xml:128 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:123 +#: apt_preferences.5.xml:131 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@ -6020,7 +6047,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:137 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@ -6030,7 +6057,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:136 +#: apt_preferences.5.xml:144 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@ -6039,7 +6066,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:141 +#: apt_preferences.5.xml:149 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@ -6051,12 +6078,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:150 +#: apt_preferences.5.xml:158 msgid "The Effect of APT Preferences" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:152 +#: apt_preferences.5.xml:160 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -6065,7 +6092,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:166 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@ -6075,7 +6102,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:165 +#: apt_preferences.5.xml:173 #, no-wrap msgid "" "Package: perl\n" @@ -6084,7 +6111,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:171 +#: apt_preferences.5.xml:179 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@ -6094,7 +6121,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:177 +#: apt_preferences.5.xml:185 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@ -6102,7 +6129,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:182 +#: apt_preferences.5.xml:190 #, no-wrap msgid "" "Package: *\n" @@ -6111,7 +6138,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:187 +#: apt_preferences.5.xml:195 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " "This should not be confused with the Origin of a distribution as specified " @@ -6121,7 +6148,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:193 +#: apt_preferences.5.xml:201 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -6129,7 +6156,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:197 +#: apt_preferences.5.xml:205 #, no-wrap msgid "" "Package: *\n" @@ -6138,7 +6165,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:202 +#: apt_preferences.5.xml:210 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>squeeze</literal>" @@ -6146,7 +6173,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:206 +#: apt_preferences.5.xml:214 #, no-wrap msgid "" "Package: *\n" @@ -6155,7 +6182,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:211 +#: apt_preferences.5.xml:219 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -6163,7 +6190,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:216 +#: apt_preferences.5.xml:224 #, no-wrap msgid "" "Package: *\n" @@ -6172,82 +6199,82 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:227 +#: apt_preferences.5.xml:235 msgid "How APT Interprets Priorities" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:235 +#: apt_preferences.5.xml:243 msgid "P > 1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:236 +#: apt_preferences.5.xml:244 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:248 msgid "990 < P <=1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:241 +#: apt_preferences.5.xml:249 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:254 msgid "500 < P <=990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:247 +#: apt_preferences.5.xml:255 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:260 msgid "100 < P <=500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:253 +#: apt_preferences.5.xml:261 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:258 +#: apt_preferences.5.xml:266 msgid "0 < P <=100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:259 +#: apt_preferences.5.xml:267 msgid "" "causes a version to be installed only if there is no installed version of " "the package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:263 +#: apt_preferences.5.xml:271 msgid "P < 0" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:264 +#: apt_preferences.5.xml:272 msgid "prevents the version from being installed" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:230 +#: apt_preferences.5.xml:238 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -6255,7 +6282,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:269 +#: apt_preferences.5.xml:277 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -6264,14 +6291,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:275 +#: apt_preferences.5.xml:283 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:279 +#: apt_preferences.5.xml:287 #, no-wrap msgid "" "Package: perl\n" @@ -6288,12 +6315,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:300 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:294 +#: apt_preferences.5.xml:302 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -6303,7 +6330,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:299 +#: apt_preferences.5.xml:307 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -6311,7 +6338,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:303 +#: apt_preferences.5.xml:311 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -6320,12 +6347,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:313 +#: apt_preferences.5.xml:321 msgid "Determination of Package Version and Distribution Properties" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:315 +#: apt_preferences.5.xml:323 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -6333,27 +6360,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:327 +#: apt_preferences.5.xml:335 msgid "the <literal>Package:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:328 +#: apt_preferences.5.xml:336 msgid "gives the package name" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 +#: apt_preferences.5.xml:339 apt_preferences.5.xml:389 msgid "the <literal>Version:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:332 +#: apt_preferences.5.xml:340 msgid "gives the version number for the named package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:319 +#: apt_preferences.5.xml:327 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -6366,12 +6393,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:348 +#: apt_preferences.5.xml:356 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:349 +#: apt_preferences.5.xml:357 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -6382,18 +6409,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:367 #, no-wrap msgid "Pin: release a=stable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:365 +#: apt_preferences.5.xml:373 msgid "the <literal>Codename:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:366 +#: apt_preferences.5.xml:374 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: squeeze\" specifies that all of the " @@ -6403,13 +6430,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:383 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:382 +#: apt_preferences.5.xml:390 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -6419,7 +6446,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:391 +#: apt_preferences.5.xml:399 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -6428,12 +6455,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:400 +#: apt_preferences.5.xml:408 msgid "the <literal>Component:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:401 +#: apt_preferences.5.xml:409 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -6444,18 +6471,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:410 +#: apt_preferences.5.xml:418 #, no-wrap msgid "Pin: release c=main\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:424 msgid "the <literal>Origin:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:417 +#: apt_preferences.5.xml:425 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -6464,18 +6491,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:423 +#: apt_preferences.5.xml:431 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:437 msgid "the <literal>Label:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:430 +#: apt_preferences.5.xml:438 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -6484,13 +6511,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:444 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:337 +#: apt_preferences.5.xml:345 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -6503,7 +6530,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:443 +#: apt_preferences.5.xml:451 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -6518,12 +6545,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:456 +#: apt_preferences.5.xml:464 msgid "Optional Lines in an APT Preferences Record" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:458 +#: apt_preferences.5.xml:466 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -6531,7 +6558,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:462 +#: apt_preferences.5.xml:470 msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " "optional. If omitted, APT assigns a priority of 1 less than the last value " @@ -6540,12 +6567,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:471 +#: apt_preferences.5.xml:479 msgid "Tracking Stable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:479 +#: apt_preferences.5.xml:487 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -6560,7 +6587,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:473 +#: apt_preferences.5.xml:481 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -6570,8 +6597,8 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 -#: apt_preferences.5.xml:600 +#: apt_preferences.5.xml:504 apt_preferences.5.xml:550 +#: apt_preferences.5.xml:608 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -6580,7 +6607,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:491 +#: apt_preferences.5.xml:499 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -6589,13 +6616,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:508 +#: apt_preferences.5.xml:516 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:502 +#: apt_preferences.5.xml:510 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -6604,12 +6631,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:514 +#: apt_preferences.5.xml:522 msgid "Tracking Testing or Unstable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:523 +#: apt_preferences.5.xml:531 #, no-wrap msgid "" "Package: *\n" @@ -6626,7 +6653,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:524 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -6637,7 +6664,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:537 +#: apt_preferences.5.xml:545 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -6646,13 +6673,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:565 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:548 +#: apt_preferences.5.xml:556 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -6664,12 +6691,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:564 +#: apt_preferences.5.xml:572 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:578 +#: apt_preferences.5.xml:586 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -6689,7 +6716,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:566 +#: apt_preferences.5.xml:574 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -6704,7 +6731,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:595 +#: apt_preferences.5.xml:603 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -6713,13 +6740,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:615 +#: apt_preferences.5.xml:623 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:606 +#: apt_preferences.5.xml:614 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -6731,12 +6758,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:624 +#: apt_preferences.5.xml:632 msgid "&file-preferences;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:630 +#: apt_preferences.5.xml:638 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "" diff --git a/doc/po/ja.po b/doc/po/ja.po index f1a766d97..80ff82081 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-01-20 12:18+0100\n" +"POT-Creation-Date: 2010-02-18 20:53+0100\n" "PO-Revision-Date: 2009-07-30 22:55+0900\n" "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1222,7 +1222,7 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 -#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 +#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125 #: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 #: sources.list.5.xml:33 @@ -1786,7 +1786,7 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 -#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 +#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 #: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 msgid "options" msgstr "オプション" @@ -1814,7 +1814,7 @@ msgstr "" "pkgcache</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376 +#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376 #: apt-sortpkgs.1.xml:58 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1841,12 +1841,12 @@ msgstr "" "<literal>Dir::Cache::srcpkgcache</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1907,7 +1907,7 @@ msgstr "" "ShowFull</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 +#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -2029,7 +2029,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 -#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 +#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:554 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" @@ -2037,7 +2037,7 @@ msgstr "&apt-commonoptions;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:630 msgid "Files" msgstr "ファイル" @@ -2049,9 +2049,9 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 +#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637 #: sources.list.5.xml:233 msgid "See Also" msgstr "関連項目" @@ -2065,7 +2065,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 +#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:575 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "診断メッセージ" @@ -2151,9 +2151,16 @@ msgstr "add" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:66 +#, fuzzy +#| msgid "" +#| "<literal>add</literal> is used to add a new disc to the source list. It " +#| "will unmount the CDROM device, prompt for a disk to be inserted and then " +#| "procceed to scan it and copy the index files. If the disc does not have a " +#| "proper <filename>disk</filename> directory you will be prompted for a " +#| "descriptive title." msgid "" "<literal>add</literal> is used to add a new disc to the source list. It will " -"unmount the CDROM device, prompt for a disk to be inserted and then procceed " +"unmount the CDROM device, prompt for a disk to be inserted and then proceed " "to scan it and copy the index files. If the disc does not have a proper " "<filename>disk</filename> directory you will be prompted for a descriptive " "title." @@ -2208,7 +2215,7 @@ msgid "Options" msgstr "オプション" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328 +#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328 msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -2395,7 +2402,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:53 apt-ftparchive.1.xml:71 +#: apt-config.8.xml:53 apt-ftparchive.1.xml:72 msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given " "one of the commands below must be present." @@ -2466,7 +2473,7 @@ msgstr "設定箇所の内容を表示するだけです。" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 +#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593 #: apt-sortpkgs.1.xml:70 msgid "&apt-conf;" msgstr "&apt-conf;" @@ -2638,6 +2645,7 @@ msgid "" "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " "<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></" "arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</" "replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></" "option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=" @@ -2673,7 +2681,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:56 +#: apt-ftparchive.1.xml:57 msgid "" "<command>apt-ftparchive</command> is the command line tool that generates " "the index files that APT uses to access a distribution source. The index " @@ -2686,7 +2694,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:60 +#: apt-ftparchive.1.xml:61 msgid "" "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; " "program, incorporating its entire functionality via the <literal>packages</" @@ -2701,7 +2709,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:66 +#: apt-ftparchive.1.xml:67 msgid "" "Internally <command>apt-ftparchive</command> can make use of binary " "databases to cache the contents of a .deb file and it does not rely on any " @@ -2716,13 +2724,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:75 +#: apt-ftparchive.1.xml:76 msgid "packages" msgstr "packages" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:77 +#: apt-ftparchive.1.xml:78 msgid "" "The packages command generates a package file from a directory tree. It " "takes the given directory and recursively searches it for .deb files, " @@ -2736,20 +2744,20 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106 +#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107 msgid "" "The option <option>--db</option> can be used to specify a binary caching DB." msgstr "<option>--db</option> オプションで、キャッシュ DB を指定できます。" # type: Content of: <refentry><refnamediv><refname> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:85 +#: apt-ftparchive.1.xml:86 msgid "sources" msgstr "sources" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:87 +#: apt-ftparchive.1.xml:88 msgid "" "The <literal>sources</literal> command generates a source index file from a " "directory tree. It takes the given directory and recursively searches it " @@ -2763,7 +2771,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:92 +#: apt-ftparchive.1.xml:93 msgid "" "If an override file is specified then a source override file will be looked " "for with an extension of .src. The --source-override option can be used to " @@ -2774,13 +2782,13 @@ msgstr "" "override オプションを使用します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:97 +#: apt-ftparchive.1.xml:98 msgid "contents" msgstr "contents" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:99 +#: apt-ftparchive.1.xml:100 msgid "" "The <literal>contents</literal> command generates a contents file from a " "directory tree. It takes the given directory and recursively searches it " @@ -2797,13 +2805,13 @@ msgstr "" "で出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:109 +#: apt-ftparchive.1.xml:110 msgid "release" msgstr "release" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:111 +#: apt-ftparchive.1.xml:112 msgid "" "The <literal>release</literal> command generates a Release file from a " "directory tree. It recursively searches the given directory for Packages, " @@ -2819,7 +2827,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:118 +#: apt-ftparchive.1.xml:119 msgid "" "Values for the additional metadata fields in the Release file are taken from " "the corresponding variables under <literal>APT::FTPArchive::Release</" @@ -2838,13 +2846,13 @@ msgstr "" "<literal>Description</literal> です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:128 +#: apt-ftparchive.1.xml:129 msgid "generate" msgstr "generate" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:130 +#: apt-ftparchive.1.xml:131 msgid "" "The <literal>generate</literal> command is designed to be runnable from a " "cron script and builds indexes according to the given config file. The " @@ -2858,13 +2866,13 @@ msgstr "" "のディレクトリから作成するかを指定する、柔軟な方法を提供します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:137 apt-get.8.xml:292 +#: apt-ftparchive.1.xml:138 apt-get.8.xml:292 msgid "clean" msgstr "clean" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:139 +#: apt-ftparchive.1.xml:140 msgid "" "The <literal>clean</literal> command tidies the databases used by the given " "configuration file by removing any records that are no longer necessary." @@ -2874,13 +2882,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:145 +#: apt-ftparchive.1.xml:146 msgid "The Generate Configuration" msgstr "Generate 設定" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:147 +#: apt-ftparchive.1.xml:148 msgid "" "The <literal>generate</literal> command uses a configuration file to " "describe the archives that are going to be generated. It follows the typical " @@ -2898,7 +2906,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:155 +#: apt-ftparchive.1.xml:156 msgid "" "The generate configuration has 4 separate sections, each described below." msgstr "" @@ -2907,13 +2915,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:157 +#: apt-ftparchive.1.xml:158 msgid "Dir Section" msgstr "Dir セクション" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:159 +#: apt-ftparchive.1.xml:160 #, fuzzy #| msgid "" #| "The <literal>Dir</literal> section defines the standard directories " @@ -2932,13 +2940,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:164 +#: apt-ftparchive.1.xml:165 msgid "ArchiveDir" msgstr "ArchiveDir" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:166 +#: apt-ftparchive.1.xml:167 msgid "" "Specifies the root of the FTP archive, in a standard Debian configuration " "this is the directory that contains the <filename>ls-LR</filename> and dist " @@ -2948,36 +2956,36 @@ msgstr "" "リには <filename>ls-LR</filename> と dist ノードがあります。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:171 +#: apt-ftparchive.1.xml:172 msgid "OverrideDir" msgstr "OverrideDir" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:173 +#: apt-ftparchive.1.xml:174 msgid "Specifies the location of the override files." msgstr "オーバーライドファイルの場所を指定します。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:176 +#: apt-ftparchive.1.xml:177 msgid "CacheDir" msgstr "CacheDir" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:178 +#: apt-ftparchive.1.xml:179 msgid "Specifies the location of the cache files" msgstr "キャッシュファイルの場所を指定します。" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:181 +#: apt-ftparchive.1.xml:182 msgid "FileListDir" msgstr "FileListDir" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:183 +#: apt-ftparchive.1.xml:184 msgid "" "Specifies the location of the file list files, if the <literal>FileList</" "literal> setting is used below." @@ -2987,13 +2995,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:189 +#: apt-ftparchive.1.xml:190 msgid "Default Section" msgstr "Default セクション" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:191 +#: apt-ftparchive.1.xml:192 msgid "" "The <literal>Default</literal> section specifies default values, and " "settings that control the operation of the generator. Other sections may " @@ -3005,13 +3013,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:195 +#: apt-ftparchive.1.xml:196 msgid "Packages::Compress" msgstr "Packages::Compress" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:197 +#: apt-ftparchive.1.xml:198 msgid "" "Sets the default compression schemes to use for the Package index files. It " "is a string that contains a space separated list of at least one of: '.' (no " @@ -3023,13 +3031,13 @@ msgstr "" "法のデフォルトはすべて '. gzip' です。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:203 +#: apt-ftparchive.1.xml:204 msgid "Packages::Extensions" msgstr "Packages::Extensions" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:205 +#: apt-ftparchive.1.xml:206 msgid "" "Sets the default list of file extensions that are package files. This " "defaults to '.deb'." @@ -3038,13 +3046,13 @@ msgstr "" "deb' です。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:209 +#: apt-ftparchive.1.xml:210 msgid "Sources::Compress" msgstr "Sources::Compress" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:211 +#: apt-ftparchive.1.xml:212 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Sources files." @@ -3053,13 +3061,13 @@ msgstr "" "指定します。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:215 +#: apt-ftparchive.1.xml:216 msgid "Sources::Extensions" msgstr "Sources::Extensions" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:217 +#: apt-ftparchive.1.xml:218 msgid "" "Sets the default list of file extensions that are source files. This " "defaults to '.dsc'." @@ -3068,13 +3076,13 @@ msgstr "" "す。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:221 +#: apt-ftparchive.1.xml:222 msgid "Contents::Compress" msgstr "Contents::Compress" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:223 +#: apt-ftparchive.1.xml:224 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Contents files." @@ -3083,13 +3091,13 @@ msgstr "" "指定します。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:227 +#: apt-ftparchive.1.xml:228 msgid "DeLinkLimit" msgstr "DeLinkLimit" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:229 +#: apt-ftparchive.1.xml:230 msgid "" "Specifies the number of kilobytes to delink (and replace with hard links) " "per run. This is used in conjunction with the per-section <literal>External-" @@ -3101,13 +3109,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:234 +#: apt-ftparchive.1.xml:235 msgid "FileMode" msgstr "FileMode" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:236 +#: apt-ftparchive.1.xml:237 msgid "" "Specifies the mode of all created index files. It defaults to 0644. All " "index files are set to this mode with no regard to the umask." @@ -3117,13 +3125,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:243 +#: apt-ftparchive.1.xml:244 msgid "TreeDefault Section" msgstr "TreeDefault セクション" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:245 +#: apt-ftparchive.1.xml:246 msgid "" "Sets defaults specific to <literal>Tree</literal> sections. All of these " "variables are substitution variables and have the strings $(DIST), " @@ -3134,13 +3142,13 @@ msgstr "" "に展開します。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:250 +#: apt-ftparchive.1.xml:251 msgid "MaxContentsChange" msgstr "MaxContentsChange" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:252 +#: apt-ftparchive.1.xml:253 msgid "" "Sets the number of kilobytes of contents files that are generated each day. " "The contents files are round-robined so that over several days they will all " @@ -3151,13 +3159,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:257 +#: apt-ftparchive.1.xml:258 msgid "ContentsAge" msgstr "ContentsAge" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:259 +#: apt-ftparchive.1.xml:260 msgid "" "Controls the number of days a contents file is allowed to be checked without " "changing. If this limit is passed the mtime of the contents file is updated. " @@ -3174,13 +3182,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:268 +#: apt-ftparchive.1.xml:269 msgid "Directory" msgstr "Directory" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:270 +#: apt-ftparchive.1.xml:271 msgid "" "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/" "$(SECTION)/binary-$(ARCH)/</filename>" @@ -3190,13 +3198,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:274 +#: apt-ftparchive.1.xml:275 msgid "SrcDirectory" msgstr "SrcDirectory" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:276 +#: apt-ftparchive.1.xml:277 msgid "" "Sets the top of the source package directory tree. Defaults to <filename>" "$(DIST)/$(SECTION)/source/</filename>" @@ -3206,13 +3214,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406 +#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407 msgid "Packages" msgstr "Packages" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:282 +#: apt-ftparchive.1.xml:283 msgid "" "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" "binary-$(ARCH)/Packages</filename>" @@ -3222,13 +3230,13 @@ msgstr "" # type: Content of: <refentry><refnamediv><refname> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411 +#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412 msgid "Sources" msgstr "Sources" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:288 +#: apt-ftparchive.1.xml:289 #, fuzzy #| msgid "" #| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" @@ -3241,13 +3249,13 @@ msgstr "" "$(SECTION)/source/Sources</filename> です。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:292 +#: apt-ftparchive.1.xml:293 msgid "InternalPrefix" msgstr "InternalPrefix" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:294 +#: apt-ftparchive.1.xml:295 msgid "" "Sets the path prefix that causes a symlink to be considered an internal link " "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</" @@ -3258,13 +3266,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417 +#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418 msgid "Contents" msgstr "Contents" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:301 +#: apt-ftparchive.1.xml:302 msgid "" "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)" "</filename>. If this setting causes multiple Packages files to map onto a " @@ -3277,24 +3285,24 @@ msgstr "" "ftparchive</command> は自動でパッケージファイルをまとめます。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:308 +#: apt-ftparchive.1.xml:309 msgid "Contents::Header" msgstr "Contents::Header" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:310 +#: apt-ftparchive.1.xml:311 msgid "Sets header file to prepend to the contents output." msgstr "contents の出力に付けるヘッダファイルを設定します。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442 +#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443 msgid "BinCacheDB" msgstr "BinCacheDB" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:315 +#: apt-ftparchive.1.xml:316 msgid "" "Sets the binary cache database to use for this section. Multiple sections " "can share the same database." @@ -3304,13 +3312,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:319 +#: apt-ftparchive.1.xml:320 msgid "FileList" msgstr "FileList" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:321 +#: apt-ftparchive.1.xml:322 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " @@ -3322,13 +3330,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:326 +#: apt-ftparchive.1.xml:327 msgid "SourceFileList" msgstr "SourceFileList" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:328 +#: apt-ftparchive.1.xml:329 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " @@ -3341,13 +3349,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:336 +#: apt-ftparchive.1.xml:337 msgid "Tree Section" msgstr "Tree セクション" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:338 +#: apt-ftparchive.1.xml:339 msgid "" "The <literal>Tree</literal> section defines a standard Debian file tree " "which consists of a base directory, then multiple sections in that base " @@ -3362,7 +3370,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:343 +#: apt-ftparchive.1.xml:344 msgid "" "The <literal>Tree</literal> section takes a scope tag which sets the " "<literal>$(DIST)</literal> variable and defines the root of the tree (the " @@ -3376,7 +3384,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:348 +#: apt-ftparchive.1.xml:349 msgid "" "All of the settings defined in the <literal>TreeDefault</literal> section " "can be use in a <literal>Tree</literal> section as well as three new " @@ -3387,7 +3395,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt-ftparchive.1.xml:354 +#: apt-ftparchive.1.xml:355 #, fuzzy, no-wrap #| msgid "" #| "for i in Sections do \n" @@ -3405,7 +3413,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><informalexample> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:351 +#: apt-ftparchive.1.xml:352 #, fuzzy #| msgid "" #| "When processing a <literal>Tree</literal> section <command>apt-" @@ -3420,13 +3428,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:360 +#: apt-ftparchive.1.xml:361 msgid "Sections" msgstr "Sections" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:362 +#: apt-ftparchive.1.xml:363 msgid "" "This is a space separated list of sections which appear under the " "distribution, typically this is something like <literal>main contrib non-" @@ -3437,13 +3445,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:367 +#: apt-ftparchive.1.xml:368 msgid "Architectures" msgstr "Architectures" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:369 +#: apt-ftparchive.1.xml:370 msgid "" "This is a space separated list of all the architectures that appear under " "search section. The special architecture 'source' is used to indicate that " @@ -3455,13 +3463,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422 +#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423 msgid "BinOverride" msgstr "BinOverride" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:376 +#: apt-ftparchive.1.xml:377 msgid "" "Sets the binary override file. The override file contains section, priority " "and maintainer address information." @@ -3471,13 +3479,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427 +#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428 msgid "SrcOverride" msgstr "SrcOverride" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:382 +#: apt-ftparchive.1.xml:383 msgid "" "Sets the source override file. The override file contains section " "information." @@ -3487,37 +3495,37 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432 +#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433 msgid "ExtraOverride" msgstr "ExtraOverride" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434 +#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435 msgid "Sets the binary extra override file." msgstr "バイナリ特別オーバーライドファイルを設定します。" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437 +#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438 msgid "SrcExtraOverride" msgstr "SrcExtraOverride" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439 +#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440 msgid "Sets the source extra override file." msgstr "ソース特別オーバーライドファイルを設定します。" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:398 +#: apt-ftparchive.1.xml:399 msgid "BinDirectory Section" msgstr "BinDirectory セクション" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:400 +#: apt-ftparchive.1.xml:401 msgid "" "The <literal>bindirectory</literal> section defines a binary directory tree " "with no special structure. The scope tag specifies the location of the " @@ -3532,13 +3540,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:408 +#: apt-ftparchive.1.xml:409 msgid "Sets the Packages file output." msgstr "Packages ファイルの出力先を設定します。" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:413 +#: apt-ftparchive.1.xml:414 msgid "" "Sets the Sources file output. At least one of <literal>Packages</literal> or " "<literal>Sources</literal> is required." @@ -3548,59 +3556,59 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:419 +#: apt-ftparchive.1.xml:420 msgid "Sets the Contents file output. (optional)" msgstr "Contents ファイルの出力先を設定します。(オプション)" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:424 +#: apt-ftparchive.1.xml:425 msgid "Sets the binary override file." msgstr "バイナリオーバーライドファイルを設定します。" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:429 +#: apt-ftparchive.1.xml:430 msgid "Sets the source override file." msgstr "ソースオーバーライドファイルを設定します。" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:444 +#: apt-ftparchive.1.xml:445 msgid "Sets the cache DB." msgstr "キャッシュ DB を設定します。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:447 +#: apt-ftparchive.1.xml:448 msgid "PathPrefix" msgstr "PathPrefix" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:449 +#: apt-ftparchive.1.xml:450 msgid "Appends a path to all the output paths." msgstr "全出力パスに付加するパス。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:452 +#: apt-ftparchive.1.xml:453 msgid "FileList, SourceFileList" msgstr "FileList, SourceFileList" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:454 +#: apt-ftparchive.1.xml:455 msgid "Specifies the file list file." msgstr "ファイル一覧ファイルを指定します。" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:461 +#: apt-ftparchive.1.xml:462 msgid "The Binary Override File" msgstr "バイナリオーバーライドファイル" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:462 +#: apt-ftparchive.1.xml:463 msgid "" "The binary override file is fully compatible with &dpkg-scanpackages;. It " "contains 4 fields separated by spaces. The first field is the package name, " @@ -3615,20 +3623,20 @@ msgstr "" "す。" #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:468 +#: apt-ftparchive.1.xml:469 #, no-wrap msgid "old [// oldn]* => new" msgstr "old [// oldn]* => new" #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:470 +#: apt-ftparchive.1.xml:471 #, no-wrap msgid "new" msgstr "new" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:467 +#: apt-ftparchive.1.xml:468 msgid "" "The general form of the maintainer field is: <placeholder type=" "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" " @@ -3646,13 +3654,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:478 +#: apt-ftparchive.1.xml:479 msgid "The Source Override File" msgstr "ソースオーバーライドファイル" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:480 +#: apt-ftparchive.1.xml:481 msgid "" "The source override file is fully compatible with &dpkg-scansources;. It " "contains 2 fields separated by spaces. The first fields is the source " @@ -3664,13 +3672,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:485 +#: apt-ftparchive.1.xml:486 msgid "The Extra Override File" msgstr "特別オーバーライドファイル" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:487 +#: apt-ftparchive.1.xml:488 msgid "" "The extra override file allows any arbitrary tag to be added or replaced in " "the output. It has 3 columns, the first is the package, the second is the " @@ -3680,13 +3688,13 @@ msgstr "" "す。3 列からなり、先頭はパッケージ、2番目はタグ、残りは新しい値です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:496 +#: apt-ftparchive.1.xml:497 msgid "<option>--md5</option>" msgstr "<option>--md5</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:498 +#: apt-ftparchive.1.xml:499 msgid "" "Generate MD5 sums. This defaults to on, when turned off the generated index " "files will not have MD5Sum fields where possible. Configuration Item: " @@ -3697,13 +3705,13 @@ msgstr "" "FTPArchive::MD5</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:503 +#: apt-ftparchive.1.xml:504 msgid "<option>--db</option>" msgstr "<option>--db</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:505 +#: apt-ftparchive.1.xml:506 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." @@ -3713,7 +3721,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:511 +#: apt-ftparchive.1.xml:512 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -3726,13 +3734,13 @@ msgstr "" "<literal>quiet</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:517 +#: apt-ftparchive.1.xml:518 msgid "<option>--delink</option>" msgstr "<option>--delink</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:519 +#: apt-ftparchive.1.xml:520 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -3745,13 +3753,13 @@ msgstr "" "<literal>APT::FTPArchive::DeLinkAct</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:525 +#: apt-ftparchive.1.xml:526 msgid "<option>--contents</option>" msgstr "<option>--contents</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:527 +#: apt-ftparchive.1.xml:528 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -3766,13 +3774,13 @@ msgstr "" "<literal>APT::FTPArchive::Contents</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:535 +#: apt-ftparchive.1.xml:536 msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:537 +#: apt-ftparchive.1.xml:538 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -3782,13 +3790,13 @@ msgstr "" "選択します。設定項目 - <literal>APT::FTPArchive::SourceOverride</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:541 +#: apt-ftparchive.1.xml:542 msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:543 +#: apt-ftparchive.1.xml:544 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@ -3797,16 +3805,43 @@ msgstr "" "FTPArchive::ReadOnlyDB</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:547 +#: apt-ftparchive.1.xml:548 +#, fuzzy +#| msgid "<option>-a</option>" +msgid "<option>--arch</option>" +msgstr "<option>-a</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:549 +#, fuzzy +#| msgid "" +#| "If the command is either <literal>install</literal> or <literal>remove</" +#| "literal>, then this option acts like running <literal>autoremove</" +#| "literal> command, removing the unused dependency packages. Configuration " +#| "Item: <literal>APT::Get::AutomaticRemove</literal>." +msgid "" +"Accept in the <literal>packages</literal> and <literal>contents</literal> " +"commands only package files matching <literal>*_arch.deb</literal> or " +"<literal>*_all.deb</literal> instead of all package files in the given " +"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>." +msgstr "" +"コマンドが <literal>install</literal> か <literal>remove</literal> である場" +"合、このオプションは使用していないパッケージを削除し、<literal>autoremove</" +"literal> のように動作します。設定項目 - <literal>APT::Get::AutomaticRemove</" +"literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:555 #, fuzzy #| msgid "<option>--version</option>" msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>--version</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:549 +#: apt-ftparchive.1.xml:557 msgid "" -"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " +"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " "will lead to problems as the now outdated cached metadata like size and " "checksums will be used. With this option enabled this will no longer happen " @@ -3818,14 +3853,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:559 +#: apt-ftparchive.1.xml:567 #, fuzzy #| msgid "<option>--version</option>" msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>--version</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:561 +#: apt-ftparchive.1.xml:569 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -3836,21 +3871,21 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 +#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477 #: sources.list.5.xml:193 msgid "Examples" msgstr "サンプル" # type: Content of: <refentry><refsect1><para><programlisting> #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:579 +#: apt-ftparchive.1.xml:587 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:575 +#: apt-ftparchive.1.xml:583 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3860,7 +3895,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:589 +#: apt-ftparchive.1.xml:597 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -7952,7 +7987,10 @@ msgstr "&apt-cache;, &apt-config;, &apt-preferences;." #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt_preferences.5.xml:13 -msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" +#, fuzzy +#| msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" +msgid "" +"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>" msgstr "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" # type: Content of: <refentry><refnamediv><refname> @@ -8025,6 +8063,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 msgid "" +"Preferences are a strong power in the hands of a system administrator but " +"they can become also their biggest nightmare if used without care! APT will " +"not questioning the preferences so wrong settings will therefore lead to " +"uninstallable packages or wrong decisions while upgrading packages. Even " +"more problems will arise if multiply distribution releases are mixed without " +"a good understanding of the following paragraphs. You have been warned." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:64 +msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " "following naming convention: The files have no or \"<literal>pref</literal>" @@ -8035,27 +8084,27 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:63 +#: apt_preferences.5.xml:71 msgid "APT's Default Priority Assignments" msgstr "APT のデフォルト優先度の割り当て" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:86 #, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:81 +#: apt_preferences.5.xml:89 #, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "APT::Default-Release \"stable\";\n" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:65 +#: apt_preferences.5.xml:73 msgid "" "If there is no preferences file or if there is no entry in the file that " "applies to a particular version then the priority assigned to that version " @@ -8080,25 +8129,25 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:90 +#: apt_preferences.5.xml:98 msgid "priority 100" msgstr "priority 100" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:91 +#: apt_preferences.5.xml:99 msgid "to the version that is already installed (if any)." msgstr "(あるならば) 既にインストールされているバージョン。" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:95 +#: apt_preferences.5.xml:103 msgid "priority 500" msgstr "priority 500" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:96 +#: apt_preferences.5.xml:104 msgid "" "to the versions that are not installed and do not belong to the target " "release." @@ -8106,20 +8155,20 @@ msgstr "インストールされておらず、ターゲットリリースに含 # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:100 +#: apt_preferences.5.xml:108 msgid "priority 990" msgstr "priority 990" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:101 +#: apt_preferences.5.xml:109 msgid "" "to the versions that are not installed and belong to the target release." msgstr "インストールされておらず、ターゲットリリースに含まれるバージョン。" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:85 +#: apt_preferences.5.xml:93 msgid "" "If the target release has been specified then APT uses the following " "algorithm to set the priorities of the versions of a package. Assign: " @@ -8131,7 +8180,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:106 +#: apt_preferences.5.xml:114 msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " @@ -8143,7 +8192,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:110 +#: apt_preferences.5.xml:118 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." @@ -8153,7 +8202,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 +#: apt_preferences.5.xml:121 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -8169,13 +8218,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:119 +#: apt_preferences.5.xml:127 msgid "Install the highest priority version." msgstr "最も高い優先度のバージョンをインストールします。" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:120 +#: apt_preferences.5.xml:128 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." @@ -8185,7 +8234,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:123 +#: apt_preferences.5.xml:131 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@ -8197,7 +8246,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:137 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@ -8213,7 +8262,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:136 +#: apt_preferences.5.xml:144 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@ -8227,7 +8276,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:141 +#: apt_preferences.5.xml:149 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@ -8247,13 +8296,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:150 +#: apt_preferences.5.xml:158 msgid "The Effect of APT Preferences" msgstr "APT 設定の効果" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:152 +#: apt_preferences.5.xml:160 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -8266,7 +8315,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:166 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@ -8281,7 +8330,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:165 +#: apt_preferences.5.xml:173 #, no-wrap msgid "" "Package: perl\n" @@ -8294,7 +8343,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:171 +#: apt_preferences.5.xml:179 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@ -8309,7 +8358,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:177 +#: apt_preferences.5.xml:185 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@ -8321,7 +8370,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:182 +#: apt_preferences.5.xml:190 #, no-wrap msgid "" "Package: *\n" @@ -8334,7 +8383,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:187 +#: apt_preferences.5.xml:195 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " "This should not be confused with the Origin of a distribution as specified " @@ -8350,7 +8399,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:193 +#: apt_preferences.5.xml:201 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -8361,7 +8410,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:197 +#: apt_preferences.5.xml:205 #, no-wrap msgid "" "Package: *\n" @@ -8374,7 +8423,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:202 +#: apt_preferences.5.xml:210 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>squeeze</literal>" @@ -8385,7 +8434,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:206 +#: apt_preferences.5.xml:214 #, no-wrap msgid "" "Package: *\n" @@ -8398,7 +8447,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:211 +#: apt_preferences.5.xml:219 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -8410,7 +8459,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:216 +#: apt_preferences.5.xml:224 #, no-wrap msgid "" "Package: *\n" @@ -8423,18 +8472,18 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:227 +#: apt_preferences.5.xml:235 msgid "How APT Interprets Priorities" msgstr "APT が優先度に割り込む方法" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:235 +#: apt_preferences.5.xml:243 msgid "P > 1000" msgstr "P > 1000" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:236 +#: apt_preferences.5.xml:244 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@ -8442,13 +8491,13 @@ msgstr "" "パッケージがダウングレードしても、このバージョンのパッケージをインストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:248 msgid "990 < P <=1000" msgstr "990 < P <=1000" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:241 +#: apt_preferences.5.xml:249 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@ -8457,13 +8506,13 @@ msgstr "" "含まれなくても、このバージョンのパッケージをインストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:254 msgid "500 < P <=990" msgstr "500 < P <=990" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:247 +#: apt_preferences.5.xml:255 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" @@ -8472,13 +8521,13 @@ msgstr "" "ジョンの方が新しいのでなければ、このバージョンのパッケージをインストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:260 msgid "100 < P <=500" msgstr "100 < P <=500" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:253 +#: apt_preferences.5.xml:261 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" @@ -8488,13 +8537,13 @@ msgstr "" "ル" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:258 +#: apt_preferences.5.xml:266 msgid "0 < P <=100" msgstr "0 < P <=100" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:259 +#: apt_preferences.5.xml:267 msgid "" "causes a version to be installed only if there is no installed version of " "the package" @@ -8503,19 +8552,19 @@ msgstr "" "ンストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:263 +#: apt_preferences.5.xml:271 msgid "P < 0" msgstr "P < 0" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:264 +#: apt_preferences.5.xml:272 msgid "prevents the version from being installed" msgstr "このバージョンのインストール禁止" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:230 +#: apt_preferences.5.xml:238 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -8527,7 +8576,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:269 +#: apt_preferences.5.xml:277 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -8541,7 +8590,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:275 +#: apt_preferences.5.xml:283 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@ -8551,7 +8600,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><programlisting> #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:279 +#: apt_preferences.5.xml:287 #, no-wrap msgid "" "Package: perl\n" @@ -8580,13 +8629,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:300 msgid "Then:" msgstr "すると、以下のように動作します。" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:294 +#: apt_preferences.5.xml:302 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -8601,7 +8650,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:299 +#: apt_preferences.5.xml:307 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -8613,7 +8662,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:303 +#: apt_preferences.5.xml:311 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -8627,13 +8676,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:313 +#: apt_preferences.5.xml:321 msgid "Determination of Package Version and Distribution Properties" msgstr "パッケージのバージョンとディストリビューションプロパティの決定" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:315 +#: apt_preferences.5.xml:323 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -8644,30 +8693,30 @@ msgstr "" "filename> ファイルを提供します。" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:327 +#: apt_preferences.5.xml:335 msgid "the <literal>Package:</literal> line" msgstr "<literal>Package:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:328 +#: apt_preferences.5.xml:336 msgid "gives the package name" msgstr "パッケージ名" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 +#: apt_preferences.5.xml:339 apt_preferences.5.xml:389 msgid "the <literal>Version:</literal> line" msgstr "<literal>Version:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:332 +#: apt_preferences.5.xml:340 msgid "gives the version number for the named package" msgstr "その名前のパッケージのバージョン番号" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:319 +#: apt_preferences.5.xml:327 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -8687,13 +8736,13 @@ msgstr "" "type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:348 +#: apt_preferences.5.xml:356 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "<literal>Archive:</literal> 行や <literal>Suite:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:349 +#: apt_preferences.5.xml:357 #, fuzzy msgid "" "names the archive to which all the packages in the directory tree belong. " @@ -8711,19 +8760,19 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:367 #, no-wrap msgid "Pin: release a=stable\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:365 +#: apt_preferences.5.xml:373 msgid "the <literal>Codename:</literal> line" msgstr "<literal>Codename:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:366 +#: apt_preferences.5.xml:374 #, fuzzy msgid "" "names the codename to which all the packages in the directory tree belong. " @@ -8740,14 +8789,14 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:383 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "Pin: release n=squeeze\n" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:382 +#: apt_preferences.5.xml:390 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -8763,7 +8812,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:391 +#: apt_preferences.5.xml:399 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -8775,13 +8824,13 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:400 +#: apt_preferences.5.xml:408 msgid "the <literal>Component:</literal> line" msgstr "<literal>Component:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:401 +#: apt_preferences.5.xml:409 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -8799,19 +8848,19 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:410 +#: apt_preferences.5.xml:418 #, no-wrap msgid "Pin: release c=main\n" msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:424 msgid "the <literal>Origin:</literal> line" msgstr "<literal>Origin:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:417 +#: apt_preferences.5.xml:425 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8824,19 +8873,19 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:423 +#: apt_preferences.5.xml:431 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:437 msgid "the <literal>Label:</literal> line" msgstr "<literal>Label:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:430 +#: apt_preferences.5.xml:438 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8849,14 +8898,14 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:444 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "Pin: release l=Debian\n" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:337 +#: apt_preferences.5.xml:345 #, fuzzy msgid "" "The <filename>Release</filename> file is normally found in the directory " @@ -8878,7 +8927,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:443 +#: apt_preferences.5.xml:451 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -8904,13 +8953,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:456 +#: apt_preferences.5.xml:464 msgid "Optional Lines in an APT Preferences Record" msgstr "APT 設定レコードのオプション行" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:458 +#: apt_preferences.5.xml:466 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -8921,7 +8970,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:462 +#: apt_preferences.5.xml:470 #, fuzzy msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " @@ -8935,13 +8984,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:471 +#: apt_preferences.5.xml:479 msgid "Tracking Stable" msgstr "安定版の追跡" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:479 +#: apt_preferences.5.xml:487 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -8966,7 +9015,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:473 +#: apt_preferences.5.xml:481 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a priority " @@ -8982,8 +9031,8 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 -#: apt_preferences.5.xml:600 +#: apt_preferences.5.xml:504 apt_preferences.5.xml:550 +#: apt_preferences.5.xml:608 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -8996,7 +9045,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:491 +#: apt_preferences.5.xml:499 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -9009,14 +9058,14 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:508 +#: apt_preferences.5.xml:516 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "apt-get install <replaceable>package</replaceable>/testing\n" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:502 +#: apt_preferences.5.xml:510 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -9030,13 +9079,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:514 +#: apt_preferences.5.xml:522 msgid "Tracking Testing or Unstable" msgstr "テスト版や不安定版の追跡" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:523 +#: apt_preferences.5.xml:531 #, no-wrap msgid "" "Package: *\n" @@ -9065,7 +9114,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:524 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a high priority " @@ -9083,7 +9132,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:537 +#: apt_preferences.5.xml:545 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -9096,14 +9145,14 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:565 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "apt-get install <replaceable>package</replaceable>/unstable\n" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:548 +#: apt_preferences.5.xml:556 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -9122,13 +9171,13 @@ msgstr "" "の最新版にアップグレードします。" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:564 +#: apt_preferences.5.xml:572 msgid "Tracking the evolution of a codename release" msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:578 +#: apt_preferences.5.xml:586 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -9162,7 +9211,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:566 +#: apt_preferences.5.xml:574 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -9178,7 +9227,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:595 +#: apt_preferences.5.xml:603 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -9191,14 +9240,14 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:615 +#: apt_preferences.5.xml:623 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "apt-get install <replaceable>package</replaceable>/sid\n" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:606 +#: apt_preferences.5.xml:614 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -9218,7 +9267,7 @@ msgstr "" # type: Content of: <refentry><refnamediv><refname> #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:624 +#: apt_preferences.5.xml:632 #, fuzzy #| msgid "apt_preferences" msgid "&file-preferences;" @@ -9226,7 +9275,7 @@ msgstr "apt_preferences" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:630 +#: apt_preferences.5.xml:638 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" diff --git a/doc/po/pl.po b/doc/po/pl.po index a3936cff2..bb70ccfd9 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" -"POT-Creation-Date: 2010-01-20 12:18+0100\n" +"POT-Creation-Date: 2010-02-18 20:53+0100\n" "PO-Revision-Date: 2004-02-12 15:06+0100\n" "Last-Translator: Krzysztof Fiertek <akfedux@megapolis.pl>\n" "Language-Team: <debian-l10n-polish@lists.debian.org>\n" @@ -865,7 +865,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 -#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 +#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125 #: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 #: sources.list.5.xml:33 @@ -1257,7 +1257,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 -#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 +#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 #: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 #, fuzzy msgid "options" @@ -1282,7 +1282,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376 +#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376 #: apt-sortpkgs.1.xml:58 msgid "<option>-s</option>" msgstr "" @@ -1303,12 +1303,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>-q</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>--quiet</option>" msgstr "" @@ -1357,7 +1357,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 +#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548 msgid "<option>-a</option>" msgstr "" @@ -1453,14 +1453,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 -#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 +#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:554 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:630 msgid "Files" msgstr "" @@ -1471,9 +1471,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 +#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637 #: sources.list.5.xml:233 msgid "See Also" msgstr "" @@ -1485,7 +1485,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 +#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:575 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "" @@ -1550,7 +1550,7 @@ msgstr "" #: apt-cdrom.8.xml:66 msgid "" "<literal>add</literal> is used to add a new disc to the source list. It will " -"unmount the CDROM device, prompt for a disk to be inserted and then procceed " +"unmount the CDROM device, prompt for a disk to be inserted and then proceed " "to scan it and copy the index files. If the disc does not have a proper " "<filename>disk</filename> directory you will be prompted for a descriptive " "title." @@ -1591,7 +1591,7 @@ msgid "Options" msgstr "Kolejne kroki" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328 +#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328 msgid "<option>-d</option>" msgstr "" @@ -1736,7 +1736,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:53 apt-ftparchive.1.xml:71 +#: apt-config.8.xml:53 apt-ftparchive.1.xml:72 msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given " "one of the commands below must be present." @@ -1787,7 +1787,7 @@ msgid "Just show the contents of the configuration space." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 +#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593 #: apt-sortpkgs.1.xml:70 msgid "&apt-conf;" msgstr "" @@ -1896,6 +1896,7 @@ msgid "" "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " "<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></" "arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</" "replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></" "option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=" @@ -1913,7 +1914,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:56 +#: apt-ftparchive.1.xml:57 msgid "" "<command>apt-ftparchive</command> is the command line tool that generates " "the index files that APT uses to access a distribution source. The index " @@ -1922,7 +1923,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:60 +#: apt-ftparchive.1.xml:61 msgid "" "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; " "program, incorporating its entire functionality via the <literal>packages</" @@ -1932,7 +1933,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:66 +#: apt-ftparchive.1.xml:67 msgid "" "Internally <command>apt-ftparchive</command> can make use of binary " "databases to cache the contents of a .deb file and it does not rely on any " @@ -1942,12 +1943,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:75 +#: apt-ftparchive.1.xml:76 msgid "packages" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:77 +#: apt-ftparchive.1.xml:78 msgid "" "The packages command generates a package file from a directory tree. It " "takes the given directory and recursively searches it for .deb files, " @@ -1956,18 +1957,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106 +#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107 msgid "" "The option <option>--db</option> can be used to specify a binary caching DB." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:85 +#: apt-ftparchive.1.xml:86 msgid "sources" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:87 +#: apt-ftparchive.1.xml:88 msgid "" "The <literal>sources</literal> command generates a source index file from a " "directory tree. It takes the given directory and recursively searches it " @@ -1976,7 +1977,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:92 +#: apt-ftparchive.1.xml:93 msgid "" "If an override file is specified then a source override file will be looked " "for with an extension of .src. The --source-override option can be used to " @@ -1984,12 +1985,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:97 +#: apt-ftparchive.1.xml:98 msgid "contents" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:99 +#: apt-ftparchive.1.xml:100 msgid "" "The <literal>contents</literal> command generates a contents file from a " "directory tree. It takes the given directory and recursively searches it " @@ -2000,12 +2001,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:109 +#: apt-ftparchive.1.xml:110 msgid "release" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:111 +#: apt-ftparchive.1.xml:112 msgid "" "The <literal>release</literal> command generates a Release file from a " "directory tree. It recursively searches the given directory for Packages, " @@ -2015,7 +2016,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:118 +#: apt-ftparchive.1.xml:119 msgid "" "Values for the additional metadata fields in the Release file are taken from " "the corresponding variables under <literal>APT::FTPArchive::Release</" @@ -2027,12 +2028,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:128 +#: apt-ftparchive.1.xml:129 msgid "generate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:130 +#: apt-ftparchive.1.xml:131 msgid "" "The <literal>generate</literal> command is designed to be runnable from a " "cron script and builds indexes according to the given config file. The " @@ -2042,25 +2043,25 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:137 apt-get.8.xml:292 +#: apt-ftparchive.1.xml:138 apt-get.8.xml:292 msgid "clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:139 +#: apt-ftparchive.1.xml:140 msgid "" "The <literal>clean</literal> command tidies the databases used by the given " "configuration file by removing any records that are no longer necessary." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:145 +#: apt-ftparchive.1.xml:146 #, fuzzy msgid "The Generate Configuration" msgstr "Plik konfiguracyjny" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:147 +#: apt-ftparchive.1.xml:148 msgid "" "The <literal>generate</literal> command uses a configuration file to " "describe the archives that are going to be generated. It follows the typical " @@ -2071,18 +2072,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:155 +#: apt-ftparchive.1.xml:156 msgid "" "The generate configuration has 4 separate sections, each described below." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:157 +#: apt-ftparchive.1.xml:158 msgid "Dir Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:159 +#: apt-ftparchive.1.xml:160 msgid "" "The <literal>Dir</literal> section defines the standard directories needed " "to locate the files required during the generation process. These " @@ -2091,12 +2092,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:164 +#: apt-ftparchive.1.xml:165 msgid "ArchiveDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:166 +#: apt-ftparchive.1.xml:167 msgid "" "Specifies the root of the FTP archive, in a standard Debian configuration " "this is the directory that contains the <filename>ls-LR</filename> and dist " @@ -2104,45 +2105,45 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:171 +#: apt-ftparchive.1.xml:172 #, fuzzy msgid "OverrideDir" msgstr "Wprowadzenie" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:173 +#: apt-ftparchive.1.xml:174 msgid "Specifies the location of the override files." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:176 +#: apt-ftparchive.1.xml:177 msgid "CacheDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:178 +#: apt-ftparchive.1.xml:179 msgid "Specifies the location of the cache files" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:181 +#: apt-ftparchive.1.xml:182 msgid "FileListDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:183 +#: apt-ftparchive.1.xml:184 msgid "" "Specifies the location of the file list files, if the <literal>FileList</" "literal> setting is used below." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:189 +#: apt-ftparchive.1.xml:190 msgid "Default Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:191 +#: apt-ftparchive.1.xml:192 msgid "" "The <literal>Default</literal> section specifies default values, and " "settings that control the operation of the generator. Other sections may " @@ -2150,12 +2151,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:195 +#: apt-ftparchive.1.xml:196 msgid "Packages::Compress" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:197 +#: apt-ftparchive.1.xml:198 msgid "" "Sets the default compression schemes to use for the Package index files. It " "is a string that contains a space separated list of at least one of: '.' (no " @@ -2164,60 +2165,60 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:203 +#: apt-ftparchive.1.xml:204 msgid "Packages::Extensions" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:205 +#: apt-ftparchive.1.xml:206 msgid "" "Sets the default list of file extensions that are package files. This " "defaults to '.deb'." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:209 +#: apt-ftparchive.1.xml:210 msgid "Sources::Compress" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:211 +#: apt-ftparchive.1.xml:212 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Sources files." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:215 +#: apt-ftparchive.1.xml:216 msgid "Sources::Extensions" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:217 +#: apt-ftparchive.1.xml:218 msgid "" "Sets the default list of file extensions that are source files. This " "defaults to '.dsc'." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:221 +#: apt-ftparchive.1.xml:222 msgid "Contents::Compress" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:223 +#: apt-ftparchive.1.xml:224 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Contents files." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:227 +#: apt-ftparchive.1.xml:228 msgid "DeLinkLimit" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:229 +#: apt-ftparchive.1.xml:230 msgid "" "Specifies the number of kilobytes to delink (and replace with hard links) " "per run. This is used in conjunction with the per-section <literal>External-" @@ -2225,24 +2226,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:234 +#: apt-ftparchive.1.xml:235 msgid "FileMode" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:236 +#: apt-ftparchive.1.xml:237 msgid "" "Specifies the mode of all created index files. It defaults to 0644. All " "index files are set to this mode with no regard to the umask." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:243 +#: apt-ftparchive.1.xml:244 msgid "TreeDefault Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:245 +#: apt-ftparchive.1.xml:246 msgid "" "Sets defaults specific to <literal>Tree</literal> sections. All of these " "variables are substitution variables and have the strings $(DIST), " @@ -2250,12 +2251,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:250 +#: apt-ftparchive.1.xml:251 msgid "MaxContentsChange" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:252 +#: apt-ftparchive.1.xml:253 msgid "" "Sets the number of kilobytes of contents files that are generated each day. " "The contents files are round-robined so that over several days they will all " @@ -2263,12 +2264,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:257 +#: apt-ftparchive.1.xml:258 msgid "ContentsAge" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:259 +#: apt-ftparchive.1.xml:260 msgid "" "Controls the number of days a contents file is allowed to be checked without " "changing. If this limit is passed the mtime of the contents file is updated. " @@ -2279,60 +2280,60 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:268 +#: apt-ftparchive.1.xml:269 msgid "Directory" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:270 +#: apt-ftparchive.1.xml:271 msgid "" "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/" "$(SECTION)/binary-$(ARCH)/</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:274 +#: apt-ftparchive.1.xml:275 msgid "SrcDirectory" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:276 +#: apt-ftparchive.1.xml:277 msgid "" "Sets the top of the source package directory tree. Defaults to <filename>" "$(DIST)/$(SECTION)/source/</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406 +#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407 msgid "Packages" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:282 +#: apt-ftparchive.1.xml:283 msgid "" "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" "binary-$(ARCH)/Packages</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411 +#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412 msgid "Sources" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:288 +#: apt-ftparchive.1.xml:289 msgid "" "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/" "source/Sources</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:292 +#: apt-ftparchive.1.xml:293 msgid "InternalPrefix" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:294 +#: apt-ftparchive.1.xml:295 msgid "" "Sets the path prefix that causes a symlink to be considered an internal link " "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</" @@ -2340,12 +2341,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417 +#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418 msgid "Contents" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:301 +#: apt-ftparchive.1.xml:302 msgid "" "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)" "</filename>. If this setting causes multiple Packages files to map onto a " @@ -2354,34 +2355,34 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:308 +#: apt-ftparchive.1.xml:309 msgid "Contents::Header" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:310 +#: apt-ftparchive.1.xml:311 msgid "Sets header file to prepend to the contents output." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442 +#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443 msgid "BinCacheDB" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:315 +#: apt-ftparchive.1.xml:316 msgid "" "Sets the binary cache database to use for this section. Multiple sections " "can share the same database." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:319 +#: apt-ftparchive.1.xml:320 msgid "FileList" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:321 +#: apt-ftparchive.1.xml:322 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " @@ -2389,12 +2390,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:326 +#: apt-ftparchive.1.xml:327 msgid "SourceFileList" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:328 +#: apt-ftparchive.1.xml:329 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " @@ -2403,12 +2404,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:336 +#: apt-ftparchive.1.xml:337 msgid "Tree Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:338 +#: apt-ftparchive.1.xml:339 msgid "" "The <literal>Tree</literal> section defines a standard Debian file tree " "which consists of a base directory, then multiple sections in that base " @@ -2418,7 +2419,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:343 +#: apt-ftparchive.1.xml:344 msgid "" "The <literal>Tree</literal> section takes a scope tag which sets the " "<literal>$(DIST)</literal> variable and defines the root of the tree (the " @@ -2427,7 +2428,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:348 +#: apt-ftparchive.1.xml:349 msgid "" "All of the settings defined in the <literal>TreeDefault</literal> section " "can be use in a <literal>Tree</literal> section as well as three new " @@ -2435,7 +2436,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt-ftparchive.1.xml:354 +#: apt-ftparchive.1.xml:355 #, no-wrap msgid "" "for i in Sections do \n" @@ -2445,7 +2446,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:351 +#: apt-ftparchive.1.xml:352 msgid "" "When processing a <literal>Tree</literal> section <command>apt-ftparchive</" "command> performs an operation similar to: <placeholder type=\"programlisting" @@ -2453,12 +2454,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:360 +#: apt-ftparchive.1.xml:361 msgid "Sections" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:362 +#: apt-ftparchive.1.xml:363 msgid "" "This is a space separated list of sections which appear under the " "distribution, typically this is something like <literal>main contrib non-" @@ -2466,12 +2467,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:367 +#: apt-ftparchive.1.xml:368 msgid "Architectures" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:369 +#: apt-ftparchive.1.xml:370 msgid "" "This is a space separated list of all the architectures that appear under " "search section. The special architecture 'source' is used to indicate that " @@ -2479,58 +2480,58 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422 +#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423 #, fuzzy msgid "BinOverride" msgstr "Wprowadzenie" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:376 +#: apt-ftparchive.1.xml:377 msgid "" "Sets the binary override file. The override file contains section, priority " "and maintainer address information." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427 +#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428 #, fuzzy msgid "SrcOverride" msgstr "Wprowadzenie" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:382 +#: apt-ftparchive.1.xml:383 msgid "" "Sets the source override file. The override file contains section " "information." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432 +#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433 msgid "ExtraOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434 +#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435 msgid "Sets the binary extra override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437 +#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438 msgid "SrcExtraOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439 +#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440 msgid "Sets the source extra override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:398 +#: apt-ftparchive.1.xml:399 msgid "BinDirectory Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:400 +#: apt-ftparchive.1.xml:401 msgid "" "The <literal>bindirectory</literal> section defines a binary directory tree " "with no special structure. The scope tag specifies the location of the " @@ -2540,64 +2541,64 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:408 +#: apt-ftparchive.1.xml:409 msgid "Sets the Packages file output." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:413 +#: apt-ftparchive.1.xml:414 msgid "" "Sets the Sources file output. At least one of <literal>Packages</literal> or " "<literal>Sources</literal> is required." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:419 +#: apt-ftparchive.1.xml:420 msgid "Sets the Contents file output. (optional)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:424 +#: apt-ftparchive.1.xml:425 msgid "Sets the binary override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:429 +#: apt-ftparchive.1.xml:430 msgid "Sets the source override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:444 +#: apt-ftparchive.1.xml:445 msgid "Sets the cache DB." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:447 +#: apt-ftparchive.1.xml:448 msgid "PathPrefix" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:449 +#: apt-ftparchive.1.xml:450 msgid "Appends a path to all the output paths." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:452 +#: apt-ftparchive.1.xml:453 msgid "FileList, SourceFileList" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:454 +#: apt-ftparchive.1.xml:455 msgid "Specifies the file list file." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:461 +#: apt-ftparchive.1.xml:462 msgid "The Binary Override File" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:462 +#: apt-ftparchive.1.xml:463 msgid "" "The binary override file is fully compatible with &dpkg-scanpackages;. It " "contains 4 fields separated by spaces. The first field is the package name, " @@ -2607,19 +2608,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:468 +#: apt-ftparchive.1.xml:469 #, no-wrap msgid "old [// oldn]* => new" msgstr "" #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:470 +#: apt-ftparchive.1.xml:471 #, no-wrap msgid "new" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:467 +#: apt-ftparchive.1.xml:468 msgid "" "The general form of the maintainer field is: <placeholder type=" "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" " @@ -2630,12 +2631,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:478 +#: apt-ftparchive.1.xml:479 msgid "The Source Override File" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:480 +#: apt-ftparchive.1.xml:481 msgid "" "The source override file is fully compatible with &dpkg-scansources;. It " "contains 2 fields separated by spaces. The first fields is the source " @@ -2643,12 +2644,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:485 +#: apt-ftparchive.1.xml:486 msgid "The Extra Override File" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:487 +#: apt-ftparchive.1.xml:488 msgid "" "The extra override file allows any arbitrary tag to be added or replaced in " "the output. It has 3 columns, the first is the package, the second is the " @@ -2656,12 +2657,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:496 +#: apt-ftparchive.1.xml:497 msgid "<option>--md5</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:498 +#: apt-ftparchive.1.xml:499 msgid "" "Generate MD5 sums. This defaults to on, when turned off the generated index " "files will not have MD5Sum fields where possible. Configuration Item: " @@ -2669,19 +2670,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:503 +#: apt-ftparchive.1.xml:504 msgid "<option>--db</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:505 +#: apt-ftparchive.1.xml:506 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:511 +#: apt-ftparchive.1.xml:512 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -2690,12 +2691,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:517 +#: apt-ftparchive.1.xml:518 msgid "<option>--delink</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:519 +#: apt-ftparchive.1.xml:520 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -2704,12 +2705,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:525 +#: apt-ftparchive.1.xml:526 msgid "<option>--contents</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:527 +#: apt-ftparchive.1.xml:528 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -2719,12 +2720,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:535 +#: apt-ftparchive.1.xml:536 msgid "<option>--source-override</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:537 +#: apt-ftparchive.1.xml:538 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -2732,26 +2733,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:541 +#: apt-ftparchive.1.xml:542 msgid "<option>--readonly</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:543 +#: apt-ftparchive.1.xml:544 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:547 -msgid "<option>APT::FTPArchive::AlwaysStat</option>" +#: apt-ftparchive.1.xml:548 +msgid "<option>--arch</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 msgid "" -"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " +"Accept in the <literal>packages</literal> and <literal>contents</literal> " +"commands only package files matching <literal>*_arch.deb</literal> or " +"<literal>*_all.deb</literal> instead of all package files in the given " +"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:555 +msgid "<option>APT::FTPArchive::AlwaysStat</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:557 +msgid "" +"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " "will lead to problems as the now outdated cached metadata like size and " "checksums will be used. With this option enabled this will no longer happen " @@ -2763,12 +2778,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:559 +#: apt-ftparchive.1.xml:567 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:561 +#: apt-ftparchive.1.xml:569 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -2778,26 +2793,26 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 +#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477 #: sources.list.5.xml:193 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:579 +#: apt-ftparchive.1.xml:587 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:575 +#: apt-ftparchive.1.xml:583 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:589 +#: apt-ftparchive.1.xml:597 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -5845,7 +5860,8 @@ msgstr "" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt_preferences.5.xml:13 -msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" +msgid "" +"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>" msgstr "" #. type: Content of: <refentry><refnamediv><refname> @@ -5893,6 +5909,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 msgid "" +"Preferences are a strong power in the hands of a system administrator but " +"they can become also their biggest nightmare if used without care! APT will " +"not questioning the preferences so wrong settings will therefore lead to " +"uninstallable packages or wrong decisions while upgrading packages. Even " +"more problems will arise if multiply distribution releases are mixed without " +"a good understanding of the following paragraphs. You have been warned." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:64 +msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " "following naming convention: The files have no or \"<literal>pref</literal>" @@ -5902,24 +5929,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:63 +#: apt_preferences.5.xml:71 msgid "APT's Default Priority Assignments" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:86 #, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:81 +#: apt_preferences.5.xml:89 #, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:65 +#: apt_preferences.5.xml:73 msgid "" "If there is no preferences file or if there is no entry in the file that " "applies to a particular version then the priority assigned to that version " @@ -5935,40 +5962,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:90 +#: apt_preferences.5.xml:98 msgid "priority 100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:91 +#: apt_preferences.5.xml:99 msgid "to the version that is already installed (if any)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:95 +#: apt_preferences.5.xml:103 msgid "priority 500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:96 +#: apt_preferences.5.xml:104 msgid "" "to the versions that are not installed and do not belong to the target " "release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:100 +#: apt_preferences.5.xml:108 msgid "priority 990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:101 +#: apt_preferences.5.xml:109 msgid "" "to the versions that are not installed and belong to the target release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:85 +#: apt_preferences.5.xml:93 msgid "" "If the target release has been specified then APT uses the following " "algorithm to set the priorities of the versions of a package. Assign: " @@ -5976,7 +6003,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:106 +#: apt_preferences.5.xml:114 msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " @@ -5984,14 +6011,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:110 +#: apt_preferences.5.xml:118 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 +#: apt_preferences.5.xml:121 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -6001,19 +6028,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:119 +#: apt_preferences.5.xml:127 msgid "Install the highest priority version." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:120 +#: apt_preferences.5.xml:128 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:123 +#: apt_preferences.5.xml:131 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@ -6021,7 +6048,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:137 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@ -6031,7 +6058,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:136 +#: apt_preferences.5.xml:144 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@ -6040,7 +6067,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:141 +#: apt_preferences.5.xml:149 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@ -6052,12 +6079,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:150 +#: apt_preferences.5.xml:158 msgid "The Effect of APT Preferences" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:152 +#: apt_preferences.5.xml:160 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -6066,7 +6093,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:166 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@ -6076,7 +6103,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:165 +#: apt_preferences.5.xml:173 #, no-wrap msgid "" "Package: perl\n" @@ -6085,7 +6112,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:171 +#: apt_preferences.5.xml:179 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@ -6095,7 +6122,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:177 +#: apt_preferences.5.xml:185 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@ -6103,7 +6130,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:182 +#: apt_preferences.5.xml:190 #, no-wrap msgid "" "Package: *\n" @@ -6112,7 +6139,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:187 +#: apt_preferences.5.xml:195 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " "This should not be confused with the Origin of a distribution as specified " @@ -6122,7 +6149,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:193 +#: apt_preferences.5.xml:201 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -6130,7 +6157,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:197 +#: apt_preferences.5.xml:205 #, no-wrap msgid "" "Package: *\n" @@ -6139,7 +6166,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:202 +#: apt_preferences.5.xml:210 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>squeeze</literal>" @@ -6147,7 +6174,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:206 +#: apt_preferences.5.xml:214 #, no-wrap msgid "" "Package: *\n" @@ -6156,7 +6183,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:211 +#: apt_preferences.5.xml:219 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -6164,7 +6191,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:216 +#: apt_preferences.5.xml:224 #, no-wrap msgid "" "Package: *\n" @@ -6173,82 +6200,82 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:227 +#: apt_preferences.5.xml:235 msgid "How APT Interprets Priorities" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:235 +#: apt_preferences.5.xml:243 msgid "P > 1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:236 +#: apt_preferences.5.xml:244 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:248 msgid "990 < P <=1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:241 +#: apt_preferences.5.xml:249 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:254 msgid "500 < P <=990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:247 +#: apt_preferences.5.xml:255 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:260 msgid "100 < P <=500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:253 +#: apt_preferences.5.xml:261 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:258 +#: apt_preferences.5.xml:266 msgid "0 < P <=100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:259 +#: apt_preferences.5.xml:267 msgid "" "causes a version to be installed only if there is no installed version of " "the package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:263 +#: apt_preferences.5.xml:271 msgid "P < 0" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:264 +#: apt_preferences.5.xml:272 msgid "prevents the version from being installed" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:230 +#: apt_preferences.5.xml:238 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -6256,7 +6283,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:269 +#: apt_preferences.5.xml:277 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -6265,14 +6292,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:275 +#: apt_preferences.5.xml:283 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:279 +#: apt_preferences.5.xml:287 #, no-wrap msgid "" "Package: perl\n" @@ -6289,12 +6316,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:300 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:294 +#: apt_preferences.5.xml:302 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -6304,7 +6331,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:299 +#: apt_preferences.5.xml:307 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -6312,7 +6339,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:303 +#: apt_preferences.5.xml:311 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -6321,12 +6348,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:313 +#: apt_preferences.5.xml:321 msgid "Determination of Package Version and Distribution Properties" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:315 +#: apt_preferences.5.xml:323 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -6334,27 +6361,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:327 +#: apt_preferences.5.xml:335 msgid "the <literal>Package:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:328 +#: apt_preferences.5.xml:336 msgid "gives the package name" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 +#: apt_preferences.5.xml:339 apt_preferences.5.xml:389 msgid "the <literal>Version:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:332 +#: apt_preferences.5.xml:340 msgid "gives the version number for the named package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:319 +#: apt_preferences.5.xml:327 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -6367,12 +6394,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:348 +#: apt_preferences.5.xml:356 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:349 +#: apt_preferences.5.xml:357 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -6383,18 +6410,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:367 #, no-wrap msgid "Pin: release a=stable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:365 +#: apt_preferences.5.xml:373 msgid "the <literal>Codename:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:366 +#: apt_preferences.5.xml:374 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: squeeze\" specifies that all of the " @@ -6404,13 +6431,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:383 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:382 +#: apt_preferences.5.xml:390 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -6420,7 +6447,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:391 +#: apt_preferences.5.xml:399 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -6429,12 +6456,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:400 +#: apt_preferences.5.xml:408 msgid "the <literal>Component:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:401 +#: apt_preferences.5.xml:409 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -6445,18 +6472,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:410 +#: apt_preferences.5.xml:418 #, no-wrap msgid "Pin: release c=main\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:424 msgid "the <literal>Origin:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:417 +#: apt_preferences.5.xml:425 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -6465,18 +6492,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:423 +#: apt_preferences.5.xml:431 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:437 msgid "the <literal>Label:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:430 +#: apt_preferences.5.xml:438 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -6485,13 +6512,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:444 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:337 +#: apt_preferences.5.xml:345 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -6504,7 +6531,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:443 +#: apt_preferences.5.xml:451 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -6519,12 +6546,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:456 +#: apt_preferences.5.xml:464 msgid "Optional Lines in an APT Preferences Record" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:458 +#: apt_preferences.5.xml:466 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -6532,7 +6559,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:462 +#: apt_preferences.5.xml:470 msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " "optional. If omitted, APT assigns a priority of 1 less than the last value " @@ -6541,12 +6568,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:471 +#: apt_preferences.5.xml:479 msgid "Tracking Stable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:479 +#: apt_preferences.5.xml:487 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -6561,7 +6588,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:473 +#: apt_preferences.5.xml:481 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -6571,8 +6598,8 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 -#: apt_preferences.5.xml:600 +#: apt_preferences.5.xml:504 apt_preferences.5.xml:550 +#: apt_preferences.5.xml:608 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -6581,7 +6608,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:491 +#: apt_preferences.5.xml:499 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -6590,13 +6617,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:508 +#: apt_preferences.5.xml:516 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:502 +#: apt_preferences.5.xml:510 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -6605,12 +6632,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:514 +#: apt_preferences.5.xml:522 msgid "Tracking Testing or Unstable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:523 +#: apt_preferences.5.xml:531 #, no-wrap msgid "" "Package: *\n" @@ -6627,7 +6654,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:524 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -6638,7 +6665,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:537 +#: apt_preferences.5.xml:545 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -6647,13 +6674,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:565 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:548 +#: apt_preferences.5.xml:556 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -6665,12 +6692,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:564 +#: apt_preferences.5.xml:572 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:578 +#: apt_preferences.5.xml:586 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -6690,7 +6717,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:566 +#: apt_preferences.5.xml:574 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -6705,7 +6732,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:595 +#: apt_preferences.5.xml:603 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -6714,13 +6741,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:615 +#: apt_preferences.5.xml:623 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:606 +#: apt_preferences.5.xml:614 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -6732,12 +6759,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:624 +#: apt_preferences.5.xml:632 msgid "&file-preferences;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:630 +#: apt_preferences.5.xml:638 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "" diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index e6225eb67..4e1eeb33a 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" -"POT-Creation-Date: 2010-01-20 12:18+0100\n" +"POT-Creation-Date: 2010-02-18 20:53+0100\n" "PO-Revision-Date: 2004-09-20 17:02+0000\n" "Last-Translator: André Luís Lopes <andrelop@debian.org>\n" "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n" @@ -823,7 +823,7 @@ msgstr "<!ENTITY translation-title \"Tradução\">" #. type: Plain text #: apt.ent:380 -#, no-wrap, fuzzy +#, fuzzy, no-wrap msgid "" "<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n" " to the translation in the past, who is responsible now and maybe further information\n" @@ -913,7 +913,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 -#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 +#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125 #: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 #: sources.list.5.xml:33 @@ -1308,7 +1308,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 -#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 +#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 #: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 msgid "options" msgstr "" @@ -1332,7 +1332,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376 +#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376 #: apt-sortpkgs.1.xml:58 msgid "<option>-s</option>" msgstr "" @@ -1353,12 +1353,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>-q</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>--quiet</option>" msgstr "" @@ -1407,7 +1407,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 +#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548 msgid "<option>-a</option>" msgstr "" @@ -1503,14 +1503,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 -#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 +#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:554 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:630 msgid "Files" msgstr "" @@ -1521,9 +1521,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 +#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637 #: sources.list.5.xml:233 #, fuzzy msgid "See Also" @@ -1536,7 +1536,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 +#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:575 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "" @@ -1601,7 +1601,7 @@ msgstr "" #: apt-cdrom.8.xml:66 msgid "" "<literal>add</literal> is used to add a new disc to the source list. It will " -"unmount the CDROM device, prompt for a disk to be inserted and then procceed " +"unmount the CDROM device, prompt for a disk to be inserted and then proceed " "to scan it and copy the index files. If the disc does not have a proper " "<filename>disk</filename> directory you will be prompted for a descriptive " "title." @@ -1641,7 +1641,7 @@ msgid "Options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328 +#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328 msgid "<option>-d</option>" msgstr "" @@ -1786,7 +1786,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:53 apt-ftparchive.1.xml:71 +#: apt-config.8.xml:53 apt-ftparchive.1.xml:72 msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given " "one of the commands below must be present." @@ -1837,7 +1837,7 @@ msgid "Just show the contents of the configuration space." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 +#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593 #: apt-sortpkgs.1.xml:70 #, fuzzy msgid "&apt-conf;" @@ -1950,6 +1950,7 @@ msgid "" "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " "<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></" "arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</" "replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></" "option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=" @@ -1967,7 +1968,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:56 +#: apt-ftparchive.1.xml:57 msgid "" "<command>apt-ftparchive</command> is the command line tool that generates " "the index files that APT uses to access a distribution source. The index " @@ -1976,7 +1977,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:60 +#: apt-ftparchive.1.xml:61 msgid "" "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; " "program, incorporating its entire functionality via the <literal>packages</" @@ -1986,7 +1987,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:66 +#: apt-ftparchive.1.xml:67 msgid "" "Internally <command>apt-ftparchive</command> can make use of binary " "databases to cache the contents of a .deb file and it does not rely on any " @@ -1996,12 +1997,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:75 +#: apt-ftparchive.1.xml:76 msgid "packages" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:77 +#: apt-ftparchive.1.xml:78 msgid "" "The packages command generates a package file from a directory tree. It " "takes the given directory and recursively searches it for .deb files, " @@ -2010,18 +2011,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106 +#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107 msgid "" "The option <option>--db</option> can be used to specify a binary caching DB." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:85 +#: apt-ftparchive.1.xml:86 msgid "sources" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:87 +#: apt-ftparchive.1.xml:88 msgid "" "The <literal>sources</literal> command generates a source index file from a " "directory tree. It takes the given directory and recursively searches it " @@ -2030,7 +2031,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:92 +#: apt-ftparchive.1.xml:93 msgid "" "If an override file is specified then a source override file will be looked " "for with an extension of .src. The --source-override option can be used to " @@ -2038,12 +2039,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:97 +#: apt-ftparchive.1.xml:98 msgid "contents" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:99 +#: apt-ftparchive.1.xml:100 msgid "" "The <literal>contents</literal> command generates a contents file from a " "directory tree. It takes the given directory and recursively searches it " @@ -2054,12 +2055,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:109 +#: apt-ftparchive.1.xml:110 msgid "release" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:111 +#: apt-ftparchive.1.xml:112 msgid "" "The <literal>release</literal> command generates a Release file from a " "directory tree. It recursively searches the given directory for Packages, " @@ -2069,7 +2070,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:118 +#: apt-ftparchive.1.xml:119 msgid "" "Values for the additional metadata fields in the Release file are taken from " "the corresponding variables under <literal>APT::FTPArchive::Release</" @@ -2081,12 +2082,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:128 +#: apt-ftparchive.1.xml:129 msgid "generate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:130 +#: apt-ftparchive.1.xml:131 msgid "" "The <literal>generate</literal> command is designed to be runnable from a " "cron script and builds indexes according to the given config file. The " @@ -2096,24 +2097,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:137 apt-get.8.xml:292 +#: apt-ftparchive.1.xml:138 apt-get.8.xml:292 msgid "clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:139 +#: apt-ftparchive.1.xml:140 msgid "" "The <literal>clean</literal> command tidies the databases used by the given " "configuration file by removing any records that are no longer necessary." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:145 +#: apt-ftparchive.1.xml:146 msgid "The Generate Configuration" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:147 +#: apt-ftparchive.1.xml:148 msgid "" "The <literal>generate</literal> command uses a configuration file to " "describe the archives that are going to be generated. It follows the typical " @@ -2124,19 +2125,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:155 +#: apt-ftparchive.1.xml:156 msgid "" "The generate configuration has 4 separate sections, each described below." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:157 +#: apt-ftparchive.1.xml:158 #, fuzzy msgid "Dir Section" msgstr "Descrição" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:159 +#: apt-ftparchive.1.xml:160 msgid "" "The <literal>Dir</literal> section defines the standard directories needed " "to locate the files required during the generation process. These " @@ -2145,12 +2146,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:164 +#: apt-ftparchive.1.xml:165 msgid "ArchiveDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:166 +#: apt-ftparchive.1.xml:167 msgid "" "Specifies the root of the FTP archive, in a standard Debian configuration " "this is the directory that contains the <filename>ls-LR</filename> and dist " @@ -2158,44 +2159,44 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:171 +#: apt-ftparchive.1.xml:172 msgid "OverrideDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:173 +#: apt-ftparchive.1.xml:174 msgid "Specifies the location of the override files." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:176 +#: apt-ftparchive.1.xml:177 msgid "CacheDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:178 +#: apt-ftparchive.1.xml:179 msgid "Specifies the location of the cache files" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:181 +#: apt-ftparchive.1.xml:182 msgid "FileListDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:183 +#: apt-ftparchive.1.xml:184 msgid "" "Specifies the location of the file list files, if the <literal>FileList</" "literal> setting is used below." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:189 +#: apt-ftparchive.1.xml:190 msgid "Default Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:191 +#: apt-ftparchive.1.xml:192 msgid "" "The <literal>Default</literal> section specifies default values, and " "settings that control the operation of the generator. Other sections may " @@ -2203,12 +2204,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:195 +#: apt-ftparchive.1.xml:196 msgid "Packages::Compress" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:197 +#: apt-ftparchive.1.xml:198 msgid "" "Sets the default compression schemes to use for the Package index files. It " "is a string that contains a space separated list of at least one of: '.' (no " @@ -2217,60 +2218,60 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:203 +#: apt-ftparchive.1.xml:204 msgid "Packages::Extensions" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:205 +#: apt-ftparchive.1.xml:206 msgid "" "Sets the default list of file extensions that are package files. This " "defaults to '.deb'." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:209 +#: apt-ftparchive.1.xml:210 msgid "Sources::Compress" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:211 +#: apt-ftparchive.1.xml:212 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Sources files." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:215 +#: apt-ftparchive.1.xml:216 msgid "Sources::Extensions" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:217 +#: apt-ftparchive.1.xml:218 msgid "" "Sets the default list of file extensions that are source files. This " "defaults to '.dsc'." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:221 +#: apt-ftparchive.1.xml:222 msgid "Contents::Compress" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:223 +#: apt-ftparchive.1.xml:224 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Contents files." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:227 +#: apt-ftparchive.1.xml:228 msgid "DeLinkLimit" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:229 +#: apt-ftparchive.1.xml:230 msgid "" "Specifies the number of kilobytes to delink (and replace with hard links) " "per run. This is used in conjunction with the per-section <literal>External-" @@ -2278,24 +2279,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:234 +#: apt-ftparchive.1.xml:235 msgid "FileMode" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:236 +#: apt-ftparchive.1.xml:237 msgid "" "Specifies the mode of all created index files. It defaults to 0644. All " "index files are set to this mode with no regard to the umask." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:243 +#: apt-ftparchive.1.xml:244 msgid "TreeDefault Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:245 +#: apt-ftparchive.1.xml:246 msgid "" "Sets defaults specific to <literal>Tree</literal> sections. All of these " "variables are substitution variables and have the strings $(DIST), " @@ -2303,12 +2304,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:250 +#: apt-ftparchive.1.xml:251 msgid "MaxContentsChange" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:252 +#: apt-ftparchive.1.xml:253 msgid "" "Sets the number of kilobytes of contents files that are generated each day. " "The contents files are round-robined so that over several days they will all " @@ -2316,12 +2317,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:257 +#: apt-ftparchive.1.xml:258 msgid "ContentsAge" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:259 +#: apt-ftparchive.1.xml:260 msgid "" "Controls the number of days a contents file is allowed to be checked without " "changing. If this limit is passed the mtime of the contents file is updated. " @@ -2332,60 +2333,60 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:268 +#: apt-ftparchive.1.xml:269 msgid "Directory" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:270 +#: apt-ftparchive.1.xml:271 msgid "" "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/" "$(SECTION)/binary-$(ARCH)/</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:274 +#: apt-ftparchive.1.xml:275 msgid "SrcDirectory" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:276 +#: apt-ftparchive.1.xml:277 msgid "" "Sets the top of the source package directory tree. Defaults to <filename>" "$(DIST)/$(SECTION)/source/</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406 +#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407 msgid "Packages" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:282 +#: apt-ftparchive.1.xml:283 msgid "" "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" "binary-$(ARCH)/Packages</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411 +#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412 msgid "Sources" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:288 +#: apt-ftparchive.1.xml:289 msgid "" "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/" "source/Sources</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:292 +#: apt-ftparchive.1.xml:293 msgid "InternalPrefix" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:294 +#: apt-ftparchive.1.xml:295 msgid "" "Sets the path prefix that causes a symlink to be considered an internal link " "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</" @@ -2393,12 +2394,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417 +#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418 msgid "Contents" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:301 +#: apt-ftparchive.1.xml:302 msgid "" "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)" "</filename>. If this setting causes multiple Packages files to map onto a " @@ -2407,34 +2408,34 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:308 +#: apt-ftparchive.1.xml:309 msgid "Contents::Header" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:310 +#: apt-ftparchive.1.xml:311 msgid "Sets header file to prepend to the contents output." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442 +#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443 msgid "BinCacheDB" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:315 +#: apt-ftparchive.1.xml:316 msgid "" "Sets the binary cache database to use for this section. Multiple sections " "can share the same database." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:319 +#: apt-ftparchive.1.xml:320 msgid "FileList" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:321 +#: apt-ftparchive.1.xml:322 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " @@ -2442,12 +2443,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:326 +#: apt-ftparchive.1.xml:327 msgid "SourceFileList" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:328 +#: apt-ftparchive.1.xml:329 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " @@ -2456,12 +2457,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:336 +#: apt-ftparchive.1.xml:337 msgid "Tree Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:338 +#: apt-ftparchive.1.xml:339 msgid "" "The <literal>Tree</literal> section defines a standard Debian file tree " "which consists of a base directory, then multiple sections in that base " @@ -2471,7 +2472,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:343 +#: apt-ftparchive.1.xml:344 msgid "" "The <literal>Tree</literal> section takes a scope tag which sets the " "<literal>$(DIST)</literal> variable and defines the root of the tree (the " @@ -2480,7 +2481,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:348 +#: apt-ftparchive.1.xml:349 msgid "" "All of the settings defined in the <literal>TreeDefault</literal> section " "can be use in a <literal>Tree</literal> section as well as three new " @@ -2488,7 +2489,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt-ftparchive.1.xml:354 +#: apt-ftparchive.1.xml:355 #, no-wrap msgid "" "for i in Sections do \n" @@ -2498,7 +2499,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:351 +#: apt-ftparchive.1.xml:352 msgid "" "When processing a <literal>Tree</literal> section <command>apt-ftparchive</" "command> performs an operation similar to: <placeholder type=\"programlisting" @@ -2506,13 +2507,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:360 +#: apt-ftparchive.1.xml:361 #, fuzzy msgid "Sections" msgstr "Descrição" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:362 +#: apt-ftparchive.1.xml:363 msgid "" "This is a space separated list of sections which appear under the " "distribution, typically this is something like <literal>main contrib non-" @@ -2520,12 +2521,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:367 +#: apt-ftparchive.1.xml:368 msgid "Architectures" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:369 +#: apt-ftparchive.1.xml:370 msgid "" "This is a space separated list of all the architectures that appear under " "search section. The special architecture 'source' is used to indicate that " @@ -2533,56 +2534,56 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422 +#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423 msgid "BinOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:376 +#: apt-ftparchive.1.xml:377 msgid "" "Sets the binary override file. The override file contains section, priority " "and maintainer address information." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427 +#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428 msgid "SrcOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:382 +#: apt-ftparchive.1.xml:383 msgid "" "Sets the source override file. The override file contains section " "information." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432 +#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433 msgid "ExtraOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434 +#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435 msgid "Sets the binary extra override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437 +#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438 msgid "SrcExtraOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439 +#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440 msgid "Sets the source extra override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:398 +#: apt-ftparchive.1.xml:399 msgid "BinDirectory Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:400 +#: apt-ftparchive.1.xml:401 msgid "" "The <literal>bindirectory</literal> section defines a binary directory tree " "with no special structure. The scope tag specifies the location of the " @@ -2592,64 +2593,64 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:408 +#: apt-ftparchive.1.xml:409 msgid "Sets the Packages file output." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:413 +#: apt-ftparchive.1.xml:414 msgid "" "Sets the Sources file output. At least one of <literal>Packages</literal> or " "<literal>Sources</literal> is required." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:419 +#: apt-ftparchive.1.xml:420 msgid "Sets the Contents file output. (optional)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:424 +#: apt-ftparchive.1.xml:425 msgid "Sets the binary override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:429 +#: apt-ftparchive.1.xml:430 msgid "Sets the source override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:444 +#: apt-ftparchive.1.xml:445 msgid "Sets the cache DB." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:447 +#: apt-ftparchive.1.xml:448 msgid "PathPrefix" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:449 +#: apt-ftparchive.1.xml:450 msgid "Appends a path to all the output paths." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:452 +#: apt-ftparchive.1.xml:453 msgid "FileList, SourceFileList" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:454 +#: apt-ftparchive.1.xml:455 msgid "Specifies the file list file." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:461 +#: apt-ftparchive.1.xml:462 msgid "The Binary Override File" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:462 +#: apt-ftparchive.1.xml:463 msgid "" "The binary override file is fully compatible with &dpkg-scanpackages;. It " "contains 4 fields separated by spaces. The first field is the package name, " @@ -2659,19 +2660,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:468 +#: apt-ftparchive.1.xml:469 #, no-wrap msgid "old [// oldn]* => new" msgstr "" #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:470 +#: apt-ftparchive.1.xml:471 #, no-wrap msgid "new" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:467 +#: apt-ftparchive.1.xml:468 msgid "" "The general form of the maintainer field is: <placeholder type=" "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" " @@ -2682,12 +2683,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:478 +#: apt-ftparchive.1.xml:479 msgid "The Source Override File" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:480 +#: apt-ftparchive.1.xml:481 msgid "" "The source override file is fully compatible with &dpkg-scansources;. It " "contains 2 fields separated by spaces. The first fields is the source " @@ -2695,12 +2696,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:485 +#: apt-ftparchive.1.xml:486 msgid "The Extra Override File" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:487 +#: apt-ftparchive.1.xml:488 msgid "" "The extra override file allows any arbitrary tag to be added or replaced in " "the output. It has 3 columns, the first is the package, the second is the " @@ -2708,12 +2709,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:496 +#: apt-ftparchive.1.xml:497 msgid "<option>--md5</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:498 +#: apt-ftparchive.1.xml:499 msgid "" "Generate MD5 sums. This defaults to on, when turned off the generated index " "files will not have MD5Sum fields where possible. Configuration Item: " @@ -2721,19 +2722,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:503 +#: apt-ftparchive.1.xml:504 msgid "<option>--db</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:505 +#: apt-ftparchive.1.xml:506 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:511 +#: apt-ftparchive.1.xml:512 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -2742,12 +2743,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:517 +#: apt-ftparchive.1.xml:518 msgid "<option>--delink</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:519 +#: apt-ftparchive.1.xml:520 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -2756,12 +2757,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:525 +#: apt-ftparchive.1.xml:526 msgid "<option>--contents</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:527 +#: apt-ftparchive.1.xml:528 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -2771,12 +2772,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:535 +#: apt-ftparchive.1.xml:536 msgid "<option>--source-override</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:537 +#: apt-ftparchive.1.xml:538 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -2784,26 +2785,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:541 +#: apt-ftparchive.1.xml:542 msgid "<option>--readonly</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:543 +#: apt-ftparchive.1.xml:544 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:547 -msgid "<option>APT::FTPArchive::AlwaysStat</option>" +#: apt-ftparchive.1.xml:548 +msgid "<option>--arch</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 msgid "" -"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " +"Accept in the <literal>packages</literal> and <literal>contents</literal> " +"commands only package files matching <literal>*_arch.deb</literal> or " +"<literal>*_all.deb</literal> instead of all package files in the given " +"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:555 +msgid "<option>APT::FTPArchive::AlwaysStat</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:557 +msgid "" +"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " "will lead to problems as the now outdated cached metadata like size and " "checksums will be used. With this option enabled this will no longer happen " @@ -2815,12 +2830,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:559 +#: apt-ftparchive.1.xml:567 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:561 +#: apt-ftparchive.1.xml:569 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -2830,27 +2845,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 +#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477 #: sources.list.5.xml:193 #, fuzzy msgid "Examples" msgstr "Exemplos" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:579 +#: apt-ftparchive.1.xml:587 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:575 +#: apt-ftparchive.1.xml:583 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:589 +#: apt-ftparchive.1.xml:597 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -5923,7 +5938,8 @@ msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt_preferences.5.xml:13 -msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" +msgid "" +"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>" msgstr "" #. type: Content of: <refentry><refnamediv><refname> @@ -5993,6 +6009,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 msgid "" +"Preferences are a strong power in the hands of a system administrator but " +"they can become also their biggest nightmare if used without care! APT will " +"not questioning the preferences so wrong settings will therefore lead to " +"uninstallable packages or wrong decisions while upgrading packages. Even " +"more problems will arise if multiply distribution releases are mixed without " +"a good understanding of the following paragraphs. You have been warned." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:64 +msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " "following naming convention: The files have no or \"<literal>pref</literal>" @@ -6002,13 +6029,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:63 +#: apt_preferences.5.xml:71 #, fuzzy msgid "APT's Default Priority Assignments" msgstr "Atribuições de Prioridade Padrão do APT" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:86 #, fuzzy, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "" @@ -6016,7 +6043,7 @@ msgstr "" "<command>apt-get install -t testing <replaceable>algum-pacote</replaceable></command>\n" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:81 +#: apt_preferences.5.xml:89 #, fuzzy, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "" @@ -6024,7 +6051,7 @@ msgstr "" "APT::Default-Release \"stable\";\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:65 +#: apt_preferences.5.xml:73 #, fuzzy msgid "" "If there is no preferences file or if there is no entry in the file that " @@ -6049,25 +6076,25 @@ msgstr "" "etc/apt/apt.conf</filename>. Por exemplo," #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:90 +#: apt_preferences.5.xml:98 #, fuzzy msgid "priority 100" msgstr "prioridade 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:91 +#: apt_preferences.5.xml:99 #, fuzzy msgid "to the version that is already installed (if any)." msgstr "para a instância que já esteja instalada (caso exista)." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:95 +#: apt_preferences.5.xml:103 #, fuzzy msgid "priority 500" msgstr "prioridade 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:96 +#: apt_preferences.5.xml:104 #, fuzzy msgid "" "to the versions that are not installed and do not belong to the target " @@ -6076,13 +6103,13 @@ msgstr "" "para as instâncias que não estã instaladas e que não pertencem a versão alvo." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:100 +#: apt_preferences.5.xml:108 #, fuzzy msgid "priority 990" msgstr "prioridade 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:101 +#: apt_preferences.5.xml:109 #, fuzzy msgid "" "to the versions that are not installed and belong to the target release." @@ -6090,7 +6117,7 @@ msgstr "" "para as instâncias que não estejam instaladas e pertençam a versão alvo." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:85 +#: apt_preferences.5.xml:93 #, fuzzy msgid "" "If the target release has been specified then APT uses the following " @@ -6102,7 +6129,7 @@ msgstr "" "Atribuirá :" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:106 +#: apt_preferences.5.xml:114 #, fuzzy msgid "" "If the target release has not been specified then APT simply assigns " @@ -6114,7 +6141,7 @@ msgstr "" "prioridade 500 para todas as instâncias de pacotes não instaladas." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:110 +#: apt_preferences.5.xml:118 #, fuzzy msgid "" "APT then applies the following rules, listed in order of precedence, to " @@ -6124,7 +6151,7 @@ msgstr "" "determinar qual instância de um pacote instalar." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 +#: apt_preferences.5.xml:121 #, fuzzy msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " @@ -6141,13 +6168,13 @@ msgstr "" "\"downgrade\" pode ser arriscado.)" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:119 +#: apt_preferences.5.xml:127 #, fuzzy msgid "Install the highest priority version." msgstr "Instala a instância de prioridade mais alta." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:120 +#: apt_preferences.5.xml:128 #, fuzzy msgid "" "If two or more versions have the same priority, install the most recent one " @@ -6157,7 +6184,7 @@ msgstr "" "mais recente (ou seja, aquela com o maior número de versão)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:123 +#: apt_preferences.5.xml:131 #, fuzzy msgid "" "If two or more versions have the same priority and version number but either " @@ -6169,7 +6196,7 @@ msgstr "" "<literal>--reinstall</literal> seja fornecida, instala aquela desinstalada." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:137 #, fuzzy msgid "" "In a typical situation, the installed version of a package (priority 100) " @@ -6186,7 +6213,7 @@ msgstr "" "forem executados." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:136 +#: apt_preferences.5.xml:144 #, fuzzy msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " @@ -6201,7 +6228,7 @@ msgstr "" "upgrade</command> forem executados." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:141 +#: apt_preferences.5.xml:149 #, fuzzy msgid "" "Sometimes the installed version of a package is more recent than the version " @@ -6221,13 +6248,13 @@ msgstr "" "disponíveis possuir uma prioridade maior do que a versão instalada." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:150 +#: apt_preferences.5.xml:158 #, fuzzy msgid "The Effect of APT Preferences" msgstr "O Efeito das Preferências do APT" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:152 +#: apt_preferences.5.xml:160 #, fuzzy msgid "" "The APT preferences file allows the system administrator to control the " @@ -6241,7 +6268,7 @@ msgstr "" "das duas formas, uma forma específica e uma forma geral." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:166 #, fuzzy msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " @@ -6257,7 +6284,7 @@ msgstr "" "com \"<literal>5.8</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:165 +#: apt_preferences.5.xml:173 #, fuzzy, no-wrap msgid "" "Package: perl\n" @@ -6270,7 +6297,7 @@ msgstr "" "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:171 +#: apt_preferences.5.xml:179 #, fuzzy msgid "" "The general form assigns a priority to all of the package versions in a " @@ -6286,7 +6313,7 @@ msgstr "" "identificado pelo nome de domínio totalmente qualificado do site Internet." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:177 +#: apt_preferences.5.xml:185 #, fuzzy msgid "" "This general-form entry in the APT preferences file applies only to groups " @@ -6299,7 +6326,7 @@ msgstr "" "no site local." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:182 +#: apt_preferences.5.xml:190 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -6312,7 +6339,7 @@ msgstr "" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:187 +#: apt_preferences.5.xml:195 #, fuzzy msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " @@ -6329,7 +6356,7 @@ msgstr "" "como \"Debian\" ou \"Ximian\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:193 +#: apt_preferences.5.xml:201 #, fuzzy msgid "" "The following record assigns a low priority to all package versions " @@ -6341,7 +6368,7 @@ msgstr "" "\"<literal>unstable</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:197 +#: apt_preferences.5.xml:205 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -6354,7 +6381,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:202 +#: apt_preferences.5.xml:210 #, fuzzy msgid "" "The following record assigns a high priority to all package versions " @@ -6366,7 +6393,7 @@ msgstr "" "\"<literal>unstable</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:206 +#: apt_preferences.5.xml:214 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -6379,7 +6406,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:211 +#: apt_preferences.5.xml:219 #, fuzzy msgid "" "The following record assigns a high priority to all package versions " @@ -6392,7 +6419,7 @@ msgstr "" "literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:216 +#: apt_preferences.5.xml:224 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -6405,19 +6432,19 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:227 +#: apt_preferences.5.xml:235 #, fuzzy msgid "How APT Interprets Priorities" msgstr "Como o APT Interpreta Prioridades" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:235 +#: apt_preferences.5.xml:243 #, fuzzy msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:236 +#: apt_preferences.5.xml:244 #, fuzzy msgid "" "causes a version to be installed even if this constitutes a downgrade of the " @@ -6427,13 +6454,13 @@ msgstr "" "dowgrade do pacote" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:248 #, fuzzy msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:241 +#: apt_preferences.5.xml:249 #, fuzzy msgid "" "causes a version to be installed even if it does not come from the target " @@ -6443,13 +6470,13 @@ msgstr "" "versão alvo, a menos que a versão instalada seja mais recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:254 #, fuzzy msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:247 +#: apt_preferences.5.xml:255 #, fuzzy msgid "" "causes a version to be installed unless there is a version available " @@ -6459,13 +6486,13 @@ msgstr "" "disponível pertencente a versão alvo ou a versão instalada seja mais recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:260 #, fuzzy msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:253 +#: apt_preferences.5.xml:261 #, fuzzy msgid "" "causes a version to be installed unless there is a version available " @@ -6476,13 +6503,13 @@ msgstr "" "seja mais recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:258 +#: apt_preferences.5.xml:266 #, fuzzy msgid "0 < P <=100" msgstr "0 <= P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:259 +#: apt_preferences.5.xml:267 #, fuzzy msgid "" "causes a version to be installed only if there is no installed version of " @@ -6492,19 +6519,19 @@ msgstr "" "instalada do pacote" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:263 +#: apt_preferences.5.xml:271 #, fuzzy msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:264 +#: apt_preferences.5.xml:272 #, fuzzy msgid "prevents the version from being installed" msgstr "impede a versão de ser instalada" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:230 +#: apt_preferences.5.xml:238 #, fuzzy msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " @@ -6516,7 +6543,7 @@ msgstr "" "seguir (a grosso modo):" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:269 +#: apt_preferences.5.xml:277 #, fuzzy msgid "" "If any specific-form records match an available package version then the " @@ -6532,7 +6559,7 @@ msgstr "" "determinará a prioridade da versão do pacote." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:275 +#: apt_preferences.5.xml:283 #, fuzzy msgid "" "For example, suppose the APT preferences file contains the three records " @@ -6542,7 +6569,7 @@ msgstr "" "registros apresentados anteriormente :" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:279 +#: apt_preferences.5.xml:287 #, fuzzy, no-wrap msgid "" "Package: perl\n" @@ -6571,12 +6598,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:300 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:294 +#: apt_preferences.5.xml:302 #, fuzzy msgid "" "The most recent available version of the <literal>perl</literal> package " @@ -6592,7 +6619,7 @@ msgstr "" "será feito um downgrade do <literal>perl</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:299 +#: apt_preferences.5.xml:307 #, fuzzy msgid "" "A version of any package other than <literal>perl</literal> that is " @@ -6604,7 +6631,7 @@ msgstr "" "mesmo versões pertencentes a versão alvo." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:303 +#: apt_preferences.5.xml:311 #, fuzzy msgid "" "A version of a package whose origin is not the local system but some other " @@ -6619,13 +6646,13 @@ msgstr "" "instalada." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:313 +#: apt_preferences.5.xml:321 #, fuzzy msgid "Determination of Package Version and Distribution Properties" msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:315 +#: apt_preferences.5.xml:323 #, fuzzy msgid "" "The locations listed in the &sources-list; file should provide " @@ -6637,31 +6664,31 @@ msgstr "" "os pacotes disponíveis nessas localidades." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:327 +#: apt_preferences.5.xml:335 #, fuzzy msgid "the <literal>Package:</literal> line" msgstr "a linha <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:328 +#: apt_preferences.5.xml:336 #, fuzzy msgid "gives the package name" msgstr "informa o nome do pacote" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 +#: apt_preferences.5.xml:339 apt_preferences.5.xml:389 #, fuzzy msgid "the <literal>Version:</literal> line" msgstr "a linha <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:332 +#: apt_preferences.5.xml:340 #, fuzzy msgid "gives the version number for the named package" msgstr "informa o número de versão do pacote" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:319 +#: apt_preferences.5.xml:327 #, fuzzy msgid "" "The <filename>Packages</filename> file is normally found in the directory " @@ -6683,13 +6710,13 @@ msgstr "" "do APT :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:348 +#: apt_preferences.5.xml:356 #, fuzzy msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:349 +#: apt_preferences.5.xml:357 #, fuzzy msgid "" "names the archive to which all the packages in the directory tree belong. " @@ -6707,7 +6734,7 @@ msgstr "" "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:367 #, fuzzy, no-wrap msgid "Pin: release a=stable\n" msgstr "" @@ -6715,13 +6742,13 @@ msgstr "" "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:365 +#: apt_preferences.5.xml:373 #, fuzzy msgid "the <literal>Codename:</literal> line" msgstr "a linha <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:366 +#: apt_preferences.5.xml:374 #, fuzzy msgid "" "names the codename to which all the packages in the directory tree belong. " @@ -6738,13 +6765,13 @@ msgstr "" "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:383 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:382 +#: apt_preferences.5.xml:390 #, fuzzy msgid "" "names the release version. For example, the packages in the tree might " @@ -6761,7 +6788,7 @@ msgstr "" "das linhas a seguir." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:391 +#: apt_preferences.5.xml:399 #, fuzzy, no-wrap msgid "" "Pin: release v=3.0\n" @@ -6774,13 +6801,13 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:400 +#: apt_preferences.5.xml:408 #, fuzzy msgid "the <literal>Component:</literal> line" msgstr "a linha <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:401 +#: apt_preferences.5.xml:409 #, fuzzy msgid "" "names the licensing component associated with the packages in the directory " @@ -6799,7 +6826,7 @@ msgstr "" "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:410 +#: apt_preferences.5.xml:418 #, fuzzy, no-wrap msgid "Pin: release c=main\n" msgstr "" @@ -6807,13 +6834,13 @@ msgstr "" "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:424 #, fuzzy msgid "the <literal>Origin:</literal> line" msgstr "a linha <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:417 +#: apt_preferences.5.xml:425 #, fuzzy msgid "" "names the originator of the packages in the directory tree of the " @@ -6827,7 +6854,7 @@ msgstr "" "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:423 +#: apt_preferences.5.xml:431 #, fuzzy, no-wrap msgid "Pin: release o=Debian\n" msgstr "" @@ -6835,13 +6862,13 @@ msgstr "" "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:437 #, fuzzy msgid "the <literal>Label:</literal> line" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:430 +#: apt_preferences.5.xml:438 #, fuzzy msgid "" "names the label of the packages in the directory tree of the " @@ -6854,7 +6881,7 @@ msgstr "" "arquivo de preferências do APT iria requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:444 #, fuzzy, no-wrap msgid "Pin: release l=Debian\n" msgstr "" @@ -6862,7 +6889,7 @@ msgstr "" "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:337 +#: apt_preferences.5.xml:345 #, fuzzy msgid "" "The <filename>Release</filename> file is normally found in the directory " @@ -6885,7 +6912,7 @@ msgstr "" "do APT :" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:443 +#: apt_preferences.5.xml:451 #, fuzzy msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " @@ -6911,13 +6938,13 @@ msgstr "" "<literal>unstable</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:456 +#: apt_preferences.5.xml:464 #, fuzzy msgid "Optional Lines in an APT Preferences Record" msgstr "Linhas Opcionais em um Registro de Preferências do APT" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:458 +#: apt_preferences.5.xml:466 #, fuzzy msgid "" "Each record in the APT preferences file can optionally begin with one or " @@ -6929,7 +6956,7 @@ msgstr "" "</literal>. Isto oferece um local para inserir comentários." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:462 +#: apt_preferences.5.xml:470 #, fuzzy msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " @@ -6943,13 +6970,13 @@ msgstr "" "release ...</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:471 +#: apt_preferences.5.xml:479 #, fuzzy msgid "Tracking Stable" msgstr "Acompanhando a Stable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:479 +#: apt_preferences.5.xml:487 #, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -6974,7 +7001,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:473 +#: apt_preferences.5.xml:481 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a priority " @@ -6990,8 +7017,8 @@ msgstr "" "outras distribuições <literal>Debian</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 -#: apt_preferences.5.xml:600 +#: apt_preferences.5.xml:504 apt_preferences.5.xml:550 +#: apt_preferences.5.xml:608 #, fuzzy, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -7004,7 +7031,7 @@ msgstr "" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:491 +#: apt_preferences.5.xml:499 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -7017,7 +7044,7 @@ msgstr "" "ulítma(s) versão(ôes) <literal>stable</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:508 +#: apt_preferences.5.xml:516 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "" @@ -7025,7 +7052,7 @@ msgstr "" "apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:502 +#: apt_preferences.5.xml:510 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -7038,13 +7065,13 @@ msgstr "" "atualizado novamente a menos que esse comando seja executado novamente." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:514 +#: apt_preferences.5.xml:522 #, fuzzy msgid "Tracking Testing or Unstable" msgstr "Acompanhando a Testing" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:523 +#: apt_preferences.5.xml:531 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -7073,7 +7100,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:524 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a high priority " @@ -7090,7 +7117,7 @@ msgstr "" "versões de pacotes de outras distribuições <literal>Debian</literal>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:537 +#: apt_preferences.5.xml:545 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -7103,7 +7130,7 @@ msgstr "" "(s) última(s) versão(ões) <literal>testing</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:565 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "" @@ -7111,7 +7138,7 @@ msgstr "" "apt-get install <replaceable>pacote</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:548 +#: apt_preferences.5.xml:556 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -7131,12 +7158,12 @@ msgstr "" "recente que a versão instalada." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:564 +#: apt_preferences.5.xml:572 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:578 +#: apt_preferences.5.xml:586 #, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -7166,7 +7193,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:566 +#: apt_preferences.5.xml:574 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -7181,7 +7208,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:595 +#: apt_preferences.5.xml:603 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -7194,7 +7221,7 @@ msgstr "" "ulítma(s) versão(ôes) <literal>stable</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:615 +#: apt_preferences.5.xml:623 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "" @@ -7202,7 +7229,7 @@ msgstr "" "apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:606 +#: apt_preferences.5.xml:614 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -7222,13 +7249,13 @@ msgstr "" "recente que a versão instalada." #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:624 +#: apt_preferences.5.xml:632 #, fuzzy msgid "&file-preferences;" msgstr "apt_preferences" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:630 +#: apt_preferences.5.xml:638 #, fuzzy msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" diff --git a/po/ar.po b/po/ar.po index c5fbe9077..15d5f7205 100644 --- a/po/ar.po +++ b/po/ar.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2006-10-20 21:28+0300\n" "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n" "Language-Team: Arabic <support@arabeyes.org>\n" @@ -151,7 +151,7 @@ msgstr " جدول النسخ:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s لـ%s %s مُجمّع على %s %s\n" @@ -247,7 +247,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "تعذرت الكتابة إلى %s" @@ -343,7 +343,7 @@ msgstr "قاعدة البيانات قديمة، محاولة ترقية %s" #: ftparchive/cachedb.cc:72 msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" @@ -358,11 +358,11 @@ msgstr "تعذر فتح ملف قاعدة البيانات %s: %s" msgid "Failed to stat %s" msgstr "" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "" @@ -427,26 +427,26 @@ msgstr "*** فشل ربط %s بـ%s" msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -550,7 +550,7 @@ msgstr "فشل تغيير اسم %s إلى %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -711,11 +711,11 @@ msgstr "حزم بحاجة للإزالة لكن الإزالة مُعطّلة." msgid "Internal error, Ordering didn't finish" msgstr "خطأ داخلي، لم تنته عملية الترتيب" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "تعذر قَفْل دليل التنزيل" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "تعذرت قراءة قائمة المصادر." @@ -744,8 +744,8 @@ msgstr "بعد الاستخراج %sب من المساحة الإضافيّة س msgid "After this operation, %sB disk space will be freed.\n" msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "تعذر حساب المساحة الحرة في %s" @@ -782,7 +782,7 @@ msgstr "إجهاض." msgid "Do you want to continue [Y/n]? " msgstr "هل تريد الاستمرار [Y/n]؟" -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "فشل إحضار %s %s\n" @@ -791,7 +791,7 @@ msgstr "فشل إحضار %s %s\n" msgid "Some files failed to download" msgstr "فشل تنزيل بعض الملفات" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "اكتمل التنزيل وفي وضع التنزيل فقط" @@ -885,51 +885,51 @@ msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'" msgid "Selected version %s (%s) for %s\n" msgstr "النسخة المحددة %s (%s) للإصدارة %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1321 #, c-format -msgid "Ignore unavailable version '%s' of package '%s'" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1352 #, c-format -msgid "Ignore unavailable target release '%s' of package '%s'" +msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1342 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 #, c-format -msgid "Picking '%s' as source package instead of '%s'\n" +msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1395 +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "لا يقبل الأمر update أية مُعطيات" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "تعذر قفل دليل القائمة" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "سيتم تثبيت الحزم الجديدة التالية:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "سيتم تثبيت الحزم الجديدة التالية:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -945,51 +945,51 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "قد تساعد المعلومات التالية في حل المشكلة:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "تعذر العثور على الحزمة %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "تعذر العثور على الحزمة %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "إلا أنه سيتم تثبيت %s" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "قد ترغب بتشغيل `apt-get -f install' لتصحيح هذه:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" "مُعتمدات غير مستوفاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -997,152 +997,152 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "حزم معطوبة" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "سيتم تثبيت الحزم الإضافيّة التالية:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "الحزم المقترحة:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "الحزم المستحسنة:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "حساب الترقية..." -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "فشل" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "تمّ" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "تعذر العثور على مصدر الحزمة %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "تخطي الملف '%s' المنزل مسبقاً\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "ليس هناك مساحة كافية في %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "إحضار المصدر %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "فشل إحضار بعض الأرشيفات." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "أمر فك الحزمة '%s' فشل.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "أمر البناء '%s' فشل.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, 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:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "الوحدات المدعومة:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1186,7 +1186,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1421,11 +1421,10 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "تعذرت قراءة %s" @@ -1455,9 +1454,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "قراءة قوائم الحزم" @@ -1588,11 +1587,11 @@ msgid "File not found" msgstr "لم يُعثر على الملف" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "فشيل تنفيذ stat" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "فشل تعيين وقت التعديل" @@ -1654,7 +1653,7 @@ msgstr "انتهى وقت الاتصال" msgid "Server closed the connection" msgstr "أغلق الخادم الاتصال" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "خطأ في القراءة" @@ -1666,7 +1665,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "خطأ في الكتابة" @@ -1720,7 +1719,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "تعذر قبول الاتصال" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1784,58 +1783,63 @@ msgstr "تعذر الاتصال بـ%s:%s (%s)." msgid "Connecting to %s" msgstr "الاتصال بـ%s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "تعذر الاتصال بـ%s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "إجهاض التثبيت." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1884,48 +1888,48 @@ msgstr "خادم http له دعم مدى معطوب" msgid "Unknown date format" msgstr "نسق تاريخ مجهول" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "فشل التحديد" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "انتهى وقت الاتصال" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "خطأ في الكتابة إلى ملف المُخرجات" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "خطأ في الكتابة إلى الملف" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "خطأ في الكتابة إلى الملف" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "خطأ في القراءة من الخادم" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "فشلت كتابة الملف %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "بيانات ترويسة سيئة" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "فشل الاتصال" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "خطأ داخلي" @@ -1933,18 +1937,25 @@ msgstr "خطأ داخلي" msgid "Can't mmap an empty file" msgstr "" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -1974,52 +1985,52 @@ msgstr "" msgid "Selection %s not found" msgstr "تعذر العثور على التحديد %s" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "اختصار نوع مجهول: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "فتح ملف التهيئة %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" @@ -2095,75 +2106,75 @@ msgstr "" msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, c-format msgid "Sub-process %s received signal %u." msgstr "" -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "مشكلة في إغلاق الملف" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "مشكلة في مزامنة الملف" @@ -2281,52 +2292,52 @@ msgstr "" msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "فتح %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@ -2443,17 +2454,17 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "قد يساعدك تنفيذ الأمر apt-get update في تصحيح هذه المشاكل" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "" @@ -2537,16 +2548,16 @@ msgstr "" msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "" @@ -2555,40 +2566,40 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "فشل إعادة التسمية ، %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum غير متطابقة" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum غير متطابقة" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "الحجم غير متطابق" @@ -2720,7 +2731,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "فتح ملف التهيئة %s" @@ -2751,7 +2761,6 @@ msgstr "إزالة %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "تمت إزالة %s بالكامل" @@ -2835,8 +2844,18 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." msgstr "" #: methods/rsh.cc:330 diff --git a/po/ast.po b/po/ast.po index 5273037fa..7df0e8f06 100644 --- a/po/ast.po +++ b/po/ast.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2009-07-01 18:09+0100\n" "Last-Translator: Marcos Alvarez Costales <marcos.alvarez.costales@gmail." "com>\n" @@ -143,7 +143,7 @@ msgstr " Tabla de versiones:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pa %s compilu en %s %s\n" @@ -299,7 +299,7 @@ msgstr "" "-o=? Afita una opcin de configuracin arbitraria, p. ej. -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Nun se pue escribir en %s" @@ -433,8 +433,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "La DB ye antigua, tentando actualizar %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "El formatu de la base de datos nun ye vlidu. Si anovaste dende una versin " @@ -451,11 +452,11 @@ msgstr "Nun pudo abrise'l ficheru de BD %s: %s" msgid "Failed to stat %s" msgstr "Nun pudo lleese %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "L'archivu nun tien rexistru de control" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Nun pudo algamase un cursor" @@ -520,26 +521,26 @@ msgstr "*** Fall msgid " DeLink limit of %sB hit.\n" msgstr " Alcanzose'l llmite of %sB de desenllaz.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "L'archivu nun tien el campu paquetes" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s nun tien la entrada saltos\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el curiador de %s ye %s y non %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s nun tien la entrada saltos de fonte\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s tampoco nun tiene una entrada binaria de saltos\n" @@ -643,7 +644,7 @@ msgstr "Nun pudo renomase %s como %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilacin d'espresin regular - %s" @@ -804,11 +805,11 @@ msgstr "Fai falta desaniciar los paquetes pero desaniciar ta torg msgid "Internal error, Ordering didn't finish" msgstr "Error internu, ordenar nun fin" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Nun pue bloquiase'l direutoriu de descarga" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Nun pudo lleese la llista de fontes." @@ -837,8 +838,8 @@ msgstr "Tres d'esta operaci msgid "After this operation, %sB disk space will be freed.\n" msgstr "Tres d'esta operacin, van lliberase %sB d'espaciu de discu.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nun pue determinase l'espaciu llibre de %s" @@ -875,7 +876,7 @@ msgstr "Encaboxar." msgid "Do you want to continue [Y/n]? " msgstr "Quies continuar [S/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Fall algamar %s %s\n" @@ -884,7 +885,7 @@ msgstr "Fall msgid "Some files failed to download" msgstr "Dellos ficheros nun pudieron descargase" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Descarga completa y en mou de slo descarga" @@ -981,35 +982,35 @@ msgstr "Nun s'alcontr msgid "Selected version %s (%s) for %s\n" msgstr "Escoyida la versin %s (%s) pa %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Nun se puede lleer la llista de paquetes d'orxenes %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "La orde update nun lleva argumentos" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Nun pudo bloquiase'l direutoriu de llista" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Suponse que nun vamos esborrar coses; nun pue entamase AutoRemover" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1017,18 +1018,18 @@ msgstr "" "Los siguientes paquetes instalaronse de manera automtica y ya nun se " "necesiten:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Los siguientes paquetes instalaronse de manera automtica y ya nun se " "necesiten:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Usa 'apt-get autoremove' pa desinstalalos." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1046,43 +1047,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "La siguiente informacin pue aidar a resolver la situacin:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Error internu, AutoRemover rompi coses" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error internu, AllUpgrade rompi coses" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Nun pudo alcontrase la tarea %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Nun pudo alcontrase'l paquete %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, escoyendo %s pa la espresin regular '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s axustu como instalu manualmente.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Habres d'executar `apt-get -f install' para iguar estos:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1090,7 +1091,7 @@ msgstr "" "Dependencies ensin cubrir. Tenta 'apt-get -f install' ensin paquetes (o " "consea una solucin)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1102,117 +1103,117 @@ msgstr "" "inestable, que dellos paquetes necesarios nun se crearon o que\n" "s'allugaron fuera d'Incoming." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Paquetes fraaos" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Instalarnse los siguientes paquetes extra:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Paquetes afalaos:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Paquetes encamentaos" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Calculando l'autualizacin... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Fall" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Fecho" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Error internu, l'iguador de problemes fra coses" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Has de consear polo menos un paquete p'algamar so fonte" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Nun pudo alcontrase un paquete fonte pa %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saltando'l ficheru y descargu '%s'\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Nun hai espaciu llibre bastante en %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Hai falta descargar %sB/%sB d'archivos fonte.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Hai falta descargar %sB d'archivos fonte.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Fonte descargada %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Fall la descarga de dellos archivos." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saltando'l desempaquetu de la fonte y desempaquetada en %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fall la orde de desempaquetu '%s'.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instalu.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fall la orde build '%s'.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Fall el procesu fu" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Hai que consear polo menos un paquete pa verificar les dependencies de " "construccin" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nun pudo algamase informacin de dependencies de construccin pa %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s nun tien dependencies de construccin.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1221,7 +1222,7 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1230,32 +1231,32 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque denguna versin " "disponible del paquete %s satisfaz los requisitos de versin" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nun se pudo satisfacer la dependencia %s pa %s: El paquete instalu %s ye " "demasiao nuevu" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Fallu pa satisfacer la dependencia %s pa %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Les dependencies de construccin de %s nun pudieron satisfacese." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Fallu al procesar les dependencies de construccin" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Mdulos sofitaos:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1341,7 +1342,7 @@ msgstr "" "pa ms informacin y opciones.\n" " Esti APT tien Poderes de Super Vaca.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1595,11 +1596,10 @@ msgstr "El ficheru %s/%s sobreescribe al que ta nel paquete %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Nun ye a lleer %s" @@ -1630,9 +1630,9 @@ msgstr "" "Los direutorios info y temp tienen de tar nel mesmu sistema de ficheros" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Lleendo llista de paquetes" @@ -1766,11 +1766,11 @@ msgid "File not found" msgstr "Nun s'atopa'l ficheru." #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Fall al lleer" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Nun se pudo afitar la hora de modificacin" @@ -1832,7 +1832,7 @@ msgstr "Gandi msgid "Server closed the connection" msgstr "El sirvidor zarr la conexn" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Fallu de llectura" @@ -1844,7 +1844,7 @@ msgstr "Una rempuesta revirti msgid "Protocol corruption" msgstr "Corrupcin del protocolu" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Fallu d'escritura" @@ -1898,7 +1898,7 @@ msgstr "Gandi msgid "Unable to accept connection" msgstr "Nun se pudo aceptar la conexn" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Hebo un problema al xenerar el hash del ficheru" @@ -1962,60 +1962,65 @@ msgstr "Nun se pudo coneutar a %s:%s (%s)." msgid "Connecting to %s" msgstr "Coneutando a %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Nun se pudo resolver '%s'" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Fallu temporal al resolver '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Daqu raru pas resolviendo '%s:%s' (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Nun se pudo coneutar a %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Nun se pudo acceder al aniellu de claves '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Encaboxando la instalacin." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Llista d'argumentos d'Acquire::gpgv::Options demasiao llarga. Colando." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Fallu internu: Robla bona, pero nun se pudo determinar la so gella dixital?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Atopse polo menos una robla mala." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "Nun se pudo executar '%s' pa verificar la robla (ta instalu gpgv?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Fallu desconocu al executar gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Les siguientes robles nun valieron:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2066,47 +2071,47 @@ msgstr "Esti sirvidor HTTP tien rotu'l soporte d'alcance" msgid "Unknown date format" msgstr "Formatu de data desconocu" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Fall la escoyeta" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Gandi'l tiempu de conexn" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Fallu al escribir nel ficheru de salida" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Fallu al escribir nel ficheru" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Fallu al escribir nel ficheru" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Fallu al lleer nel sirvidor. El llau remotu zarr la conexn." -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Fallu al lleer nel sirvidor" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Fall al francer el ficheru" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Datos de testera incorreutos" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Fallo la conexn" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Fallu internu" @@ -2114,12 +2119,12 @@ msgstr "Fallu internu" msgid "Can't mmap an empty file" msgstr "Nun se puede facer mmap d'un ficheru baleru" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Nun se pudo facer mmap de %lu bytes" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " @@ -2128,6 +2133,13 @@ msgstr "" "Dynamic MMap escos l'espaciu. Por favor aumenta'l tamau de APT::Cache-" "Limit. El valor actual ye : %lu. (man 5 apt.conf)" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2157,53 +2169,53 @@ msgstr "%lis" msgid "Selection %s not found" msgstr "Escoyeta %s que nun s'atopa" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Triba d'abreviatura que nun se reconoz: %c" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Abriendo ficheros de configuracin %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Fallu de sintaxis %s:%u: Nun hai un nome al entamu del bloque." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Fallu de sintaxis %s:%u: Marca mal formada" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Fallu de sintaxis %s:%u: Puxarra extra dempus del valor" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Error de sintaxis %s:%u: Les directives pueden facese slo nel nivel cimeru" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Fallu de sintaxis %s:%u: Demasiaes inclusiones aeraes" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Fallu de sintaxis %s:%u: Incluyendo dende equ" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Error de sintaxis %s:%u: La directiva '%s' nun ta sofitada" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Fallu de sintaxis %s:%u: Puxarra extra al final del ficheru" @@ -2279,75 +2291,75 @@ msgstr "Nun se pudo cambiar a %s" msgid "Failed to stat the cdrom" msgstr "Nun se pudo montar el CD-ROM" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nun ta usndose bloquu pal ficheru de bloquu de slo llectura %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Nun puede abrise'l ficheru de bloquu %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nun ta usndose bloquu pal ficheru de bloquu %s montu per nfs" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Nun se pudo torgar %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperaba %s pero nun taba ell" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "El subprocesu %s recibi un fallu de segmentacin." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "El subprocesu %s recibi un fallu de segmentacin." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "El subprocesu %s devolvi un cdigu d'error (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "El subprocesu %s termin de manera inesperada" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Nun se pudo abrir el ficheru %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "lleos, ent tena de lleer %lu pero nun queda nada" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escritos, ent tena d'escribir %lu pero nun pudo facerse" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problemes zarrando'l ficheru" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Hai problemes desvenceyando'l ficheru %s" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Hai problemes al sincronizar el ficheru" @@ -2464,52 +2476,52 @@ msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Nun se pudo tratar el ficheru de paquetes %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Llinia %lu mal formada na llista d'orxenes %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Llinia %lu mal formada na llista d'orxenes %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Llinia %lu mal formada na llista d'orxenes %s (anals d'URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Llinia %lu mal formada na llista d'orxenes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Llinia %lu mal formada na llista d'orxenes %s (anals de dist)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Abriendo %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Llinia %u demasiao llarga na llista d'orgenes %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Llinia %u mal formada na llista d'orxenes %s (triba)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Triba '%s' desconocida na llinia %u de la llista d'orxenes %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Llinia %u mal formada na llista d'orxenes %s (id del proveedor)" @@ -2635,18 +2647,18 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Has d'executar apt-get update pa iguar estos problemes" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" "Rexistru invlidu nel ficheru de preferencies, nun hai cabecera Paquete" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Nun s'entiende'l tipu de pin %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Nun hai priorid (o ye cero) conseada pa pin" @@ -2731,16 +2743,16 @@ msgstr "Hebo un error al procesar %s (CollectFileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "Al procesar dependencies de ficheros nun s'alcontr el paquete %s %s" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nun se puede lleer la llista de paquetes d'orxenes %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Recoyendo ficheros qu'apurren" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Fallu de E/S al grabar cach d'orxenes" @@ -2749,19 +2761,19 @@ msgstr "Fallu de E/S al grabar cach msgid "rename failed, %s (%s -> %s)." msgstr "fall'l cambiu de nome, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "La suma MD5 nun concasa" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "La suma hash nun concasa" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Nun hai clave pblica denguna disponible pa les IDs de clave darru:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2770,7 +2782,7 @@ msgstr "" "Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que " "necesites iguar manualmente esti paquete (por faltar una arquitectura)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2779,7 +2791,7 @@ msgstr "" "Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que " "necesites iguar manualmente esti paquete" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2787,7 +2799,7 @@ msgstr "" "Los ficheros d'indiz de paquetes tan corrompos. Nun hai campu Filename: pal " "paquete %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "El tamau nun concasa" @@ -2924,7 +2936,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Abriendo ficheros de configuracin %s" @@ -2935,7 +2946,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "La suma hash nun concasa" @@ -2956,7 +2966,6 @@ msgstr "Desinstalando %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Desinstalse dafechu %s" @@ -3042,14 +3051,30 @@ msgstr "" msgid "Not locked" msgstr "Non bloquiu" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Nun fui quien a parchiar el ficheru" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Conexn encaboxada prematuramente" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Nun se pudo acceder al aniellu de claves '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "Nun fui quien a parchiar el ficheru" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/bg.po b/po/bg.po index 840007734..5c366b765 100644 --- a/po/bg.po +++ b/po/bg.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2009-01-27 12:41+0200\n" "Last-Translator: Damyan Ivanov <dmn@debian.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" @@ -151,7 +151,7 @@ msgstr " Таблица с версиите:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s за %s компилиран на %s %s\n" @@ -308,7 +308,7 @@ msgstr "" " -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Неуспех при записа на %s" @@ -446,8 +446,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "БД е стара, опит за актуализиране на %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "Форматът на БД е невалиден. Ако сте обновили от стара версия на apt, " @@ -464,11 +465,11 @@ msgstr "Неуспех при отварянето на файл %s от БД: % msgid "Failed to stat %s" msgstr "Грешка при получаването на атрибути за %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "В архива няма поле „control“" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Неуспех при получаването на курсор" @@ -533,26 +534,26 @@ msgstr "*** Неуспех при създаването на връзка %s к msgid " DeLink limit of %sB hit.\n" msgstr "Превишен лимит на DeLink от %sB.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Архивът няма поле „package“" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s няма запис „override“\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " поддържащия пакета %s е %s, а не %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s няма запис „source override“\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s няма също и запис „binary override“\n" @@ -656,7 +657,7 @@ msgstr "Неуспех при преименуването на %s на %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Грешка при компилирането на регулярния израз - %s" @@ -819,11 +820,11 @@ msgstr "Трябва да бъдат премахнати пакети, но п msgid "Internal error, Ordering didn't finish" msgstr "Вътрешна грешка, „Ordering“ не завърши" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Неуспех при заключването на директорията за изтегляне" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Списъкът с източници не можа да бъде прочетен." @@ -855,8 +856,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "След тази операция ще бъде освободено %sB дисково пространство.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Неуспех при определянето на свободното пространство в %s" @@ -893,7 +894,7 @@ msgstr "Прекъсване." msgid "Do you want to continue [Y/n]? " msgstr "Искате ли да продължите [Y/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Неуспех при изтеглянето на %s %s\n" @@ -902,7 +903,7 @@ msgstr "Неуспех при изтеглянето на %s %s\n" msgid "Some files failed to download" msgstr "Някои файлове не можаха да бъдат изтеглени" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Изтеглянето завърши в режим само на изтегляне" @@ -999,53 +1000,53 @@ msgstr "Не е намерена версия „%s“ на „%s“" msgid "Selected version %s (%s) for %s\n" msgstr "Избрана е версия %s (%s) за %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" "Неуспех при получаването на атрибути на списъка с пакети с изходен код %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Командата „update“ не възприема аргументи" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Неуспех при заключването на директорията със списъка на пакетите" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Не би трябвало да се изтрива. AutoRemover няма да бъде стартиран" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" "Следните пакети са били инсталирани автоматично и вече не са необходими:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Следните пакети са били инсталирани автоматично и вече не са необходими:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Използвайте „apt-get autoremove“ за да ги премахнете." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1063,44 +1064,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "" "Следната информация може да помогне за намиране на изход от ситуацията:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Вътрешна грешка, AutoRemover счупи нещо в системата" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Неуспех при намирането на задача %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Неуспех при намирането на пакет %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Забележете, избиране на %s за регулярен израз „%s“\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s е отбелязан като ръчно инсталиран.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1108,7 +1109,7 @@ msgstr "" "Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или " "укажете разрешение)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1120,118 +1121,118 @@ msgstr "" "дистрибуция, че някои необходими пакети още не са създадени или пък\n" "са били преместени от Incoming." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Счупени пакети" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Следните допълнителни пакети ще бъдат инсталирани:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Предложени пакети:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Препоръчвани пакети:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Изчисляване на актуализацията..." -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Неуспех" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Готово" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Неуспех при намирането на изходен код на пакет %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускане на вече изтегления файл „%s“\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Нямате достатъчно свободно пространство в %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Изтегляне на изходен код %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Неуспех при изтеглянето на някои архиви." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Командата за разпакетиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Командата за компилиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Процесът-потомък пропадна" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Трябва да укажете поне един пакет за проверка на зависимости за компилиране" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Неуспех при получаването на информация за зависимостите за компилиране на %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s няма зависимости за компилиране.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1240,7 +1241,7 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " "не може да бъде намерен" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1250,32 +1251,32 @@ msgstr "" "налични версии на пакета %s, които могат да удовлетворят изискването за " "версия" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният " "пакет %s е твърде нов" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Неуспех при обработката на зависимостите за компилиране" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Поддържани модули:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1362,7 +1363,7 @@ msgstr "" "информация и опции.\n" " Това APT има Върховни Сили.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1609,11 +1610,10 @@ msgstr "Файл %s/%s заменя този в пакет %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Неуспех при четенето на %s" @@ -1644,9 +1644,9 @@ msgstr "" "Директориите info и temp трябва да бъдат на една и съща файлова система" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Четене на списъците с пакети" @@ -1780,11 +1780,11 @@ msgid "File not found" msgstr "Файлът не е намерен" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Неуспех при получаването на атрибути" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Неуспех при задаването на време на промяна" @@ -1846,7 +1846,7 @@ msgstr "Допустимото време за свързването изтеч msgid "Server closed the connection" msgstr "Сървърът разпадна връзката" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Грешка при четене" @@ -1858,7 +1858,7 @@ msgstr "Отговорът препълни буфера." msgid "Protocol corruption" msgstr "Развален протокол" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Грешка при запис" @@ -1914,7 +1914,7 @@ msgstr "Времето за установяване на връзка с гне msgid "Unable to accept connection" msgstr "Невъзможно е да се приеме свързването" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Проблем при хеширане на файла" @@ -1978,64 +1978,69 @@ msgstr "Неуспех при свързване с %s:%s (%s)." msgid "Connecting to %s" msgstr "Свързване с %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Неуспех при намирането на IP адреса на „%s“" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Временен неуспех при намирането на IP адреса на „%s“" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Нещо лошо се случи при намирането на IP адреса на „%s:%s“ (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Неуспех при свързването с %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Неуспех при достъпа до набор на ключове: „%s“" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Прекъсване на инсталирането." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Списъкът с аргументи от Acquire::gpgv::Options е твърде дълъг. Завършване " "на работа." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Вътрешна грешка: Валиден подпис, но не може да се провери отпечатъка на " "ключа?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Намерен е поне един невалиден подпис." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Неуспех при изпълнението на „%s“ за проверка на подписа (инсталиран ли е " "gpgv?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Неизвестна грешка при изпълнението на gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Следните подписи са невалидни:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2086,47 +2091,47 @@ msgstr "HTTP сървърът няма поддръжка за прехвърл msgid "Unknown date format" msgstr "Неизвестен формат на дата" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Неуспех на избора" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Допустимото време за свързване изтече" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Грешка при записа на изходен файл" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Грешка при записа на файл" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Грешка при записа на файла" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Грешка при четене от сървъра" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Неуспех при отрязване на края на файла" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Невалидни данни на заглавната част" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Неуспех при свързването" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Вътрешна грешка" @@ -2134,18 +2139,25 @@ msgstr "Вътрешна грешка" msgid "Can't mmap an empty file" msgstr "Невъзможно е да се прехвърли в паметта празен файл" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Неуспех при прехвърлянето в паметта на %lu байта" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2175,54 +2187,54 @@ msgstr "" msgid "Selection %s not found" msgstr "Изборът %s не е намерен" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Неизвестен тип на абревиатура: „%c“" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Отваряне на конфигурационен файл %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Синтактична грешка %s:%u: В началото на блока няма име." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Синтактична грешка %s:%u: Лошо форматиран таг" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Синтактична грешка %s:%u: Излишни символи след стойността" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Синтактична грешка %s:%u: Директиви могат да се задават само в най-горното " "ниво" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Синтактична грешка %s:%u: Твърде много вложени „include“" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Синтактична грешка %s:%u: Извикан „include“ оттук" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Синтактична грешка %s:%u: Неподдържана директива „%s“" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Синтактична грешка %s:%u: Излишни символи в края на файла" @@ -2298,78 +2310,78 @@ msgstr "Неуспех при преминаването в %s" msgid "Failed to stat the cdrom" msgstr "Неуспех при намирането на атрибутите на cdrom" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Не се използва заключване за файл за заключване %s, който е само за четене" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Неуспех при отварянето на файл за заключване %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Не се използва заключване за файл за заключване %s, който е монтиран по NFS" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Неуспех при достъпа до заключване %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Изчака се завършването на %s, но той не беше пуснат" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Подпроцесът %s върна код за грешка (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Подпроцесът %s завърши неочаквано" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Неуспех при отварянето на файла %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "" "грешка при четене, все още има %lu за четене, но няма нито един останал" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "грешка при запис, все още име %lu за запис, но не успя" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Проблем при затварянето на файла" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Проблем при премахването на връзка към файла" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Проблем при синхронизиране на файла" @@ -2486,54 +2498,54 @@ msgstr "Неуспех при анализирането на пакетен ф msgid "Unable to parse package file %s (2)" msgstr "Неуспех при анализирането на пакетен файл %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (адрес-URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (дистрибуция)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (неограничена дистрибуция)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Отваряне на %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Ред %u в списъка с източници %s е твърде дълъг." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен." -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@ -2666,17 +2678,17 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "" "Може да искате да изпълните „apt-get update“, за да коригирате тези проблеми" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Невалиден запис във файла с настройки, няма заглавна част Package" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Неизвестен тип за отбиване %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Няма указан приоритет (или е нула) на отбиването" @@ -2764,17 +2776,17 @@ msgstr "Възникна грешка при обработката на %s (Col msgid "Package %s %s was not found while processing file dependencies" msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "" "Неуспех при получаването на атрибути на списъка с пакети с изходен код %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Събиране на информация за „Осигурява“" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код" @@ -2783,19 +2795,19 @@ msgstr "Входно/изходна грешка при запазването msgid "rename failed, %s (%s -> %s)." msgstr "преименуването се провали, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "Несъответствие на контролна сума MD5" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Несъответствие на контролната сума" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2804,7 +2816,7 @@ msgstr "" "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет (поради пропусната архитектура)." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2813,14 +2825,14 @@ msgstr "" "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Несъответствие на размера" @@ -2955,7 +2967,6 @@ msgstr "Записани са %i записа с %i липсващи и %i не #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Отваряне на конфигурационен файл %s" @@ -2966,7 +2977,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Несъответствие на контролната сума" @@ -2987,7 +2997,6 @@ msgstr "Премахване на %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "%s е напълно премахнат" @@ -3073,14 +3082,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Неуспех при закърпване на файла" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Връзката прекъсна преждевременно" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Неуспех при достъпа до набор на ключове: „%s“" + +#~ msgid "Could not patch file" +#~ msgstr "Неуспех при закърпване на файла" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/bs.po b/po/bs.po index cab5ac4c7..7b2316bdb 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: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n" "Language-Team: Bosnian <lokal@lugbih.org>\n" @@ -147,7 +147,7 @@ msgstr "" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" @@ -254,7 +254,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Ne mogu zapisati na %s" @@ -351,7 +351,7 @@ msgstr "DB je stara, pokušavam nadogradnju %s" #: ftparchive/cachedb.cc:72 msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" @@ -366,11 +366,11 @@ msgstr "Ne mogu otvoriti DB datoteku %s" msgid "Failed to stat %s" msgstr "" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arhiva nema kontrolnog zapisa" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "" @@ -435,26 +435,26 @@ msgstr "" msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -558,7 +558,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -719,11 +719,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "" @@ -752,8 +752,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -788,7 +788,7 @@ msgstr "Odustani." msgid "Do you want to continue [Y/n]? " msgstr "Da li želite nastaviti? [Y/n]" -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -797,7 +797,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "" @@ -889,51 +889,51 @@ msgstr "" msgid "Selected version %s (%s) for %s\n" msgstr "" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1321 #, c-format -msgid "Ignore unavailable version '%s' of package '%s'" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1352 #, c-format -msgid "Ignore unavailable target release '%s' of package '%s'" +msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1342 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 #, c-format -msgid "Picking '%s' as source package instead of '%s'\n" +msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1395 +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Slijedeći NOVI paketi će biti instalirani:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Slijedeći NOVI paketi će biti instalirani:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -949,49 +949,49 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ali se %s treba instalirati" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -999,152 +999,152 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Oštećeni paketi" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Predloženi paketi:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Preporučeni paketi:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Računam nadogradnju..." -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Neuspješno" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Urađeno" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, 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:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Podržani moduli:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1188,7 +1188,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1418,11 +1418,10 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Ne mogu čitati %s" @@ -1452,9 +1451,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Čitam spiskove paketa" @@ -1585,11 +1584,11 @@ msgid "File not found" msgstr "Datoteka nije pronađena" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "" @@ -1649,7 +1648,7 @@ msgstr "" msgid "Server closed the connection" msgstr "Server je zatvorio vezu" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Greška pri čitanju" @@ -1662,7 +1661,7 @@ msgstr "" msgid "Protocol corruption" msgstr "Oštećenje protokola" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Greška pri pisanju" @@ -1716,7 +1715,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1780,59 +1779,64 @@ msgstr "" msgid "Connecting to %s" msgstr "Povezujem se sa %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Ne mogu se povezati sa %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Odustajem od instalacije." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1881,48 +1885,48 @@ msgstr "" msgid "Unknown date format" msgstr "Nepoznat oblik datuma" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Ne mogu ukloniti %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Povezivanje neuspješno" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Unutrašnja greška" @@ -1930,18 +1934,25 @@ msgstr "Unutrašnja greška" msgid "Can't mmap an empty file" msgstr "" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -1971,52 +1982,52 @@ msgstr "" msgid "Selection %s not found" msgstr "" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" @@ -2092,75 +2103,75 @@ msgstr "" msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, c-format msgid "Sub-process %s received signal %u." msgstr "" -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "" @@ -2279,52 +2290,52 @@ msgstr "" msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Otvaram %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@ -2441,17 +2452,17 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "" @@ -2535,16 +2546,16 @@ msgstr "" msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "" @@ -2553,39 +2564,39 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "" @@ -2830,8 +2841,18 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." msgstr "" #: methods/rsh.cc:330 diff --git a/po/ca.po b/po/ca.po index eb1a48a12..fa4c4a414 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.22\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2009-06-06 02:17+0200\n" "Last-Translator: Jordi Mallach <jordi@debian.org>\n" "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n" @@ -148,7 +148,7 @@ msgstr " Taula de versió:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s per a %s compilat el %s %s\n" @@ -302,7 +302,7 @@ msgstr "" " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "No es pot escriure en %s" @@ -436,8 +436,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "La BD és vella, s'està intentant actualitzar %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "El format de la base de dades és invàlid. Si heu actualitzat des d'una " @@ -454,11 +455,11 @@ msgstr "No es pot obrir el fitxer de DB %s: %s" msgid "Failed to stat %s" msgstr "No es pot determinar l'estat de %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arxiu sense registre de control" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "No es pot aconseguir un cursor" @@ -523,26 +524,26 @@ msgstr "*** No s'ha pogut enllaçar %s a %s" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink s'ha arribat al límit de %sB.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Arxiu sense el camp paquet" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s no té una entrada dominant\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el mantenidor de %s és %s, no %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s no té una entrada dominant de font\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s no té una entrada dominant de binari\n" @@ -646,7 +647,7 @@ msgstr "No s'ha pogut canviar el nom de %s a %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "S'ha produït un error de compilació de l'expressió regular - %s" @@ -810,11 +811,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "S'ha produït un error intern, l'ordenació no ha acabat" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "No és possible blocar el directori de descàrrega" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "No s'ha pogut llegir la llista de les fonts." @@ -845,8 +846,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Després d'aquesta operació s'alliberaran %sB d'espai en disc.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "No s'ha pogut determinar l'espai lliure en %s" @@ -883,7 +884,7 @@ msgstr "Avortat." msgid "Do you want to continue [Y/n]? " msgstr "Voleu continuar [S/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" @@ -892,7 +893,7 @@ msgstr "No s'ha pogut obtenir %s %s\n" msgid "Some files failed to download" msgstr "Alguns fitxers no s'han pogut baixar" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Descàrrega completa i en mode de només descàrrega" @@ -990,54 +991,54 @@ msgstr "No s'ha trobat la versió «%s» per a «%s»" msgid "Selected version %s (%s) for %s\n" msgstr "Versió seleccionada %s (%s) per a %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "No s'ha pogut llegir la llista de paquets font %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "L'ordre update no pren arguments" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "No es pot blocar el directori de la llista" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Es suposa que no hauriem de suprimir coses, no es pot iniciar el supressor " "automàtic" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" "Els paquets següents s'instal·laren automàticament i ja no són necessaris:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Els paquets següents s'instal·laren automàticament i ja no són necessaris:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Empreu «apt-get autoremove» per a suprimir-los." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1055,43 +1056,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "La informació següent pot ajudar-vos a resoldre la situació:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "S'ha produït un error intern, el supressor automàtic ha trencat coses" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error intern, AllUpgrade ha trencat coses" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "No s'ha pogut trobar la tasca %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "No s'ha pogut trobar el paquet %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota: s'està seleccionant %s per a l'expressió regular '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "S'ha marcat %s com instal·lat manualment.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1099,7 +1100,7 @@ msgstr "" "Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o " "especifiqueu una solució)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1111,120 +1112,120 @@ msgstr "" "unstable i alguns paquets requerits encara no han estat creats o bé\n" "encara no els hi han afegit." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Paquets trencats" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "S'instal·laran els següents paquets extres:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Paquets suggerits:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Paquets recomanats:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "S'està calculant l'actualització... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Ha fallat" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Fet" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "" "S'ha produït un error intern, el solucionador de problemes ha trencat coses" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Haureu d'especificar un paquet de codi font per a baixar" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "No es pot trobar un paquet de fonts per a %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "S'està ometent el fitxer ja baixat «%s»\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "No teniu prou espai lliure en %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es necessita baixar %sB/%sB d'arxius font.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es necessita baixar %sB d'arxius font.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Obté el font %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "No s'ha pogut baixar alguns arxius." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comproveu si el paquet «dpkgdev» està instal·lat.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "L'ordre de construir «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Ha fallat el procés fill" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "S'ha d'especificar un paquet per a verificar les dependències de construcció " "per a" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "No es pot obtenir informació sobre les dependències de construcció per a %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s no té dependències de construcció.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1233,7 +1234,7 @@ msgstr "" "La dependència %s en %s no es pot satisfer per que no es pot trobar el " "paquet %s" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1242,32 +1243,32 @@ msgstr "" "La dependència %s per a %s no es pot satisfer per que cap versió del paquet %" "s pot satisfer els requeriments de versions" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No s'ha pogut satisfer la dependència %s per a %s: El paquet instal·lat %s " "és massa nou" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No s'han pogut satisfer les dependències de construcció per a %s" -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcció" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Mòduls suportats:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1353,7 +1354,7 @@ msgstr "" "per a obtenir més informació i opcions.\n" " Aquest APT té superpoders bovins\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1603,11 +1604,10 @@ msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "No es pot llegir %s" @@ -1639,9 +1639,9 @@ msgstr "" "fitxers" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "S'està llegint la llista de paquets" @@ -1775,11 +1775,11 @@ msgid "File not found" msgstr "Fitxer no trobat" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "L'estat ha fallat" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "No s'ha pogut establir el temps de modificació" @@ -1841,7 +1841,7 @@ msgstr "Temps de connexió finalitzat" msgid "Server closed the connection" msgstr "El servidor ha tancat la connexió" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Error de lectura" @@ -1853,7 +1853,7 @@ msgstr "Una resposta ha desbordat la memòria temporal." msgid "Protocol corruption" msgstr "Protocol corromput" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Error d'escriptura" @@ -1908,7 +1908,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:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema escollint el fitxer" @@ -1972,64 +1972,69 @@ msgstr "No s'ha pogut connectar amb %s:%s (%s)." msgid "Connecting to %s" msgstr "S'està connectant amb %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "No s'ha pogut resoldre '%s'" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "S'ha produït un error temporal en resoldre '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "No es pot connectar amb %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "No s'ha pogut accedir a l'anell de claus: «%s»" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "S'està avortant la instal·lació." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: La llista d'arguments d'Acquire::gpgv::Options és massa llarga. S'està " "sortint." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error intern: La signatura és correcta, però no s'ha pogut determinar " "l'emprempta digital de la clau!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "S'ha trobat almenys una signatura invàlida." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "No s'ha pogut executar «%s» per a verificar la signatura (està instal·lat el " "gpgv?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "S'ha produït un error desconegut en executar el gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Les signatures següents són invàlides:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2080,48 +2085,48 @@ msgstr "Aquest servidor HTTP té el suport d'abast trencat" msgid "Unknown date format" msgstr "Format de la data desconegut" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Ha fallat la selecció" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Connexió finalitzada" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "S'ha produït un error en escriure al fitxer de sortida" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "S'ha produït un error en escriure al fitxer" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "S'ha produït un error en escriure al fitxer" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "" "S'ha produït un error en llegir, el servidor remot ha tancat la connexió" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "S'ha produït un error en llegir des del servidor" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "No s'ha pogut truncar el fitxer %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Capçalera de dades no vàlida" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Ha fallat la connexió" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Error intern" @@ -2129,12 +2134,12 @@ msgstr "Error intern" msgid "Can't mmap an empty file" msgstr "No es pot transferir un fitxer buit a memòria" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "No s'ha pogut crear un mapa de memòria de %lu octets" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " @@ -2143,6 +2148,13 @@ msgstr "" "No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-Limit. " "Valor actual: %lu. (man 5 apt.conf)" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2172,52 +2184,52 @@ msgstr "%lis" msgid "Selection %s not found" msgstr "No s'ha trobat la selecció %s" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreujament de tipus no reconegut: «%c»" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "S'està obrint el fitxer de configuració %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Error sintàctic %s:%u: No comença el camp amb un nom." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Error sintàctic %s:%u: Etiqueta malformada" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Error sintàctic %s:%u Text extra després del valor" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Error sintàctic %s:%u: Es permeten directrius només al nivell més alt" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Error sintàctic %s:%u: Hi ha masses fitxers include niats" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Error sintàctic %s:%u: Inclusió des d'aquí" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Error sintàctic %s:%u: Directriu no suportada «%s»" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Error sintàctic %s:%u: Text extra al final del fitxer" @@ -2293,76 +2305,76 @@ msgstr "No es pot canviar a %s" msgid "Failed to stat the cdrom" msgstr "No s'ha pogut fer «stat» del cdrom" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "No s'empren blocats per a llegir el fitxer de blocat de sols lectura %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "No es pot resoldre el fitxer de blocat %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "No s'empren blocats per al fitxer de blocat %s de muntar nfs" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "No s'ha pogut blocar %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperava %s però no hi era" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Sub-procés %s ha rebut una violació de segment." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Sub-procés %s ha rebut una violació de segment." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Sub-procés %s ha retornat un codi d'error (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "El sub-procés %s ha sortit inesperadament" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "No s'ha pogut obrir el fitxer %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "llegits, falten %lu per llegir, però no queda res" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escrits, falten %lu per escriure però no s'ha pogut" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Ha hagut un problema en tancar el fitxer" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Ha hagut un problema en desenllaçar el fitxer" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Ha hagut un problema en sincronitzar el fitxer" @@ -2479,52 +2491,52 @@ msgstr "No es pot analitzar el fitxer del paquet %s (1)" msgid "Unable to parse package file %s (2)" msgstr "No es pot analitzar el fitxer del paquet %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Línia %lu malformada en la llista de fonts %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Línia %lu malformada en la llista de fonts %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Línia %lu malformada en la llista de fonts %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "S'està obrint %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "La línia %u és massa llarga en la llista de fonts %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "La línia %u és malformada en la llista de fonts %s (tipus)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "La línia %u és malformada en la llista de fonts %s (id del proveïdor)" @@ -2654,17 +2666,17 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "" "Potser voldreu executar apt-get update per a corregir aquests problemes" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Registre no vàlid al fitxer de preferències, paquet sense capçalera" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "No s'ha entès el pin de tipus %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "No hi ha prioritat especificada per al pin (o és zero)" @@ -2756,16 +2768,16 @@ msgid "Package %s %s was not found while processing file dependencies" msgstr "" "No s'ha trobat el paquet %s %s en processar les dependències del fitxer" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "No s'ha pogut llegir la llista de paquets font %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "S'estan recollint els fitxers que proveeixen" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Error d'E/S en desar la memòria cau de la font" @@ -2774,19 +2786,19 @@ msgstr "Error d'E/S en desar la memòria cau de la font" msgid "rename failed, %s (%s -> %s)." msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "La suma MD5 no concorda" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "La suma resum no concorda" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2796,7 +2808,7 @@ msgstr "" "significar que haureu d'arreglar aquest paquet manualment (segons " "arquitectura)." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2805,7 +2817,7 @@ msgstr "" "No s'ha trobat un fitxer pel paquet %s. Això podria significar que haureu " "d'arreglar aquest paquet manualment." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2813,7 +2825,7 @@ msgstr "" "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp " "per al paquet %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "La mida no concorda" @@ -2950,7 +2962,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "S'està obrint el fitxer de configuració %s" @@ -2961,7 +2972,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "La suma resum no concorda" @@ -2982,7 +2992,6 @@ msgstr "S'està suprimint el paquet %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "S'ha suprimit completament el paquet %s" @@ -3068,14 +3077,30 @@ msgstr "" msgid "Not locked" msgstr "No blocat" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "No s'ha pogut aplicar el pedaç al fitxer" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "La connexió s'ha tancat prematurament" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "No s'ha pogut accedir a l'anell de claus: «%s»" + +#~ msgid "Could not patch file" +#~ msgstr "No s'ha pogut aplicar el pedaç al fitxer" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/cs.po b/po/cs.po index 3657a68ba..9b1eccdb8 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-11-16 18:05+0100\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" @@ -146,7 +146,7 @@ msgstr " Tabulka verzí:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pro %s zkompilován na %s %s\n" @@ -298,7 +298,7 @@ msgstr "" " -c=? Načte tento konfigurační soubor\n" " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Nemohu zapsat do %s" @@ -431,8 +431,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB je stará, zkouším aktualizovat %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "Formát databáze je neplatný. Pokud jste přešli ze starší verze apt, databázi " @@ -449,11 +450,11 @@ msgstr "Nemohu otevřít DB soubor %s: %s" msgid "Failed to stat %s" msgstr "Nemohu vyhodnotit %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Archiv nemá kontrolní záznam" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Nemohu získat kurzor" @@ -518,26 +519,26 @@ msgstr "*** Nezdařilo se slinkovat %s s %s" msgid " DeLink limit of %sB hit.\n" msgstr " Odlinkovací limit %sB dosažen.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Archiv nemá pole Package" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s nemá žádnou položku pro override\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " správce %s je %s, ne %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s nemá žádnou zdrojovou položku pro override\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nemá ani žádnou binární položku pro override\n" @@ -641,7 +642,7 @@ msgstr "Selhalo přejmenování %s na %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba při kompilaci regulárního výrazu - %s" @@ -802,11 +803,11 @@ msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta." msgid "Internal error, Ordering didn't finish" msgstr "Vnitřní chyba, třídění nedoběhlo do konce" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Nemohu zamknout adresář pro stahování" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Nelze přečíst seznam zdrojů." @@ -836,8 +837,8 @@ msgstr "Po této operaci bude na disku použito dalších %sB.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po této operaci bude na disku uvolněno %sB.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nemohu určit volné místo v %s" @@ -874,7 +875,7 @@ msgstr "Přerušeno." msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovat [Y/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" @@ -883,7 +884,7 @@ msgstr "Selhalo stažení %s %s\n" msgid "Some files failed to download" msgstr "Některé soubory nemohly být staženy" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Stahování dokončeno v režimu pouze stáhnout" @@ -980,52 +981,52 @@ msgstr "Verze „%s“ pro „%s“ nebyla nalezena" msgid "Selected version %s (%s) for %s\n" msgstr "Vybraná verze %s (%s) pro %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Příkaz update neakceptuje žádné argumenty" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Nemohu uzamknout list adresář" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Neměli bychom mazat věci, nemůžu spustit AutoRemover" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" "Následující balíky byly nainstalovány automaticky a již nejsou potřeba:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Následující balíky byly nainstalovány automaticky a již nejsou potřeba:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Pro jejich odstranění použijte „apt-get autoremove“." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1043,43 +1044,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Vnitřní chyba, AutoRemover pokazil věci" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnitřní chyba, AllUpgrade pokazil věci" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Nemohu najít úlohu %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Nemohu najít balík %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Pozn: vybírám %s pro regulární výraz „%s“\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s nastaven jako instalovaný ručně.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Pro opravení následujících můžete spustit „apt-get -f install“:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1087,7 +1088,7 @@ msgstr "" "Nesplněné závislosti. Zkuste spustit „apt-get -f install“ bez balíků (nebo " "navrhněte řešení)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1098,124 +1099,124 @@ msgstr "" "nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n" "vyžadované balíky ještě nebyly vytvořeny nebo přesunuty z Příchozí fronty." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Poškozené balíky" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Následující extra balíky budou instalovány:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Doporučované balíky:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Propočítávám aktualizaci... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Selhalo" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Vnitřní chyba, řešitel problémů pokazil věci" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Nemohu najít zdrojový balík pro %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Přeskakuji dříve stažený soubor „%s“\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatek volného místa" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Stáhnout zdroj %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Stažení některých archivů selhalo." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Příkaz pro rozbalení „%s“ selhal.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Zkontrolujte, zda je nainstalován balíček „dpkg-dev“.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Příkaz pro sestavení „%s“ selhal.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Synovský proces selhal" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti " "pro sestavení" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nemohu získat závislosti pro sestavení %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žádné závislosti pro sestavení.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1224,31 +1225,31 @@ msgstr "" "%s závislost pro %s nemůže být splněna protože není k dispozici verze balíku " "%s, která odpovídá požadavku na verzi" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Selhalo splnění %s závislosti pro %s: Instalovaný balík %s je příliš nový" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Selhalo splnění %s závislosti pro %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti pro sestavení %s nemohly být splněny." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Chyba při zpracování závislostí pro sestavení" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1332,7 +1333,7 @@ msgstr "" "a apt.conf(5).\n" " Tato APT má schopnosti svaté krávy.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1577,11 +1578,10 @@ msgstr "Soubor %s/%s přepisuje ten z balíku %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Nemohu číst %s" @@ -1611,9 +1611,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Adresáře info a temp musí být na stejném souborovém systému" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Čtu seznamy balíků" @@ -1747,11 +1747,11 @@ msgid "File not found" msgstr "Soubor nebyl nalezen" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Selhalo vyhodnocení" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Nelze nastavit čas modifikace" @@ -1813,7 +1813,7 @@ msgstr "Čas spojení vypršel" msgid "Server closed the connection" msgstr "Server uzavřel spojení" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Chyba čtení" @@ -1825,7 +1825,7 @@ msgstr "Odpověď přeplnila buffer." msgid "Protocol corruption" msgstr "Porušení protokolu" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Chyba zápisu" @@ -1879,7 +1879,7 @@ msgstr "Spojení datového socketu vypršelo" msgid "Unable to accept connection" msgstr "Nemohu přijmout spojení" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problém s hashováním souboru" @@ -1943,59 +1943,64 @@ msgstr "Nemohu se připojit k %s:%s (%s)." msgid "Connecting to %s" msgstr "Připojuji se k %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Nemohu zjistit „%s“" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Dočasné selhání při zjišťování „%s“" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Něco hodně ošklivého se přihodilo při zjišťování „%s:%s“ (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Nemohu se připojit k %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Nemohu přistoupit ke klíčence: „%s“" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Přerušuji instalaci." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Seznam argumentů Acquire::gpgv::Options je příliš dlouhý. Končím." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Vnitřní chyba: Dobrý podpis, ale nemohu zjistit otisk klíče?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Byl zaznamenán nejméně jeden neplatný podpis. " -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Nepodařilo se spustit „%s“ pro ověření podpisu (je gpgv nainstalováno?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Neznámá chyba při spouštění gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Následující podpisy jsou neplatné:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2046,47 +2051,47 @@ msgstr "Tento HTTP server má porouchanou podporu rozsahů" msgid "Unknown date format" msgstr "Neznámý formát data" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Výběr selhal" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Čas spojení vypršel" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupního souboru" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Chyba čtení ze serveru" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Nelze zmenšit soubor" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Špatné datové záhlaví" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Spojení selhalo" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Vnitřní chyba" @@ -2094,18 +2099,25 @@ msgstr "Vnitřní chyba" msgid "Can't mmap an empty file" msgstr "Nemohu provést mmap prázdného souboru" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Nešlo mmapovat %lu bajtů" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2135,53 +2147,53 @@ msgstr "" msgid "Selection %s not found" msgstr "Výběr %s nenalezen" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Nerozpoznaná zkratka typu: „%c“" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Otevírám konfigurační soubor %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaktická chyba %s:%u: Blok nezačíná jménem." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaktická chyba %s:%u: Zkomolená značka" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaktická chyba %s:%u: Za hodnotou následuje zbytečné smetí" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntaktická chyba %s:%u: Direktivy je možné provádět pouze na nejvyšší úrovni" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaktická chyba %s:%u: Příliš mnoho vnořených propojení (include)" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaktická chyba %s:%u: Zahrnuto odtud" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktiva „%s“" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaktická chyba %s:%u: Na konci souboru je zbytečné smetí" @@ -2257,75 +2269,75 @@ msgstr "Nemohu přejít do %s" msgid "Failed to stat the cdrom" msgstr "Nezdařilo se vyhodnotit cdrom" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nepoužívám zamykání pro zámkový soubor %s, který je pouze pro čtení" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Nešlo otevřít zámkový soubor %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nepoužívám zamykání pro zámkový soubor %s připojený přes nfs" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Nemohu získat zámek %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Čekal jsem na %s, ale nebyl tam" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s obdržel chybu segmentace." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Podproces %s obdržel chybu segmentace." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s vrátil chybový kód (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s neočekávaně skončil" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Nemohu otevřít soubor %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "čtení, stále mám k přečtení %lu, ale už nic nezbývá" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "zápis, stále mám %lu k zápisu, ale nejde to" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problém při zavírání souboru" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Problém při odstraňování souboru" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Problém při synchronizování souboru" @@ -2442,52 +2454,52 @@ msgstr "Nelze zpracovat soubor %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Nelze zpracovat soubor %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (Absolutní dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování dist)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Otevírám %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Řádek %u v seznamu zdrojů %s je příliš dlouhý." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Zkomolený řádek %u v seznamu zdrojů %s (id výrobce)" @@ -2612,17 +2624,17 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Pro nápravu těchto problémů můžete zkusit spustit apt-get update" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Neplatný záznam v souboru preferencí, žádné záhlaví balíku" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Nerozumím vypíchnutí typu %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Pro vypíchnutí nebyla zadána žádná (nebo nulová) priorita" @@ -2706,16 +2718,16 @@ msgstr "Při zpracování %s se objevila chyba (CollectFileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "Při zpracování závislostí nebyl nalezen balík %s %s" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Collecting File poskytuje" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Chyba IO při ukládání zdrojové cache" @@ -2724,19 +2736,19 @@ msgstr "Chyba IO při ukládání zdrojové cache" msgid "rename failed, %s (%s -> %s)." msgstr "přejmenování selhalo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "Neshoda MD5 součtů" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Neshoda kontrolních součtů" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2745,7 +2757,7 @@ msgstr "" "Nebyl jsem schopen nalézt soubor s balíkem %s. To by mohlo znamenat, že " "tento balík je třeba opravit ručně (kvůli chybějící architektuře)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2754,14 +2766,14 @@ msgstr "" "Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík " "opravit ručně." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Velikosti nesouhlasí" @@ -2897,7 +2909,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Otevírám konfigurační soubor %s" @@ -2908,7 +2919,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Neshoda kontrolních součtů" @@ -2929,7 +2939,6 @@ msgstr "Odstraňuji %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Kompletně odstraněn %s" @@ -3013,14 +3022,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Nemohu záplatovat soubor" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Spojení bylo předčasně ukončeno" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Nemohu přistoupit ke klíčence: „%s“" + +#~ msgid "Could not patch file" +#~ msgstr "Nemohu záplatovat soubor" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/cy.po b/po/cy.po index 8b8382a0c..09f9a8869 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n" "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n" @@ -164,7 +164,7 @@ msgstr " Tabl Fersiynnau:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n" @@ -324,7 +324,7 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad hwn\n" " -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Ni ellir ysgrifennu i %s" @@ -461,7 +461,7 @@ msgstr "Hen gronfa data, yn ceisio uwchraddio %s" #: ftparchive/cachedb.cc:72 msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" @@ -476,11 +476,11 @@ msgstr "Ni ellir agor y ffeil DB2 %s: %s" msgid "Failed to stat %s" msgstr "Methodd stat() o %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Does dim cofnod rheoli gan yr archif" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Ni ellir cael cyrchydd" @@ -546,26 +546,26 @@ msgstr "*** Methwyd cysylltu %s at %s" msgid " DeLink limit of %sB hit.\n" msgstr " Tarwyd y terfyn cyswllt %sB.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Doedd dim maes pecyn gan yr archif" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Cynaliwr %s yw %s nid %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" @@ -670,7 +670,7 @@ msgstr "Methwyd ailenwi %s at %s" msgid "Y" msgstr "I" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" @@ -840,11 +840,11 @@ msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi." msgid "Internal error, Ordering didn't finish" msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Methwyd darllen y rhestr ffynhonellau." @@ -873,8 +873,8 @@ msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" @@ -912,7 +912,7 @@ msgstr "Erthylu." msgid "Do you want to continue [Y/n]? " msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" @@ -921,7 +921,7 @@ msgstr "Methwyd cyrchu %s %s\n" msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" @@ -1021,51 +1021,51 @@ msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " msgid "Selected version %s (%s) for %s\n" msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Ni ellir cloi'r cyfeiriadur rhestr" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1081,46 +1081,46 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 #, fuzzy msgid "Internal error, AllUpgrade broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain:" # FIXME -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1129,7 +1129,7 @@ msgstr "" "pecyn (neu penodwch ddatrys)" # FIXME: needs commas -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1141,118 +1141,118 @@ msgstr "" "ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n" "heb gael eu symud allan o Incoming." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 #, fuzzy msgid "Calculating upgrade... " msgstr "Yn Cyfrifo'r Uwchraddiad... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Methwyd" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Wedi Gorffen" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1261,7 +1261,7 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %" "s" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1270,34 +1270,34 @@ msgstr "" "Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd " "ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy " "newydd" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1382,7 +1382,7 @@ msgstr "" "\n" " Mae gan yr APT hwn bŵerau buwch hudol.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1636,11 +1636,10 @@ msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Ni ellir darllen %s" @@ -1670,9 +1669,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 #, fuzzy msgid "Reading package lists" msgstr "Yn Darllen Rhestrau Pecynnau" @@ -1820,11 +1819,11 @@ msgid "File not found" msgstr "Ffeil heb ei ganfod" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Methwyd stat()" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Methwyd gosod amser newid" @@ -1887,7 +1886,7 @@ msgstr "Goramser cysylltu" msgid "Server closed the connection" msgstr "Caeodd y gweinydd y cysylltiad" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Gwall darllen" @@ -1899,7 +1898,7 @@ msgstr "Gorlifodd ateb y byffer." msgid "Protocol corruption" msgstr "Llygr protocol" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Gwall ysgrifennu" @@ -1955,7 +1954,7 @@ msgstr "Goramserodd cysylltiad y soced data" msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" @@ -2020,59 +2019,64 @@ msgstr "Methwyd cysylltu i %s:%s (%s)." msgid "Connecting to %s" msgstr "Yn cysylltu i %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Methwyd datrys '%s'" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Methiant dros dro yn datrys '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Methwyd cysylltu i %s %s:" -#: methods/gpgv.cc:71 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 #, fuzzy, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Methwyd datrys '%s'" +msgid "No keyring installed in %s." +msgstr "Yn Erthylu'r Sefydliad." -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" + +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2125,50 +2129,50 @@ msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:891 +#: methods/http.cc:892 #, fuzzy msgid "Error reading from server. Remote end closed connection" msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Methwyd ysgrifennu ffeil %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 #, fuzzy msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Gwall mewnol" @@ -2176,18 +2180,25 @@ msgstr "Gwall mewnol" msgid "Can't mmap an empty file" msgstr "Ni ellir defnyddio mmap() ar ffeil gwag" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Methwyd gwneud mmap() efo %lu beit" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2217,54 +2228,54 @@ msgstr "" msgid "Selection %s not found" msgstr "Ni chanfuwyd y dewis %s" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Talgryniad math anhysbys: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw." # FIXME -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, fuzzy, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil" @@ -2342,77 +2353,77 @@ msgstr "Ni ellir newid i %s" msgid "Failed to stat the cdrom" msgstr "Methwyd gwneud stat() o'r CD-ROM" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Methwyd agor y ffeil clo %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Ddim yn cloi'r ffeil clo ar NFS %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Methwyd cael y clo %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, fuzzy, c-format msgid "Waited for %s but it wasn't there" msgstr "Arhoswyd am %s ond nid oedd e yna" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Dychwelodd is-broses %s gôd gwall (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Gorffenodd is-broses %s yn annisgwyl" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Methwyd agor ffeil %s" # FIXME -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "o hyd %lu i ddarllen ond dim ar ôl" # FIXME -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "o hyd %lu i ysgrifennu ond methwyd" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Gwall wrth dadgysylltu'r ffeil" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" @@ -2535,53 +2546,53 @@ msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, fuzzy, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Yn agor %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, fuzzy, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" @@ -2715,18 +2726,18 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn." # FIXME: literal -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'" # FIXME: tense -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Methwyd daeall y math pin %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin" @@ -2813,16 +2824,16 @@ msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Yn Casglu Darpariaethau Ffeil" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" @@ -2831,21 +2842,21 @@ msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" msgid "rename failed, %s (%s -> %s)." msgstr "methwyd ailenwi, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 #, fuzzy msgid "Hash Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" # FIXME: case -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2854,7 +2865,7 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2863,14 +2874,14 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" @@ -3004,7 +3015,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Yn agor y ffeil cyfluniad %s" @@ -3118,15 +3128,32 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "Methwyd agor ffeil %s" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Caewyd y cysylltiad yn gynnar" +#, fuzzy +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Methwyd datrys '%s'" + +#, fuzzy +#~ msgid "Could not patch file" +#~ msgstr "Methwyd agor ffeil %s" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/da.po b/po/da.po index 9d2f234c4..ffac0e91f 100644 --- a/po/da.po +++ b/po/da.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-da\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2007-09-06 21:40+0200\n" "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n" "Language-Team: Danish\n" @@ -152,7 +152,7 @@ msgstr " Versionstabel:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s oversat %s %s\n" @@ -306,7 +306,7 @@ msgstr "" " -c=? Ls denne opstningsfil\n" " -o=? Angiv et opstningstilvalg. F.eks. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Kunne ikke skrive til %s" @@ -439,8 +439,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB er gammel, forsger at opgradere %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "Databaseformatet er ugyldigt. Hvis du har opgraderet fra en tidligere " @@ -457,11 +458,11 @@ msgstr "Kunne ikke msgid "Failed to stat %s" msgstr "Kunne ikke finde %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arkivet har ingen kontrolindgang" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Kunne skaffe en markr" @@ -526,26 +527,26 @@ msgstr "*** Kunne ikke l msgid " DeLink limit of %sB hit.\n" msgstr " Nede DeLink-begrnsningen p %sB.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Arkivet havde intet package-felt" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen tvangs-post\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " pakkeansvarlig for %s er %s, ikke %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s har ingen linje med tilsidesttelse af standard for kildefiler\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -650,7 +651,7 @@ msgstr "Kunne ikke omd msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Fejl ved tolkning af regulrt udtryk - %s" @@ -811,11 +812,11 @@ msgstr "Pakker skal afinstalleres, men Remove er deaktiveret." msgid "Internal error, Ordering didn't finish" msgstr "Intern fejl. Sortering blev ikke fuldfrt" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Kunne ikke lse nedhentningsmappen" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Listen med kilder kunne ikke lses." @@ -844,8 +845,8 @@ msgstr "Efter udpakning vil %sB yderligere diskplads v msgid "After this operation, %sB disk space will be freed.\n" msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunne ikke bestemme ledig plads i %s" @@ -882,7 +883,7 @@ msgstr "Afbryder." msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortstte [J/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" @@ -891,7 +892,7 @@ msgstr "Kunne ikke hente %s %s\n" msgid "Some files failed to download" msgstr "Nedhentningen af filer mislykkedes" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand" @@ -990,52 +991,52 @@ msgstr "Versionen '%s' for '%s' blev ikke fundet" msgid "Selected version %s (%s) for %s\n" msgstr "Valgte version %s (%s) af %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Kunne ikke finde kildepakkelisten %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "'update'-kommandoen benytter ingen parametre" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Kunne ikke lse listemappen" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Det er ikke meningen, at vi skal slette ting og sager, kan ikke starte " "AutoRemover" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Flgende pakker blev installeret automatisk, og behves ikke lngere:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Flgende pakker blev installeret automatisk, og behves ikke lngere:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Brug 'apt-get autoremove' til at fjerne dem." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1053,43 +1054,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Flgende oplysninger kan hjlpe dig med at klare situationen:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Intern fejl. AutoRemover delagde noget" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern fejl, AllUpgrade delagde noget" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Kunne ikke finde opgaven %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Kunne ikke finde pakken %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Bemrk, vlger %s som regulrt udtryk '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "%s sat til manuelt installeret.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du kan muligvis rette det ved at kre 'apt-get -f install':" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1097,7 +1098,7 @@ msgstr "" "Uopfyldte afhngigheder. Prv 'apt-get -f install' uden pakker (eller angiv " "en lsning)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1108,115 +1109,115 @@ msgstr "" "en umulig situation eller bruger den ustabile distribution, hvor enkelte\n" "pakker endnu ikke er lavet eller gjort tilgngelige." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "delagte pakker" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Flgende yderligere pakker vil blive installeret:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Foreslede pakker:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Anbefalede pakker:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Beregner opgraderingen... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Mislykkedes" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Frdig" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Intern fejl. Problemlseren delagde noget" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Du skal angive mindst n pakke at hente kildeteksten til" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunne ikke finde kildetekstpakken for %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Overspringer allerede hentet fil '%s'\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plads i %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Henter kildetekst %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Nogle arkiver kunne ikke hentes." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Udpakningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Opbygningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Barneprocessen fejlede" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "Skal angive mindst n pakke at tjekke opbygningsafhngigheder for" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunne ikke hente oplysninger om opbygningsafhngigheder for %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen opbygningsafhngigheder.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1224,7 +1225,7 @@ msgid "" msgstr "" "%s-afhngigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1233,32 +1234,32 @@ msgstr "" "%s-afhngigheden for %s kan ikke opfyldes, da ingen af de tilgngelige " "udgaver af pakken %s kan tilfredsstille versions-kravene" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Kunne ikke opfylde %s-afhngigheden for %s: Den installerede pakke %s er for " "ny" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Kunne ikke opfylde %s-afhngigheden for %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Opbygningsafhngigheden for %s kunne ikke opfyldes." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Kunne ikke behandler opbygningsafhngighederne" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Understttede moduler:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1342,7 +1343,7 @@ msgstr "" "for flere oplysninger og tilvalg.\n" " Denne APT har \"Super Cow Powers\".\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1592,11 +1593,10 @@ msgstr "File %s/%s overskriver filen i pakken %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Kunne ikke lse %s" @@ -1626,9 +1626,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Mapperne info og temp skal ligge i samme filsystem" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Indlser pakkelisterne" @@ -1764,11 +1764,11 @@ msgid "File not found" msgstr "Fil blev ikke fundet" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Kunne ikke finde" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Kunne ikke angive ndringstidspunkt" @@ -1830,7 +1830,7 @@ msgstr "Tidsudl msgid "Server closed the connection" msgstr "Serveren lukkede forbindelsen" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Lsefejl" @@ -1842,7 +1842,7 @@ msgstr "Mellemlageret blev overfyldt af et svar." msgid "Protocol corruption" msgstr "Protokolfejl" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivefejl" @@ -1896,7 +1896,7 @@ msgstr "Tidsudl msgid "Unable to accept connection" msgstr "Kunne ikke acceptere forbindelse" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved \"hashing\" af fil" @@ -1960,60 +1960,65 @@ msgstr "Kunne ikke forbinde til %s:%s (%s)." msgid "Connecting to %s" msgstr "Forbinder til %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Kunne ikke omstte navnet '%s'" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Midlertidig fejl ved omstning af navnet '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Der skete noget underligt under navneomstning af '%s:%s' (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Kunne ikke forbinde til %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Kunne ikke tilg ngleringent '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Afbryder installationen." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "F: Argumentlisten fra Acquire::gpgv::Options er for lang. Afslutter." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Intern fejl: Gyldig signatur, men kunne ikke afgre ngle-fingeraftryk?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Stdte p mindst n ugyldig signatur." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Kunne ikke kre '%s' for at verificere signaturen (er gpgv installeret?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Ukendt fejl ved krsel af gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Flgende signaturer var ugyldige:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2065,48 +2070,48 @@ msgstr "" msgid "Unknown date format" msgstr "Ukendt datoformat" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Valg mislykkedes" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Tidsudlb p forbindelsen" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Fejl ved skrivning af uddatafil" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Fejl ved skrivning til fil" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Fejl ved skrivning til filen" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Fejl ved lsning fra serveren. Den fjerne ende lukkede forbindelsen" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Fejl ved lsning fra server" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Kunne ikke skrive filen %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Ugyldige hoved-data" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Forbindelsen mislykkedes" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Intern fejl" @@ -2114,18 +2119,25 @@ msgstr "Intern fejl" msgid "Can't mmap an empty file" msgstr "Kan ikke udfre mmap for en tom fil" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Kunne ikke udfre mmap for %lu byte" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2155,52 +2167,52 @@ msgstr "" msgid "Selection %s not found" msgstr "Det valgte %s blev ikke fundet" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ukendt type-forkortelse: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "bner konfigurationsfilen %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaksfejl %s:%u: Blokken starter uden navn." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksfejl %s:%u: Forkert udformet mrke" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaksfejl %s:%u: Overskydende affald efter vrdien" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaksfejl %s:%u: Direktiver kan kun angives i topniveauet" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaksfejl %s:%u: For mange sammenkdede inkluderinger" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksfejl %s:%u: Inkluderet herfra" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaksfejl %s:%u: Ikke-understttet direktiv '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksfejl %s:%u: Overskydende affald i slutningen af filen" @@ -2276,75 +2288,75 @@ msgstr "Kunne ikke skifte til %s" msgid "Failed to stat the cdrom" msgstr "Kunne ikke finde cdrommen" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Benytter ikke lsning for skrivebeskyttet lsefil %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Kunne ikke bne lsefilen %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Benytter ikke lsning for nfs-monteret lsefil %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Kunne ikke opn lsen %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ventede p %s, men den var der ikke" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprocessen %s modtog en segmenteringsfejl." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Underprocessen %s modtog en segmenteringsfejl." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprocessen %s returnerede en fejlkode (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprocessen %s afsluttedes uventet" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Kunne ikke bne filen %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "ls, mangler stadig at lse %lu men der er ikke flere" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skriv, mangler stadig at skrive %lu men kunne ikke" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problem under lukning af fil" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Fejl ved frigivelse af filen" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Problem under synkronisering af fil" @@ -2461,52 +2473,52 @@ msgstr "Kunne ikke tolke pakkefilen %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Kunne ikke tolke pakkefilen %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Ugyldig linje %lu i kildelisten %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Ugyldig linje %lu i kildelisten %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "bner %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Linjen %u er for lang i kildelisten %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Ugyldig linje %u i kildelisten %s (type)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen '%s' er ukendt p linje %u i kildelisten %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Ugyldig linje %u i kildelisten %s (producent-id)" @@ -2633,17 +2645,17 @@ msgstr "Pakkelisterne eller statusfilen kunne ikke tolkes eller msgid "You may want to run apt-get update to correct these problems" msgstr "Du kan muligvis rette problemet ved at kre 'apt-get update'" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Ugyldig indgang i indstillingsfilen. Pakkehovedet mangler" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Kunne ikke forst pin-type %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin" @@ -2729,16 +2741,16 @@ msgstr "Der skete en fejl under behandlingen af %s (CollectfileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "Pakken %s %s blev ikke fundet under behandlingen af filafhngigheder" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunne ikke finde kildepakkelisten %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Samler filudbud" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "IO-fejl ved gemning af kilde-mellemlageret" @@ -2747,21 +2759,21 @@ msgstr "IO-fejl ved gemning af kilde-mellemlageret" msgid "rename failed, %s (%s -> %s)." msgstr "omdbning mislykkedes, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum stemmer ikke" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum stemmer ikke" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Der er ingen tilgngelige offentlige ngler for flgende ngle-ID'er:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2770,7 +2782,7 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "ndt til manuelt at reparere denne pakke. (grundet manglende arch)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2779,13 +2791,13 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "ndt til manuelt at reparere denne pakke." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Strrelsen stemmer ikke" @@ -2921,7 +2933,6 @@ msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "bner konfigurationsfilen %s" @@ -2952,7 +2963,6 @@ msgstr "Fjerner %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Fjernede %s helt" @@ -3036,14 +3046,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Kunne ikke pfre filen %s en lap" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Forbindelsen lukkedes for hurtigt" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Kunne ikke tilg ngleringent '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "Kunne ikke pfre filen %s en lap" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/de.po b/po/de.po index 982ba7f15..4ba47bceb 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2009-10-20 21:55+0200\n" "Last-Translator: Holger Wansing <linux@wansing-online.de>\n" "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n" @@ -150,7 +150,7 @@ msgstr " Versions-Tabelle:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s für %s, kompiliert am %s %s\n" @@ -310,7 +310,7 @@ msgstr "" " -o=? Eine beliebige Konfigurationsoption setzen, z. B. -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Schreiben nach %s nicht möglich" @@ -451,8 +451,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "Datenbank ist veraltet, versuche %s zu erneuern" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "Datenbank-Format ist ungültig. Wenn Sie ein Update basierend auf einer " @@ -470,11 +471,11 @@ msgstr "Datenbank-Datei %s kann nicht geöffnet werden: %s" msgid "Failed to stat %s" msgstr "Ausführen von »stat« auf %s fehlgeschlagen." -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Archiv hat keinen Steuerungs-Datensatz" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Bekommen eines Cursors nicht möglich" @@ -539,26 +540,26 @@ msgstr "*** Erzeugen einer Verknüpfung von %s zu %s fehlgeschlagen" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-Limit von %sB erreicht.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Archiv hatte kein Paket-Feld" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s hat keinen Eintrag in der Override-Liste.\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-Betreuer ist %s und nicht %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s hat keinen Eintrag in der Source-Override-Liste.\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s hat keinen Eintrag in der Binary-Override-Liste.\n" @@ -664,7 +665,7 @@ msgstr "%s konnte nicht in %s umbenannt werden" msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Fehler beim Kompilieren eines regulären Ausdrucks – %s" @@ -826,11 +827,11 @@ msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet." msgid "Internal error, Ordering didn't finish" msgstr "Interner Fehler, Anordnung beendete nicht" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Das Downloadverzeichnis konnte nicht gesperrt werden." -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Die Liste der Quellen konnte nicht gelesen werden." @@ -861,8 +862,8 @@ msgstr "Nach dieser Operation werden %sB Plattenplatz zusätzlich benutzt.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Freier Platz in %s konnte nicht bestimmt werden" @@ -899,7 +900,7 @@ msgstr "Abbruch." msgid "Do you want to continue [Y/n]? " msgstr "Möchten Sie fortfahren [J/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Fehlschlag beim Holen von %s %s\n" @@ -908,7 +909,7 @@ msgstr "Fehlschlag beim Holen von %s %s\n" msgid "Some files failed to download" msgstr "Einige Dateien konnten nicht heruntergeladen werden" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv" @@ -1009,36 +1010,36 @@ msgstr "Version »%s« für »%s« konnte nicht gefunden werden" msgid "Selected version %s (%s) for %s\n" msgstr "Gewählte Version %s (%s) für %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "»stat« konnte nicht auf die Liste %s der Quellpakete ausgeführt werden." -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Der Befehl »update« akzeptiert keine Argumente" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Das Listenverzeichnis kann nicht gesperrt werden" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Es soll nichts gelöscht werden, AutoRemover kann nicht gestartet werden" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1046,17 +1047,17 @@ msgstr "" "Die folgenden Pakete wurden automatisch installiert und werden nicht länger " "benötigt:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "%lu Pakete wurden automatisch installiert und werden nicht mehr benötigt.\n" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Verwenden Sie »apt-get autoremove«, um sie zu entfernen." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1075,44 +1076,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "" "Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Interner Fehler, AutoRemover hat was kaputt gemacht" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Task %s konnte nicht gefunden werden" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Paket %s konnte nicht gefunden werden" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Hinweis: %s wird für regulären Ausdruck »%s« gewählt\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s wurde als manuell installiert festgelegt.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1120,7 +1121,7 @@ msgstr "" "Nicht erfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne " "jegliche Pakete (oder geben Sie eine Lösung an)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1132,120 +1133,120 @@ msgstr "" "Unstable-Distribution verwenden, einige erforderliche Pakete noch nicht\n" "erstellt wurden oder Incoming noch nicht verlassen haben." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Kaputte Pakete" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Die folgenden zusätzlichen Pakete werden installiert:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Vorgeschlagene Pakete:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Empfohlene Pakete:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Berechne Upgrade (Paketaktualisierung) ..." -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Fehlgeschlagen" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Fertig" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "" "Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden " "sollen" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Quellpaket für %s kann nicht gefunden werden" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Überspringe schon heruntergeladene Datei »%s«\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Sie haben nicht genug freien Platz in %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es müssen noch %sB von %sB an Quellarchiven heruntergeladen werden.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es müssen %sB an Quellarchiven heruntergeladen werden.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Quelle %s wird heruntergeladen\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Einige Archive konnten nicht heruntergeladen werden." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Überprüfen Sie, ob das Paket »dpkg-dev« installiert ist.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Es muss zumindest ein Paket angegeben werden, dessen Bau-Abhängigkeiten\n" "überprüft werden sollen." -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Informationen zu Bau-Abhängigkeiten für %s konnten nicht gefunden werden." -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s hat keine Bau-Abhängigkeiten.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1254,7 +1255,7 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht " "gefunden werden kann." -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1263,32 +1264,32 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da keine verfügbare " "Version des Pakets %s die Versionsanforderungen erfüllen kann." -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Die »%s«-Abhängigkeit für %s kann nicht erfüllt werden: Installiertes Paket %" "s ist zu neu." -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Die »%s«-Abhängigkeit für %s konnte nicht erfüllt werden: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bau-Abhängigkeiten für %s konnten nicht erfüllt werden." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Verarbeitung der Bau-Abhängigkeiten fehlgeschlagen" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Unterstützte Module:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1379,7 +1380,7 @@ msgstr "" "weitergehende Informationen und Optionen.\n" " Dieses APT hat Super-Kuh-Kräfte.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1632,11 +1633,10 @@ msgstr "Durch die Datei %s/%s wird die Datei in Paket %s überschrieben" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "%s kann nicht gelesen werden" @@ -1667,9 +1667,9 @@ msgstr "" "Die »info«- und »temp«-Verzeichnisse müssen in demselben Dateisystem liegen" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Paketlisten werden gelesen" @@ -1807,11 +1807,11 @@ msgstr "Datei nicht gefunden" # looks like someone hardcoded English grammar #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "»stat« konnte nicht ausgeführt werden." -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Änderungszeitpunkt kann nicht gesetzt werden" @@ -1873,7 +1873,7 @@ msgstr "Zeitüberschreitung der Verbindung" msgid "Server closed the connection" msgstr "Verbindung durch Server geschlossen" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Lesefehler" @@ -1885,7 +1885,7 @@ msgstr "Durch eine Antwort wurde der Puffer zum Überlaufen gebracht." msgid "Protocol corruption" msgstr "Protokoll beschädigt" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Schreibfehler" @@ -1941,7 +1941,7 @@ msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung" msgid "Unable to accept connection" msgstr "Verbindung konnte nicht angenommen werden" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf" @@ -2007,62 +2007,67 @@ msgstr "Verbindung mit %s:%s nicht möglich (%s)." msgid "Connecting to %s" msgstr "Verbindung mit %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "»%s« konnte nicht aufgelöst werden" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Temporärer Fehlschlag beim Auflösen von »%s«" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, c-format msgid "Unable to connect to %s:%s:" msgstr "Verbindung mit %s:%s nicht möglich:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Zugriff auf Schlüsselring nicht möglich: »%s«" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Installation abgebrochen." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "F: Argumentliste von Acquire::gpgv::Options zu lang. Abbruch." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Interner Fehler: Gültige Signatur, Fingerabdruck des Schlüssels konnte " "jedoch nicht ermittelt werden?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Mindestens eine ungültige Signatur wurde entdeckt." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "»%s« zur Überprüfung der Signatur konnte nicht ausgeführt werden (ist gpgv " "installiert?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Unbekannter Fehler beim Ausführen von gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Die folgenden Signaturen waren ungültig:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2115,49 +2120,49 @@ msgstr "" msgid "Unknown date format" msgstr "Unbekanntes Datumsformat" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Auswahl fehlgeschlagen" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Verbindung erlitt Zeitüberschreitung" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Fehler beim Schreiben der Ausgabedatei" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Fehler beim Schreiben einer Datei" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Fehler beim Schreiben der Datei" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fehler beim Lesen vom Server: Verbindung wurde durch den Server auf der " "anderen Seite geschlossen" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Fehler beim Lesen vom Server" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Datei konnte nicht eingekürzt werden" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Fehlerhafte Kopfzeilendaten" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Verbindung fehlgeschlagen" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Interner Fehler" @@ -2165,12 +2170,12 @@ msgstr "Interner Fehler" msgid "Can't mmap an empty file" msgstr "Eine leere Datei kann nicht mit mmap abgebildet werden" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "mmap von %lu Bytes konnte nicht durchgeführt werden" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " @@ -2179,6 +2184,13 @@ msgstr "" "Nicht genügend Platz für Dynamic MMap. Bitte erhöhen Sie den Wert von APT::" "Cache-Limit. Aktueller Wert: %lu. (Siehe auch man 5 apt.conf.)" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2208,53 +2220,53 @@ msgstr "%lis" msgid "Selection %s not found" msgstr "Auswahl %s nicht gefunden" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Nicht erkannte Typabkürzung: »%c«" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Öffne Konfigurationsdatei %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaxfehler %s:%u: Block beginnt ohne Namen." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaxfehler %s:%u: Missgestaltetes Tag" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaxfehler %s:%u: Zusätzlicher Müll nach Wert" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntaxfehler %s:%u: Direktiven können nur auf oberster Ebene benutzt werden" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaxfehler %s:%u: Zu viele verschachtelte Einbindungen (includes)" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaxfehler %s:%u: Eingefügt von hier" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaxfehler %s:%u: Nicht unterstützte Direktive »%s«" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaxfehler %s:%u: Zusätzlicher Müll am Dateiende" @@ -2331,77 +2343,77 @@ msgstr "Es konnte nicht nach %s gewechselt werden" msgid "Failed to stat the cdrom" msgstr "»stat« konnte nicht auf die CD-ROM ausgeführt werden" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Es wird keine Sperre für schreibgeschützte Lockdatei %s verwendet" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Lockdatei %s konnte nicht geöffnet werden" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Es wird keine Sperre für per NFS eingebundene Lockdatei %s verwendet" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Konnte Lock %s nicht bekommen" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Unterprozess %s hat einen Speicherzugriffsfehler empfangen." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, c-format msgid "Sub-process %s received signal %u." msgstr "Unterprozess %s hat Signal %u empfangen." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Unterprozess %s hat Fehlercode zurückgegeben (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Unterprozess %s unerwartet beendet" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Datei %s konnte nicht geöffnet werden" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "Lesevorgang: es verbleiben noch %lu zu lesen, jedoch nichts mehr übrig" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" "Schreibvorgang: es verbleiben noch %lu zu schreiben, jedoch Schreiben nicht " "möglich" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Beim Schließen der Datei trat ein Problem auf" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Beim Unlinking der Datei trat ein Problem auf" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Beim Synchronisieren der Datei trat ein Problem auf" @@ -2518,52 +2530,52 @@ msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)" msgid "Unable to parse package file %s (2)" msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s wird geöffnet" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Zeile %u zu lang in der Quellliste %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ »%s« ist unbekannt in Zeile %u der Quellliste %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Missgestaltete Zeile %u in Quellliste %s (»vendor id«)" @@ -2697,17 +2709,17 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Probieren Sie »apt-get update«, um diese Probleme zu korrigieren." -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Ungültiger Eintrag in Einstellungsdatei %s, keine »Package«-Kopfzeilen" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Pinning-Typ (pin type) %s nicht verständlich" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Keine Priorität (oder Null) für Pin angegeben" @@ -2800,16 +2812,16 @@ msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Paket %s %s wurde nicht gefunden beim Verarbeiten der Dateiabhängigkeiten" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "»stat« konnte nicht auf die Liste %s der Quellpakete ausgeführt werden." -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Sammle Datei-Provides" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "E/A-Fehler beim Speichern des Quell-Caches" @@ -2818,20 +2830,20 @@ msgstr "E/A-Fehler beim Speichern des Quell-Caches" msgid "rename failed, %s (%s -> %s)." msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5-Summe stimmt nicht überein" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Hash-Summe stimmt nicht überein" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Es gibt keine öffentlichen Schlüssel für die folgenden Schlüssel-IDs:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2841,7 +2853,7 @@ msgstr "" "Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender " "Architektur)." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2850,14 +2862,14 @@ msgstr "" "Es konnte keine Datei für Paket %s gefunden werden. Das könnte heißen, dass " "Sie dieses Paket von Hand korrigieren müssen." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Die Paketindexdateien sind beschädigt: Kein Filename:-Feld für Paket %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Größe stimmt nicht überein" @@ -2996,7 +3008,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Öffne Konfigurationsdatei %s" @@ -3007,7 +3018,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Hash-Summe stimmt nicht überein" @@ -3028,7 +3038,6 @@ msgstr "%s wird entfernt" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "%s vollständig entfernt" @@ -3119,14 +3128,30 @@ msgstr "" msgid "Not locked" msgstr "Nicht gesperrt" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Datei konnte nicht gepatcht werden" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Verbindung vorzeitig beendet" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Zugriff auf Schlüsselring nicht möglich: »%s«" + +#~ msgid "Could not patch file" +#~ msgstr "Datei konnte nicht gepatcht werden" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/dz.po b/po/dz.po index aa75a0ddd..3d0644477 100644 --- a/po/dz.po +++ b/po/dz.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po.pot\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2006-09-19 09:49+0530\n" "Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n" "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n" @@ -152,7 +152,7 @@ msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s་གི་དོན་ལུ་%s %sགུར་ཕྱོགས་སྒྲིག་འབད་ཡོད་པའི་%s %s\n" @@ -308,7 +308,7 @@ msgstr "" " -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/tmp་" "བཟུམ།\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr " %sལུ་འབྲི་མ་ཚུགས།" @@ -445,8 +445,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "ཌི་བི་འདི་རྙིངམ་ཨིན་པས་ %s་ཡར་བསྐྱེད་འབད་ནིའི་དོན་ལུ་དཔའ་བཅམ་དོ།" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "ཌི་བི་རྩ་སྒྲིག་འདི་ ནུས་མེད་ཨིན་པས། ཁྱོད་ཀྱི་ apt་ གྱི་འཐོན་རིམ་རྙིངམ་ཅིག་ནང་ལས་ ཡར་བསྐྱེད་འབད་ཡོད་" @@ -463,11 +464,11 @@ msgstr "%s: %s་ཌི་བི་ཡིག་སྣོད་འདི་ཁ་ msgid "Failed to stat %s" msgstr "%s་སིཊེཊི་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "ཡིག་མཛོད་འདི་ལུ་ཚད་འཛིན་དྲན་ཐོ་མིན་འདུག" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "འོད་རྟགས་ལེན་མ་ཚུགས།" @@ -532,26 +533,26 @@ msgstr "*** %s་ལས་%sལུ་འབྲེལ་འཐུད་འབད msgid " DeLink limit of %sB hit.\n" msgstr "%sB་ཧེང་བཀལ་བཀྲམ་ནིའི་འབྲེལ་མེད་བཅད་མཚམས།\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "ཡིག་མཛོད་ལུ་ཐུམ་སྒྲིལ་ཅི་ཡང་འཐུས་ཤོར་མ་བྱུང་།" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %sལུ་ཟུར་བཞག་ཐོ་བཀོད་མེད།\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s ་རྒྱུན་སྐྱོང་པ་འདི་ %s ཨིན་ %s མེན།\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s ལུ་འབྱུང་ཁུངས་མེདཔ་གཏང་ནིའི་ཐོ་བཀོད་འདི་མེད།\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %sལུ་ཟུང་ལྡན་མེདཔ་གཏང་ནིའི་་ཐོ་བཀོད་གང་རུང་ཡང་མིན་འདུག།\n" @@ -655,7 +656,7 @@ msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི msgid "Y" msgstr "ཝའི།" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s" @@ -818,11 +819,11 @@ msgstr "ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་བཏ msgid "Internal error, Ordering didn't finish" msgstr "ནང་འཁོད་འཛོལ་བ་ གོ་རིམ་བཟོ་ནི་ཚུ་མཇུག་མ་བསྡུ་བས།" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབས་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "འབྱུང་ཁུངས་ཚུ་ཀྱི་ཐོ་ཡིག་དེ་ལྷག་མི་ཚུགས་པས།" @@ -853,8 +854,8 @@ msgstr "ཁ་སྐོང་གི་%sB་འདི་བཤུབ་པའི msgid "After this operation, %sB disk space will be freed.\n" msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི་བར་སྟོང་དེ་དལཝ་སྦེ་ལུས་འོང་།\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s་ནང་བར་སྟོང་" @@ -891,7 +892,7 @@ msgstr "བར་བཤོལ་འབད།" msgid "Do you want to continue [Y/n]? " msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་[Y/n]?" -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n" @@ -900,7 +901,7 @@ msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བ msgid "Some files failed to download" msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།" @@ -999,51 +1000,51 @@ msgstr "'%s'་གི་དོན་ལུ་འཐོན་རིམ་'%s'་ msgid "Selected version %s (%s) for %s\n" msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1059,44 +1060,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་སྐབས་འདི་མོས་མཐུན་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "ནང་འགོད་འཛོལ་བ་ ཡར་བསྐྱེད་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་ཐལ་ཡོད།" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "དྲན་འཛིན་ རི་ཇེགསི་'%s'གི་དོན་ལུ་%s་སེལ་འཐུ་འབད་དོ།\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "འདི་ཚུ་ནོར་བཅོས་འབད་ནིའི་དོན་ལུ་ཁྱོད་ཀྱི་`apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1104,7 +1105,7 @@ msgstr "" "མ་ཚང་བའི་རྟེན་འབྲེལ་ ཐུས་སྒྲིལ་མེད་མི་ཚུ་དང་གཅིག་ཁར་ 'apt-get -f install'དེ་འབཐ་རྩོལ་བསྐྱེདཔ།" "(ཡང་ན་ཐབས་ཤེས་ཅིག་གསལ་བཀོད་འབད།)" -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1115,122 +1116,122 @@ msgstr "" "འབད་འབདཝ་འོང་ནི་མས་ ཡང་ན་ད་ལྟོ་ཡང་གསར་བསྐྲུན་མ་འབད་བར་ཡོད་པའི་ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་ཡང་ན་ནང་" "འབྱོར་གྱི་ཕྱི་ཁར་རྩ་བསྐྲད་བཏང་ཡོད་པའི་རྩ་བརྟན་མེད་པའི་བགོ་འགྲེམ་ཚུ་ལག་ལེན་འཐབ་དོ་ཡོདཔ་འོང་ནི་ཨིན་པས།" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ།" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཐེབས་ཚུ་གཞི་བཙུགས་འབད་འོང་:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "བསམ་འཆར་བཀོད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "འབད་ཚར་ཡི།" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "%s་གི་དོན་ལུ་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འཐོབ" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr " %s་ནང་ཁྱོད་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB་ལེན་དགོཔ་འདུག་ འབྱུང་ཁུངས་ཡིག་མཛོད་ཀྱི་%sB།\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "%s་འབྱུང་ཁུངས་ལེན།\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས།" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1239,32 +1240,32 @@ msgstr "" "%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་" "ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་སྐོང་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་ གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་" "སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས།" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འཐུས་ཤོར་བྱུང་ནུག" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1351,7 +1352,7 @@ msgstr "" "ཤོག་ལེབ་ཚུ་ལུ་བལྟ།\n" " འ་ནི་ ཨེ་ཊི་པི་འདི་ལུ་ཡང་དག་ ཀའུ་ ནུས་ཤུགས་ཚུ་ཡོད།\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1602,11 +1603,10 @@ msgstr "ཐུམ་སྒྲིལ་%s་ནང་ལུ་་ཡིག་ས #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "%s་འདི་ལུ་ལྷག་མ་ཚུགས།" @@ -1636,9 +1636,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "info ་དང་ temp་སྣོད་ཐོ་ཚུ་ཡིག་སྣོད་རིམ་ལུགས་གཅིག་གུར་ལུ་བཞག་དགོཔ་ཨིན།" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།" @@ -1772,11 +1772,11 @@ msgid "File not found" msgstr "ཡིག་སྣོད་འཚོལ་མ་ཐོབ།" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབཐ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" @@ -1838,7 +1838,7 @@ msgstr "མཐུད་ལམ་ངལ་མཚམས" msgid "Server closed the connection" msgstr "སར་བར་གྱིས་མཐུད་ལམ་འདི་ཁ་བསྡམས་ཏེ་ཡོདཔ་ཨིན།" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "འཛོལ་བ་ལྷབ།" @@ -1850,7 +1850,7 @@ msgstr "ལན་གྱིས་ གནད་ཁོངས་གུར་ལས msgid "Protocol corruption" msgstr "གནད་སྤེལ་ལམ་ལུགས་ ངན་ཅན།" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "འཛོལ་བ་འབྲི།" @@ -1904,7 +1904,7 @@ msgstr "གནད་སྡུད་སོ་ཀེཊི་ མཐུད་ན msgid "Unable to accept connection" msgstr "མཐུད་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགས།" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལ།" @@ -1968,63 +1968,68 @@ msgstr " %s:%s (%s)ལུ་མཐུད་མ་ཚུགས།" msgid "Connecting to %s" msgstr "%s་ལུ་མཐུད་དོ།" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "'%s'མོས་མཐུན་འབད་མ་ཚུགས།" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "'%s'མོས་མཐུན་འབད་ནི་ལུ་གནས་སྐབས་ཀྱི་འཐུས་ཤོར།" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་པ་ཅིག་བྱུང་ཡི།" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "%s %s:ལུ་མཐུད་མ་ཚུགས།" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "'%s'ལྡེ་འཁོར་འདི་འཛུལ་སྤྱོད་འབད་མ་ཚུགས།" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།" + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Acquire::gpgv::Options་ནང་ལས་ཀྱི་སྒྲུབ་རྟགས་ཀྱི་ཐོ་ཡིག་དེ་གནམ་མེད་ས་མེད་རིངམ་འདུག ཕྱིར་" "འཐོན་དོ།" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "ནང་འཁོད་འཛོལ་བ: མིང་རྟགས་འདི་ལེགས་ཤོམ་ཅིག་འདུག་ འདི་འབདཝ་ད་མཛུབ་རྗེས་ལྡེ་མིག་དེ་གཏན་འབེབས་བཟོ་" "མ་ཚུགས?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "ཉུང་མཐའ་རང་ནུས་མེད་ཀྱི་མིང་རྟགས་ཅིག་གདོང་ཐུག་བྱུང་སྟེ་ཡོདཔ་ཨིན།" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gpgv་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་ན།?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "gpgv་ལག་ལེན་འཐབ་ནི་ལུ་མ་ཤེས་པའི་འཛོལ་བ་།" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "འོག་གི་མིང་རྟགས་ཚུ་ནུས་མེད་ཨིན་པས།:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2074,48 +2079,48 @@ msgstr "འ་ནི་ ཨེཆི་ཊི་ཊི་པི་ སར་བ msgid "Unknown date format" msgstr "མ་ཤེས་པའི་ཚེས་རྩ་སྒྲིག" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "སེལ་འཐུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "མཐུད་ལམ་ངལ་མཚམས་འབད་ཡོད།" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ། ཐག་རིང་མཇུག་གི་མཐུད་ལམ་དེ་ཁ་བསྡམས།" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ།" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེས།" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "ནང་འཁོད་འཛོལ་བ།" @@ -2123,18 +2128,25 @@ msgstr "ནང་འཁོད་འཛོལ་བ།" msgid "Can't mmap an empty file" msgstr "ཡིག་སྣོད་སྟོངམ་འདི་mmap་འབད་མ་ཚུགས།" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "%lu་བཱའིཊིསི་གི་mmap་བཟོ་མ་ཚུགས།" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2164,52 +2176,52 @@ msgstr "" msgid "Selection %s not found" msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "ངོ་མ་ཤེས་པའི་སྡུད་ཚིག་གི་དབྱེ་བ:'%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་དོ།" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "་ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: སྡེབ་ཚན་གྱིས་མིང་མེད་མི་དང་གཅིག་ཁར་འགོ་བཙུགསཔ་ཨིན" -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཟོ་ཉེས་འགྱུར་བའི་ངོ་རྟགས།" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:གནས་གོང་གི་ཤུལ་ལས་མཁོ་མེད་ཐེབས།" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཀོད་རྒྱ་ཚུ་ཆེ་རིམ་ནང་རྐྱངམ་ཅིག་བྱིན་ཚུགས།" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:འདུ་འཛོམས་འབད་འབདཝ་ལེ་ཤཱ་གྲངས་སུ་བཙུགསཔ་ཨིན།" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ནཱ་ལས་རང་འགོ་བཙུགས་གྲངས་སུ་བཙུགས་ཏེ་ཡོད།" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: རྒྱབ་སྐྱོར་མ་འབད་བར་ཡོད་པའི་'%s'བཀོད་རྒྱ།" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ཡིག་སྣོད་ཀྱི་མཇུག་ལུ་མཁོ་མེད་ཐེབས།" @@ -2285,76 +2297,76 @@ msgstr "%s་ལུ་བསྒྱུར་བཅོས་འབད་མ་ཚ msgid "Failed to stat the cdrom" msgstr "སི་ཌི་རོམ་འདི་ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "%s ལྷག་ནི་རྐྱངམ་ཅིག་འབད་མི་ལྡེ་མིག་ཡིག་སྣོད་འདི་གི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "ལྡེ་མིག་རྐྱབས་ཡོད་པའི་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "ཨེན་ཨེཕ་ཨེསི་ %s སྦྱར་བརྩེགས་འབད་ཡོད་པའི་ལྡེ་མིག་ཡིག་སྣོད་ཀྱི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "%sལྡེ་མིག་རྐྱབ་ནི་ལེན་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "ཡན་ལག་ལས་སྦྱོར་%s་གིས་འཛོལ་བའི་ཨང་རྟགས་(%u)ཅིག་སླར་ལོག་འབད་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "ཡན་ལག་ལས་སྦྱོར་་%s་གིས་རེ་བ་མེད་པར་ཕྱིར་ཐོན་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "ལྷག་ ད་ལྟོ་ཡང་ལྷག་ནི་ལུ་%lu་ཡོད་འདི་འབདཝ་ད་ཅི་ཡང་ལྷག་ལུས་མིན་འདུག" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "འབྲི་ ད་ལྟོ་ཡང་འབྲི་ནི་ལུ་%lu་ཡོད་འདི་འདབཝ་ད་འབད་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེདཔ་བཟོ་བའི་བསྒང་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།" @@ -2472,52 +2484,52 @@ msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་ msgid "Unable to parse package file %s (2)" msgstr "%s (༢་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu འབྱུང་ཁུངས་ཐོ་ཡིག་ %s (ཡུ་ཨར་ཨའི་)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(ཡང་དག་ dist)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s་ཁ་ཕྱེ་དོ།" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "གྲལ་ཐིག་%u་འདི་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་ནང་ལུ་གནམ་མེད་ས་མེད་རིངམོ་འདུག" -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (དབྱེ་བ)་ནང་ན།" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(སིལ་ཚོང་པ་ ཨའི་ཌི)གི་ནང་ན།" @@ -2645,17 +2657,17 @@ msgstr "ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་ཡང་ msgid "You may want to run apt-get update to correct these problems" msgstr "འ་ནི་དཀའ་ངལ་འདི་ཚུ་སེལ་ནིའི་ལུ་ ཁྱོད་ཀྱི་ apt-get update་དེ་གཡོག་བཀོལ་དགོཔ་འོང་།" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "དགའ་གདམ་ཡིག་སྣོད་ནང་ལུ་ནུས་མེད་ཀྱི་དྲན་ཐོ་ ཐུམ་སྒྲིལ་མགོ་ཡིག་མིན་འདུག" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "ངོ་རྟགས་ཨང་གི་དབྱེ་བ་ %s འདི་ཧ་གོ་མ་ཚུགས།" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "གོ་རྟགས་ཨང་གི་དོན་ལུ་ གཙོ་རིམ་(ཡང་ན་ ཀླད་ཀོར་)ཚུ་གསལ་བཀོད་མ་འབད་བས།" @@ -2740,16 +2752,16 @@ msgstr "%s (CollectFileProvides)དེ་བཟོ་སྦྱོར་འབད msgid "Package %s %s was not found while processing file dependencies" msgstr "ཡིག་སྣོད་རྟེན་འབྲེལ་འདི་ཚུ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་ཐུམ་སྒྲིལ་ %s %s ་འདི་མ་ཐོབ་པས།" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོ།" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།" @@ -2758,20 +2770,20 @@ msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མ msgid "rename failed, %s (%s -> %s)." msgstr "%s (%s -> %s)བསྐྱར་མིང་བཏགས་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 #, fuzzy msgid "Hash Sum mismatch" msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འཐོབ་མི་ཚུགས་པས:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2780,7 +2792,7 @@ msgstr "" " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ " "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2789,14 +2801,14 @@ msgstr "" " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ " "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག " -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "ཐུམ་སྒྲིལ་ ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: %s་ཐུམ་སྒྲིལ་གྱི་དོན་ལུ་ས་སྒོ།" -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "ཚད་མ་མཐུན།" @@ -2932,7 +2944,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་དོ།" @@ -2963,7 +2974,6 @@ msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།" @@ -3047,15 +3057,31 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "དུས་སུ་མ་འབབ་པ་རང་མཐུད་ལམ་འདི་ག་བསྡམས་ཡོད།" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "'%s'ལྡེ་འཁོར་འདི་འཛུལ་སྤྱོད་འབད་མ་ཚུགས།" + +#, fuzzy +#~ msgid "Could not patch file" +#~ msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" + #~ msgid " %4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/el.po b/po/el.po index b4800b8be..5c4ead054 100644 --- a/po/el.po +++ b/po/el.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-08-26 18:25+0300\n" "Last-Translator: quad-nrg.net <yodesy@quad-nrg.net>\n" "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n" @@ -158,7 +158,7 @@ msgstr " Πίνακας Έκδοσης:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s για %s είναι μεταγλωττισμένο σε %s %s\n" @@ -316,7 +316,7 @@ msgstr "" " -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n" " -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Αδύνατη η εγγραφή στο %s" @@ -453,8 +453,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "Η βάση δεν είναι ενημερωμένη, γίνεται προσπάθεια να αναβαθμιστεί το %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "Το φορμά της βάσης δεν είναι έγκυρο. Εάν αναβαθμίσατε το apt σε νεότερη " @@ -471,11 +472,11 @@ msgstr "Το άνοιγμά του αρχείου της βάσης %s: %s απ msgid "Failed to stat %s" msgstr "Αποτυχία εύρεσης της κατάστασης του %s." -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Η αρχειοθήκη δεν περιέχει πεδίο ελέγχου" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Αδύνατη η πρόσβαση σε δείκτη" @@ -540,26 +541,26 @@ msgstr " Αποτυχία σύνδεσης του %s με το %s" msgid " DeLink limit of %sB hit.\n" msgstr " Αποσύνδεση ορίου του %sB hit.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s συντηρητής είναι ο %s όχι ο %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s δεν έχει εγγραφή πηγαίας παράκαμψης\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s δεν έχει ούτε εγγραφή δυαδικής παράκαμψης\n" @@ -663,7 +664,7 @@ msgstr "Αποτυχία μετονομασίας του %s σε %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "σφάλμα μεταγλωτισμου - %s" @@ -827,11 +828,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Αδύνατη η ανάγνωση της λίστας πηγών." @@ -863,8 +864,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Μετά από αυτή τη λειτουργία, θα ελευθερωθούν %sB χώρου από το δίσκο.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s" @@ -901,7 +902,7 @@ msgstr "Εγκατάλειψη." msgid "Do you want to continue [Y/n]? " msgstr "Θέλετε να συνεχίσετε [Ν/ο]; " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Αποτυχία ανάκτησης του %s %s\n" @@ -910,7 +911,7 @@ msgstr "Αποτυχία ανάκτησης του %s %s\n" msgid "Some files failed to download" msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο" @@ -1012,51 +1013,51 @@ msgstr "Η έκδοση %s για το %s δεν βρέθηκε" msgid "Selected version %s (%s) for %s\n" msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Η εντολή update δεν παίρνει ορίσματα" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Δεν επιτρέπεται οποιαδήποτε διαγραφή· αδυναμία εκκίνησης του AutoRemover" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Χρησιμοποιήστε 'apt-get autoremove' για να τα διαγράψετε." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1074,43 +1075,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Εσωτερικό Σφάλμα, το AutoRemover δημιούργησε κάποιο πρόβλημα" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Εσωτερικό Σφάλμα, η διαδικασία αναβάθμισης χάλασε" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Αδύνατη η εύρεση του συνόλου πακέτων %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Αδύνατη η εύρεση του πακέτου %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "το %s έχει εγκατασταθεί με το χέρι\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Aν τρέξετε 'apt-get -f install' ίσως να διορθώσετε αυτά τα προβλήματα:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1118,7 +1119,7 @@ msgstr "" "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε " "πακέτο (ή καθορίστε μια λύση)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1130,120 +1131,120 @@ msgstr "" "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n" "μετακινηθεί από τα εισερχόμενα." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Χαλασμένα πακέτα" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Προτεινόμενα πακέτα:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Συνιστώμενα πακέτα:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Υπολογισμός της αναβάθμισης... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Απέτυχε" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Ετοιμο" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "" "Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο " "υλικό" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον " "κωδικάτου" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Μεταφόρτωση Κωδικα %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Απέτυχε η εντολή χτισίματος %s.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Η απογονική διεργασία απέτυχε" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1251,7 +1252,7 @@ msgid "" msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1260,32 +1261,32 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες " "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s " "είναι νεώτερο" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Υποστηριζόμενοι Οδηγοί:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1368,7 +1369,7 @@ msgstr "" "για περισσότερες πληροφορίες και επιλογές.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1618,11 +1619,10 @@ msgstr "Το αρχείο %s/%s αντικαθιστά αυτό στο πακέ #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Αδύνατη η ανάγνωση του %s" @@ -1652,9 +1652,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Οι φάκελοι info και temp πρέπει να βρίσκονται στο ίδιο σύστημα αρχείων" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Ανάγνωση Λιστών Πακέτων" @@ -1789,11 +1789,11 @@ msgid "File not found" msgstr "Το αρχείο Δε Βρέθηκε" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Αποτυχία εύρεσης της κατάστασης" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης" @@ -1855,7 +1855,7 @@ msgstr "Λήξη χρόνου σύνδεσης" msgid "Server closed the connection" msgstr "Ο διακομιστής έκλεισε την σύνδεση" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Σφάλμα ανάγνωσης" @@ -1867,7 +1867,7 @@ msgstr "Το μήνυμα απάντησης υπερχείλισε την εν msgid "Protocol corruption" msgstr "Αλλοίωση του πρωτοκόλλου" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Σφάλμα εγγραφής" @@ -1921,7 +1921,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο msgid "Unable to accept connection" msgstr "Αδύνατη η αποδοχή συνδέσεων" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Πρόβλημα κατά το hashing του αρχείου" @@ -1985,62 +1985,67 @@ msgstr "Αδύνατη η σύνδεση στο %s:%s (%s)." msgid "Connecting to %s" msgstr "Σύνδεση στο %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Αδύνατη η εύρεση του '%s'" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Προσωρινή αποτυχία στην εύρεση του '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Κάτι παράξενο συνέβη κατά την εύρεση του '%s:%s' (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Αδύνατη η σύνδεση στο %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Αδύνατη η εύρεση του συνόλου κλειδιών '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Εγκατάλειψη της εγκατάστασης." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "Ε: Λίστα Ορισμάτων από Acquire::gpgv::Options πολύ μεγάλη. Έξοδος." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Εσωτερικό σφάλμα: Η υπογραφή είναι καλή, αλλά αδυναμία προσδιορισμού του " "αποτυπώματος?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Αδυναμία εκτέλεσης του '%s' για την επαλήθευση της υπογραφής (είναι " "εγκατεστημένο το gpgv;)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2091,49 +2096,49 @@ msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρω msgid "Unknown date format" msgstr "Άγνωστη μορφή ημερομηνίας" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Η επιλογή απέτυχε" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Λήξη χρόνου σύνδεσης" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "" "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Σφάλμα στην ανάγνωση από το διακομιστή" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Αποτυχία εγγραφής του αρχείου %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Ελαττωματικά δεδομένα επικεφαλίδας" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Η σύνδεση απέτυχε" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Εσωτερικό Σφάλμα" @@ -2141,18 +2146,25 @@ msgstr "Εσωτερικό Σφάλμα" msgid "Can't mmap an empty file" msgstr "Αδύνατη η απεικόνιση mmap ενός άδειου αρχείου" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Αδύνατη η απεικόνιση μέσω mmap %lu bytes" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2182,53 +2194,53 @@ msgstr "" msgid "Selection %s not found" msgstr "Η επιλογή %s δε βρέθηκε" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Μη αναγνωρισμένος τύπος σύντμησης: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Συντακτικό σφάλμα %s:%u: Το block αρχίζει χωρίς όνομα." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Συντακτικό σφάλμα %s:%u: Λάθος μορφή Ετικέτας (Tag)" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες μετά την τιμή" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Συντακτικό σφάλμα %s:%u: Οι οδηγίες βρίσκονται μόνο στο ανώτατο επίπεδο" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Συντακτικό σφάλμα %s:%u: Υπερβολικός αριθμός συνδυασμένων includes" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Συντακτικό σφάλμα %s:%u: Συμπεριλαμβάνεται από εδώ" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Συντακτικό σφάλμα %s:%u: Μη υποστηριζόμενη εντολή '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες στο τέλος του αρχείου" @@ -2305,78 +2317,78 @@ msgstr "Αδύνατη η αλλαγή σε %s" msgid "Failed to stat the cdrom" msgstr "Αδύνατη η εύρεση της κατάστασης του cdrom" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Δε θα χρησιμοποιηθεί κλείδωμα για το ανάγνωσης μόνο αρχείο κλειδώματος %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Αδύνατο το άνοιγμα του αρχείου κλειδώματος %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Δε θα χρησιμοποιηθεί κλείδωμα για το συναρμοσμένο από nfs αρχείο κλειδώματος " "%s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Αδύνατο το κλείδωμα %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)" -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)" -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Η υποδιεργασία %s επέστρεψε ένα κωδικός σφάλματος (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Η υποδιεργασία %s εγκατέλειψε απρόσμενα" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Αδύνατο το άνοιγμα του αρχείου %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "αναγνώστηκαν, απομένουν ακόμη %lu για ανάγνωση αλλά δεν απομένουν άλλα" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Πρόβλημα κατά την διαγραφή του αρχείου" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου" @@ -2493,52 +2505,52 @@ msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s msgid "Unable to parse package file %s (2)" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Άνοιγμα του %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος " -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (id κατασκευαστή)" @@ -2669,17 +2681,17 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "" "Ίσως να πρέπει να τρέξετε apt-get update για να διορθώσετε αυτά τα προβλήματα" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Μη έγκυρη εγγραφή στο αρχείο προτιμήσεων, καμία επικεφαλίδα Package" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Αδύνατη η κατανόηση του τύπου καθήλωσης %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "" "Δεν έχει οριστεί προτεραιότητα (ή έχει οριστεί μηδενική) για την καθήλωση" @@ -2768,16 +2780,16 @@ msgstr "Προέκυψε σφάλμα κατά την επεξεργασία τ msgid "Package %s %s was not found while processing file dependencies" msgstr "Το πακέτο %s %s δε βρέθηκε κατά την επεξεργασία εξαρτήσεων του αρχείου" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Συλλογή Παροχών Αρχείου" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών" @@ -2786,19 +2798,19 @@ msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγ msgid "rename failed, %s (%s -> %s)." msgstr "απέτυχε η μετονομασία, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "Ανόμοιο MD5Sum" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Ανόμοιο MD5Sum" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Δεν υπάρχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2807,7 +2819,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2816,7 +2828,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2824,7 +2836,7 @@ msgstr "" "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο " "πακέτο %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Ανόμοιο μέγεθος" @@ -2959,7 +2971,6 @@ msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία κα #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s" @@ -2970,7 +2981,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Ανόμοιο MD5Sum" @@ -2991,7 +3001,6 @@ msgstr "Αφαιρώ το %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Το %s διαγράφηκε πλήρως" @@ -3077,14 +3086,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Αδύνατη η διόρθωση του αρχείου" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Η σύνδεση έκλεισε πρόωρα" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Αδύνατη η εύρεση του συνόλου κλειδιών '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "Αδύνατη η διόρθωση του αρχείου" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/en_GB.po b/po/en_GB.po index 3b73e344b..39163a47e 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-11-13 11:47+0000\n" "Last-Translator: Neil Williams <linux@codehelp.co.uk>\n" "Language-Team: en_GB <en_gb@li.org>\n" @@ -146,7 +146,7 @@ msgstr " Version table:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s compiled on %s %s\n" @@ -299,7 +299,7 @@ msgstr "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Unable to write to %s" @@ -432,8 +432,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB is old, attempting to upgrade %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "DB format is invalid. If you upgraded from a older version of apt, please " @@ -450,11 +451,11 @@ msgstr "Unable to open DB file %s: %s" msgid "Failed to stat %s" msgstr "Failed to stat %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Archive has no control record" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Unable to get a cursor" @@ -519,26 +520,26 @@ msgstr "*** Failed to link %s to %s" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink limit of %sB hit.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Archive had no package field" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s has no override entry\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s maintainer is %s not %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s has no source override entry\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s has no binary override entry either\n" @@ -642,7 +643,7 @@ msgstr "Failed to rename %s to %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Regex compilation error - %s" @@ -803,11 +804,11 @@ msgstr "Packages need to be removed but remove is disabled." msgid "Internal error, Ordering didn't finish" msgstr "Internal error, Ordering didn't finish" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Unable to lock the download directory" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "The list of sources could not be read." @@ -836,8 +837,8 @@ msgstr "After this operation, %sB of additional disk space will be used.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "After this operation, %sB disk space will be freed.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Couldn't determine free space in %s" @@ -874,7 +875,7 @@ msgstr "Abort." msgid "Do you want to continue [Y/n]? " msgstr "Do you want to continue [Y/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Failed to fetch %s %s\n" @@ -883,7 +884,7 @@ msgstr "Failed to fetch %s %s\n" msgid "Some files failed to download" msgstr "Some files failed to download" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Download complete and in download only mode" @@ -980,35 +981,35 @@ msgstr "Version ‘%s’ for ‘%s’ was not found" msgid "Selected version %s (%s) for %s\n" msgstr "Selected version %s (%s) for %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Couldn't stat source package list %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "The update command takes no arguments" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Unable to lock the list directory" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "We are not supposed to delete stuff, cannot start AutoRemover" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1016,18 +1017,18 @@ msgstr "" "The following packages were automatically installed and are no longer " "required:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "The following packages were automatically installed and are no longer " "required:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Use 'apt-get autoremove' to remove them." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1045,43 +1046,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "The following information may help to resolve the situation:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Internal Error, AutoRemoved broke stuff" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, AllUpgrade broke stuff" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Couldn't find task %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Couldn't find package %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, selecting %s for regex ‘%s’\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s set to manually installed.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "You might want to run 'apt-get -f install' to correct these:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1089,7 +1090,7 @@ msgstr "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1101,116 +1102,116 @@ msgstr "" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Broken packages" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "The following extra packages will be installed:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Suggested packages:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Recommended packages:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Calculating upgrade... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Failed" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Done" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Internal error, problem resolver broke stuff" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Must specify at least one package for which to fetch source" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Unable to find a source package for %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Skipping already downloaded file '%s'\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "You don't have enough free space in %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Need to get %sB/%sB of source archives.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Need to get %sB of source archives.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Fetch source %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Failed to fetch some archives." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Skipping unpack of already unpacked source in %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Unpack command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Check if the 'dpkg-dev' package is installed.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Child process failed" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Must specify at least one package for which you want to check builddeps" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Unable to get build-dependency information for %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s has no build depends.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1219,7 +1220,7 @@ msgstr "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1228,31 +1229,31 @@ msgstr "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Failed to satisfy %s dependency for %s: Installed package %s is too new" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Failed to satisfy %s dependency for %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Build-dependencies for %s could not be satisfied." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Failed to process build dependencies" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Supported modules:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1337,7 +1338,7 @@ msgstr "" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1583,11 +1584,10 @@ msgstr "File %s/%s overwrites the one in the package %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Unable to read %s" @@ -1617,9 +1617,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "The info and temp directories need to be on the same filesystem" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Reading package lists" @@ -1753,11 +1753,11 @@ msgid "File not found" msgstr "File not found" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Failed to stat" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Failed to set modification time" @@ -1819,7 +1819,7 @@ msgstr "Connection timeout" msgid "Server closed the connection" msgstr "Server closed the connection" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Read error" @@ -1831,7 +1831,7 @@ msgstr "A response overflowed the buffer." msgid "Protocol corruption" msgstr "Protocol corruption" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Write error" @@ -1885,7 +1885,7 @@ msgstr "Data socket connect timed out" msgid "Unable to accept connection" msgstr "Unable to accept connection" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem hashing file" @@ -1949,59 +1949,64 @@ msgstr "Could not connect to %s:%s (%s)." msgid "Connecting to %s" msgstr "Connecting to %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Could not resolve ‘%s’" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Temporary failure resolving ‘%s’" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Something wicked happened resolving ‘%s:%s’ (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Unable to connect to %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Couldn't access keyring: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Aborting install." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Argument list from Acquire::gpgv::Options too long. Exiting." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Internal error: Good signature, but could not determine key fingerprint?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "At least one invalid signature was encountered." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "Could not execute '%s' to verify signature (is gpgv installed?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Unknown error executing gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "The following signatures were invalid:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2052,47 +2057,47 @@ msgstr "This HTTP server has broken range support" msgid "Unknown date format" msgstr "Unknown date format" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Select failed" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Connection timed out" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Error writing to output file" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Error writing to file" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Error writing to the file" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Error reading from server. Remote end closed connection" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Error reading from server" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Failed to truncate file" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Bad header data" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Connection failed" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Internal error" @@ -2100,18 +2105,25 @@ msgstr "Internal error" msgid "Can't mmap an empty file" msgstr "Cannot mmap an empty file" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Couldn't make mmap of %lu bytes" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2141,52 +2153,52 @@ msgstr "" msgid "Selection %s not found" msgstr "Selection %s not found" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Unrecognized type abbreviation: ‘%c’" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Opening configuration file %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntax error %s:%u: Block starts with no name." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntax error %s:%u: Malformed tag" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntax error %s:%u: Extra junk after value" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntax error %s:%u: Directives can only be done at the top level" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntax error %s:%u: Too many nested includes" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntax error %s:%u: Included from here" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntax error %s:%u: Unsupported directive ‘%s’" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntax error %s:%u: Extra junk at end of file" @@ -2262,75 +2274,75 @@ msgstr "Unable to change to %s" msgid "Failed to stat the cdrom" msgstr "Failed to stat the cdrom" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Not using locking for read only lock file %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Could not open lock file %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Not using locking for nfs mounted lock file %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Could not get lock %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Waited for %s but it wasn't there" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Sub-process %s received a segmentation fault." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Sub-process %s received a segmentation fault." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Sub-process %s returned an error code (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Sub-process %s exited unexpectedly" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Could not open file %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "read, still have %lu to read but none left" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "write, still have %lu to write but couldn't" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problem closing the file" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Problem unlinking the file" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Problem syncing the file" @@ -2447,52 +2459,52 @@ msgstr "Unable to parse package file %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Unable to parse package file %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Malformed line %lu in source list %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Malformed line %lu in source list %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Malformed line %lu in source list %s (URI parse)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Malformed line %lu in source list %s (absolute dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Malformed line %lu in source list %s (dist parse)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Opening %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Line %u too long in source list %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Malformed line %u in source list %s (type)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Type ‘%s’ is not known on line %u in source list %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Malformed line %u in source list %s (vendor id)" @@ -2618,17 +2630,17 @@ msgstr "The package lists or status file could not be parsed or opened." msgid "You may want to run apt-get update to correct these problems" msgstr "You may want to run apt-get update to correct these problems" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Invalid record in the preferences file, no Package header" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Did not understand pin type %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "No priority (or zero) specified for pin" @@ -2712,16 +2724,16 @@ msgstr "Error occurred while processing %s (CollectFileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "Package %s %s was not found while processing file dependencies" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Couldn't stat source package list %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Collecting File Provides" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "IO Error saving source cache" @@ -2730,19 +2742,19 @@ msgstr "IO Error saving source cache" msgid "rename failed, %s (%s -> %s)." msgstr "rename failed, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum mismatch" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Hash Sum mismatch" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "There is no public key available for the following key IDs:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2751,7 +2763,7 @@ msgstr "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2760,14 +2772,14 @@ msgstr "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "The package index files are corrupted. No Filename: field for package %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Size mismatch" @@ -2902,7 +2914,6 @@ msgstr "Wrote %i records with %i missing files and %i mismatched files\n" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Opening configuration file %s" @@ -2913,7 +2924,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Hash Sum mismatch" @@ -2934,7 +2944,6 @@ msgstr "Removing %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Completely removed %s" @@ -3018,14 +3027,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Could not patch file" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Connection closed prematurely" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Couldn't access keyring: '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "Could not patch file" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/es.po b/po/es.po index de7730b05..f8d09b3f5 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-11-15 21:52+0100\n" "Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n" "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -150,7 +150,7 @@ msgstr " Tabla de versi #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s compilado en %s %s\n" @@ -309,7 +309,7 @@ msgstr "" " -o=? Establece una opcin de configuracin arbitraria, p. ej. -o dir::" "cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "No se puede escribir en %s" @@ -447,8 +447,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB anticuada, intentando actualizar %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "El formato de la base de datos no es vlido. Debe eliminar y recrear la base " @@ -465,11 +466,11 @@ msgstr "No se pudo abrir el archivo DB %s: %s" msgid "Failed to stat %s" msgstr "No pude leer %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "No hay registro de control del archivo" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "No se pudo obtener un cursor" @@ -534,26 +535,26 @@ msgstr "*** No pude enlazar %s con %s" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink se ha llegado al lmite de %sB.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Archivo no tiene campo de paquetes" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s no tiene entrada de predominio\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el encargado de %s es %s y no %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s no tiene una entrada fuente predominante\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s tampoco tiene una entrada binaria predominante\n" @@ -657,7 +658,7 @@ msgstr "Fall msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilacin de expresiones regulares - %s" @@ -818,11 +819,11 @@ msgstr "Los paquetes necesitan eliminarse pero Remove est msgid "Internal error, Ordering didn't finish" msgstr "Error interno, no termin el ordenamiento" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "No se puede bloquear el directorio de descarga" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "No se pudieron leer las listas de fuentes." @@ -854,8 +855,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Se liberarn %sB despus de esta operacin.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "No pude determinar el espacio libre en %s" @@ -892,7 +893,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "Desea continuar [S/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Imposible obtener %s %s\n" @@ -901,7 +902,7 @@ msgstr "Imposible obtener %s %s\n" msgid "Some files failed to download" msgstr "Algunos archivos no pudieron descargarse" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Descarga completa y en modo de slo descarga" @@ -998,36 +999,36 @@ msgstr "No se encontr msgid "Selected version %s (%s) for %s\n" msgstr "Versin seleccionada %s (%s) para %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "No se puede leer la lista de paquetes fuente %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "El comando de actualizacin no toma argumentos" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "No se pudo bloquear el directorio de listas" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Se supone que no vamos a eliminar cosas, no se pudo iniciar AutoRemover" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1035,18 +1036,18 @@ msgstr "" "Se instalaron de forma automtica los siguientes paquetes y ya no son " "necesarios." -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Se instalaron de forma automtica los siguientes paquetes y ya no son " "necesarios." -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Utilice apt-get autoremove para eliminarlos." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1064,43 +1065,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "La siguiente informacin puede ayudar a resolver la situacin:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Error interno, AutoRemover rompi cosas" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error Interno, AllUpgrade rompi cosas" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "No se pudo encontrar la tarea %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "No se pudo encontrar el paquete %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, seleccionando %s para la expresin regular '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "fijado %s como instalado manualmente.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1108,7 +1109,7 @@ msgstr "" "Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o " "especifique una solucin)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1120,119 +1121,119 @@ msgstr "" "inestable, que algunos paquetes necesarios no han sido creados o han\n" "sido movidos fuera de Incoming." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Paquetes rotos" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Se instalarn los siguientes paquetes extras:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Paquetes sugeridos:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Paquetes recomendados" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Calculando la actualizacin... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Fall" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Listo" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "" "Error interno, el sistema de solucin de problemas rompi\n" "algunas cosas" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Debe especificar al menos un paquete para obtener su cdigo fuente" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "No se pudo encontrar un paquete de fuentes para %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ignorando fichero ya descargado '%s'\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "No tiene suficiente espacio libre en %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Necesito descargar %sB/%sB de archivos fuente.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Necesito descargar %sB de archivos fuente.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Fuente obtenida %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "No se pudieron obtener algunos archivos." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fall la orden de desempaquetamiento '%s'.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Compruebe que el paquete dpkg-dev est instalado.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fall la orden de construccin '%s'.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Fall el proceso hijo" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Debe especificar al menos un paquete para verificar sus\n" "dependencias de construccin" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "No se pudo obtener informacin de dependencias de construccin para %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tiene dependencias de construccin.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1241,7 +1242,7 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede \n" "encontrar el paquete %s" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1250,32 +1251,32 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque ninguna versin\n" "disponible del paquete %s satisface los requisitos de versin" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es " "demasiado nuevo" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "No se pudo satisfacer la dependencia %s para %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No se pudieron satisfacer las dependencias de construccin de %s." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "No se pudieron procesar las dependencias de construccin" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Mdulos soportados:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1361,7 +1362,7 @@ msgstr "" "para ms informacin y opciones.\n" " Este APT tiene poderes de Super Vaca.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1613,11 +1614,10 @@ msgstr "El archivo %s/%s sobreescribe al que est #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "No pude leer %s" @@ -1648,9 +1648,9 @@ msgstr "" "Los directorios info y temp deben de estar en el mismo sistema de archivos" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Leyendo lista de paquetes" @@ -1784,11 +1784,11 @@ msgid "File not found" msgstr "Fichero no encontrado" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "No pude leer" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "No pude poner el tiempo de modificacin" @@ -1850,7 +1850,7 @@ msgstr "La conexi msgid "Server closed the connection" msgstr "El servidor cerr la conexin" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Error de lectura" @@ -1862,7 +1862,7 @@ msgstr "Una respuesta desbord msgid "Protocol corruption" msgstr "Corrupcin del protocolo" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Error de escritura" @@ -1916,7 +1916,7 @@ msgstr "Expir msgid "Unable to accept connection" msgstr "No pude aceptar la conexin" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Hay problemas enlazando fichero" @@ -1980,61 +1980,66 @@ msgstr "No pude conectarme a %s:%s (%s)." msgid "Connecting to %s" msgstr "Conectando a %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "No pude resolver '%s'" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Fallo temporal al resolver '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Algo raro pas resolviendo '%s:%s' (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "No pude conectarme a %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "No se pudo acceder al anillo de claves: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Abortando la instalacin." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Lista de argumentos de Acquire::gpgv::Options demasiado larga. Terminando." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error interno: Firma correcta, pero no se pudo determinar su huella digital?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Se encontr al menos una firma invlida." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "No se pudo ejecutar '%s' para verificar la firma (est instalado gpgv?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Error desconocido ejecutando gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Las siguientes firms fueron invlidas:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2085,47 +2090,47 @@ msgstr " msgid "Unknown date format" msgstr "Formato de fecha desconocido" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Fall la seleccin" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Expir la conexin" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Error escribiendo al archivo de salida" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Error escribiendo a archivo" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Error escribiendo al archivo" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Error leyendo del servidor, el lado remoto cerr la conexin." -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Error leyendo del servidor" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Fall al truncar el archivo" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Mala cabecera Data" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Fallo la conexin" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Error interno" @@ -2133,18 +2138,25 @@ msgstr "Error interno" msgid "Can't mmap an empty file" msgstr "No puedo hacer mmap de un fichero vaco" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "No pude hacer mmap de %lu bytes" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2174,54 +2186,54 @@ msgstr "" msgid "Selection %s not found" msgstr "Seleccin %s no encontrada" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Tipo de abreviacin no reconocida: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Abriendo fichero de configuracin %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Error de sintaxis %s:%u: No hay un nombre al comienzo del bloque." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Error de sintaxis %s:%u: Marca mal formada" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Error de sintaxis %s:%u: Basura extra despus del valor" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Error de sintaxis %s:%u: Las directivas slo se pueden poner\n" "en el primer nivel" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Error de sintaxis %s:%u: Demasiadas inclusiones anidadas" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Error de sintaxis %s:%u: Incluido desde aqu" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Error de sintaxis %s:%u: Directiva '%s' no soportada" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Error de sintaxis %s:%u: Basura extra al final del archivo" @@ -2299,75 +2311,75 @@ msgstr "No se pudo cambiar a %s" msgid "Failed to stat the cdrom" msgstr "No pude montar el cdrom" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "No se utiliza bloqueos para el fichero de bloqueo de slo lectura %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "No se pudo abrir el fichero de bloqueo '%s'" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "No se utilizan bloqueos para el fichero de bloqueo de montaje nfs %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "No se pudo bloquear %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperaba %s pero no estaba all" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "El subproceso %s recibi un fallo de segmentacin." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "El subproceso %s recibi un fallo de segmentacin." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "El subproceso %s devolvi un cdigo de error (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "El subproceso %s termin de forma inesperada" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "No pude abrir el fichero %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "ledos, todava deba leer %lu pero no queda nada" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escritos, todava tena que escribir %lu pero no pude hacerlo" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problemas cerrando el archivo" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Hay problemas desligando el fichero %s" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Hay problemas sincronizando el fichero" @@ -2484,52 +2496,52 @@ msgstr "No se pudo tratar el archivo de paquetes %s (1)" msgid "Unable to parse package file %s (2)" msgstr "No se pudo tratar el archivo de paquetes %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Lnea %lu mal formada en lista de fuentes %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Lnea %lu mal formada en lista de fuentes %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Lnea %lu mal formada en lista de fuentes %s (anlisis de URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Lnea %lu mal formada en lista de fuentes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Lnea %lu mal formada en lista de fuentes %s (anlisis de dist)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Abriendo %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Lnea %u demasiado larga en la lista de fuentes %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Lnea %u mal formada en lista de fuentes %s (tipo)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo '%s' desconocido en la lnea %u de lista de fuentes %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Lnea %u mal formada en la lista de fuentes %s (id del fabricante)" @@ -2660,18 +2672,18 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Tal vez quiera ejecutar 'apt-get update' para corregir estos problemas" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" "Registro invlido en el archivo de preferencias, no hay cabecera de paquete" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "No se entiende el pin tipo %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "No hay prioridad especificada para pin (o es cero)" @@ -2761,16 +2773,16 @@ msgstr "" "Al procesar las dependencias de archivos no se encontr el\n" "paquete %s %s" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "No se puede leer la lista de paquetes fuente %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Recogiendo archivos que proveen" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Error de E/S guardando cach fuente" @@ -2779,21 +2791,21 @@ msgstr "Error de E/S guardando cach msgid "rename failed, %s (%s -> %s)." msgstr "fall el cambio de nombre, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "La suma MD5 difiere" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "La suma hash difiere" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" "No existe ninguna clave pblica disponible para los siguientes " "identificadores de clave:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2803,7 +2815,7 @@ msgstr "" "que necesita arreglar manualmente este paquete (debido a que falta una " "arquitectura)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2812,7 +2824,7 @@ msgstr "" "No se pudo localizar un archivo para el paquete %s. Esto puede significar " "que necesita arreglar manualmente este paquete." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2820,7 +2832,7 @@ msgstr "" "Los archivos de ndice de paquetes estn corrompidos. El campo 'Filename:' " "no existe para para el paquete %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "El tamao difiere" @@ -2959,7 +2971,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Abriendo fichero de configuracin %s" @@ -2970,7 +2981,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "La suma hash difiere" @@ -2991,7 +3001,6 @@ msgstr "Eliminando %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Se borr completamente %s" @@ -3077,14 +3086,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "No pude parchear el fichero" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "La conexin se cerr prematuramente" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "No se pudo acceder al anillo de claves: '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "No pude parchear el fichero" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/eu.po b/po/eu.po index 79627a72e..40ee7ce9a 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: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2009-05-17 00:41+0200\n" "Last-Translator: Piarres Beobide <pi@beobide.net>\n" "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n" @@ -150,7 +150,7 @@ msgstr " Bertsio taula:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s %s-rentzat %s %s-ean konpilatua\n" @@ -303,7 +303,7 @@ msgstr "" " -c=? Irakurri konfigurazio fitxategi hau\n" " -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "%s : ezin da idatzi" @@ -435,8 +435,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "Datu-basea zaharra da; %s bertsio-berritzen saiatzen ari da" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "DB formatu baliogabe da. Apt bertsio zaharrago batetik eguneratu baduzu, " @@ -453,11 +454,11 @@ msgstr "Ezin da ireki %s datu-base fitxategia: %s" msgid "Failed to stat %s" msgstr "Huts egin du %s(e)tik datuak lortzean" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Artxiboak ez du kontrol erregistrorik" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Ezin da kurtsorerik eskuratu" @@ -522,26 +523,26 @@ msgstr "*** Ezin izan da %s %s(r)ekin estekatu" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-en mugara (%sB) heldu da.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Artxiboak ez du pakete eremurik" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s: ez du override sarrerarik\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s mantentzailea %s da, eta ez %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s: ez du jatorri gainidazketa sarrerarik\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s: ez du bitar gainidazketa sarrerarik\n" @@ -645,7 +646,7 @@ msgstr "Huts egin du %s izenaren ordez %s ipintzean" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Adierazpen erregularren konpilazio errorea - %s" @@ -806,11 +807,11 @@ msgstr "Paketeak ezabatu beharra dute baina Ezabatzea ezgaiturik dago." msgid "Internal error, Ordering didn't finish" msgstr "Barne errorea, ez da ordenatzeaz amaitu" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Ezin da deskarga direktorioa blokeatu" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Ezin izan da Iturburu zerrenda irakurri." @@ -841,8 +842,8 @@ msgstr "Ekintza honen ondoren, %sB gehiago erabiliko dira diskoan.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Ekintza honen ondoren, %sB libratuko dira diskoan.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ezin da %s(e)n duzun leku librea atzeman." @@ -879,7 +880,7 @@ msgstr "Abortatu." msgid "Do you want to continue [Y/n]? " msgstr "Aurrera jarraitu nahi al duzu [B/e]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ezin da lortu %s %s\n" @@ -888,7 +889,7 @@ msgstr "Ezin da lortu %s %s\n" msgid "Some files failed to download" msgstr "Fitxategi batzuk ezin izan dira deskargatu" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Deskarga amaituta eta deskarga soileko moduan" @@ -985,35 +986,35 @@ msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu" msgid "Selected version %s (%s) for %s\n" msgstr "Hautatutako bertsioa: %s (%s) -- %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Ezin da atzitu %s iturburu paketeen zerrenda" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Eguneratzeko komandoak ez du argumenturik hartzen" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Ezin da zerrenda direktorioa blokeatu" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Suposatu ez dugun zerbait ezabatuko da, ezin da AutoRemover abiarazi" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1021,18 +1022,18 @@ msgstr "" "Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago " "behar." -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago " "behar." -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "'apt-get autoremove' erabili ezabatzeko." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1050,43 +1051,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Informazio honek arazoa konpontzen lagun dezake:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Barne Errorea, AutoRemover-ek zerbait apurtu du" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Ezin izan da %s zeregina aurkitu" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Ezin izan da %s paketea aurkitu" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s eskuz instalatua bezala ezarri.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1094,7 +1095,7 @@ msgstr "" "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo " "zehaztu konponbide bat)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1106,117 +1107,117 @@ msgstr "" "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n" "Sarrerakoetan (Incoming) egoten jarraituko dute." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Hautsitako paketeak" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Ondorengo pakete gehigarriak instalatuko dira:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Iradokitako paketeak:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Gomendatutako paketeak:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Berriketak kalkulatzen... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Huts egin du" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Eginda" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Ez daukazu nahikoa leku libre %s(e)n." -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Iturburu artxiboetako %sB/%sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Eskuratu %s iturburua\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Huts egin du zenbat artxibo lortzean." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Eraikitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Prozesu umeak huts egin du" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Gutxienez pakete bat zehaztu behar duzu eraikitze mendekotasunak egiaztatzeko" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ezin izan da %s(r)en eraikitze mendekotasunen informazioa eskuratu" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s: ez du eraikitze mendekotasunik.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1224,7 +1225,7 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1233,32 +1234,32 @@ msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak " "betetzen dituen %3$s paketearen bertsio erabilgarririk" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s " "paketea berriegia da" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s(r)en eraikitze mendekotasunak ezin izan dira bete." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Huts egin du eraikitze mendekotasunak prozesatzean" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Onartutako Moduluak:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1343,7 +1344,7 @@ msgstr "" "sources.list(5) eta apt.conf(5) orrialdeak eskuliburuan.\n" " APT honek Super Behiaren Ahalmenak ditu.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1590,11 +1591,10 @@ msgstr "%s/%s fitxategiak %s paketekoa gainidazten du" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Ezin da %s irakurri" @@ -1624,9 +1624,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "info eta temp direktorioek fitxategi sistema berean egon behar dute" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Pakete Zerrenda irakurtzen" @@ -1762,11 +1762,11 @@ msgid "File not found" msgstr "Ez da fitxategia aurkitu" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Huts egin du atzitzean" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Huts egin du aldaketa ordua ezartzean" @@ -1830,7 +1830,7 @@ msgstr "Konexioa denboraz kanpo" msgid "Server closed the connection" msgstr "Zerbitzariak konexioa itxi du" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Irakurketa errorea" @@ -1842,7 +1842,7 @@ msgstr "Erantzun batek bufferrari gainez eragin dio." msgid "Protocol corruption" msgstr "Protokolo hondatzea" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Idazketa errorea" @@ -1897,7 +1897,7 @@ msgstr "Datu-socket konexioak denbora muga gainditu du" msgid "Unable to accept connection" msgstr "Ezin da konexioa onartu" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Arazoa fitxategiaren hash egitean" @@ -1962,58 +1962,63 @@ msgstr "Ezin izan da konektatu -> %s:%s (%s)" msgid "Connecting to %s" msgstr "Konektatzen -> %s..." -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Ezin izan da '%s' ebatzi" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Aldi baterako akatsa '%s' ebaztean" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Ezin da konektatu -> %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Ezin da eraztuna ebatzi: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Abortatu instalazioa." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Acquire::gpgv::Options argumentu zerrenda luzeegia. Uzten." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Barne errorea: Sinadura zuzena, baina ezin da egiaztapen marka zehaztu" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Beintza sinadura baliogabe bat aurkitu da." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "Ezin da %s abiarazi sinadura egiaztatzeko (gpgv instalaturik al dago?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Errore ezezaguna gpgv exekutatzean" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Ondorengo sinadurak baliogabeak dira:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2064,47 +2069,47 @@ msgstr "http zerbitzariak barruti onarpena apurturik du" msgid "Unknown date format" msgstr "Datu formatu ezezaguna" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Hautapenak huts egin du" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Konexioaren denbora muga gainditu da" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Errorea irteerako fitxategian idaztean" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Errorea zerbitzaritik irakurtzean" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Huts fitxategia mozterakoan" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Goiburu data gaizki dago" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Konexioak huts egin du" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Barne errorea" @@ -2112,12 +2117,12 @@ msgstr "Barne errorea" msgid "Can't mmap an empty file" msgstr "Ezin da fitxategi huts baten mmap egin" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Ezin izan da %lu byteren mmap egin" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " @@ -2126,6 +2131,13 @@ msgstr "" "MMAP dinamikoa memoriaz kanpo. Mesedez handitu APT::Cache-Limit muga. Uneko " "balioa: %lu. (man 5 apt.conf)" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2155,52 +2167,52 @@ msgstr "" msgid "Selection %s not found" msgstr "%s hautapena ez da aurkitu" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Mota ezezaguneko laburtzapena: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "%s konfigurazio fitxategia irekitzen" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Sintaxi errorea, %s:%u: Blokearen hasieran ez dago izenik." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Sintaxi errorea %s:%u: Gaizki eratutako" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Sintaxi errorea, %s:%u: Zabor gehigarria balioaren ondoren" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Sintaxi errorea, %s:%u: Direktibak goi-mailan bakarrik egin daitezke" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Sintaxi errorea, %s:%u: habiaratutako elementu gehiegi" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Sintaxi errorea, %s:%u: hemendik barne hartuta" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Sintaxi errorea, %s:%u: onartu gabeko '%s' direktiba" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Sintaxi errorea, %s:%u: Zabor gehigarria fitxategi amaieran" @@ -2277,78 +2289,78 @@ msgstr "Ezin da %s(e)ra aldatu" msgid "Failed to stat the cdrom" msgstr "Huts egin du CDROMa atzitzean" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Ez da blokeorik erabiltzen ari irakurtzeko soilik den %s blokeo " "fitxategiarentzat" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Ezin izan da %s blokeo fitxategia ireki" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo fitxategiarentzat" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Ezin izan da %s blokeoa hartu" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s espero zen baina ez zegoen han" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s azpiprozesuak errore kode bat itzuli du (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s azpiprozesua ustekabean amaitu da" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "%s fitxategia ezin izan da ireki" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "idatzita; oraindik %lu idazteke, baina ezin da" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Arazoa fitxategia ixtean" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Arazoa fitxategia desestekatzean" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Arazoa fitxategia sinkronizatzean" @@ -2465,52 +2477,52 @@ msgstr "Ezin da %s pakete fitxategia analizatu (1)" msgid "Unable to parse package file %s (2)" msgstr "Ezin da %s pakete fitxategia analizatu (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (banaketa orokorra)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s irekitzen" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "%2$s iturburu zerrendako %1$u lerroa luzeegia da." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (hornitzaile id-a)" @@ -2636,17 +2648,17 @@ msgstr "Pakete zerrenda edo egoera fitxategia ezin dira analizatu edo ireki." msgid "You may want to run apt-get update to correct these problems" msgstr "Beharbada 'apt-get update' exekutatu nahiko duzu arazoak konpontzeko" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Erregistro baliogabea hobespenen fitxategian, pakete goibururik ez" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Ez da ulertu %s orratz-mota (pin)" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Ez da lehentasunik zehaztu orratzarentzat (pin) (edo zero da)" @@ -2730,16 +2742,16 @@ msgstr "Errorea gertatu da %s prozesatzean (CollectFileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "%s %s paketea ez da aurkitu fitxategi mendekotasunak prozesatzean" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Ezin da atzitu %s iturburu paketeen zerrenda" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Fitxategiaren erreferentziak biltzen" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "S/I errorea iturburu katxea gordetzean" @@ -2748,19 +2760,19 @@ msgstr "S/I errorea iturburu katxea gordetzean" msgid "rename failed, %s (%s -> %s)." msgstr "huts egin du izen-aldaketak, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum ez dator bat" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Egiaztapena ez dator bat" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2769,7 +2781,7 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea. (arkitektura falta delako)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2778,7 +2790,7 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2786,7 +2798,7 @@ msgstr "" "Paketearen indize fitxategiak hondatuta daude. 'Filename:' eremurik ez %s " "paketearentzat." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Tamaina ez dator bat" @@ -2922,7 +2934,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "%s konfigurazio fitxategia irekitzen" @@ -2933,7 +2944,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Egiaztapena ez dator bat" @@ -2954,7 +2964,6 @@ msgstr "%s kentzen" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "%s guztiz ezabatu da" @@ -3040,14 +3049,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Ezin izan zaio fitxategiari adabakia ezarri" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Konexioa behar baino lehenago itxi da" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Ezin da eraztuna ebatzi: '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "Ezin izan zaio fitxategiari adabakia ezarri" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/fi.po b/po/fi.po index 06faec09a..c345a749e 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: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-12-11 14:52+0200\n" "Last-Translator: Tapio Lehtonen <tale@debian.org>\n" "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n" @@ -148,7 +148,7 @@ msgstr " Versiotaulukko:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s laitealustalle %s käännöksen päiväys %s %s\n" @@ -300,7 +300,7 @@ msgstr "" " -c=? Lue tämä asetustiedosto\n" " -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Tiedostoon %s kirjoittaminen ei onnistu" @@ -436,8 +436,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "Tietokanta on vanha, yritetään päivittää %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "Tietokannan muoto ei kelpaa. Jos tehtiin päivitys vanhasta apt:n versiosta, " @@ -454,11 +455,11 @@ msgstr "Tietokantatiedostoa %s ei saatu avattua: %s" msgid "Failed to stat %s" msgstr "Tiedostolle %s ei toimi stat" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arkistolla ei ole ohjaustietuetta" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Kohdistinta ei saada" @@ -523,26 +524,26 @@ msgstr "*** Linkin %s -> %s luonti ei onnistunut" msgid " DeLink limit of %sB hit.\n" msgstr " DeLinkin yläraja %st saavutettu.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Arkistossa ei ollut pakettikenttää" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s:llä ei ole poikkeustietuetta\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s ylläpitäjä on %s eikä %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s:llä ei ole poikkeustietuetta\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s:llä ei ole binääristäkään poikkeustietuetta\n" @@ -646,7 +647,7 @@ msgstr "Nimen muuttaminen %s -> %s ei onnistunut" msgid "Y" msgstr "K" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Käännösvirhe lausekkeessa - %s" @@ -807,11 +808,11 @@ msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä." msgid "Internal error, Ordering didn't finish" msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Noutokansiota ei saatu lukittua" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Lähteiden luetteloa ei pystynyt lukemaan." @@ -841,8 +842,8 @@ msgstr "Toiminnon jälkeen käytetään %s t lisää levytilaa.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Toiminnon jälkeen vapautuu %s t levytilaa.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kansion %s vapaan tilan määrä ei selvinnyt" @@ -880,7 +881,7 @@ msgstr "Keskeytä." msgid "Do you want to continue [Y/n]? " msgstr "Haluatko jatkaa [K/e]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Tiedoston %s nouto ei onnistunut %s\n" @@ -889,7 +890,7 @@ msgstr "Tiedoston %s nouto ei onnistunut %s\n" msgid "Some files failed to download" msgstr "Joidenkin tiedostojen nouto ei onnistunut" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Nouto on valmis ja määrätty vain nouto" @@ -986,36 +987,36 @@ msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt" msgid "Selected version %s (%s) for %s\n" msgstr "Valittiin versio %s (%s) paketille %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "stat ei toiminut lähdepakettiluettelolle %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Komento update ei käytä parametreja" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Luettelokansiota ei voitu lukita" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "On tarkoitus olla poistamatta mitään, joten AutoRemover:ia ei voi käynnistää" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1023,18 +1024,18 @@ msgstr "" "Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää " "vaadittuja:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää " "vaadittuja:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Poista ne komennolla \"apt-get autoremove\"." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1052,43 +1053,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Sisäinen virhe, AutoRemover rikkoi jotain" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Tehtävää %s ei löytynyt" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Pakettia %s ei löytynyt" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1096,7 +1097,7 @@ msgstr "" "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" " "ilmanpaketteja (tai ratkaise itse)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1107,116 +1108,116 @@ msgstr "" "jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n" "vielä luotu tai siirretty Incoming-kansiosta." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Rikkinäiset paketit" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Ehdotetut paketit:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Suositellut paketit:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Käsitellään päivitystä ... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Ei onnistunut" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Valmis" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Sisäinen virhe, resolver rikkoi jotain" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Paketin %s lähdekoodipakettia ei löytynyt" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "On noudettava %st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Nouda lähdekoodi %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Joidenkin arkistojen noutaminen ei onnistunut." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Purkukomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Paketointikomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Lapsiprosessi kaatui" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Paketille %s ei ole saatavilla riippuvuustietoja" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1224,7 +1225,7 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1233,32 +1234,32 @@ msgstr "" "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio " "ei vastaa versioriippuvuuksia" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian " "uusi" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Paketointiriippuvuuksien käsittely ei onnistunut" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Tuetut moduulit:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1342,7 +1343,7 @@ msgstr "" "lisätietoja ja lisää valitsimia.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1590,11 +1591,10 @@ msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen päälle" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Tiedostoa %s ei voi lukea" @@ -1624,9 +1624,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Kansioiden info ja temp pitää olla samassa tiedostojärjestelmässä" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Luetaan pakettiluetteloita" @@ -1762,11 +1762,11 @@ msgid "File not found" msgstr "Tiedostoa ei löydy" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Komento stat ei toiminut" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua" @@ -1828,7 +1828,7 @@ msgstr "Yhteys aikakatkaistiin" msgid "Server closed the connection" msgstr "Palvelin sulki yhteyden" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Lukuvirhe" @@ -1840,7 +1840,7 @@ msgstr "Vastaus aiheutti puskurin ylivuodon." msgid "Protocol corruption" msgstr "Yhteyskäytäntö on turmeltunut" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Virhe kirjoitettaessa" @@ -1894,7 +1894,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin" msgid "Unable to accept connection" msgstr "Yhteyttä ei voitu hyväksyä" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Pulmia tiedoston hajautuksessa" @@ -1958,61 +1958,66 @@ msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s)" msgid "Connecting to %s" msgstr "Avataan yhteys %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Nimeä \"%s\" ei voitu selvittää" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Tilapäinen häiriö selvitettäessä \"%s\"" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Avainrengasta \"%s\" ei saatavilla" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Asennus keskeytetään." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Parametrien luettelo Acquire::gpgv::Options liian pitkä. Lopetetaan." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Sisäinen virhe: Allekirjoitus kelpaa, mutta avaimen sormenjälki tuntematon?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "LÖytyi ainakin yksi kelvoton allekirjoitus." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Ei käynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gpgv asennettu?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Tapahtui tuntematon virhe suoritettaessa gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Seuraavat allekirjoitukset eivät olleet kelvollisia:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2063,47 +2068,47 @@ msgstr "HTTP-palvelimen arvoaluetuki on rikki" msgid "Unknown date format" msgstr "Tuntematon päiväysmuoto" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Select ei toiminut" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Yhteys aikakatkaistiin" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Tapahtui virhe luettaessa palvelimelta" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Tiedoston typistäminen ei onnistunut" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Virheellinen otsikkotieto" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Yhteys ei toiminut" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Sisäinen virhe" @@ -2111,18 +2116,25 @@ msgstr "Sisäinen virhe" msgid "Can't mmap an empty file" msgstr "Tyhjälle tiedostolle ei voi tehdä mmap:ia" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Ei voitu tehdä %lu tavun mmap:ia" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2152,52 +2164,52 @@ msgstr "" msgid "Selection %s not found" msgstr "Valintaa %s ei löydy" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Tuntematon tyypin lyhenne: \"%c\"" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Avataan asetustiedosto %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaksivirhe %s: %u: Lohko alkaa ilman nimeä." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksivirhe %s: %u: väärän muotoinen nimikenttä" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaksivirhe %s: %u: Arvon jälkeen ylimääräistä roskaa" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaksivirhe %s: %u: Direktiivejä voi olla vain ylimmällä tasolla" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaksivirhe %s: %u: Liian monta sisäkkäistä includea" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksivirhe %s: %u: Sisällytetty tästä" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaksivirhe %s: %u: Tätä direktiiviä ei tueta \"%s\"" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksivirhe %s: %u: Ylimääräistä roskaa tiedoston lopussa" @@ -2273,75 +2285,75 @@ msgstr "Kansioon %s vaihto ei onnistu" msgid "Failed to stat the cdrom" msgstr "Komento stat ei toiminut rompulle" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Lukkoa ei käytetä kirjoitussuojatulle tiedostolle %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Lukkotiedostoa %s ei voitu avata" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Lukitusta ei käytetä NFS-liitetylle tiedostolle %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Lukkoa %s ei saada" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Odotettiin %s, mutta sitä ei ollut" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Aliprosessi %s aiheutti suojausvirheen." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Aliprosessi %s aiheutti suojausvirheen." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Aliprosessi %s palautti virhekoodin (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Aliprosessi %s lopetti odottamatta" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Tiedostoa %s ei voitu avata" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "read, vielä %lu lukematta mutta tiedosto loppui" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "write, vielä %lu kirjoittamatta mutta epäonnistui" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Pulmia tiedoston sulkemisessa" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Pulmia tehtäessä tiedostolle unlink" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Pulmia tehtäessä tiedostolle sync" @@ -2458,52 +2470,52 @@ msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" msgid "Unable to parse package file %s (2)" msgstr "Pakettitiedostoa %s (2) ei voi jäsentää" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (Absoluuttinen dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Avataan %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Rivi %u on liian pitkä lähdeluettelossa %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Rivi %u on väärän muotoinen lähdeluettelossa%s (toimittajan tunniste)" @@ -2628,17 +2640,17 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Voit haluta suorittaa apt-get update näiden pulmien korjaamiseksi" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Asetustiedostossa on virheellinen tietue, Package-otsikko puuttuu" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Tunnistetyyppi %s on tuntematon" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Tärkeysjärjestystä ei määritetty tunnisteelle (tai se on nolla)" @@ -2723,16 +2735,16 @@ msgstr "Tapahtui virhe käsiteltäessä %s (CollectFileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "Pakettia %s %s ei löytynyt käsiteltäessä tiedostojen riippuvuuksia." -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "stat ei toiminut lähdepakettiluettelolle %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Kootaan tiedostojen tarjoamistietoja" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa" @@ -2741,19 +2753,19 @@ msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa" msgid "rename failed, %s (%s -> %s)." msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum ei täsmää" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Hash Sum täsmää" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2762,7 +2774,7 @@ msgstr "" "En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan " "tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2771,7 +2783,7 @@ msgstr "" "Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan " "tämän paketin itse." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2779,7 +2791,7 @@ msgstr "" "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-" "kenttää." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Koko ei täsmää" @@ -2916,7 +2928,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Avataan asetustiedosto %s" @@ -2927,7 +2938,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Hash Sum täsmää" @@ -2948,7 +2958,6 @@ msgstr "Poistetaan %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "%s poistettiin kokonaan" @@ -3034,14 +3043,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Tiedostoa %s ei voitu avata" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Yhteys katkesi ennenaikaisesti" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Avainrengasta \"%s\" ei saatavilla" + +#~ msgid "Could not patch file" +#~ msgstr "Tiedostoa %s ei voitu avata" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/gl.po b/po/gl.po index c382d3ae9..a8be68b13 100644 --- a/po/gl.po +++ b/po/gl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_gl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-12-17 22:44+0100\n" "Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n" "Language-Team: galician <proxecto@trasno.net>\n" @@ -151,7 +151,7 @@ msgstr " Táboa de versións:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s compilado o %s %s\n" @@ -308,7 +308,7 @@ msgstr "" " -o=? Establece unha opción de configuración, por exemplo: -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Non se puido escribir en %s" @@ -447,8 +447,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "A base de datos é antiga, trátase de actualizar %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "O formato da base de datos non é válido. Se actualizou desde unha versión " @@ -465,11 +466,11 @@ msgstr "Non se puido abrir o ficheiro de base de datos %s: %s" msgid "Failed to stat %s" msgstr "Non se atopou %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "O arquivo non ten un rexistro de control" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Non se puido obter un cursor" @@ -534,26 +535,26 @@ msgstr "*** Non se puido ligar %s con %s" msgid " DeLink limit of %sB hit.\n" msgstr " Alcanzouse o límite de desligado de %sB.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "O arquivo non tiña un campo Package" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s non ten unha entrada de \"override\"\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " O mantedor de %s é %s, non %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s non ten unha entrada de \"override\" de código fonte\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s tampouco ten unha entrada de \"override\" de binarios\n" @@ -657,7 +658,7 @@ msgstr "Non se puido cambiar o nome de %s a %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Erro na compilación da expresión regular - %s" @@ -818,11 +819,11 @@ msgstr "Hai que eliminar paquetes pero a eliminación está desactivada." msgid "Internal error, Ordering didn't finish" msgstr "Erro interno, a ordeación non rematou" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Non se puido bloquear o directorio de descargas" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Non se puido ler a lista de orixes." @@ -852,8 +853,8 @@ msgstr "Despois desta operación hanse ocupar %sB de disco adicionais.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Despois desta operación hanse liberar %sB de disco.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Non se puido determinar o espazo libre en %s" @@ -890,7 +891,7 @@ msgstr "Abortar." msgid "Do you want to continue [Y/n]? " msgstr "¿Quere continuar [S/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Non se puido obter %s %s\n" @@ -899,7 +900,7 @@ msgstr "Non se puido obter %s %s\n" msgid "Some files failed to download" msgstr "Non se puido descargar algúns ficheiros" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Completouse a descarga no modo de só descargas" @@ -998,54 +999,54 @@ msgstr "Non se atopou a versión \"%s\" de \"%s\"" msgid "Selected version %s (%s) for %s\n" msgstr "Escolleuse a versión %s (%s) de %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Non se atopou a lista de paquetes fonte %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "A orde \"update\" non toma argumentos" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Non se puido bloquear o directorio de listas" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Non se supón que se deban eliminar cousas; non se pode iniciar o " "autoeliminador" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" "Os seguintes paquetes instaláronse automaticamente e xa non son necesarios:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Os seguintes paquetes instaláronse automaticamente e xa non son necesarios:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Empregue \"apt-get autoremove\" para eliminalos." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1063,43 +1064,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "A seguinte información pode axudar a resolver a situación:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Erro interno, o autoeliminador rompeu cousas" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro interno, AllUpgrade rompeu cousas" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Non se puido atopar a tarefa %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Non se puido atopar o paquete %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, escóllese %s para a expresión regular \"%s\"\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s cambiouse a instalado manualmente.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Pode querer executar \"apt-get -f install\" corrixir isto:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1107,7 +1108,7 @@ msgstr "" "Dependencias incumpridas. Probe \"apt-get -f install\" sen paquetes (ou " "especifique unha solución)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1118,118 +1119,118 @@ msgstr "" "unha situación imposible ou, se emprega a distribución inestable, que\n" "algúns paquetes solicitados aínda non se crearon ou moveron de Incoming." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Paquetes rotos" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Hanse instalar os seguintes paquetes extra:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Paquetes suxiridos:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Paquetes recomendados:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "A calcular a actualización... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Fallou" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Rematado" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Erro interno, o resolvedor interno rompeu cousas" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "" "Ten que especificar alomenos un paquete para lle descargar o código fonte" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Non se puido atopar un paquete fonte para %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omítese o ficheiro xa descargado \"%s\"\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Non hai espazo libre de abondo en %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Hai que recibir %sB/%sB de arquivos de fonte.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Hai que recibir %sB de arquivos de fonte.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Non se puido recibir algúns arquivos." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omítese o desempaquetamento do código fonte xa desempaquetado en %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fallou a orde de desempaquetamento \"%s\".\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comprobe que o paquete \"dpkg-dev\" estea instalado.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fallou a codificación de %s.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "O proceso fillo fallou" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Ten que especificar alomenos un paquete para lle comprobar as dependencias " "de compilación" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Non se puido obter a información de dependencias de compilación de %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ten dependencias de compilación.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1238,7 +1239,7 @@ msgstr "" "A dependencia \"%s\" de %s non se pode satisfacer porque non se pode atopar " "o paquete %s" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1247,32 +1248,32 @@ msgstr "" "A dependencia \"%s\" de %s non se pode satisfacer porque ningunha versión " "dispoñible do paquete %s satisfai os requirimentos de versión" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Non se puido satisfacer a dependencia \"%s\" de %s: O paquete instalado %s é " "novo de máis" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Non se puido satisfacer a dependencia \"%s\" de %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Non se puideron satisfacer as dependencias de compilación de %s." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Non se puido procesar as dependencias de compilación" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Módulos soportados:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1360,7 +1361,7 @@ msgstr "" "máis información e opcións.\n" " Este APT ten Poderes de Supervaca.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1607,11 +1608,10 @@ msgstr "O ficheiro %s/%s sobrescribe o do paquete %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Non se pode ler %s" @@ -1642,9 +1642,9 @@ msgstr "" "Os directorios info e temp teñen que estar no mesmo sistema de ficheiros" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "A ler as listas de paquetes" @@ -1778,11 +1778,11 @@ msgid "File not found" msgstr "Non se atopou o ficheiro" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Non se atopou" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Non se puido estabrecer a hora de modificación" @@ -1844,7 +1844,7 @@ msgstr "Tempo esgotado para a conexión" msgid "Server closed the connection" msgstr "O servidor pechou a conexión" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Erro de lectura" @@ -1856,7 +1856,7 @@ msgstr "Unha resposta desbordou o buffer." msgid "Protocol corruption" msgstr "Corrupción do protocolo" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Erro de escritura" @@ -1911,7 +1911,7 @@ msgstr "A conexión do socket de datos esgotou o tempo" msgid "Unable to accept connection" msgstr "Non se pode aceptar a conexión" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema ao calcular o hash do ficheiro" @@ -1975,63 +1975,68 @@ msgstr "Non se puido conectar a %s:%s (%s)." msgid "Connecting to %s" msgstr "A conectar a %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Non se puido resolver \"%s\"" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Fallo temporal ao resolver \"%s\"" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Algo estraño ocorreu ao resolver \"%s:%s\" (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Non se pode conectar a %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Non se puido acceder ao chaveiro: \"%s\"" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "A abortar a instalación." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: A lista de argumentos de Acquire:gpgv::Options é longa de máis. Sáese." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erro interno: Sinatura correcta, pero non se puido determinar a pegada " "dixital da chave" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Atopouse alomenos unha sinatura non válida." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Non se puido executar \"%s\" para verificar a sinatura (¿está gpgv " "instalado?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Erro descoñecido ao executar gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "As seguintes sinaturas non eran válidas:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2082,47 +2087,47 @@ msgstr "Este servidor HTTP ten un soporte de rangos roto" msgid "Unknown date format" msgstr "Formato de data descoñecido" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Fallou a chamada a select" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "A conexión esgotou o tempo" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Erro ao escribir no ficheiro de saída" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Erro ao escribir nun ficheiro" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Erro ao escribir no ficheiro" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Erro ao ler do servidor. O extremo remoto pechou a conexión" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Erro ao ler do servidor" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Non se puido truncar o ficheiro" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Datos da cabeceira incorrectos" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "A conexión fallou" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Erro interno" @@ -2130,18 +2135,25 @@ msgstr "Erro interno" msgid "Can't mmap an empty file" msgstr "Non se pode facer mmap sobre un ficheiro baleiro" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Non se puido facer mmap de %lu bytes" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2171,52 +2183,52 @@ msgstr "" msgid "Selection %s not found" msgstr "Non se atopou a selección %s" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreviatura de tipo \"%c\" descoñecida" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "A abrir o ficheiro de configuración %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Erro de sintaxe %s:%u: O bloque comeza sen un nome." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Erro de sintaxe %s:%u: Etiqueta mal formada" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Erro de sintaxe %s:%u: Lixo extra despois do valor" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Erro de sintaxe %s:%u: Só se poden facer directivas no nivel superior" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Erro de sintaxe %s:%u: Includes aniñados de máis" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Erro de sintaxe %s:%u: Incluído de aquí" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Erro de sintaxe %s:%u: Non se soporta a directiva \"%s\"" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Erro de sintaxe %s:%u: Lixo extra á fin da liña" @@ -2293,75 +2305,75 @@ msgstr "Non se pode cambiar a %s" msgid "Failed to stat the cdrom" msgstr "Non se puido analizar o CD-ROM" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Non se empregan bloqueos para o ficheiro de bloqueo de só lectura %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Non se puido abrir o ficheiro de bloqueo %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Non se empregan bloqueos para o ficheiro de bloqueo montado por NFS %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Non se puido obter o bloqueo %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Agardouse por %s pero non estaba alí" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "O subproceso %s recibiu un fallo de segmento." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "O subproceso %s recibiu un fallo de segmento." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "O subproceso %s devolveu un código de erro (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "O subproceso %s saíu de xeito inesperado" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Non se puido abrir o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "lectura, aínda hai %lu para ler pero non queda ningún" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escritura, aínda hai %lu para escribir pero non se puido" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problema ao pechar o ficheiro" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Problema ao borrar o ficheiro" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Problema ao sincronizar o ficheiro" @@ -2478,52 +2490,52 @@ msgstr "Non se pode analizar o ficheiro de paquetes %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Non se pode analizar o ficheiro de paquetes %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Liña %lu mal formada na lista de fontes %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Liña %lu mal formada na lista de fontes %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Liña %lu mal formada na lista de fontes %s (análise de URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Liña %lu mal formada na lista de fontes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Liña %lu mal formada na lista de fontes %s (análise de dist)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "A abrir %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Liña %u longa de máis na lista de fontes %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Liña %u mal formada na lista de fontes %s (tipo)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo \"%s\" non se coñece na liña %u da lista de fontes %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Liña %u mal formada na lista de fontes %s (id de provedor)" @@ -2649,19 +2661,19 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Pode querer executar apt-get update para corrixir estes problemas" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" "Rexistro non válido no ficheiro de preferencias, non hai unha cabeceira " "Package" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Non se entendeu o tipo de inmobilización %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "" "Non se indicou unha prioridade (ou indicouse cero) para a inmobilización" @@ -2746,16 +2758,16 @@ msgstr "Ocorreu un erro ao procesar %s (CollectFileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "Non se atopou o paquete %s %s ao procesar as dependencias de ficheiros" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Non se atopou a lista de paquetes fonte %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "A recoller as provisións de ficheiros" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Erro de E/S ao gravar a caché de fontes" @@ -2764,20 +2776,20 @@ msgstr "Erro de E/S ao gravar a caché de fontes" msgid "rename failed, %s (%s -> %s)." msgstr "fallou o cambio de nome, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "Os MD5Sum non coinciden" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Os \"hashes\" non coinciden" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Non hai unha clave pública dispoñible para os seguintes IDs de clave:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2786,7 +2798,7 @@ msgstr "" "Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que " "ten que arranxar este paquete a man. (Falla a arquitectura)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2795,7 +2807,7 @@ msgstr "" "Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que " "ten que arranxar este paquete a man." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2803,7 +2815,7 @@ msgstr "" "Os ficheiros de índices de paquetes están corrompidos. Non hai un campo " "Filename: para o paquete %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Os tamaños non coinciden" @@ -2940,7 +2952,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "A abrir o ficheiro de configuración %s" @@ -2951,7 +2962,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Os \"hashes\" non coinciden" @@ -2972,7 +2982,6 @@ msgstr "A eliminar %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Eliminouse %s completamente" @@ -3058,14 +3067,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Non se puido parchear o ficheiro" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "A conexión pechouse prematuramente" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Non se puido acceder ao chaveiro: \"%s\"" + +#~ msgid "Could not patch file" +#~ msgstr "Non se puido parchear o ficheiro" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/hu.po b/po/hu.po index 54a8814fe..95a845819 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: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-05-11 14:49+0100\n" "Last-Translator: SZERVÁC Attila <sas@321.hu>\n" "Language-Team: Hungarian <debian-l10n-hungarian>\n" @@ -151,7 +151,7 @@ msgstr " Verziótáblázat:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s erre: %s ekkor fordult: %s %s\n" @@ -305,7 +305,7 @@ msgstr "" " -c=? Ezt a konfigurációs fájlt olvassa be\n" " -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Nem lehet írni ebbe: %s" @@ -440,8 +440,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB régi, megkísérlem frissíteni erre: %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "DB formátum érvénytelen. Ha az apt régebbi változatáról frissítettél, töröld " @@ -458,11 +459,11 @@ msgstr "A(z) %s DB fájlt nem lehet megnyitni: %s" msgid "Failed to stat %s" msgstr "%s elérése sikertelen" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Az archívumnak nincs vezérlő rekordja" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Nem sikerült egy mutatóhoz jutni" @@ -527,26 +528,26 @@ msgstr "*** %s linkelése ehhez: %s sikertelen" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink elérte %sB korlátját.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Az archívumnak nem volt csomag mezője" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s nem rendelkezik felülbíráló bejegyzéssel\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s karbantartója %s, nem %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s nem rendelkezik forrás felülbíráló bejegyzéssel\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nem rendelkezik bináris felülbíráló bejegyzéssel sem\n" @@ -650,7 +651,7 @@ msgstr "Nem sikerült átnevezni %s-t erre: %s" msgid "Y" msgstr "I" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Regex fordítási hiba - %s" @@ -811,11 +812,11 @@ msgstr "Csomagokat kellene eltávolítani, de az Eltávolítás nem engedélyeze msgid "Internal error, Ordering didn't finish" msgstr "Belső hiba, a rendezés nem zárult" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Nem tudom zárolni a letöltési könyvtárat" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "A források listája olvashatatlan." @@ -844,8 +845,8 @@ msgstr "E művelet után további %sB lemez-területetet használok fel.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "E művelet után %sB lemez-terület szabadul fel.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nem határozható meg a szabad hely itt: %s" @@ -882,7 +883,7 @@ msgstr "Megszakítva." msgid "Do you want to continue [Y/n]? " msgstr "Folytatni akarod [Y/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Sikertelen letöltés: %s %s\n" @@ -891,7 +892,7 @@ msgstr "Sikertelen letöltés: %s %s\n" msgid "Some files failed to download" msgstr "Néhány fájlt nem sikerült letölteni" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "A letöltés befejeződött a 'csak letöltés' módban" @@ -987,50 +988,50 @@ msgstr "'%s' verzió ehhez: '%s' nem található" msgid "Selected version %s (%s) for %s\n" msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Az update parancsnak nincsenek argumentumai" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Nem tudom a listakönyvtárat zárolni" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Nincs törölnivaló, az AutoRemover nem indítható" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Az alábbi csomagok automatikusan települtek, de már nem kellenek:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Az alábbi csomagok automatikusan települtek, de már nem kellenek:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Töröld az 'apt-get autoremove' paranccsal!" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1048,43 +1049,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Az alábbi információ segíthet megoldani a helyzetet:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Belső hiba, az AutoRemover sérült" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Belső hiba, AllUpgrade megsértett valamit" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Hiányzó %s feladat" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Az alábbi csomag nem található: %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Megjegyzés: %s kiválasztása %s reguláris kifejezéshez\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s kézi telepítésre állított.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Próbáld futtatni az 'apt-get -f install'-t az alábbiak javításához:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1092,7 +1093,7 @@ msgstr "" "Teljesítetlen függőségek. Próbáld az 'apt-get -f install'-t csomagok nélkül " "(vagy telepítsd a függőségeket is!)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1104,118 +1105,118 @@ msgstr "" "használod, akkor néhány igényelt csomag még nem készült el vagy ki\n" "lett mozdítva az Incoming-ból." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Törött csomagok" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Az alábbi extra csomagok kerülnek telepítésre:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Javasolt csomagok:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Ajánlott csomagok:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Frissítés kiszámítása... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Sikertelen" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Kész" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Belső hiba, hibafeloldó gond" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "" "Legalább egy csomagot meg kell adnod, aminek a forrását le kell tölteni" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Nem található forráscsomag ehhez: %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "A már letöltött '%s' fájl kihagyása\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Nincs elég szabad hely itt: %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB forrás-archívumot kell letölteni.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB forrás-archívumot kell letölteni.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Forrás letöltése: %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Nem sikerült néhány archívumot letölteni." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' kibontási parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ellenőrizd, hogy a 'dpkg-dev' csomag telepítve van-e.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s' elkészítési parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Hiba a gyermekfolyamatnál" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Legalább egy csomagot adj meg, aminek a fordítási függőségeit ellenőrizni " "kell" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nem lehet %s fordítási-függőség információját beszerezni" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "Nincs fordítási függősége a következőnek: %s.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1224,7 +1225,7 @@ msgstr "" "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomag nem " "található" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1233,32 +1234,32 @@ msgstr "" "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomagnak nincs a " "verzió-követelményt kielégítő elérhető verziója." -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%s függőséget %s csomaghoz nem lehet kielégíteni: %s telepített csomag túl " "friss." -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s függőséget %s csomaghoz nem lehet kielégíteni: %s " -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s építési függőségei nem elégíthetőek ki." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Nem sikerült az építési függőségeket feldolgozni" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Támogatott modulok:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1343,7 +1344,7 @@ msgstr "" "további információkért és opciókért.\n" " Ez az APT a SzuperTehén Hatalmával rendelkezik.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1588,11 +1589,10 @@ msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levőt" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "%s nem olvasható" @@ -1622,9 +1622,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Az info és temp könyvtáraknak egy fájlrendszeren kell lenniük" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Csomaglisták olvasása" @@ -1758,11 +1758,11 @@ msgid "File not found" msgstr "Nem találom a fájlt" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Nem érhető el" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "A módosítási időt beállítása sikertelen" @@ -1824,7 +1824,7 @@ msgstr "Időtúllépés a kapcsolatban" msgid "Server closed the connection" msgstr "A kiszolgáló lezárta a kapcsolatot" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Olvasási hiba" @@ -1836,7 +1836,7 @@ msgstr "A válasz túlcsordította a puffert." msgid "Protocol corruption" msgstr "Protokoll hiba" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Írási hiba" @@ -1890,7 +1890,7 @@ msgstr "Az adat sockethez kapcsolódás túllépte az időt" msgid "Unable to accept connection" msgstr "Nem lehet elfogadni a kapcsolatot" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probléma a fájl hash értékének meghatározásakor" @@ -1954,58 +1954,63 @@ msgstr "Nem tudtam kapcsolódni ehhez: %s: %s (%s)." msgid "Connecting to %s" msgstr "Kapcsolódás: %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Nem lehet feloldani a következőt: '%s' " -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Átmeneti hiba '%s' feloldása közben" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Valami rossz történt '%s: %s' feloldásakor (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Sikertelen kapcsolódás ide: %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "%s kulcstartó nem érhető el" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Telepítés megszakítása." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "H: Az Acquire::gpgv::Options argumentum lista túl hosszú. Kilépek." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Belső hiba: Jó aláírás, de meghatározhatatlan kulcs ujjlenyomat?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "1 vagy több érvénytelen aláírást találtam." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "'%s' nem futtatható az aláírás ellenőrzéséhez (a gpgv telepítve van?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Ismeretlen gpgv futtatási hiba" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Az alábbi aláírások érvénytelenek voltak:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2055,48 +2060,48 @@ msgstr "Ez a http szerver támogatja a sérült tartományokat " msgid "Unknown date format" msgstr "Ismeretlen dátum formátum" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Sikertelen kiválasztás" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Időtúllépés a kapcsolatban" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Hiba a kimeneti fájl írásakor" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Hiba fájl írásakor" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:891 +#: methods/http.cc:892 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:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Hiba a kiszolgálóról olvasáskor" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "%s fájl írása sikertelen" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Rossz fejlécadat" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Sikertelen kapcsolódás" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Belső hiba" @@ -2105,18 +2110,25 @@ msgstr "Belső hiba" msgid "Can't mmap an empty file" msgstr "Nem lehet mmap-olni egy üres fájlt" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Nem sikerült %lu bájtot mmap-olni" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2146,52 +2158,52 @@ msgstr "" msgid "Selection %s not found" msgstr "%s kiválasztás nem található" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ismeretlen típusrövidítés: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "%s konfigurációs fájl megnyitása" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Szintaktikai hiba %s: %u: A blokk név nélkül kezdődik" -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Szintaktikai hiba %s: %u: hibás formátumú címke" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Szintaktikai hiba %s: %u: fölösleges szemét az érték után" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Szintaktikai hiba %s: %u: Csak legfelső szinten használhatók előírások" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Szintaktikai hiba %s: %u: Túl sok beágyazott include" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Szintaktikai hiba %s: %u: ugyaninnen include-olva" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Szintaktikai hiba %s: %u: '%s' nem támogatott előírás" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Szintaktikai hiba %s: %u: fölösleges szemét a fájl végén" @@ -2268,75 +2280,75 @@ msgstr "Nem sikerült ide váltani: %s" msgid "Failed to stat the cdrom" msgstr "Nem sikerült elérni a CD-ROM-ot." -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nem zárolom '%s' csak olvasható zárolási fájlt" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "%s zárolási fájl nem nyitható meg" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nem zárolom '%s' NFS-csatlakoztatású zárolási fájlt" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Nem sikerült zárolni: %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s nem volt itt, ahogy vártam" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s alfolyamat szegmentálási hibát okozott." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "%s alfolyamat szegmentálási hibát okozott." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s alfolyamat hibakóddal tért vissza (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s alfolyamat váratlanul kilépett" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Nem lehet megnyitni %s fájlt" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "olvasás, még kellene %lu, de már az összes elfogyott" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "írás, még kiírandó %lu de ez nem lehetséges" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Hiba a fájl bezárásakor" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Hiba a fájl leválasztásával" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Hiba a fájl szinkronizálásakor" @@ -2453,52 +2465,52 @@ msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)" msgid "Unable to parse package file %s (2)" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "A(z) %lu. sor hibás %s forráslistában (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "A(z) %lu. sor hibás %s forráslistában (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "A(z) %lu. sor hibás %s forráslistában (URI feldolgozó)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "A(z) %lu. sor hibás %s forráslistában (Abszolút dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "A(z) %lu. sor hibás %s forráslistában (dist feldolgozó)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s megnyitása" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "A(z) %u. sor túl hosszú %s forráslistában." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "A(z) %u. sor hibás %s forráslistában (típus)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "'%s' típus nem ismert a(z) %u. sorban a(z) %s forráslistában" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "A(z) %u. sor hibás %s forráslistában (terjesztő id)" @@ -2625,17 +2637,17 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Próbáld futtatni az apt-get update -et, hogy javítsd e hibákat" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Hibás rekord a tulajdonság fájlban, nincs csomagfejléc" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "A(z) %s tűtípus nem értelmezhető" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Nincs prioritás (vagy nulla) megadva a tűhöz" @@ -2724,17 +2736,17 @@ msgid "Package %s %s was not found while processing file dependencies" msgstr "" "%s %s csomag nem volt megtalálható a fájl függőségeinek feldolgozása közben" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni" # FIXME -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "\"Előkészít\" kapcsolatok összegyűjtése" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "IO hiba a forrás-gyorsítótár mentésekor" @@ -2743,19 +2755,19 @@ msgstr "IO hiba a forrás-gyorsítótár mentésekor" msgid "rename failed, %s (%s -> %s)." msgstr "sikertelen átnevezés, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "Az MD5Sum nem megfelelő" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "A Hash Sum nem megfelelő" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Nincs elérhető nyilvános kulcs az alábbi kulcs azonosítókhoz:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2764,7 +2776,7 @@ msgstr "" "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot. (hiányzó arch. miatt)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2773,14 +2785,14 @@ msgstr "" "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "A csomagindex-fájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "A méret nem megfelelő" @@ -2915,7 +2927,6 @@ msgstr "%i rekord kiírva %i hiányzó és %i hibásan párosított fájllal\n" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "%s konfigurációs fájl megnyitása" @@ -2926,7 +2937,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "A Hash Sum nem megfelelő" @@ -2947,7 +2957,6 @@ msgstr "%s eltávolítása" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "%s teljesen eltávolítva" @@ -3031,14 +3040,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "%s fájl foltozása sikertelen" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "A kapcsolat idő előtt lezárult" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "%s kulcstartó nem érhető el" + +#~ msgid "Could not patch file" +#~ msgstr "%s fájl foltozása sikertelen" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/it.po b/po/it.po index fdbb9b46e..9208fcc7f 100644 --- a/po/it.po +++ b/po/it.po @@ -2009,7 +2009,6 @@ msgstr "Impossibile connettersi a %s:%s:" #. TRANSLATOR: %s is the trusted keyring parts directory #: methods/gpgv.cc:78 #, fuzzy, c-format -#| msgid "Aborting install." msgid "No keyring installed in %s." msgstr "Interruzione dell'installazione." diff --git a/po/ja.po b/po/ja.po index bb2e5fddc..e60501fc3 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-11-13 09:26+0900\n" "Last-Translator: Kenshi Muto <kmuto@debian.org>\n" "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n" @@ -147,7 +147,7 @@ msgstr " バージョンテーブル:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s コンパイル日時: %s %s\n" @@ -301,7 +301,7 @@ msgstr "" " -c=? 指定した設定ファイルを読み込む\n" " -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "%s に書き込めません" @@ -436,8 +436,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB が古いため、%s のアップグレードを試みます" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "DB フォーマットが無効です。apt の古いバージョンから更新したのであれば、データ" @@ -454,11 +455,11 @@ msgstr "DB ファイル %s を開くことができません: %s" msgid "Failed to stat %s" msgstr "%s の状態を取得するのに失敗しました" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "アーカイブにコントロールレコードがありません" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "カーソルを取得できません" @@ -523,26 +524,26 @@ msgstr "*** %s を %s にリンクするのに失敗しました" msgid " DeLink limit of %sB hit.\n" msgstr " リンクを外す制限の %sB に到達しました。\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "アーカイブにパッケージフィールドがありませんでした" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s に override エントリがありません\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %1$s メンテナは %3$s ではなく %2$s です\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s にソース override エントリがありません\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s にバイナリ override エントリがありません\n" @@ -646,7 +647,7 @@ msgstr "%s を %s に名前変更できませんでした" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "正規表現の展開エラー - %s" @@ -809,11 +810,11 @@ msgstr "パッケージを削除しなければなりませんが、削除が無 msgid "Internal error, Ordering didn't finish" msgstr "内部エラー、調整が終わっていません" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "ダウンロードディレクトリをロックできません" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "ソースのリストを読むことができません。" @@ -843,8 +844,8 @@ msgstr "この操作後に追加で %sB のディスク容量が消費されま msgid "After this operation, %sB disk space will be freed.\n" msgstr "この操作後に %sB のディスク容量が解放されます。\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s の空き領域を測定できません" @@ -881,7 +882,7 @@ msgstr "中断しました。" msgid "Do you want to continue [Y/n]? " msgstr "続行しますか [Y/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s の取得に失敗しました %s\n" @@ -890,7 +891,7 @@ msgstr "%s の取得に失敗しました %s\n" msgid "Some files failed to download" msgstr "いくつかのファイルの取得に失敗しました" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました" @@ -989,53 +990,53 @@ msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした" msgid "Selected version %s (%s) for %s\n" msgstr "%3$s にはバージョン %1$s (%2$s) を選択しました\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "ソースパッケージリスト %s の状態を取得できません" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "update コマンドは引数をとりません" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "list ディレクトリをロックできません" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "一連のものを削除するようになっていないので、AutoRemover を開始できません" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" "以下のパッケージが自動でインストールされましたが、もう必要とされていません:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "以下のパッケージが自動でインストールされましたが、もう必要とされていません:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "これらを削除するには 'apt-get autoremove' を利用してください。" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1053,45 +1054,45 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "以下の情報がこの問題を解決するために役立つかもしれません:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "内部エラー、AutoRemover が何かを破壊しました" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "内部エラー、AllUpgrade が何かを破壊しました" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "タスク %s が見つかりません" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "パッケージ %s が見つかりません" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意: 正規表現 '%2$s' に対して %1$s を選択しました\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s は手動でインストールしたと設定されました。\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ" "ません:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1099,7 +1100,7 @@ msgstr "" "未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法" "を明示してください)。" -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1111,118 +1112,118 @@ msgstr "" "であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n" "動されていないことが考えられます。" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "壊れたパッケージ" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "以下の特別パッケージがインストールされます:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "提案パッケージ:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "推奨パッケージ:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "アップグレードパッケージを検出しています ... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "失敗" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "完了" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "内部エラー、問題リゾルバが何かを破壊しました" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "" "ソースを取得するには少なくともひとつのパッケージ名を指定する必要があります" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "%s のソースパッケージが見つかりません" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "すでにダウンロードされたファイル '%s' をスキップします\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "%s に充分な空きスペースがありません" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB のソースアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "ソース %s を取得\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "いくつかのアーカイブの取得に失敗しました。" -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "展開コマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" "'dpkg-dev' パッケージがインストールされていることを確認してください。\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "ビルドコマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "子プロセスが失敗しました" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s のビルド依存情報を取得できません" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s にはビルド依存情報が指定されていません。\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1231,7 +1232,7 @@ msgstr "" "パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと" "ができません" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1240,32 +1241,32 @@ msgstr "" "入手可能な %3$s はいずれもバージョンについての要求を満たせないため、%2$s に対" "する %1$s の依存関係を満たすことができません" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s の依存関係 %1$s を満たすことができません: インストールされた %3$s パッ" "ケージは新しすぎます" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s のビルド依存関係を満たすことができませんでした。" -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "ビルド依存関係の処理に失敗しました" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "サポートされているモジュール:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1354,7 +1355,7 @@ msgstr "" "apt.conf(5) を参照してください。\n" " この APT は Super Cow Powers 化されています。\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1600,11 +1601,10 @@ msgstr "ファイル %s/%s がパッケージ %s のものを上書きします" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "%s を読み込むことができません" @@ -1634,9 +1634,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "info と temp ディレクトリは同じファイルシステム上になければなりません" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "パッケージリストを読み込んでいます" @@ -1772,11 +1772,11 @@ msgid "File not found" msgstr "ファイルが見つかりません" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "状態の取得に失敗しました" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "変更時刻の設定に失敗しました" @@ -1838,7 +1838,7 @@ msgstr "接続タイムアウト" msgid "Server closed the connection" msgstr "サーバが接続を切断しました" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "読み込みエラー" @@ -1850,7 +1850,7 @@ msgstr "レスポンスがバッファをオーバフローさせました。" msgid "Protocol corruption" msgstr "プロトコルが壊れています" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "書き込みエラー" @@ -1904,7 +1904,7 @@ msgstr "データソケット接続タイムアウト" msgid "Unable to accept connection" msgstr "接続を accept できません" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "ファイルのハッシュでの問題" @@ -1968,61 +1968,66 @@ msgstr "%s:%s (%s) へ接続できませんでした。" msgid "Connecting to %s" msgstr "%s へ接続しています" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "'%s' を解決できませんでした" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "'%s' が一時的に解決できません" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "'%s:%s' (%i) の解決中に問題が起こりました" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "%s %s へ接続できません:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "キーリングにアクセスできませんでした: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "インストールを中断します。" + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "エラー: Acquire::gpgv::Options の引数リストが長すぎます。終了しています。" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "内部エラー: 正しい署名ですが、鍵指紋を確定できません?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "少なくとも 1 つの不正な署名が発見されました。" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "署名を検証するための '%s' の実行ができませんでした (gpgv はインストールされて" "いますか?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "gpgv の実行中に未知のエラーが発生" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "以下の署名が無効です:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2071,47 +2076,47 @@ msgstr "http サーバのレンジサポートが壊れています" msgid "Unknown date format" msgstr "不明な日付フォーマットです" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "select に失敗しました" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "接続タイムアウト" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "出力ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "サーバからの読み込みに失敗しました" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "ファイルの切り詰めに失敗しました" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "不正なヘッダです" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "接続失敗" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "内部エラー" @@ -2119,18 +2124,25 @@ msgstr "内部エラー" msgid "Can't mmap an empty file" msgstr "空のファイルを mmap できません" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "%lu バイトの mmap ができませんでした" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2160,52 +2172,52 @@ msgstr "" msgid "Selection %s not found" msgstr "選択された %s が見つかりません" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "理解できない省略形式です: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "設定ファイル %s をオープンできませんでした" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "文法エラー %s:%u: ブロックが名前なしで始まっています。" -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "文法エラー %s:%u: 不正なタグです" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "文法エラー %s:%u: 値の後に余分なゴミが入っています" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "文法エラー %s:%u: 命令はトップレベルでのみ実行できます" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "文法エラー %s:%u: インクルードのネストが多すぎます" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "文法エラー %s:%u: ここからインクルードされています" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "文法エラー %s:%u: 未対応の命令 '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "文法エラー %s:%u: ファイルの最後に余計なゴミがあります" @@ -2281,75 +2293,75 @@ msgstr "%s へ変更することができません" msgid "Failed to stat the cdrom" msgstr "cdrom の状態を取得するのに失敗しました" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "読み込み専用のロックファイル %s にロックは使用しません" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "ロックファイル %s をオープンできません" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "nfs マウントされたロックファイル %s にはロックを使用しません" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "ロック %s が取得できませんでした" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s を待ちましたが、そこにはありませんでした" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子プロセス %s がセグメンテーション違反を受け取りました。" -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "子プロセス %s がセグメンテーション違反を受け取りました。" -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子プロセス %s がエラーコード (%u) を返しました" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子プロセス %s が予期せず終了しました" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "ファイル %s をオープンできませんでした" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "読み込みが %lu 残っているはずですが、何も残っていません" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "あと %lu 書き込む必要がありますが、書き込むことができませんでした" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "ファイルのクローズ中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "ファイルの削除中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "ファイルの同期中に問題が発生しました" @@ -2466,52 +2478,52 @@ msgstr "パッケージファイル %s を解釈することができません ( msgid "Unable to parse package file %s (2)" msgstr "パッケージファイル %s を解釈することができません (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (absolute dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist parse)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s をオープンしています" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "ソースリスト %2$s の %1$u 行目が長すぎます。" -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "ソースリスト %2$s の %1$u 行目が不正です (vendor id)" @@ -2643,19 +2655,19 @@ msgstr "" "これらの問題を解決するためには apt-get update を実行する必要があるかもしれま" "せん" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" "不正なレコードが preferences ファイルに存在します。パッケージヘッダがありませ" "ん" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "pin タイプ %s が理解できませんでした" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "pin で優先度 (または 0) が指定されていません" @@ -2739,16 +2751,16 @@ msgstr "%s を処理中にエラーが発生しました (CollectFileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "ソースパッケージリスト %s の状態を取得できません" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "ファイル提供情報を収集しています" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "ソースキャッシュの保存中に IO エラーが発生しました" @@ -2757,19 +2769,19 @@ msgstr "ソースキャッシュの保存中に IO エラーが発生しまし msgid "rename failed, %s (%s -> %s)." msgstr "名前の変更に失敗しました。%s (%s -> %s)" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum が適合しません" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "ハッシュサムが適合しません" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2778,7 +2790,7 @@ msgstr "" "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります (存在しないアーキテクチャのため)。" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2787,7 +2799,7 @@ msgstr "" "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります。" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2795,7 +2807,7 @@ msgstr "" "パッケージインデックスファイルが壊れています。パッケージ %s に Filename: " "フィールドがありません。" -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "サイズが適合しません" @@ -2932,7 +2944,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "設定ファイル %s をオープンできませんでした" @@ -2943,7 +2954,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "ハッシュサムが適合しません" @@ -2964,7 +2974,6 @@ msgstr "%s を削除しています" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "%s を完全に削除しました" @@ -3050,14 +3059,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "ファイルにパッチできませんでした" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "途中で接続がクローズされました" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "キーリングにアクセスできませんでした: '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "ファイルにパッチできませんでした" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/km.po b/po/km.po index a30ffe945..0b197126b 100644 --- a/po/km.po +++ b/po/km.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_km\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2006-10-10 09:48+0700\n" "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n" "Language-Team: Khmer <support@khmeros.info>\n" @@ -152,7 +152,7 @@ msgstr " តារាង​កំណែ ៖" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s សម្រាប់ %s %s បាន​ចងក្រងនៅលើ​%s %s\n" @@ -306,7 +306,7 @@ msgstr "" " -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n" " -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "មិន​អាច​សរសេរ​ទៅ %s" @@ -440,8 +440,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB ចាស់​, កំពុង​ព្យាយាម​ធ្វើ​ឲ្យ %s ប្រសើរ​ឡើង" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "ទ្រង់ទ្រាយ​មូលដ្ឋាន​ទិន្នន័យ​មិន​ត្រឹមត្រូវ ។ ប្រសិន​បើ​អ្នក​បាន​ធ្វើ​ឲ្យ​វា​ប្រសើឡើង​ពី​កំណែ​ចាស់​របស់ apt សូម​យក​" @@ -458,11 +459,11 @@ msgstr "មិន​អាច​បើក​ឯកសារ​ DB បានទ msgid "Failed to stat %s" msgstr "បាន​បរាជ័យ​ក្នុង​ការថ្លែង %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "ប័ណ្ណសារ​គ្មាន​កំណត់​ត្រា​ត្រួត​ពិនិត្យ​ទេ​" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "មិន​អាច​យក​ទស្សន៍ទ្រនិច​" @@ -527,26 +528,26 @@ msgstr "*** បាន​បរាជ័យ​ក្នុង​ការ​ត msgid " DeLink limit of %sB hit.\n" msgstr " DeLink កំណត់​នៃ​ការ​វាយ %sB ។\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "ប័ណ្ណសារ​គ្មាន​វាល​កញ្ចប់​" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s គ្មាន​ធាតុធាតុបញ្ចូល​​បដិសេធឡើយ\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " អ្នក​ថែទាំ %s គឺ %s មិនមែន​ %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s គ្មាន​ធាតុ​បដិសេធ​ប្រភព\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s គ្មាន​ធាតុប​ដិសេធគោល​ពីរ​ដែរ\n" @@ -650,7 +651,7 @@ msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Regex កំហុស​ការចងក្រង​ - %s" @@ -811,11 +812,11 @@ msgstr "កញ្ចប់ ​ត្រូវការឲ្យ​យក​ច msgid "Internal error, Ordering didn't finish" msgstr "កំហុស​ខាងក្នុង​ ការ​រៀប​តាម​លំដាប់​មិន​បាន​បញ្ចប់ឡើយ" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "មិន​អាច​ចាក់​សោ​ថត​ទាញ​យក​បាន​ឡើយ" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "មិន​អាច​អាន​បញ្ជី​ប្រភព​បាន​ឡើយ​ ។" @@ -844,8 +845,8 @@ msgstr "បន្ទាប់​ពី​ពន្លា​ %sB នៃ​កា msgid "After this operation, %sB disk space will be freed.\n" msgstr "បន្ទាប់​ពី​ពន្លា​ %sB ទំហំ​ថាសនឹង​​ទំនេរ ។ \n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "មិន​អាច​កំណត់​ទំហំ​ទំនេរ​ក្នុង​ %s បានឡើយ" @@ -882,7 +883,7 @@ msgstr "បោះបង់ ។" msgid "Do you want to continue [Y/n]? " msgstr "តើ​អ្នក​ចង់​បន្តឬ​ [បាទ ចាស/ទេ​] ? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n" @@ -891,7 +892,7 @@ msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រម msgid "Some files failed to download" msgstr "ឯកសារ​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​ទាញ​យក​" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​តែ​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ" @@ -988,51 +989,51 @@ msgstr "រក​មិន​ឃើញ​កំណែ​ '%s' សម្រាប msgid "Selected version %s (%s) for %s\n" msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1048,51 +1049,51 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "ព័ត៌មាន​ដូចតទៅនេះ អាចជួយ​ដោះស្រាយ​ស្ថានភាព​បាន ៖" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "កំហុស​ខាងក្នុង ការធ្វើឲ្យប្រសើរ​ទាំងអស់បានធ្វើឲ្យ​ឧបករណ៍​ខូច" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "ចំណាំ កំពុង​ជ្រើស​ %s សម្រាប់ regex '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "អ្នក​ប្រហែល​ជា​ចង់​រត់ `apt-get -f install' ដើម្បី​កែ​ពួក​វា​ទាំង​នេះ ៖" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" "ភាពអស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ 'apt-get -f install' ដោយ​គ្មាន​កញ្ចប់ (ឬ បញ្ជាក់​ដំណោះស្រាយ) ។" -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1104,122 +1105,122 @@ msgstr "" "ដែលបាន​ទាមទារនឹងមិនទាន់បានបង្កើត​ឡើយ​\n" " ឬ ​បានយក​ចេញ​ពីការមកដល់ ។" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "កញ្ចប់​ដែល​បាន​ខូច​" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "កញ្ចប់​បន្ថែម​ដូចតទៅនេះ នឹងត្រូវបាន​ដំឡើង ៖" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​យោបល់ ៖" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​អនុសាសន៍ ៖" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "បាន​បរាជ័យ" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "ធ្វើរួច​" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "មិន​អាច​រក​កញ្ចប់ប្រភព​​សម្រាប់ %s បានឡើយ" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "អ្នក​ពុំ​មាន​ទំហំ​ទំនេរ​គ្រប់គ្រាន់​ទេ​នៅក្នុង​ %s ឡើយ" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "ត្រូវការ​យក​ %sB/%sB នៃ​ប័ណ្ណសារ​ប្រភព ។\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "ត្រូវការ​យក​ %sB នៃ​ប័ណ្ណសារ​ប្រភព​ ។\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "ទៅប្រមូល​ប្រភព​ %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "បរាជ័យ​ក្នុងការទៅប្រមូលយក​ប័ណ្ណសារ​មួយចំនួន ។" -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ័យ​ ។\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជ័យ​ ។\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ័យ​" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "ត្រូវតែ​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "មិន​អាច​សាងសង់​​ព័ត៌មាន​ភាពអស្រ័យ​សម្រាប់ %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s មិនមានភាពអាស្រ័យ​ស្ថាបនាឡើយ​ ។\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ " -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1228,30 +1229,30 @@ msgstr "" "ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាច​តម្រូវចិត្តបានទេ ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​តម្រូវចិត្ត​" "តម្រូវការ​កំណែបានឡើយ" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺថ្មីពេក" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ភាពអាស្រ័យ​ដែល​បង្កើត​ %s មិន​អាច​បំពេញ​សេចក្ដី​ត្រូវការ​បាន​ទេ ។" -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ " -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1334,7 +1335,7 @@ msgstr "" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1579,11 +1580,10 @@ msgstr "ឯកសារ​ %s/%s សរសេរជាន់​ពីលើ​ #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "មិន​អាច​អាន​ %s បានឡើយ" @@ -1613,9 +1613,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "ថតព័ត៌មាន​ និង ពុម្ព ត្រូវការនៅលើ​ប្រព័ន្ធឯកសារ​ដូចគ្នា​" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "កំពុង​អាន​បញ្ជី​កញ្ចប់" @@ -1748,11 +1748,11 @@ msgid "File not found" msgstr "រកឯកសារ​មិន​ឃើញ​" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "បរាជ័យ​ក្នុងការថ្លែង" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "បរាជ័យក្នុងការកំណត់​ពេលវេលា​ការកែប្រែ​" @@ -1813,7 +1813,7 @@ msgstr "អស់ពេល​ក្នុងការតភ្ជាប់​" msgid "Server closed the connection" msgstr "ម៉ាស៊ីន​បម្រើ​បាន​បិទ​ការតភ្ជាប់​" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "ការអាន​មានកំហុស" @@ -1825,7 +1825,7 @@ msgstr "ឆ្លើយតប​សតិ​បណ្តោះអាសន្ន msgid "Protocol corruption" msgstr "ការបង្ខូច​ពិធីការ​" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "ការសរសេរ​មានកំហុស" @@ -1879,7 +1879,7 @@ msgstr "ការតភ្ជាប់​រន្ធ​​ទិន្នន័ msgid "Unable to accept connection" msgstr "មិនអាច​ទទួលយក​ការតភ្ជាប់​បានឡើយ" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "បញ្ហា​ធ្វើឲ្យខូច​ឯកសារ" @@ -1943,58 +1943,63 @@ msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​ %s msgid "Connecting to %s" msgstr "កំពុង​តភ្ជាប់​ទៅកាន់ %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "មិន​អាច​ដោះស្រាយ​ '%s' បានឡើយ" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "ការ​ដោះស្រាយ​ភាព​បរាជ័យ​​បណ្តោះអាសន្ន '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក់ដែល​បាន​កើត​ឡើង​ '%s:%s' (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​​ %s %s ៖" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "មិន​អាច​ចូល​ដំណើរការ keyring ៖ '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។" + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E ៖ បញ្ជី​អាគុយ​ម៉ង់​ពី​ Acquire::gpgv::Options too long ។ ចេញ​ ។" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "កំហុស​ខាងក្នុង​ ៖ ហត្ថលេខា​​ល្អ ប៉ុន្តែ ​មិន​អាច​កំណត់​កូនសោ​ស្នាម​ម្រាមដៃ ?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "​បានជួប​ប្រទះ​​​​ហត្ថលេខា​យ៉ាងហោចណាស់មួយ ដែ​លត្រឹមត្រូវ​ ។" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "មិន​អាច​ប្រតិបត្តិ '%s' ដើម្បី​ផ្ទៀងផ្ទាត់​ហត្ថលេខា (តើ gpgv ត្រូវ​បាន​ដំឡើង​ឬនៅ ?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "មិនស្គាល់កំហុស ក្នុងការប្រតិបត្តិ gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "ហត្ថលេខា​ខាង​ក្រោម​មិន​ត្រឹមត្រូវ ៖\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2043,48 +2048,48 @@ msgstr "ម៉ាស៊ីន​បម្រើ HTTP នេះបាន​ខូ msgid "Unknown date format" msgstr "មិនស្គាល់​ទ្រង់ទ្រាយ​កាលបរិច្ឆេទ" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "ជ្រើស​បាន​បរាជ័យ​" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "ការតភ្ជាប់​បាន​អស់ពេល​" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារលទ្ធផល" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារ" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "កំហុសក្នុងការ​សរសេរ​ទៅកាន់​ឯកសារ" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "កំហុស​ក្នុងការ​អាន​ពី​ម៉ាស៊ីនបម្រើ ។ ការបញ្ចប់​ពីចម្ងាយ​បានបិទការតភ្ជាប់" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "កំហុស​ក្នុងការអាន​ពី​ម៉ាស៊ីន​បម្រើ" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "ទិន្នន័យ​បឋមកថា​ខូច" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "កំហុស​ខាង​ក្នុង​" @@ -2092,18 +2097,25 @@ msgstr "កំហុស​ខាង​ក្នុង​" msgid "Can't mmap an empty file" msgstr "មិនអាច mmap ឯកសារទទេ​បានឡើយ" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "មិន​អាច​បង្កើត​ mmap នៃ​ %lu បៃបានឡើយ" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2133,52 +2145,52 @@ msgstr "" msgid "Selection %s not found" msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "មិន​បាន​​ទទួល​ស្គាល់​ប្រភេទ​អក្សរ​សង្ខេប ៖ '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "កំពុង​បើ​ឯកសារ​កំណត់រចនាសម្ព័ន្ធ​ %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "កំហុស​វាក្យ​សម្ពន្ធ %s:%u ៖ ប្លុក​ចាប់​ផ្តើម​​ដោយ​គ្មាន​ឈ្មោះ​ ។" -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "កំហុស​​វាក្យ​សម្ពន្ធ %s:%u ៖ ស្លាក​ដែលបាន Malformed" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "កំហុស​​វាក្យ​សម្ពន្ធ %s:%u ៖ តម្លៃ​ឥតបានការ​នៅ​ក្រៅ​" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ សេចក្ដីបង្គាប់​អាចត្រូវបានធ្វើ​តែនៅលើ​កម្រិត​កំពូល​តែប៉ុណ្ណោះ" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "កំហុស​វាក្យសម្ពន្ធ %s:%u ៖ មាន​ការរួមបញ្ចូល​ដែលដាក់​រួមគ្នា​យ៉ាងច្រើន" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ បានរួម​បញ្ចូល​ពី​ទីនេះ​" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "កំហុស​វាក្យ​សម្ពន្ធ %s:%u ៖ សេចក្ដី​បង្គាប់​ដែល​មិនបានគាំទ្រ '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "កំហុស​វាក្យសម្ពន្ធ %s:%u ៖ សារឥតបានការ​បន្ថែម ដែលនៅខាងចុង​ឯកសារ" @@ -2254,75 +2266,75 @@ msgstr "មិនអាច​ប្ដូរទៅ %s បានឡើយ" msgid "Failed to stat the cdrom" msgstr "បរាជ័យក្នុងការ​ថ្លែង ស៊ីឌីរ៉ូម" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "មិន​ប្រើប្រាស់​ការចាក់សោ សម្រាប់តែឯកសារចាក់សោ​ដែលបានតែអានប៉ុណ្ណោះ %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "មិន​អាច​បើក​ឯកសារ​ចាក់សោ​ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "មិនប្រើ​ការចាក់សោ សម្រាប់ nfs ឯកសារ​ចាក់សោដែលបានម៉ោន%s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "មិន​អាច​ចាក់សោ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។" -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។" -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "ដំណើរការ​រង​ %s បានត្រឡប់​ទៅកាន់​កូដ​មាន​កំហុស​ (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "ដំណើរការ​រង​ %s បានចេញ ដោយ​មិន​រំពឹង​ទុក​ " -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "អាន​, នៅតែ​មាន %lu ដើម្បី​អាន​ ប៉ុន្តែ​គ្មាន​អ្វី​នៅសល់" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "សរសេរ​, នៅតែមាន​ %lu ដើម្បី​សរសេរ​ ប៉ុន្តែ​មិន​អាច​" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ​ឯកសារ" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​" @@ -2440,52 +2452,52 @@ msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1 msgid "Unable to parse package file %s (2)" msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់​ %s (2) បានឡើយ" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​ញ្ជី​ប្រភព​ %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "បន្ទាត់​ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist លែងប្រើ)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "កំពុង​បើក​ %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "បន្ទាត់​ %u មាន​ប្រវែង​វែងពេកនៅ​ក្នុង​បញ្ជី​ប្រភព​ %s ។" -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (ប្រភេទ​)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (លេខសម្គាល់​ក្រុមហ៊ុន​លក់)" @@ -2608,17 +2620,17 @@ msgstr "បញ្ជី​កញ្ចប់​ ឬ ឯកសារ​ស្ថ msgid "You may want to run apt-get update to correct these problems" msgstr "អ្នកប្រហែលជា​ចង់ភាពទាន់សម័យ apt-get ដើម្បី​កែ​បញ្ហា​ទាំងនេះ" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "កំណត់ត្រា​មិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារចំណង់ចំណូលចិត្ត មិនមាន​បឋមកថា​កញ្ចប់ទេ" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "មិន​បាន​យល់​ពី​ប្រភេទ​ម្ជុល %s ឡើយ" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "គ្មាន​អទិភាព (ឬ សូន្យ​) បានបញ្ជាក់​សម្រាប់​ម្ជុល​ទេ" @@ -2703,16 +2715,16 @@ msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​ក msgid "Package %s %s was not found while processing file dependencies" msgstr "កញ្ចប់​ %s %s រក​មិន​ឃើញ​ខណៈ​ពេល​កំពុង​ដំណើរការ​ភាពអាស្រ័យ​​ឯកសារ" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដុំ" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាត់​ប្រភព​" @@ -2721,20 +2733,20 @@ msgstr "IO កំហុសក្នុងការររក្សាទុក​ msgid "rename failed, %s (%s -> %s)." msgstr "ប្តូរ​ឈ្មោះ​បានបរាជ័យ​, %s (%s -> %s) ។" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum មិន​ផ្គួផ្គង​" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum មិន​ផ្គួផ្គង​" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "គ្មាន​កូនសោ​សាធារណៈ​អាច​រក​បាន​ក្នុងកូនសោ IDs ខាងក្រោម​នេះទេ ៖\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2743,7 +2755,7 @@ msgstr "" "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។ " "(ដោយសារ​​បាត់​ស្ថាបត្យកម្ម)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2751,13 +2763,13 @@ msgid "" msgstr "" "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បានទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ត្រូវ​បាន​ខូច ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់នេះ​ទេ​ %s ។" -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​" @@ -2891,7 +2903,6 @@ msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួ #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "កំពុង​បើ​ឯកសារ​កំណត់រចនាសម្ព័ន្ធ​ %s" @@ -2922,7 +2933,6 @@ msgstr "កំពុង​យក %s ចេញ" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង" @@ -3006,15 +3016,31 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "បាន​បិទ​ការ​តភ្ជាប់​មុន​ពេល" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "មិន​អាច​ចូល​ដំណើរការ keyring ៖ '%s'" + +#, fuzzy +#~ msgid "Could not patch file" +#~ msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/ko.po b/po/ko.po index bd0a0b003..ec4b95ac9 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-11-13 07:14+0900\n" "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n" "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n" @@ -144,7 +144,7 @@ msgstr " 버전 테이블:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s(%s), 컴파일 시각 %s %s\n" @@ -297,7 +297,7 @@ msgstr "" " -c=? 설정 파일을 읽습니다\n" " -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "%s에 쓸 수 없습니다" @@ -431,8 +431,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB가 오래되었습니다. %s의 업그레이드를 시도합니다" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "DB 형식이 잘못되었습니다. apt 예전 버전에서 업그레이드했다면, 데이터베이스를 " @@ -449,12 +450,12 @@ msgstr "DB 파일, %s 파일을 열 수 없습니다: %s" msgid "Failed to stat %s" msgstr "%s의 정보를 읽는 데 실패했습니다" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "아카이브에 컨트롤 기록이 없습니다" # FIXME: 왠 커서?? -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "커서를 가져올 수 없습니다" @@ -520,26 +521,26 @@ msgstr "*** %s 파일을 %s에 링크하는 데 실패했습니다" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "아카이브에 패키지 필드가 없습니다" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s에는 override 항목이 없습니다\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 관리자가 %s입니다 (%s 아님)\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s에는 source override 항목이 없습니다\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s에는 binary override 항목이 없습니다\n" @@ -643,7 +644,7 @@ msgstr "%s 파일의 이름을 %s(으)로 바꾸는 데 실패했습니다" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "정규식 컴파일 오류 - %s" @@ -805,11 +806,11 @@ msgstr "패키지를 지워야 하지만 지우기가 금지되어 있습니다. msgid "Internal error, Ordering didn't finish" msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "다운로드 디렉토리를 잠글 수 없습니다" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "소스 목록을 읽을 수 없습니다." @@ -840,8 +841,8 @@ msgstr "이 작업 후 %s바이트의 디스크 공간을 더 사용하게 됩 msgid "After this operation, %sB disk space will be freed.\n" msgstr "이 작업 후 %s바이트의 디스크 공간이 비워집니다.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다" @@ -881,7 +882,7 @@ msgstr "중단." msgid "Do you want to continue [Y/n]? " msgstr "계속 하시겠습니까 [Y/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s 파일을 받는 데 실패했습니다 %s\n" @@ -890,7 +891,7 @@ msgstr "%s 파일을 받는 데 실패했습니다 %s\n" msgid "Some files failed to download" msgstr "일부 파일을 받는 데 실패했습니다" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다" @@ -988,50 +989,50 @@ msgstr "%2$s 패키지의 '%1$s' 버전을 찾을 수 없습니다" msgid "Selected version %s (%s) for %s\n" msgstr "%3$s 패키지의 %1$s (%2$s) 버전을 선택합니다\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "update 명령은 인수를 받지 않습니다" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "목록 디렉토리를 잠글 수 없습니다" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "삭제를 할 수 없으므로 AutoRemover를 실행하지 못합니다" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "다음 새 패키지가 전에 자동으로 설치되었지만 더 이상 필요하지 않습니다:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "다음 새 패키지가 전에 자동으로 설치되었지만 더 이상 필요하지 않습니다:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "이들을 지우기 위해서는 'apt-get autoremove'를 사용하십시오." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1049,44 +1050,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "내부 오류, AllUpgrade 프로그램이 무언가를 망가뜨렸습니다" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "%s 작업를 찾을 수 없습니다" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "%s 패키지를 찾을 수 없습니다" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s 패키지 수동설치로 지정합니다.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "다음을 바로잡으려면 `apt-get -f install'을 실행해 보십시오:" # FIXME: specify a solution? 무슨 솔루션? -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1094,7 +1095,7 @@ msgstr "" "의존성이 맞지 않습니다. 패키지 없이 'apt-get -f install'을 시도해 보십시오 " "(아니면 해결 방법을 지정하십시오)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1105,115 +1106,115 @@ msgstr "" "불안정 배포판을 사용해서 일부 필요한 패키지를 아직 만들지 않았거나,\n" "아직 Incoming에서 나오지 않은 경우일 수도 있습니다." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "망가진 패키지" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "다음 패키지를 더 설치할 것입니다:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "제안하는 패키지:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "추천하는 패키지:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "업그레이드를 계산하는 중입니다... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "실패" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "완료" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "%s의 소스 패키지를 찾을 수 없습니다" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "%s에 충분한 공간이 없습니다" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "%s 소스를 가져옵니다\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "일부 아카이브를 가져오는 데 실패했습니다." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "압축 풀기 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "빌드 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "하위 프로세스가 실패했습니다" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "해당되는 빌드 의존성을 검사할 패키지를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s 패키지에 빌드 의존성이 없습니다.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1222,7 +1223,7 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1231,32 +1232,32 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지의 사용 가능한 버" "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: 설치한 %3$s 패키지가 너" "무 최근 버전입니다" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s의 빌드 의존성을 만족시키지 못했습니다." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "빌드 의존성을 처리하는 데 실패했습니다" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "지원하는 모듈:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1340,7 +1341,7 @@ msgstr "" "apt.conf(5) 매뉴얼 페이지를 보십시오.\n" " 이 APT는 Super Cow Powers로 무장했습니다.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1587,11 +1588,10 @@ msgstr "%s/%s 파일은 %s 패키지에 있는 파일을 덮어 씁니다" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "%s을(를) 읽을 수 없습니다" @@ -1621,9 +1621,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "정보 디렉토리와 임시 디렉토리는 같은 파일 시스템에 있어야 합니다" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "패키지 목록을 읽는 중입니다" @@ -1756,11 +1756,11 @@ msgid "File not found" msgstr "파일이 없습니다" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "파일 정보를 읽는 데 실패했습니다" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "파일 변경 시각을 설정하는 데 실패했습니다" @@ -1822,7 +1822,7 @@ msgstr "연결 시간 초과" msgid "Server closed the connection" msgstr "서버에서 연결을 닫았습니다" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "읽기 오류" @@ -1834,7 +1834,7 @@ msgstr "응답이 버퍼 크기를 넘어갔습니다." msgid "Protocol corruption" msgstr "프로토콜이 틀렸습니다" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "쓰기 오류" @@ -1888,7 +1888,7 @@ msgstr "데이터 소켓 연결 시간 초과" msgid "Unable to accept connection" msgstr "연결을 받을 수 없습니다" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "파일 해싱에 문제가 있습니다" @@ -1952,60 +1952,65 @@ msgstr "%s:%s에 연결할 수 없습니다 (%s)." msgid "Connecting to %s" msgstr "%s에 연결하는 중입니다" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "'%s'의 주소를 알아낼 수 없습니다" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "'%s'의 주소를 알아내는 데 임시로 실패했습니다" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "'%s:%s'의 주소를 알아내는 데 무언가 이상한 일이 발생했습니다 (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "%s %s에 연결할 수 없습니다:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "키링에 접근할 수 없습니다: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "설치를 중단합니다." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Acquire::gpgv::Options의 인자 목록이 너무 깁니다. 끝냅니다." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "내부 오류: 서명은 올바르지만 키 지문을 확인할 수 없습니다!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "최소한 하나 이상의 서명이 잘못되었습니다." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "서명을 확인하는 '%s' 프로그램을 실행할 수 없습니다. (gnuv 프로그램을 설치했습" "니까?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "gpgv 실행 도중 알 수 없는 오류 발생" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "다음 서명이 올바르지 않습니다:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2054,47 +2059,47 @@ msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다" msgid "Unknown date format" msgstr "데이터 형식을 알 수 없습니다" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "select가 실패했습니다" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "연결 시간이 초과했습니다" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "출력 파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "해당 파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "서버에서 읽는 데 오류가 발생했습니다" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "파일을 자르는 데 실패했습니다" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "헤더 데이터가 잘못되었습니다" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "연결이 실패했습니다" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "내부 오류" @@ -2102,18 +2107,25 @@ msgstr "내부 오류" msgid "Can't mmap an empty file" msgstr "빈 파일에 메모리 매핑할 수 없습니다" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "%lu바이트를 메모리 매핑할 수 없습니다" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2143,52 +2155,52 @@ msgstr "" msgid "Selection %s not found" msgstr "선택한 %s이(가) 없습니다" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "이 타입 줄임말을 알 수 없습니다: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "설정 파일 %s 파일을 여는 중입니다" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "문법 오류 %s:%u: 블럭이 이름으로 시작하지 않습니다." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "문법 오류 %s:%u: 태그의 형식이 잘못되었습니다" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "문법 오류 %s:%u: 값 뒤에 쓰레기 데이터가 더 있습니다" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "문법 오류 %s:%u: 지시어는 맨 위 단계에서만 쓸 수 있습니다" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "문법 오류 %s:%u: include가 너무 많이 겹쳐 있습니다" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "문법 오류 %s:%u: 여기서 include됩니다" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "문법 오류 %s:%u: 지원하지 않는 지시어 '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "문법 오류 %s:%u: 파일의 끝에 쓰레기 데이터가 더 있습니다" @@ -2264,75 +2276,75 @@ msgstr "%s 디렉토리로 이동할 수 없습니다" msgid "Failed to stat the cdrom" msgstr "CD-ROM의 정보를 읽을 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "읽기 전용 잠금 파일 %s에 대해 잠금을 사용하지 않습니다" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "잠금 파일 %s 파일을 열 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "NFS로 마운트된 잠금 파일 %s에 대해 잠금을 사용하지 않습니다" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "%s 잠금 파일을 얻을 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받았습니다." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받았습니다." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "하위 프로세스 %s 프로세스가 오류 코드(%u)를 리턴했습니다" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "하위 프로세스 %s 프로세스가 예상치 못하게 끝났습니다" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "%s 파일을 열 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "%lu만큼 더 읽어야 하지만 더 이상 읽을 데이터가 없습니다" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "%lu만큼 더 써야 하지만 더 이상 쓸 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "파일을 닫는 데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "파일을 지우는 데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "파일을 동기화하는 데 문제가 있습니다" @@ -2449,52 +2461,52 @@ msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)" msgid "Unable to parse package file %s (2)" msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (절대 dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s 파일을 여는 중입니다" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (벤더 ID)" @@ -2620,17 +2632,17 @@ msgstr "패키지 목록이나 상태 파일을 파싱할 수 없거나 열 수 msgid "You may want to run apt-get update to correct these problems" msgstr "apt-get update를 실행하면 이 문제를 바로잡을 수도 있습니다." -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "기본 설정 파일에 잘못된 데이터가 있습니다. 패키지 헤더가 없습니다" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "핀 타입 %s이(가) 무엇인지 이해할 수 없습니다" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "핀에 우선순위(혹은 0)를 지정하지 않았습니다" @@ -2714,16 +2726,16 @@ msgstr "%s 처리 중에 오류가 발생했습니다 (CollectFileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "파일 의존성을 처리하는 데, %s %s 패키지가 없습니다" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "파일에서 제공하는 것을 모으는 중입니다" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다" @@ -2732,19 +2744,19 @@ msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다 msgid "rename failed, %s (%s -> %s)." msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum이 맞지 않습니다" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "해쉬 합계가 서로 다릅니다" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "다음 키 ID의 공개키가 없습니다:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2753,7 +2765,7 @@ msgstr "" "%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습" "니다. (아키텍쳐가 빠졌기 때문입니다)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2762,14 +2774,14 @@ msgstr "" "%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습" "니다." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "패키지 인덱스 파일이 손상되었습니다. %s 패키지에 Filename: 필드가 없습니다." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "크기가 맞지 않습니다" @@ -2902,7 +2914,6 @@ msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상 #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "설정 파일 %s 파일을 여는 중입니다" @@ -2913,7 +2924,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "해쉬 합계가 서로 다릅니다" @@ -2934,7 +2944,6 @@ msgstr "%s 패키지를 지우는 중입니다" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "%s 패키지를 완전히 지웠습니다" @@ -3019,14 +3028,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "%s 파일을 열 수 없습니다" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "연결이 너무 빨리 끊어졌습니다" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "키링에 접근할 수 없습니다: '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "%s 파일을 열 수 없습니다" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/ku.po b/po/ku.po index 2c9c3dcfb..c22027eb1 100644 --- a/po/ku.po +++ b/po/ku.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-ku\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-05-08 12:48+0200\n" "Last-Translator: Erdal Ronahi <erdal dot ronahi at gmail dot com>\n" "Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n" @@ -151,7 +151,7 @@ msgstr " Tabloya guhertoyan:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s ji bo %s %s komkirî di %s %s de\n" @@ -259,7 +259,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Nivîsandin ji bo %s ne pêkane" @@ -355,7 +355,7 @@ msgstr "Danegir kevn e, ji bo bilindkirina %s hewl dide" #: ftparchive/cachedb.cc:72 msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" @@ -370,11 +370,11 @@ msgstr "Danegira %s nehate vekirin: %s" msgid "Failed to stat %s" msgstr "" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Tomara kontrola arşîvê tuneye" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "" @@ -439,26 +439,26 @@ msgstr "" msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Di arşîvê de qada pakêtê tuneye" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -562,7 +562,7 @@ msgstr "" msgid "Y" msgstr "E" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -721,11 +721,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Pelrêça daxistinê nayê quflekirin" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "" @@ -754,8 +754,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nikarî cihê vala li %s tesbît bike" @@ -789,7 +789,7 @@ msgstr "Betal." msgid "Do you want to continue [Y/n]? " msgstr "Dixwazî bidomînî [E/n]?" -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Anîna %s %s biserneket\n" @@ -798,7 +798,7 @@ msgstr "Anîna %s %s biserneket\n" msgid "Some files failed to download" msgstr "Daxistina çend pelan biserneket" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "" @@ -890,51 +890,51 @@ msgstr "" msgid "Selected version %s (%s) for %s\n" msgstr "" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1321 #, c-format -msgid "Ignore unavailable version '%s' of package '%s'" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1352 #, c-format -msgid "Ignore unavailable target release '%s' of package '%s'" +msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1342 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 #, c-format -msgid "Picking '%s' as source package instead of '%s'\n" +msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1395 +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Ev pakêtên NÛ dê werine sazkirin:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Ev pakêtên NÛ dê werine sazkirin:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -950,49 +950,49 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Peywira %s nehate dîtin" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Nikarî pakêta %s bibîne" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "lê %s dê were sazkirin" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1000,152 +1000,152 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Paketên şikestî" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Paketên tên pêşniyaz kirin:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Paketên tên tawsiyê kirin:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Bilindkirin tê hesibandin..." -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Serneket" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Temam" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Cihê vala li %s têre nake" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Çavkanîna %s bîne\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Anîna çend arşîvan biserneket." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, 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:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1189,7 +1189,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1422,11 +1422,10 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Nikare %s bixwîne" @@ -1456,9 +1455,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Lîsteya pakêtan tê xwendin" @@ -1587,12 +1586,12 @@ msgid "File not found" msgstr "Pel nehate dîtin" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 #, fuzzy msgid "Failed to stat" msgstr "%s venebû" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "" @@ -1652,7 +1651,7 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Çewiya xwendinê" @@ -1664,7 +1663,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Çewtiya nivîsînê" @@ -1718,7 +1717,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1783,59 +1782,64 @@ msgstr "" msgid "Connecting to %s" msgstr "Bi %s re tê girêdan" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Nikarî '%s' çareser bike" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Nikare bi %s re girêdan pêk bîne %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Sazkirin tê betalkirin." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Di xebitandina gpgv de çewtiya nenas" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Ev pakêtên NÛ dê werine sazkirin:" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1884,49 +1888,49 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Hilbijartin neserketî" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "" -#: methods/http.cc:818 +#: methods/http.cc:819 #, fuzzy msgid "Error writing to output file" msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Dema li pelî dihate nivîsîn çewtî" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Dema li pelî dihate nivîsîn çewtî" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Nivîsîna pelê %s biserneket" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Girêdan pêk nehatiye" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Çewtiya hundirîn" @@ -1934,18 +1938,25 @@ msgstr "Çewtiya hundirîn" msgid "Can't mmap an empty file" msgstr "" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -1975,52 +1986,52 @@ msgstr "" msgid "Selection %s not found" msgstr "Hilbijartina %s nehatiye dîtin" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" @@ -2096,75 +2107,75 @@ msgstr "Nikarî derbasa %s bike" msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Nikarî qufila pelê %s veke" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, c-format msgid "Sub-process %s received signal %u." msgstr "" -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Nikarî pelê %s veke" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "" @@ -2281,52 +2292,52 @@ msgstr "Pakêt nehate dîtin %s" msgid "Unable to parse package file %s (2)" msgstr "Pakêt nehate dîtin %s" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s tê vekirin" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@ -2443,17 +2454,17 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "" @@ -2537,16 +2548,16 @@ msgstr "" msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "" @@ -2555,39 +2566,39 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "nav guherandin biserneket, %s (%s -> %s)" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum li hev nayên" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Hash Sum li hev nayên" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Mezinahî li hev nayên" @@ -2728,7 +2739,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Hash Sum li hev nayên" @@ -2749,7 +2759,6 @@ msgstr "%s tê rakirin" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "%s bi tevahî hatine rakirin" @@ -2833,15 +2842,28 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "Danegira %s nehate vekirin: %s" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Girêdan zû hatiye girtin" +#, fuzzy +#~ msgid "Could not patch file" +#~ msgstr "Danegira %s nehate vekirin: %s" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/lt.po b/po/lt.po index aa12c3437..4d081b0c1 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-08-02 01:47-0400\n" "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n" "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n" @@ -150,7 +150,7 @@ msgstr " Versijų lentelė:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" @@ -268,7 +268,7 @@ msgstr "" " -c=? Nuskaityti šį konfigūracijų failą\n" " -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Nepavyko įrašyti į %s" @@ -407,8 +407,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "Duomenų bazė yra sena, bandoma atnaujinti %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "Duomenų bazės formatas yra netinkamas. Jei jūs atsinaujinote iš senesnės " @@ -425,11 +426,11 @@ msgstr "Nepavyko atverti DB failo %s: %s" msgid "Failed to stat %s" msgstr "Nepavyko patikrinti %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "" @@ -494,26 +495,26 @@ msgstr "*** Nepavyko susieti %s su %s" msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Archyvas neturėjo paketo lauko" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s neturi perrašymo įrašo\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s prižiūrėtojas yra %s, o ne %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -617,7 +618,7 @@ msgstr "Nepavyko pervadinti %s į %s" msgid "Y" msgstr "T" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -779,11 +780,11 @@ msgstr "Reikia pašalinti paketus, tačiau šalinimas išjungtas." msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Nepavyko užrakinti parsiuntimų aplanko" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Nepavyko perskaityti šaltinių sąrašo." @@ -812,8 +813,8 @@ msgstr "Po šios operacijos bus naudojama %sB papildomos disko vietos.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po šios operacijos bus atlaisvinta %sB disko vietos.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nepavyko nustatyti %s laisvos vietos" @@ -850,7 +851,7 @@ msgstr "Nutraukti." msgid "Do you want to continue [Y/n]? " msgstr "Ar norite tęsti [T/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nepavyko parsiųsti %s %s\n" @@ -859,7 +860,7 @@ msgstr "Nepavyko parsiųsti %s %s\n" msgid "Some files failed to download" msgstr "Nepavyko parsiųsti kai kurių failų" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Pavyko parsiųsti tik parsiuntimo režime" @@ -957,50 +958,50 @@ msgstr "Nebuvo rasta „%s“ versija paketui „%s“" msgid "Selected version %s (%s) for %s\n" msgstr "Pažymėta versija %s (%s) paketui %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1321 #, c-format -msgid "Ignore unavailable version '%s' of package '%s'" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1352 #, c-format -msgid "Ignore unavailable target release '%s' of package '%s'" +msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1342 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 #, c-format -msgid "Picking '%s' as source package instead of '%s'\n" +msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1395 +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Atnaujinimo komandai argumentų nereikia" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Nepavyko užrakinti sąrašo aplanko" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Norėdami juos pašalinti, paleiskite „apt-get autoremove“" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1016,43 +1017,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Ši informacija gali padėti išspręsti šią situaciją:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Nepavyko rasti užduoties %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Nepavyko rasti paketo %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Pastaba, žymima %s regex atitikimų formoje '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Jūs galite norėti paleisti 'apt-get -f install\" klaidų taisymui:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1060,7 +1061,7 @@ msgstr "" "Nepatenkintos priklausomybės. Pabandykite įvykdyti 'apt-get -f install' be " "nurodytų paketų (arba nurodykite išeitį)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1072,115 +1073,115 @@ msgstr "" "leidimą, kuomet kai kurie paketai dar nebuvo sukurti arba buvo\n" "pašalinti iš \"Incoming\" aplanko." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Sugadinti paketai" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Bus įdiegti šie papildomi paketai:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Siūlomi paketai:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Rekomenduojami paketai:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Skaičiuojami atnaujinimai... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Nepavyko" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Įvykdyta" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Vidinė klaida, problemos sprendimas kažką sugadino" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Būtina nurodyti bent vieną paketą, kad parsiųsti jo išeities tekstą" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Nepavyko surasti išeities teksto paketo, skirto %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Praleidžiama jau parsiųsta byla „%s“\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Neturite pakankamai laisvos vietos %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Reikia parsiųsti %sB/%sB išeities archyvų.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Reikia parsiųsti %sB išeities archyvų.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Parsiunčiamas archyvas %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Nepavyko gauti kai kurių arhcyvų." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Jau išpakuotas archyvas %s praleidžiama\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Nepavyko įvykdyti išpakavimo komandos „%s“\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Nepavyko įvykdyti paketo kompiliavimo komandos „%s“\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Klaida procese-palikuonyje" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "Būtina nurodyti bent vieną paketą, kuriam norite įvykdyti builddeps" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nepavyko gauti kūrimo-priklausomybių informacijos paketui %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1188,7 +1189,7 @@ msgid "" msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1197,32 +1198,32 @@ msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes nėra tinkamos " "versijos %s paketo" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nepavyko patenkinti %s priklausomybės %s paketui: Įdiegtas paketas %s yra " "per naujas" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nepavyko patenkinti %s priklausomybės %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Palaikomi moduliai:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1266,7 +1267,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1516,11 +1517,10 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Nepavyko perskaityti %s" @@ -1550,9 +1550,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Skaitomi paketų sąrašai" @@ -1681,11 +1681,11 @@ msgid "File not found" msgstr "Failas nerastas" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "" @@ -1745,7 +1745,7 @@ msgstr "Jungiamasi per ilgai" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Skaitymo klaida" @@ -1757,7 +1757,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Rašymo klaida" @@ -1811,7 +1811,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1875,58 +1875,63 @@ msgstr "Nepavyko prisijungti prie %s:%s (%s)." msgid "Connecting to %s" msgstr "Jungiamasi prie %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Nepavyko surasti vardo „%s“" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Laikinas sutrikimas ieškant vardo „%s“" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Nepavyko prisijungti prie %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Diegimas nutraukiamas." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Nežinoma klaida kviečiant gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Šie parašai buvo nevalidūs:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1975,48 +1980,48 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Prisijungimo laiko limitas baigėsi" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Klaida bandant rašyti į failą" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Nepavyko patikrinti %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Prisijungti nepavyko" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Vidinė klaida" @@ -2024,18 +2029,25 @@ msgstr "Vidinė klaida" msgid "Can't mmap an empty file" msgstr "" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2065,52 +2077,52 @@ msgstr "" msgid "Selection %s not found" msgstr "" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" @@ -2186,75 +2198,75 @@ msgstr "Nepavyko pakeisti į %s" msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Nepavyko atverti rakinimo failo %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Nepavyko rezervuoti rakinimo failo %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Procesas %s gavo segmentavimo klaidą" -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Procesas %s gavo segmentavimo klaidą" -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Procesas %s grąžino klaidos kodą (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Procesas %s netikėtai išėjo" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Nepavyko atverti failo %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Klaida užveriant failą" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Klaida sinchronizuojant failą" @@ -2371,52 +2383,52 @@ msgstr "" msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Atveriama %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@ -2537,17 +2549,17 @@ msgstr "" "Greičiausiai norėsite paleisti „apt-get update“, kad šios problemos būtų " "ištaisytos" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "" @@ -2631,16 +2643,16 @@ msgstr "" msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "" @@ -2649,39 +2661,39 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5 sumos neatitikimas" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Maišos sumos nesutapimas" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Neatitinka dydžiai" @@ -2812,7 +2824,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Skipping already downloaded file '%s'\n" msgid "Skipping nonexistent file %s" msgstr "Praleidžiama jau parsiųsta byla „%s“\n" @@ -2823,7 +2834,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Maišos sumos nesutapimas" @@ -2844,7 +2854,6 @@ msgstr "Šalinamas %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Visiškai pašalintas %s" @@ -2928,16 +2937,29 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -#, fuzzy -#| msgid "Could not open file %s" -msgid "Could not patch file" -msgstr "Nepavyko atverti failo %s" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "" +#, fuzzy +#~| msgid "Could not open file %s" +#~ msgid "Could not patch file" +#~ msgstr "Nepavyko atverti failo %s" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/mr.po b/po/mr.po index 53fe538d1..646661c56 100644 --- a/po/mr.po +++ b/po/mr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-11-20 23:27+0530\n" "Last-Translator: Sampada <sampadanakhare@gmail.com>\n" "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " @@ -146,7 +146,7 @@ msgstr "आवृत्ती कोष्टक:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s हे %s करिता %s %s वर संग्रहित\n" @@ -299,7 +299,7 @@ msgstr "" " -c=? ही संरचना संचिका वाचा \n" " -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे- -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "%s मध्ये लिहिण्यास असमर्थ " @@ -433,8 +433,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB जुने आहे,%s पुढच्या आवृतीसाठी प्रयत्न करत आहे" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "DB स्वरुप वैध नाही. जर तुम्ही apt च्या जुन्या आवृत्तीपासून पुढिल आवृत्तीकृत करत असाल तर, " @@ -451,11 +452,11 @@ msgstr "%s: %s DB संचिका उघडण्यास असमर्थ msgid "Failed to stat %s" msgstr "%s स्टेट करण्यास असमर्थ" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "अर्काईव्ह मध्ये नियंत्रण माहिती संच नाही" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "संकेतक घेण्यास असमर्थ" @@ -520,26 +521,26 @@ msgstr "%s चा %s दुवा साधण्यास असमर्थ" msgid " DeLink limit of %sB hit.\n" msgstr "%sB हीट ची डिलींक मर्यादा\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "अर्काईव्ह ला पॅकेज जागा नाही" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr "%s ला ओव्हरराईड/दुर्लक्षित जागा नाही\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "%s देखभालकर्ता हा %s आणि %s नाही \n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr "%s ला उगम ओव्हरराईड/दुर्लक्षित जागा नाही\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr "%s ला द्वयंक ओव्हरराईड जागा नाही\n" @@ -643,7 +644,7 @@ msgstr "%s ला पुनर्नामांकन %s करण्यास msgid "Y" msgstr "होय" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "रिजेक्स कंपायलेशन त्रुटी -%s " @@ -804,11 +805,11 @@ msgstr "पॅकेजेस कायमची काढायची आहे msgid "Internal error, Ordering didn't finish" msgstr "अंतर्गत त्रुटी,क्रम अजून संपला नाही" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "डाऊनलोड डिरेक्टरी कुलूपबंद करण्यास असमर्थ" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "उगमांच्या याद्या वाचता येणार नाहीत." @@ -837,8 +838,8 @@ msgstr "या क्रियेनंतर, %sB एवढी अधिक ड msgid "After this operation, %sB disk space will be freed.\n" msgstr "या क्रियेनंतर, %sB डिस्क जागा मोकळी होईल.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s मध्ये रिकामी जागा सांगू शकत नाही" @@ -875,7 +876,7 @@ msgstr "व्यत्यय/बंद करा." msgid "Do you want to continue [Y/n]? " msgstr "तुम्हाला पुढे जायचे आहे [Y/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s आणणे असफल\n" @@ -884,7 +885,7 @@ msgstr "%s %s आणणे असफल\n" msgid "Some files failed to download" msgstr "काही संचिका डाऊनलोड करण्यास असमर्थ" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "डाऊनलोड संपूर्ण आणि डाऊनलोड मध्ये फक्त पद्धती" @@ -982,50 +983,50 @@ msgstr "'%s' साठी '%s' आवृत्ती सापडली ना msgid "Selected version %s (%s) for %s\n" msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ शकत नाही." -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "आपण या गोष्टी काढून टाकता नये, ऑटोरिमूव्हर सुरू करता येत नाही" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1043,45 +1044,45 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "खालील माहिती परिस्थिती निवळण्यासाठी मदत ठरू शकेल:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "अंतर्गत त्रुटी, AutoRemoverने स्टफला तोडले" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "अंतर्गत त्रुटी,ऑलअपग्रेडने स्टफला तोडले" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "%s कार्य सापडू शकले नाही" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "%s पॅकेज सापडू शकले नाही" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "सूचना, '%s' रिजेक्स साठी %s ची निवड करत आहे\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "तुम्हाला कदाचित `apt-get -f install'(एपीटी-गेट -एफ संस्थापन') प्रोग्राम चालू करावा " "लागेल'यात बदल करण्यासाठी:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1089,7 +1090,7 @@ msgstr "" "अनमेट डिपेंडन्सीज.एपीटी-गेट -एफ संस्थापन (`apt-get -f install') पॅकेजशिवाय प्रयत्न करा " "(किंवा पर्याय सांगा)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1101,122 +1102,122 @@ msgstr "" "विभागणी असणारी पण हवी असणारी, तयार केली नसलेली पॅकेजेस वापरत असाल \n" "किंवा ती येणाऱ्यांपैकी बाहेर हलविली असतील." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "तुटलेली पॅकेजेस" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "खालील अतिरिक्त पॅकेजेस संस्थापित होतील:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "सुचवलेली पॅकेजेस:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "शिफारस केलेली पॅकेजेस:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "पुढिल आवृत्तीची गणती करीत आहे..." -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "असमर्थ" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "झाले" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "अंतर्गत त्रुटी, अडचण निवारकाने स्टफला तोडले" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "%s उगम पॅकेज शोधणे शक्य नाही/शोधण्यास असमर्थ आहे" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "%s मध्ये पुरेशी जागा नाही" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "उगम अर्काईव्हज चा %sB/%sB घेण्याची गरज आहे.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "उगम अर्काईव्हजचा %sB घेण्याची गरज आहे.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "%s उगम घ्या\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "काही अर्काईव्हज आणण्यास असमर्थ." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s मध्ये आधीच उघडलेल्या उगमातील उघडलेल्याला सोडून द्या किंवा वगळा\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' आज्ञा सुट्या करण्यास असमर्थ.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "बांधणी करणाऱ्या आज्ञा '%s' अयशस्वी.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "चाईल्ड प्रक्रिया अयशस्वी" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "बिल्डेपस् कशासाठी ते पडताळण्यासाठी किमान एक पॅकेज सांगणे गरजेचे आहे" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s साठी बांधणी डिपेंडन्सी माहिती मिळवण्यास असमर्थ" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s ला बांधणी डिपेंडन्स नाहीत.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1225,30 +1226,30 @@ msgstr "" "आवृतीची मागणी पूर्ण करण्यासाठी %s पॅकेजची आवृत्ती उपलब्ध नाही,त्यामुळे %s साठी %s " "डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%s अवलंबित्व %s साठी पूर्ण होण्यास असमर्थ: संस्थापित पॅकेज %s खूपच नवीन आहे" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s साठी बांधणी-डिपेंडन्सीज पूर्ण होऊ शकत नाही." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ " -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1333,7 +1334,7 @@ msgstr "" " apt.conf(5) पुस्तिका पाने पहा.\n" " ह्या APT ला सुपर काऊ पॉवर्स आहेत\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1580,11 +1581,10 @@ msgstr "File %s/%s, %s पॅकेज मधल्या एका वर प #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "%s वाचण्यास असमर्थ" @@ -1614,9 +1614,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "info आणि temp संचिका सारख्याच फाईलप्रणालीत असणे आवश्यक आहे" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "पॅकेज याद्या वाचत आहोत" @@ -1749,11 +1749,11 @@ msgid "File not found" msgstr "फाईल सापडली नाही" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "स्टॅट करण्यास असमर्थ" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "बदलण्याचा वेळ निश्चित करण्यास असमर्थ" @@ -1815,7 +1815,7 @@ msgstr "वेळेअभावी संबंध जोडता येत msgid "Server closed the connection" msgstr "सर्व्हरने संबंध जोडणी बंद केली" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "त्रुटी वाचा" @@ -1827,7 +1827,7 @@ msgstr "प्रतिसाधाने बफर भरुन गेले." msgid "Protocol corruption" msgstr "प्रोटोकॉल खराब झाले" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "लिहिण्यात त्रुटी" @@ -1881,7 +1881,7 @@ msgstr "डेटा सॉकेट जोडणी वेळेअभावी msgid "Unable to accept connection" msgstr "जोडणी स्विकारण्यास असमर्थ" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "फाईल हॅश करण्यात त्रुटी" @@ -1945,60 +1945,65 @@ msgstr "%s:%s (%s) ला जोडू शकत नाही" msgid "Connecting to %s" msgstr "%s ला जोडत आहे" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "%s रिझॉल्व्ह होऊ शकत नाही " -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "'%s' रिझॉल्व्ह करताना तात्पुरती त्रुटी" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना काहीतरी वाईट घडले" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "%s %s ला जोडण्यास असमर्थ:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "'%s': कीरिंग पर्यंत पोहोचू शकत नाही" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "संस्थापन खंडित करत आहे." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "दोष: ::gpgv:: कडून प्राप्त झालेला ऑर्गुमेंट सूचीचा पर्याय खूप लांबीचा. बाहेर पडत आहे." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "अंतर्गत त्रुटी: चांगली सही, पण की ठसे सांगू शकत नाही?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "किमान एक अवैध सही सापडली." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "सहीची खात्री करण्यासाठी '%s' कार्यान्वित करू शकत नाही (gpgv संस्थापित केले आहे का?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "gpgv कार्यान्वित होत असताना अपरिचित त्रुटी" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "खालील सह्या अवैध आहेत:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2047,47 +2052,47 @@ msgstr "HTTP सर्व्हरने विस्तार तांत् msgid "Unknown date format" msgstr "अपरिचित दिनांक प्रकार/स्वरूप " -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "चुकले/असमर्थ निवड करा" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "जोडणी वेळेअभावी तुटली" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "निर्गत फाईल मध्ये लिहिताना त्रुटी/चूक" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "सर्व्हर मधून वाचण्यात चूक. लांब शेवट आणि बंद झालेली जोडणी" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "सर्व्हर मधून वाचण्यात चूक" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "फाईल छोटी करणे असफल" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "चुकीचा शीर्षक डाटा" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "जोडणी अयशस्वी" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "अंतर्गत त्रुटी" @@ -2095,18 +2100,25 @@ msgstr "अंतर्गत त्रुटी" msgid "Can't mmap an empty file" msgstr "रिकामी फाईल mmap करता येणार नाही" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "mmap चे %lu बाईटस् करता येणार नाहीत" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2136,52 +2148,52 @@ msgstr "" msgid "Selection %s not found" msgstr "%s निवडक भाग सापडत नाही" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "संक्षिप्तरुपाचा माहित नसलेला प्रकार: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "%s संरचना फाईल उघडत आहे" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "रचनेच्या नियमांचा दोष %s:%u: ब्लॉक नावाशिवाय सुरू होतो." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "रचनेच्या नियमांचा दोष : %s:%u: मालफॉर्मड् टॅग" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "रचनेच्या नियमांचा दोष %s:%u: मुल्यांच्या नंतर अधिक जंक" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "रचनेच्या नियमांचा दोष %s:%u: दिशादर्शक फक्त उच्च पातळीवर केले जाऊ शकतात" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "रचनेच्या नियमांचा दोष %s:%u: खूपच एकात एक इनक्लूडस्" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "रचनेच्या नियमांचा दोष %s:%u: ह्या पासून समाविष्ट " -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "नियम रचनेचा दोष %s:%u: '%s' दिशादर्शक असहाय्यकारी" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "नियम रचनेचा दोष %s:%u: फाईलच्या अंती अधिक जंक" @@ -2257,75 +2269,75 @@ msgstr "%s मध्ये बदलण्यास असमर्थ" msgid "Failed to stat the cdrom" msgstr "सीडी-रॉम स्टॅट करण्यास असमर्थ" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "फक्त वाचण्यासाठी कुलूप संचिका %s साठी कुलूपबंदचा वापर करीत नाही" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "%s कुलूप फाईल उघडता येत नाही" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "%s nfs(नेटवर्क फाईल सिस्टीम) माऊंटेड कुलुप फाईल ला कुलुप /बंद करता येत नाही" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "%s कुलुप मिळवता येत नाही" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s साठी थांबलो पण ते तेथे नव्हते" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s उपक्रियेने (%u) त्रुटी कोड दिलेला आहे" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s उपक्रिया अचानकपणे बाहेर पडली" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "%s फाईल उघडता येत नाही" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "वाचा, %lu अजूनही वाचण्यासाठी आहे पण आता काही उरली नाही" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "लिहा, %lu अजूनही लिहिण्यासाठी आहे पण लिहिता येत नाही" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "फाईल बंद करण्यात अडचण" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "फाईल अनलिंकिंग करण्यात अडचण" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "संचिकेची syncing समस्या" @@ -2442,52 +2454,52 @@ msgstr "%s (1) पॅकेज फाईल पार्स करण्या msgid "Unable to parse package file %s (2)" msgstr "%s (२) पॅकेज फाईल पार्स करण्यात असमर्थ" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "स्त्रोत सुची %s (यूआरआय) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "स्त्रोत सुची %s (absolute dist) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s उघडत आहे" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "%s स्त्रोत सुचीमध्ये ओळ %u खूप लांब आहे." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "स्त्रोत सुची %s (प्रकार) मध्ये %u वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही " -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "स्त्रोत सुची %s (विक्रेता आयडी) मध्ये %u वाईट/व्यंग रेषा " @@ -2612,17 +2624,17 @@ msgstr "पॅकेजच्या याद्या किंवा संच msgid "You may want to run apt-get update to correct these problems" msgstr "तुम्ही ह्या समस्यांचे निवारण करण्यासाठी apt-get update प्रोग्राम चालू करु शकता" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "पसंतीच्या संचिकेत अवैध माहितीसंच, पॅकेजला शीर्षक नाही " -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "%s पिनचा प्रकार समजलेला नाही" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "पिन करिता प्राधान्य/अग्रक्रम (किंवा शून्य)निर्देशीत केलेला नाही" @@ -2711,16 +2723,16 @@ msgstr "%s (तरतूद/पुरवलेल्या संचिका msgid "Package %s %s was not found while processing file dependencies" msgstr "अवलंबित/विसंबून असणाऱ्या संचिकांची प्रक्रिया करीत असतांना पॅकेज %s %s सापडले नाही " -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "तरतूद/पुरवलेल्या संचिका संग्रहित करीत आहे" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "IO त्रुटी उगम निवडक संचयस्थानात संग्रहित होत आहे" @@ -2729,19 +2741,19 @@ msgstr "IO त्रुटी उगम निवडक संचयस्था msgid "rename failed, %s (%s -> %s)." msgstr "पुनर्नामांकन अयशस्वी, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "एमडी५ बेरीज/MD5Sum जुळत नाही" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "हॅश बेरीज जुळत नाही" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "पुढील कळ ओळखचिन्हांसाठी सार्वजनिक कळ उपलब्ध नाही:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2750,7 +2762,7 @@ msgstr "" "मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते " "स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) " -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2759,7 +2771,7 @@ msgstr "" "मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हालाहे पॅकेज स्वहस्ते " "स्थिर/निश्चित करण्याची गरज आहे." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2767,7 +2779,7 @@ msgstr "" "पॅकेज यादीची/सुचीची संचिका दूषित/खराब झालेली आहे. संचिका नाव नाही: पॅकेजकरीता क्षेत्र/" "ठिकाण %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "आकार जुळतनाही" @@ -2902,7 +2914,6 @@ msgstr "%i गहाळ संचिकाबरोबर आणि %i विज #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "%s संरचना फाईल उघडत आहे" @@ -2913,7 +2924,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "हॅश बेरीज जुळत नाही" @@ -2934,7 +2944,6 @@ msgstr "%s काढून टाकत आहे" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "%s संपूर्ण काढून टाकले" @@ -3018,14 +3027,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "फाईल पॅच करता आली नाही" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "जोडणी अकाली बंद झाली" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "'%s': कीरिंग पर्यंत पोहोचू शकत नाही" + +#~ msgid "Could not patch file" +#~ msgstr "फाईल पॅच करता आली नाही" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/nb.po b/po/nb.po index 7688df3e7..7f92788f1 100644 --- a/po/nb.po +++ b/po/nb.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2009-02-01 18:26+0100\n" "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n" "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.ui.no>\n" @@ -154,7 +154,7 @@ msgstr " Versjonstabell:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s kompilert p %s %s\n" @@ -309,7 +309,7 @@ msgstr "" " -c=? Les denne innstillingsfila.\n" " -o=? Sett en vilkrlig innstilling, f.eks. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Kan ikke skrive til %s" @@ -443,8 +443,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "Databasen er gammel, forsker oppgradere %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "DB-formatet er ugyldig. Hvis du oppgraderte fra en eldre versjon av apt, " @@ -461,11 +462,11 @@ msgstr "Klarte ikke msgid "Failed to stat %s" msgstr "Klarte ikke f statusen p %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arkivet har ingen kontrollpost" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Klarte ikke finne en peker" @@ -530,26 +531,26 @@ msgstr "*** Klarte ikke msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-grensa p %s B er ndd.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Arkivet har ikke noe pakkefelt" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen overstyringsoppfring\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-vedlikeholderen er %s, ikke %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s har ingen kildeoverstyringsoppfring\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s har ingen binroverstyringsoppfring heller\n" @@ -653,7 +654,7 @@ msgstr "Klarte ikke msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Kompileringsfeil i regulrt uttrykk - %s" @@ -814,11 +815,11 @@ msgstr "Pakker trenges msgid "Internal error, Ordering didn't finish" msgstr "Intern feil, sortering fullfrte ikke" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Klarer ikke lse nedlastingsmappa" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Kan ikke lese kildlista." @@ -849,8 +850,8 @@ msgstr "Etter denne operasjonen vil %sB ekstra diskplass bli brukt.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Etter denne operasjonen vil %sB diskplass bli ledig.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Klarte ikke bestemme ledig plass i %s" @@ -888,7 +889,7 @@ msgstr "Avbryter." msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsette [Y/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikke skaffe %s %s\n" @@ -897,7 +898,7 @@ msgstr "Klarte ikke msgid "Some files failed to download" msgstr "Noen av filene kunne ikke lastes ned" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Nedlasting fullfrt med innstillinga bare nedlasting" @@ -995,50 +996,50 @@ msgstr "Versjon msgid "Selected version %s (%s) for %s\n" msgstr "Utvalgt versjon %s (%s) for %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Kunne ikke finne informasjon om %s - lista over kildekodepakker" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Oppdaterings-kommandoen tar ingen argumenter" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Kan ikke lse listemappa" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Vi skal ikke slette ting, kan ikke starte auto-fjerner (AutoRemover)" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Flgende pakker ble automatisk installert og er ikke lenger pkrevet:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Flgende pakker ble automatisk installert og er ikke lenger pkrevet:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Bruk apt-get autoremove for fjerne dem." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1056,43 +1057,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Flgende informasjon kan vre til hjelp med lse problemet:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Intern feil, autofjerneren (AutoRemover) dela noe" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil - AllUpgrade dela noe" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Klarte ikke finne oppgave %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Klarte ikke finne pakken %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, velger %s istedenfor det regulre uttrykket %s\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s satt til manuell installasjon.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du vil kanskje utfre apt-get -f install for rette p disse:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1100,7 +1101,7 @@ msgstr "" "Uinnfridde avhengighetsforhold. Prv apt-get -f install uten pakker (eller " "angi en lsning)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1112,122 +1113,122 @@ msgstr "" "at visse kjernepakker enn ikke er laget eller flyttet ut av Incoming for\n" "distribusjonen." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "delagte pakker" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Flgende ekstra pakker vil bli installert." -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Foresltte pakker:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Anbefalte pakker" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Beregner oppgradering... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Mislyktes" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Utfrt" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil, problemlser dela noe" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Du m angi minst en pakke du vil ha kildekoden til" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Klarer ikke finne en kildekodepakke for %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hopper over allerede nedlastet fil %s\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plass i %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Trenger skaffe %sB av %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Trenger skaffe %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Skaffer kildekode %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Klarte ikke skaffe alle arkivene." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omgr utpakking av allerede utpakket kilde i %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislyktes.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Sjekk om pakken dpkg-dev er installert.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggekommandoen %s mislyktes.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Barneprosessen mislyktes" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "Du m angi minst en pakke du vil sjekke builddeps for" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarer ikke skaffe informasjon om bygge-avhengighetene for %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen avhengigheter.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1236,32 +1237,32 @@ msgstr "" "Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige " "versjoner av pakken %s som oppfyller versjonskravene" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Klarte ikke tilfredsstille %s avhengighet for %s: den installerte pakken %" "s er for ny" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikke tilfredsstille %s avhengighet for %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Klarte ikke tilfredstille bygg-avhengighetene for %s." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Klarte ikke behandle forutsetningene for bygging" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Stttede moduler:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1346,7 +1347,7 @@ msgstr "" "for mer informasjon og flere innstillinger\n" " Denne APT har kraften til en Superku.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1594,11 +1595,10 @@ msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Klarer ikke lese %s" @@ -1629,9 +1629,9 @@ msgstr "" "Infokatalogen og den midlertidige katalogen m vre p det samme filsystemet" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Leser pakkelister" @@ -1769,11 +1769,11 @@ msgid "File not found" msgstr "Fant ikke fila" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Klarte ikke f status" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Klarte ikke sette endringstidspunkt" @@ -1835,7 +1835,7 @@ msgstr "Tidsavbrudd p msgid "Server closed the connection" msgstr "Tjeneren lukket forbindelsen" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Lesefeil" @@ -1847,7 +1847,7 @@ msgstr "Et svar oversv msgid "Protocol corruption" msgstr "Protokolldeleggelse" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivefeil" @@ -1901,7 +1901,7 @@ msgstr "Tidsavbrudd p msgid "Unable to accept connection" msgstr "Klarte ikke godta tilkoblingen" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nkkel for fil" @@ -1965,59 +1965,64 @@ msgstr "Klarte ikke msgid "Connecting to %s" msgstr "Kobler til %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Klarte ikke sl opp %s" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Midlertidig feil ved oppslag av %s" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Noe galt skjedde ved oppslag av %s:%s (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Klarte ikke koble til %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Klarte ikke sl opp i nkkelring; %s" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Avbryter istallasjonen." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Argumentliste fra Acquire::gpgv::Options for lang. Avbryter." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Intern feil: God signatur, men kunne bestemme nkkelfingeravtrykk?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Minst en ugyldig signatur ble funnet." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Klarte ikke kjre %s for verifisere signaturen (er gpgv installert?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Ukjent feil ved kjring av gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "De flgende signaturene var ugyldige:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2068,47 +2073,47 @@ msgstr "Denne HTTP-tjeneren har msgid "Unknown date format" msgstr "Ukjent datoformat" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Utvalget mislykkes" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Tidsavbrudd p forbindelsen" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Feil ved lesing fra tjeneren" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Klarte ikke forkorte fila %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "delagte hodedata" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Forbindelsen mislykkes" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Intern feil" @@ -2116,12 +2121,12 @@ msgstr "Intern feil" msgid "Can't mmap an empty file" msgstr "Kan ikke utfre mmap p en tom fil" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Kunne ikke lage mmap av %lu bytes" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " @@ -2130,6 +2135,13 @@ msgstr "" "Dynamisk MMap gikk tom for minne. k strrelsen p APT::Cache-Limit. " "Nvrende verdi: %lu. (man 5 apt.conf)" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2159,52 +2171,52 @@ msgstr "" msgid "Selection %s not found" msgstr "Fant ikke utvalget %s" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ukjent typeforkortelse: %c" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "pner oppsettsfila %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaksfeil %s:%u: Blokka starter uten navn." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksfeil %s:%u: Feil p taggen" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaksfeil %s:%u: Ugyldige angivelser etter verdien" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaksfeil %s:%u: Direktivene kan bare ligge i det verste nivet" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaksfeil %s:%u: For mange nstede inkluderte filer" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksfeil %s:%u: Inkludert herfra" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaksfeil %s:%u: Direktivet %s er ikke stttet" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksfeil %s:%u: Ugyldige angivelser p slutten av fila" @@ -2280,75 +2292,75 @@ msgstr "Klarer ikke msgid "Failed to stat the cdrom" msgstr "Klarer ikke f statusen p CD-spilleren" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Bruker ikke lsing for den skrivebeskyttede lsefila %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Kunne ikke pne lsefila %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Bruker ikke lsing p den nfs-monterte lsefila %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Fr ikke lst %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ventet p %s, men den ble ikke funnet" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprosessen %s mottok et minnefeilsignal." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Underprosessen %s mottok et minnefeilsignal." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprosessen %s ga en feilkode (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprosessen %s avsluttet uventet" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Kunne ikke pne fila %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "lese, har fremdeles %lu igjen lese, men ingen igjen" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skrive, har fremdeles %lu igjen skrive, men klarte ikke " -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problem ved lsing av fila" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Problem ved oppheving av lenke til fila" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Problem ved oppdatering av fila" @@ -2465,52 +2477,52 @@ msgstr "Klarer ikke msgid "Unable to parse package file %s (2)" msgstr "Klarer ikke fortolke pakkefila %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Feil p linje %lu i kildelista %s (nettadresse)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Feil p linje %lu i kildelista %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Feil p %lu i kildelista %s (fortolkning av nettadressen)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Feil p %lu i kildelista %s (Absolutt dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Feil p %lu i kildelista %s (dist fortolking)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "pner %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Linje %u i kildelista %s er for lang" -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Feil p %u i kildelista %s (type)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen %s er ukjent i linje %u i kildelista %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Feil p %u i kildelista %s (selgers id)" @@ -2637,17 +2649,17 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "" "Det kan hende du vil kjre apt-get update for rette p disse problemene" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Ugyldig oppslag i foretrekksfila, manglende pakkehode" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Forsto ikke spikring av typen %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller null) spesifisert for pin" @@ -2731,16 +2743,16 @@ msgstr "Feil oppsto under behandling av %s (CollectFileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "Fant ikke pakken %s %s ved behandling av filkrav" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunne ikke finne informasjon om %s - lista over kildekodepakker" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Samler inn filtilbud" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "IO-feil ved lagring av kildekode-lager" @@ -2749,20 +2761,20 @@ msgstr "IO-feil ved lagring av kildekode-lager" msgid "rename failed, %s (%s -> %s)." msgstr "klarte ikke endre navnet, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "Feil MD5sum" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Hashsummen stemmer ikke" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Det er ingen offentlig nkkel tilgjengelig for de flgende nkkel-ID-ene:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2771,7 +2783,7 @@ msgstr "" "Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne pakken " "selv (fordi arkitekturen mangler)." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2780,13 +2792,13 @@ msgstr "" "Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne denne " "pakken selv." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Oversiktsfilene er delagte. Feltet Filename: mangler for pakken %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Feil strrelse" @@ -2921,7 +2933,6 @@ msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "pner oppsettsfila %s" @@ -2932,7 +2943,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Hashsummen stemmer ikke" @@ -2953,7 +2963,6 @@ msgstr "Fjerner %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Fjernet %s fullstendig" @@ -3037,14 +3046,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Kunne ikke pne fila %s" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Forbindelsen ble uventet stengt" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Klarte ikke sl opp i nkkelring; %s" + +#~ msgid "Could not patch file" +#~ msgstr "Kunne ikke pne fila %s" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/ne.po b/po/ne.po index 5ea94d3a7..08d1225f3 100644 --- a/po/ne.po +++ b/po/ne.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n" "Language-Team: Nepali <info@mpp.org.np>\n" @@ -149,7 +149,7 @@ msgstr " संस्करण तालिका:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s को लागि %s %s, %s %s मा कम्पाएल गरिएको छ\n" @@ -304,7 +304,7 @@ msgstr "" " -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n" " -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr " %s मा लेख्न असक्षम" @@ -441,7 +441,7 @@ msgstr "DB पुरानो छ, %s स्तरवृद्धि गर् #: ftparchive/cachedb.cc:72 msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" @@ -456,11 +456,11 @@ msgstr "DB फाइल %s असक्षम भयो: %s" msgid "Failed to stat %s" msgstr " %s स्थिर गर्न असफल" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "संग्रह संग नियन्त्रण रेकर्ड छैन" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "कर्सर प्राप्त गर्न असक्षम भयो" @@ -525,26 +525,26 @@ msgstr "*** %s मा %s लिङ्क असफल भयो" msgid " DeLink limit of %sB hit.\n" msgstr "यस %sB हिटको डि लिङ्क सिमा।\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "संग्रह संग कुनै प्याकेज फाँट छैन" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s संभारकर्ता %s हो %s होइन\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" @@ -648,7 +648,7 @@ msgstr " %s मा %s पुन:नामकरण असफल भयो" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s" @@ -809,11 +809,11 @@ msgstr "प्याकेजहरू हट्न चाहदैछन् त msgid "Internal error, Ordering didn't finish" msgstr "आन्तरिक त्रुटि, आदेश समाप्त भएको छैन" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "डाउनलोड डाइरेक्ट्री ताल्चा मार्न असक्षम" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "स्रोतहरुको सूचि पढ्न सकिएन ।" @@ -842,8 +842,8 @@ msgstr "अनप्याक गरिसके पछि थप डिस् msgid "After this operation, %sB disk space will be freed.\n" msgstr "%sB अनप्याक गरिसके पछि डिस्क खाली ठाउँ खाली हुनेछ ।\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन" @@ -880,7 +880,7 @@ msgstr "परित्याग गर्नुहोस् ।" msgid "Do you want to continue [Y/n]? " msgstr "के तपाईँ निरन्तरता दिन चाहनुहुन्छ [Y/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s तान्न असफल भयो\n" @@ -889,7 +889,7 @@ msgstr "%s %s तान्न असफल भयो\n" msgid "Some files failed to download" msgstr "केही फाइलहरू डाउनलोड गर्न असफल भयो" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ" @@ -986,51 +986,51 @@ msgstr " '%s' को लागि '%s' संस्करण फेला पा msgid "Selected version %s (%s) for %s\n" msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन " -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1046,44 +1046,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "निम्न सूचनाले अवस्थालाई हल गर्न मद्दत गर्नेछ: " -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो " -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "आन्तरिक त्रुटि,सबै स्तरवृद्धिले उत्तम गुण नष्ट गर्दछ" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "प्याकेज फेला पार्न सकिएन %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "प्याकेज फेला पार्न सकिएन %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "द्रष्टब्य, रिजेक्स '%s' को लागि %s चयन गरिदैछ\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "तर %s स्थापना हुनुपर्यो" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "तपाईँ यसलाई सुधार गर्न `apt-get -f install' चलाउन चाहनुहुन्छ:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1091,7 +1091,7 @@ msgstr "" "नभेटिएका निर्भरताहरू । प्याकेजहरू बिना 'apt-get -f install' प्रयास गर्नुहोस् ( वा " "समाधान निर्दिष्ट गर्नुहोस्) ।" -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1104,122 +1104,122 @@ msgstr "" " वितरण अहिले सम्म सिर्जना\n" " भएको छैन वा आवगमन विनानै सर्यो ।" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "भाँचिएका प्याकेजहरू" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "निम्न अतिरिक्त प्याकेजहरू स्थापना हुनेछन्:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "सुझाव दिएका प्याकेजहरू:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "सिफारिस गरिएका प्याकेजहरू:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "स्तर वृद्धि गणना गरिदैछ..." -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "असफल भयो" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "काम भयो" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो " -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "%s को लागि स्रोत प्याकेज फेला पार्न असफल भयो" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "स्रोत संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक छ ।\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "स्रोत फड्काउनुहोस् %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "केही संग्रह फड्काउन असफल भयो ।" -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "अनप्याक आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "निर्माण आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "शाखा प्रक्रिया असफल भयो" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1228,30 +1228,30 @@ msgstr "" "%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण " "आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन " -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । " -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "समर्थित मोड्युलहरू:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1334,7 +1334,7 @@ msgstr "" "pages हेर्नुहोस् ।\n" " APT संग सुपर काउ शक्तिहरू छ ।\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1581,11 +1581,10 @@ msgstr "फाइल %s/%s ले प्याकेज %s मा एउटा #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "%s पढ्न असफल भयो" @@ -1615,9 +1614,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "सूचना र टेम्प डाइरेक्ट्रीहरू एउटै फाइल प्रणालीमा हुनपर्छ" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "प्याकेज सूचिहरू पढिदैछ" @@ -1750,11 +1749,11 @@ msgid "File not found" msgstr "फाइल फेला परेन " #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "स्थिर गर्न असफल भयो" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "परिमार्जन समय सेट असफल भयो" @@ -1816,7 +1815,7 @@ msgstr "जडान समय सकियो" msgid "Server closed the connection" msgstr "सर्भरले जडान बन्द गर्यो" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "त्रुटि पढ्नुहोस्" @@ -1828,7 +1827,7 @@ msgstr "एउटा प्रतिक्रियाले बफर अधि msgid "Protocol corruption" msgstr "प्रोटोकल दूषित" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "त्रुटि लेख्नुहोस्" @@ -1882,7 +1881,7 @@ msgstr "डेटा सकेटको जडान समय सकियो" msgid "Unable to accept connection" msgstr "जडान स्वीकार गर्न असक्षम भयो" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "समस्या द्रुतान्वेषण फाइल" @@ -1946,58 +1945,63 @@ msgstr " %s:%s (%s) मा जडान गर्न सकिएन ।" msgid "Connecting to %s" msgstr "%s मा जडान गरिदैछ" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "'%s' हल गर्न सकिएन" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "'%s' हल गर्दा अस्थायी असफल" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट्यो" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "%s %s मा जडान गर्न असफल भयो:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "कुञ्जी घण्टी पहुँच गर्न सकिएन: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "स्थापना परित्याग गरिदैछ ।" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" + +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: प्राप्त गर्नेबाट तर्क सूचि::gpgv::अति लामो विकल्पहरू अवस्थित छ ।" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "आन्तरिक त्रुटि: असल हस्ताक्षर, तर कुञ्जी औठाछाप निर्धारण गर्न सकिएन?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gpgv स्थापना भयो?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "gpgv कार्यन्वयन गर्दा अज्ञात त्रुटि" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "निम्न हस्ताक्षरहरू अवैध छन्:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2046,48 +2050,48 @@ msgstr "HTTP सर्भर संग भाँचिएको दायरा msgid "Unknown date format" msgstr "अज्ञात मिति ढाँचा" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "असफल चयन गर्नुहोस्" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "जडान समय सकियो" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "निर्गात फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "सर्भरबाट त्रुटि पढिदैछ । दूर गन्तब्य बन्द जडान" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "सर्भरबाट त्रुटि पढिदैछ" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "फाइल %s लेख्न असफल भयो" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "खराब हेडर डेटा" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "जडान असफल भयो" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "आन्तरिक त्रुटि" @@ -2095,18 +2099,25 @@ msgstr "आन्तरिक त्रुटि" msgid "Can't mmap an empty file" msgstr "एउटा खाली फाइल mmap बनाउन सकिएन" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "%lu बाइटहरुको mmap बनाउन सकिएन" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2136,52 +2147,52 @@ msgstr "" msgid "Selection %s not found" msgstr "चयन %s फेला पार्न सकिएन" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "नचिनिएको टाइप संक्षिप्त रुप: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "कनफिगरेसन फाइल खोलिदैछ %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "वाक्य संरचना त्रुटि %s:%u: बन्द कुनै नाम बिना सुरू हुन्छ ।" -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "वाक्य संरचना त्रुटि %s:%u: वैरुप गरिएको ट्याग" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "वाक्य संरचना त्रुटि %s:%u: मान पछाडि अतिरिक्त जंक" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "वाक्य संरचना त्रुटि %s:%u: निर्देशनहरू माथिल्लो तहबाट मात्र हुन्छ" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "वाक्य संरचना त्रुटि %s:%u: अति धेरै नेस्टेड समावेश गर्दछ" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "वाक्य संरचना त्रुटि %s:%u: यहाँ बाट समावेश गरेको" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "वाक्य संरचना त्रुटि %s:%u: समर्थन नभएको डाइरेक्टिभ '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "वाक्य संरचना त्रुटि %s:%u:फाइलको अन्त्यमा अतिरिक्त जंक" @@ -2257,75 +2268,75 @@ msgstr "%s मा परिवर्तन गर्न असक्षम" msgid "Failed to stat the cdrom" msgstr "सिडी रोम स्थिर गर्न असफल भयो" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "ताल्चा मारिएको फाइल मात्र पढ्नको लागि ताल्चा मार्न प्रयोग गरिएको छैन %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "ताल्चा मारिएको फाइल खोल्न सकिएन %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "nfs माउन्ट गरिएको लक फाइलको लागि लक प्रयोग गरिएको छैन %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "ताल्चा प्राप्त गर्न सकिएन %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।" -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।" -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "सहायक प्रक्रिया %s ले एउटा त्रुटि कोड फर्कायो (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "सहायक प्रक्रिया %s अनपेक्षित बन्द भयो" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "फाइल %s खोल्न सकिएन" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "पड्नुहोस्, अहिले सम्म %lu पढ्न छ तर कुनै बाँकी छैन" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "लेख्नुहोस्, अहिले सम्म %lu लेख्न छ तर सकिदैन " -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "फाइल बन्द गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "फाइल अनलिङ्क गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "फाइल गुप्तिकरण गर्दा समस्या" @@ -2443,52 +2454,52 @@ msgstr "प्याकेज फाइल पद वर्णन गर्न msgid "Unable to parse package file %s (2)" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (२)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (पूर्ण dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s खोलिदैछ" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "लाइन %u स्रोत सूचि %s मा अति लामो छ ।" -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (प्रकार)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (बिक्रता आइडी)" @@ -2612,17 +2623,17 @@ msgstr "प्याकेज सूचीहरू वा वस्तुस् msgid "You may want to run apt-get update to correct these problems" msgstr "यो समस्याहरू सुधार्न तपाईँ apt-get अद्यावधिक चलाउन चाहनुहुन्छ" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "प्राथमिकता फाइलमा अवैध रेकर्ड, कुनै प्याकेज हेडर छैन" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "पिन टाइप %s बुझ्न सकिएन " -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "पिनको लागि कुनै प्राथमिकता (वा शून्य) निर्दिष्ट छैन" @@ -2707,16 +2718,16 @@ msgstr " %s प्रक्रिया गर्दा त्रुटि द msgid "Package %s %s was not found while processing file dependencies" msgstr "फाइल निर्भरताहरू प्रक्रिया गर्दा प्याकेज %s %s फेला परेन" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन " -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "फाइल उपलब्धताहरू संकलन गरिदैछ" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि" @@ -2725,20 +2736,20 @@ msgstr "स्रोत क्यास बचत गर्दा IO त्र msgid "rename failed, %s (%s -> %s)." msgstr "पुन:नामकरण असफल गरियो, %s (%s -> %s) ।" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum मेल भएन" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum मेल भएन" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "निम्न कुञ्जी IDs को लागि कुनै सार्वजनिक कुञ्जी उपलब्ध छैन:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2747,7 +2758,7 @@ msgstr "" "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज " "निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) " -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2756,13 +2767,13 @@ msgstr "" "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज " "निश्चित गर्नुहोस् ।" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "प्याकेज अनुक्रमणिका फाइलहरू दूषित भए । प्याकेज %s को लागि कुनै फाइलनाम: फाँट छैन ।" -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "साइज मेल खाएन" @@ -2896,7 +2907,6 @@ msgstr "हराइरहेको फाइल %i हरू र मेल न #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "कनफिगरेसन फाइल खोलिदैछ %s" @@ -2927,7 +2937,6 @@ msgstr " %s हटाइदैछ" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr " %s पूर्ण रुपले हट्यो" @@ -3011,15 +3020,31 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "फाइल %s खोल्न सकिएन" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "जडान असमायिक बन्द भयो" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "कुञ्जी घण्टी पहुँच गर्न सकिएन: '%s'" + +#, fuzzy +#~ msgid "Could not patch file" +#~ msgstr "फाइल %s खोल्न सकिएन" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/nl.po b/po/nl.po index 5f37143a6..967869c6e 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: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-05-05 18:39+0200\n" "Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n" "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n" @@ -147,7 +147,7 @@ msgstr " Versietabel:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s voor %s gecompileerd op %s %s\n" @@ -305,7 +305,7 @@ msgstr "" " -c=? Lees dit configuratiebestand.\n" " -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Kan niet naar %s schrijven" @@ -443,8 +443,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB is verouderd, opwaardering van %s wordt geprobeerd" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "DB-formaat is ongeldig. Als u opgewaardeerd heeft van een oudere versie, van " @@ -461,11 +462,11 @@ msgstr "Kan het DB-bestand %s niet openen: %s" msgid "Failed to stat %s" msgstr "Status opvragen van %s is mislukt" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Archief heeft geen 'control'-record" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Kan geen cursor verkrijgen" @@ -530,26 +531,26 @@ msgstr "*** Linken van %s aan %s is mislukt" msgid " DeLink limit of %sB hit.\n" msgstr " Ontlinklimiet van %sB is bereikt.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Archief heeft geen 'package'-veld" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s heeft geen voorrangsingang\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s beheerder is %s, niet %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s heeft geen voorrangsingang voor bronpakketten\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n" @@ -653,7 +654,7 @@ msgstr "Hernoemen van %s naar %s is mislukt" msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-compilatiefout - %s" @@ -815,11 +816,11 @@ msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld." msgid "Internal error, Ordering didn't finish" msgstr "Interne fout, rangschikken is niet voltooid" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Kon de ophaalmap niet vergrendelen" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "De lijst van bronnen kon niet gelezen worden." @@ -850,8 +851,8 @@ msgstr "Door deze operatie zal er %sB extra schijfruimte gebruikt worden.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Door deze operatie zal er %sB schijfruimte vrijkomen.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen" @@ -888,7 +889,7 @@ msgstr "Afbreken." msgid "Do you want to continue [Y/n]? " msgstr "Wilt u doorgaan [J/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s %s is mislukt\n" @@ -897,7 +898,7 @@ msgstr "Ophalen van %s %s is mislukt\n" msgid "Some files failed to download" msgstr "Ophalen van sommige bestanden is mislukt" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Ophalen klaar en alleen-ophalen-modus staat aan" @@ -997,35 +998,35 @@ msgstr "Versie '%s' voor '%s' is niet gevonden" msgid "Selected version %s (%s) for %s\n" msgstr "Versie %s (%s) geselecteerd voor %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Kon de status van de bronpakketlijst %s niet opvragen" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "De 'update'-opdracht aanvaard geen argumenten" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Kon de lijst-map niet vergrendelen" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "We mogen geen dingen verwijderen, kan AutoRemover niet starten" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1033,18 +1034,18 @@ msgstr "" "De volgende pakketten zijn automatisch geïnstalleerd en zijn niet langer " "nodig:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "De volgende pakketten zijn automatisch geïnstalleerd en zijn niet langer " "nodig:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "U kunt deze verwijderen via 'apt-get autoremove'." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1062,45 +1063,45 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "De volgende informatie helpt u mogelijk verder:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Interne fout, AutoRemover heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Kon taak %s niet vinden" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Kon pakket %s niet vinden" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Let op, %s wordt geselecteerd omwille van de regex '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s is ingesteld voor handmatige installatie.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "U wilt waarschijnlijk 'apt-get -f install' uitvoeren om volgende op te " "lossen:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1108,7 +1109,7 @@ msgstr "" "Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren " "zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1119,119 +1120,119 @@ msgstr "" "een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n" "gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Niet-werkende pakketten:" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "De volgende extra pakketten zullen geïnstalleerd worden:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Voorgestelde pakketten:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Aanbevolen pakketten:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Opwaardering wordt doorgerekend... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Mislukt" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Klaar" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "" "U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet " "worden" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Kan geen bronpakket vinden voor %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "U heeft niet voldoende vrije schijfruimte op %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Moet %sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Ophalen bron %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Ophalen van sommige archieven is mislukt." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uitpakopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geïnstalleerd is.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Bouwopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Dochterproces is mislukt" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "U dient tenminste één pakket op te geven om de bouwvereisten van te " "controleren" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s heeft geen bouwvereisten.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1240,7 +1241,7 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1249,32 +1250,32 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat er geen " "beschikbare versies zijn van pakket %s die aan de versievereisten voldoen" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Voldoen van Vereiste %s van pakket %s is mislukt: geïnstalleerde versie %s " "is te nieuw" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Voldoen van de vereiste %s van pakket %s is mislukt: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bouwvereisten voor %s konden niet voldaan worden." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Verwerken van de bouwvereisten is mislukt" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Ondersteunde modules:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1363,7 +1364,7 @@ msgstr "" "voor meer informatie en opties.\n" " Deze APT heeft Super Koekrachten.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1616,11 +1617,10 @@ msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Kan %s niet lezen" @@ -1651,9 +1651,9 @@ msgstr "" "De 'info'- en de 'temp'-mappen dienen op hetzelfde bestandsysteem te staan" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Pakketlijsten worden ingelezen" @@ -1789,11 +1789,11 @@ msgid "File not found" msgstr "Bestand niet gevonden" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Status opvragen is mislukt" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Instellen van de aanpassingstijd is mislukt" @@ -1855,7 +1855,7 @@ msgstr "Verbinding is verlopen" msgid "Server closed the connection" msgstr "Verbinding is verbroken door de server" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Leesfout" @@ -1867,7 +1867,7 @@ msgstr "Een reactie deed de buffer overlopen" msgid "Protocol corruption" msgstr "Protocolcorruptie" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Schrijffout" @@ -1921,7 +1921,7 @@ msgstr "Datasocket verbinding is verlopen" msgid "Unable to accept connection" msgstr "Kan de verbinding niet aanvaarden" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probleem bij het hashen van het bestand" @@ -1985,64 +1985,69 @@ msgstr "Kon niet verbinden met %s:%s (%s)." msgid "Connecting to %s" msgstr "Er wordt verbinding gemaakt met %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Kon '%s' niet vinden" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Tijdelijke fout bij het opzoeken van '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Er gebeurde iets raars bij het zoeken naar '%s:%s' (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Kan niet verbinden met %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Kon de sleutelring niet benaderen: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Installatie wordt afgebroken." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "F: argumentenlijst van Acquire::gpv::Options was te lang. Er wordt " "afgesloten." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Interne fout: ondertekening is goed maar kon de vingerafdruk van de sleutel\n" "niet bepalen?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Er is tenminste één ongeldige ondertekening gevonden." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Kon '%s' niet uitvoeren om ondertekening te verifiëren (is gpgv " "geïnstalleerd?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Onbekende fout bij het uitvoeren van gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "De volgende ondertekeningen waren ongeldig:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2095,49 +2100,49 @@ msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet" msgid "Unknown date format" msgstr "Onbekend datumformaat" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Selectie is mislukt" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Verbinding verliep" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Fout bij het schrijven naar het uitvoerbestand" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Fout bij het schrijven naar bestand" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Fout bij het schrijven naar het bestand" -#: methods/http.cc:891 +#: methods/http.cc:892 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:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Fout bij het lezen van de server" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Wegschrijven van bestand %s is mislukt" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Foute koptekstdata" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Verbinding mislukt" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Interne fout" @@ -2145,18 +2150,25 @@ msgstr "Interne fout" msgid "Can't mmap an empty file" msgstr "Kan een leeg bestand niet mmappen" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Kon van %lu bytes geen mmap maken" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2186,54 +2198,54 @@ msgstr "" msgid "Selection %s not found" msgstr "Selectie %s niet gevonden" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Onbekende type-afkorting '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Configuratiebestand %s wordt geopend" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaxfout %s:%u: Blok start zonder naam." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaxfout %s:%u: Verkeerd gevormde markering" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaxfout %s:%u: Extra rommel na waarde" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntaxfout %s:%u: Richtlijnen kunnen enkel op het hoogste niveau gegeven " "worden" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaxfout %s:%u: Teveel geneste invoegingen" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaxfout %s:%u: Vanaf hier ingevoegd" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaxfout %s:%u: Niet-ondersteunde richtlijn '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaxfout %s:%u: Extra rommel aan het einde van het bestand" @@ -2311,78 +2323,78 @@ msgstr "Kan %s niet veranderen" msgid "Failed to stat the cdrom" msgstr "Het opvragen van de CD-status is mislukt" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Er wordt geen vergrendeling gebruikt voor het alleen-lezen-" "vergrendelingsbestand %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Kon het vergrendelingsbestand '%s' niet openen" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Het via nfs aangekoppelde vergrendelingsbestand %s wordt niet vergrendeld" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Kon vergrendeling %s niet verkrijgen" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Er is gewacht op %s, maar die kwam niet" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Subproces %s ontving een segmentatiefout." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Subproces %s ontving een segmentatiefout." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Subproces %s gaf de foutcode %u terug" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Subproces %s sloot onverwacht af" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Kon het bestand %s niet openen" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "lees, de laatste te lezen %lu zijn niet beschikbaar" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "schrijf, de laatste %lu konden niet weggeschreven worden" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Probleem bij het afsluiten van het bestand" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Probleem bij het ontlinken van het bestand" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Probleem bij het synchroniseren van het bestand" @@ -2499,52 +2511,52 @@ msgstr "Kon pakketbestand %s niet ontleden (1)" msgid "Unable to parse package file %s (2)" msgstr "Kon pakketbestand %s niet ontleden (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Misvormde regel %lu in bronlijst %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Misvormde regel %lu in bronlijst %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Misvormde regel %lu in bronlijst %s (URI parse)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Misvormde regel %lu in bronlijst %s (absolute dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Misvormde regel %lu in bronlijst %s (dist parse)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s wordt geopend" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Regel %u van de bronlijst %s is te lang." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misvormde regel %u in bronlijst %s (type)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Type '%s' op regel %u in bronlijst %s is onbekend" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Misvormde regel %u in bronlijst %s (verkopers-ID)" @@ -2677,17 +2689,17 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "" "U kunt misschien 'apt-get update' uitvoeren om deze problemen te verhelpen" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Ongeldige record in het voorkeurenbestand, geen 'Package'-koptekst" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Pintype %s wordt niet begrepen" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin" @@ -2775,16 +2787,16 @@ msgstr "" "Pakket %s %s werd niet gevonden bij het verwerken van de " "bestandsafhankelijkheden" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kon de status van de bronpakketlijst %s niet opvragen" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Voorziene bestanden worden verzameld" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakket-cache" @@ -2793,20 +2805,20 @@ msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakket-cache" msgid "rename failed, %s (%s -> %s)." msgstr "herbenoeming is mislukt, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5-som komt niet overeen" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Hash-som komt niet overeen" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2815,7 +2827,7 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren (wegens missende architectuur)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2824,7 +2836,7 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2832,7 +2844,7 @@ msgstr "" "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor " "pakket %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Grootte komt niet overeen" @@ -2969,7 +2981,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Configuratiebestand %s wordt geopend" @@ -2980,7 +2991,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Hash-som komt niet overeen" @@ -3001,7 +3011,6 @@ msgstr "%s wordt verwijderd" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "%s is volledig verwijderd" @@ -3087,14 +3096,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Kon bestand niet patchen" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Verbinding werd voortijdig afgebroken" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Kon de sleutelring niet benaderen: '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "Kon bestand niet patchen" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/nn.po b/po/nn.po index 8508266f1..428d07152 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: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n" "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -151,7 +151,7 @@ msgstr " Versjonstabell:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s %s kompilert p %s %s\n" @@ -308,7 +308,7 @@ msgstr "" " -c=? Les denne innstillingsfila.\n" " -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Klarte ikkje skriva til %s" @@ -442,7 +442,7 @@ msgstr "DB er for gammal, fors #: ftparchive/cachedb.cc:72 msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" @@ -457,11 +457,11 @@ msgstr "Klarte ikkje opna DB-fila %s: %s" msgid "Failed to stat %s" msgstr "Klarte ikkje f status til %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arkivet har ingen kontrollpost" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Klarte ikkje f peikar" @@ -526,26 +526,26 @@ msgstr "*** Klarte ikkje lenkja %s til %s" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-grensa p %sB er ndd.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Arkivet har ikkje noko pakkefelt" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s har inga overstyringsoppfring\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-vedlikehaldaren er %s, ikkje %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " %s har inga overstyringsoppfring\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " %s har inga overstyringsoppfring\n" @@ -649,7 +649,7 @@ msgstr "Klarte ikkje endra namnet p msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-kompileringsfeil - %s" @@ -812,11 +812,11 @@ msgstr "Nokre pakkar m msgid "Internal error, Ordering didn't finish" msgstr "Intern feil ved tilleggjing av avleiing" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Klarte ikkje lsa nedlastingskatalogen" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Kjeldelista kan ikkje lesast." @@ -845,8 +845,8 @@ msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Du har ikkje nok ledig plass i %s" @@ -884,7 +884,7 @@ msgstr "Avbryt." msgid "Do you want to continue [Y/n]? " msgstr "Vil du halda fram [J/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikkje henta %s %s\n" @@ -893,7 +893,7 @@ msgstr "Klarte ikkje henta %s %s\n" msgid "Some files failed to download" msgstr "Klarte ikkje henta nokre av filene" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Nedlastinga er ferdig i nedlastingsmodus" @@ -992,51 +992,51 @@ msgstr "Fann ikkje versjonen msgid "Selected version %s (%s) for %s\n" msgstr "Vald versjon %s (%s) for %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Klarte ikkje f status p kjeldepakkelista %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Oppdateringskommandoen tek ingen argument" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Klarte ikkje lsa listekatalogen" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Dei flgjande NYE pakkane vil verta installerte:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Dei flgjande NYE pakkane vil verta installerte:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1052,44 +1052,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Flgjande informasjon kan hjelpa med lysa situasjonen:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Fann ikkje pakken %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Fann ikkje pakken %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, vel %s i staden for regex %s\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "men %s skal installerast" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du vil kanskje prva retta p desse ved kyra apt-get -f install." -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1097,7 +1097,7 @@ msgstr "" "Nokre krav er ikkje oppfylte. Du kan prva apt-get -f install (eller velja " "ei lysing)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1109,123 +1109,123 @@ msgstr "" "distribusjonen, kan det g henda at nokre av pakkane som trengst ikkje\n" "er laga enno eller at dei framleis ligg i Incoming." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "ydelagde pakkar" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Dei flgjande tilleggspakkane vil verta installerte:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Fresltte pakkar:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Tilrdde pakkar" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Reknar ut oppgradering ... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Mislukkast" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Ferdig" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Du m velja minst in pakke som kjeldekoden skal hentast for" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Finn ingen kjeldepakke for %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikkje nok ledig plass i %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "M henta %sB/%sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "M henta %sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Hent kjeldekode %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Klarte ikkje henta nokre av arkiva." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggjekommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Barneprosessen mislukkast" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "Du m velja minst ein pakke som byggjekrava skal sjekkast for" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarte ikkje henta byggjekrav for %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen byggjekrav.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1234,31 +1234,31 @@ msgstr "" "Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon " "tilgjengelege versjonar av pakken %s som oppfyller versjonskrava" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikkje oppfylla kravet %s for %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggjekrav for %s kunne ikkje tilfredstillast." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Klarte ikkje behandla byggjekrava" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Sttta modular:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1342,7 +1342,7 @@ msgstr "" "til apt-get(8), sources.list(5) og apt.conf(5).\n" " APT har superku-krefter.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1587,11 +1587,10 @@ msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Klarte ikkje lesa %s" @@ -1622,9 +1621,9 @@ msgstr "" "Infokatalogen og den mellombelse katalogen m vera p det same filsystemet" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Les pakkelister" @@ -1761,11 +1760,11 @@ msgid "File not found" msgstr "Fann ikkje fila" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Klarte ikkje f status" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Klarte ikkje setja endringstidspunkt" @@ -1827,7 +1826,7 @@ msgstr "Tidsavbrot p msgid "Server closed the connection" msgstr "Tenaren lukka sambandet" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Lesefeil" @@ -1839,7 +1838,7 @@ msgstr "Eit svar flaumde over bufferen." msgid "Protocol corruption" msgstr "Protokollydeleggjing" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivefeil" @@ -1893,7 +1892,7 @@ msgstr "Tidsavbrot p msgid "Unable to accept connection" msgstr "Klarte ikkje godta tilkoplinga" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nkkel for fil" @@ -1957,59 +1956,64 @@ msgstr "Klarte ikkje kopla til %s:%s (%s)." msgid "Connecting to %s" msgstr "Koplar til %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Klarte ikkje sl opp %s" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Mellombels feil ved oppslag av %s" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Det hende noko dumt ved oppslag av %s:%s (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Klarte ikkje kopla til %s %s:" -#: methods/gpgv.cc:71 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 #, fuzzy, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Klarte ikkje sl opp %s" +msgid "No keyring installed in %s." +msgstr "Avbryt installasjon." -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" + +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Dei flgjande tilleggspakkane vil verta installerte:" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2058,48 +2062,48 @@ msgstr "Denne HTTP-tenaren har msgid "Unknown date format" msgstr "Ukjend datoformat" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Utvalet mislukkast" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Tidsavbrot p sambandet" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Feil ved lesing fr tenaren" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Klarte ikkje skriva fila %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "ydelagde hovuddata" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Sambandet mislukkast" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Intern feil" @@ -2107,18 +2111,25 @@ msgstr "Intern feil" msgid "Can't mmap an empty file" msgstr "Kan ikkje utfra mmap p ei tom fil" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Klarte ikkje laga mmap av %lu byte" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2148,52 +2159,52 @@ msgstr "" msgid "Selection %s not found" msgstr "Fann ikkje utvalet %s" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ukjend typeforkorting: %c" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Opnar oppsettsfila %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaksfeil %s:%u: Blokka startar utan namn." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksfeil %s:%u: Misforma tagg" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaksfeil %s:%u: Ekstra rot etter verdien" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaksfeil %s:%u: Direktiva kan berre liggja i det vste nivet" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaksfeil %s:%u: For mange nsta inkluderte filer" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksfeil %s:%u: Inkludert herifr" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaksfeil %s:%u: Direktivet %s er ikkje sttta" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksfeil %s:%u: Ekstra rot til slutt i fila" @@ -2269,75 +2280,75 @@ msgstr "Klarte ikkje byta til %s" msgid "Failed to stat the cdrom" msgstr "Klarte ikkje f status til CD-ROM" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Brukar ikkje lsing for den skrivebeskytta lsefila %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Klarte ikkje opna lsefila %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Brukar ikkje lsing for den nfs-monterte lsefila %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Klarte ikkje lsa %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Venta p %s, men den fanst ikkje" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprosessen %s mottok ein segmenteringsfeil." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Underprosessen %s mottok ein segmenteringsfeil." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprosessen %s returnerte ein feilkode (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprosessen %s avslutta uventa" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Klarte ikkje opna fila %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "lese, har framleis %lu att lesa, men ingen att" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skrive, har framleis %lu att skrive, men klarte ikkje" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problem ved lsing av fila" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Problem ved oppheving av lenkje til fila" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Problem ved synkronisering av fila" @@ -2455,52 +2466,52 @@ msgstr "Klarte ikkje tolka pakkefila %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Klarte ikkje tolka pakkefila %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Misforma linje %lu i kjeldelista %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Misforma linje %lu i kjeldelista %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Misforma linje %lu i kjeldelista %s (absolutt dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Opnar %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Linja %u i kjeldelista %s er for lang." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misforma linje %u i kjeldelista %s (type)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen %s er ukjend i linja %u i kjeldelista %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Misforma linje %u i kjeldelista %s (utgjevar-ID)" @@ -2630,17 +2641,17 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "" "Du vil kanskje prva retta p desse problema ved kyra apt-get update." -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Ugyldig oppslag i innstillingsfila, manglar pakkehovud" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Skjnar ikkje spikringstypen %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller null) oppgitt for spiker" @@ -2725,16 +2736,16 @@ msgstr "Feil ved behandling av %s (CollectFileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "Fann ikkje pakken %s %s ved behandling av filkrav" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Klarte ikkje f status p kjeldepakkelista %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Samlar inn filtilbod" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "IU-feil ved lagring av kjeldelager" @@ -2743,20 +2754,20 @@ msgstr "IU-feil ved lagring av kjeldelager" msgid "rename failed, %s (%s -> %s)." msgstr "endring av namn mislukkast, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "Feil MD5-sum" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 #, fuzzy msgid "Hash Sum mismatch" msgstr "Feil MD5-sum" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2765,7 +2776,7 @@ msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv " "(fordi arkitekturen manglar)." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2773,14 +2784,14 @@ msgid "" msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pakkeindeksfilene er ydelagde. Feltet Filename: manglar for pakken %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Feil storleik" @@ -2914,7 +2925,6 @@ msgstr "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Opnar oppsettsfila %s" @@ -3028,15 +3038,32 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "Klarte ikkje opna fila %s" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Sambandet vart uventa stengd" +#, fuzzy +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Klarte ikkje sl opp %s" + +#, fuzzy +#~ msgid "Could not patch file" +#~ msgstr "Klarte ikkje opna fila %s" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/pl.po b/po/pl.po index 30e5741ab..f21b2cf21 100644 --- a/po/pl.po +++ b/po/pl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.23.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2009-09-27 03:42+0100\n" "Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n" "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n" @@ -151,7 +151,7 @@ msgstr " Tabela wersji:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s dla %s skompilowany %s %s\n" @@ -306,7 +306,7 @@ msgstr "" " -c=? Czyta wskazany plik konfiguracyjny.\n" " -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Nie udało się pisać do %s" @@ -442,8 +442,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "Baza jest przestarzała, próbuję zaktualizować %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "Niepoprawny format bazy. Jeśli została zaktualizowana starsza wersja apt, " @@ -460,11 +461,11 @@ msgstr "Nie udało się otworzyć pliku bazy %s: %s" msgid "Failed to stat %s" msgstr "Nie udało się wykonać operacji stat na %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Archiwum nie posiada rekordu kontrolnego" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Nie udało się pobrać kursora" @@ -529,26 +530,26 @@ msgstr "*** Nie udało się dowiązać %s do %s" msgid " DeLink limit of %sB hit.\n" msgstr " Osiągnięto ograniczenie odłączania %sB.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Archiwum nie posiadało pola pakietu" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s nie posiada wpisu w pliku override\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " opiekunem %s jest %s, a nie %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s nie posiada wpisu w pliku override źródeł\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nie posiada również wpisu w pliku override binariów\n" @@ -652,7 +653,7 @@ msgstr "Nie udało się zmienić nazwy %s na %s" msgid "Y" msgstr "T" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Błąd kompilacji wyrażenia regularnego - %s" @@ -813,11 +814,11 @@ msgstr "Pakiety powinny zostać usunięte, ale Remove jest wyłączone." msgid "Internal error, Ordering didn't finish" msgstr "Błąd wewnętrzny, sortowanie niezakończone" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Nie udało się zablokować katalogu pobierania" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Nie udało się odczytać list źródeł." @@ -848,8 +849,8 @@ msgstr "Po tej operacji zostanie dodatkowo użyte %sB miejsca na dysku.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po tej operacji zostanie zwolnione %sB miejsca na dysku.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nie udało się ustalić ilości wolnego miejsca w %s" @@ -886,7 +887,7 @@ msgstr "Przerwane." msgid "Do you want to continue [Y/n]? " msgstr "Kontynuować [T/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nie udało się pobrać %s %s\n" @@ -895,7 +896,7 @@ msgstr "Nie udało się pobrać %s %s\n" msgid "Some files failed to download" msgstr "Nie udało się pobrać niektórych plików" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Ukończono pobieranie w trybie samego pobierania" @@ -994,35 +995,35 @@ msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona" msgid "Selected version %s (%s) for %s\n" msgstr "Wybrano wersję %s (%s) dla %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Nie udało się wykonać operacji stat na liście pakietów źródłowych %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Polecenie update nie wymaga żadnych argumentów" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Nie udało się zablokować katalogu list" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Nic nie powinno być usuwane, AutoRemover nie zostanie uruchomiony" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1030,18 +1031,18 @@ msgstr "" "Następujące pakiety zostały zainstalowane automatycznie i nie są już więcej " "wymagane:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "%lu pakiety(ów) zostały zainstalowane automatycznie i nie są już więcej " "wymagane.\n" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Aby je usunąć należy użyć \"apt-get autoremove\"." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1059,43 +1060,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Następujące informacje mogą pomóc rozwiązać sytuację:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Błąd wewnętrzny, AutoRemover wszystko popsuł" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Błąd wewnętrzny, AllUpgrade wszystko popsuło" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Nie udało się odnaleźć zadania %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Nie udało się odnaleźć pakietu %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Uwaga, wybieranie %s za wyrażenie \"%s\"\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s zaznaczony jako zainstalowany ręcznie.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1103,7 +1104,7 @@ msgstr "" "Niespełnione zależności. Proszę spróbować \"apt-get -f install\" bez " "pakietów (lub podać rozwiązanie)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1115,119 +1116,119 @@ msgstr "" "w której niektóre pakiety nie zostały jeszcze utworzone lub przeniesione\n" "z katalogu Incoming (\"Przychodzące\")." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Pakiety są uszkodzone" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Zostaną zainstalowane następujące dodatkowe pakiety:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Sugerowane pakiety:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Polecane pakiety:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Obliczanie aktualizacji..." -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Nie udało się" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Gotowe" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Błąd wewnętrzny, rozwiązywanie problemów wszystko popsuło" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "" "Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane " "źródła" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Nie udało się odnaleźć źródła dla pakietu %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Pomijanie już pobranego pliku \"%s\"\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "W %s nie ma wystarczającej ilości wolnego miejsca" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Konieczne pobranie %sB/%sB archiwów źródeł.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Konieczne pobranie %sB archiwów źródeł.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Pobierz źródło %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Nie udało się pobrać niektórych archiwów." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pomijanie rozpakowania już rozpakowanego źródła w %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Polecenie budowania \"%s\" zawiodło.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Proces potomny zawiódł" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Należy podać przynajmniej jeden pakiet, dla którego mają zostać sprawdzone " "zależności dla budowania" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nie udało się pobrać informacji o zależnościach dla budowania %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s nie ma zależności dla budowania.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1236,7 +1237,7 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono " "pakietu %s" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1245,32 +1246,32 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ żadna z dostępnych " "wersji pakietu %s nie ma odpowiedniej wersji" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nie udało się spełnić zależności %s od %s: Zainstalowany pakiet %s jest zbyt " "nowy" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nie udało się spełnić zależności %s od %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Nie udało się spełnić zależności dla budowania %s." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Nie udało się przetworzyć zależności dla budowania" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Obsługiwane moduły:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1354,7 +1355,7 @@ msgstr "" "apt-get(8), sources.list(5) i apt.conf(5).\n" " Ten APT ma moce Super Krowy.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1607,11 +1608,10 @@ msgstr "Plik %s/%s nadpisuje plik w pakiecie %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Nie można czytać %s" @@ -1641,9 +1641,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Pliki info i katalog tymczasowy muszą być na tym samym systemie plików" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Czytanie list pakietów" @@ -1779,11 +1779,11 @@ msgid "File not found" msgstr "Nie odnaleziono pliku" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Nie udało się wykonać operacji stat" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Nie udało się ustawić czasu modyfikacji" @@ -1847,7 +1847,7 @@ msgstr "Przekroczenie czasu połączenia" msgid "Server closed the connection" msgstr "Serwer zamknął połączenie" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Błąd odczytu" @@ -1859,7 +1859,7 @@ msgstr "Odpowiedź przepełniła bufor." msgid "Protocol corruption" msgstr "Naruszenie zasad protokołu" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Błąd zapisu" @@ -1913,7 +1913,7 @@ msgstr "Przekroczony czas połączenia gniazda danych" msgid "Unable to accept connection" msgstr "Nie udało się przyjąć połączenia" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Nie udało się obliczyć skrótu pliku" @@ -1977,62 +1977,67 @@ msgstr "Nie udało się połączyć z %s:%s (%s)." msgid "Connecting to %s" msgstr "Łączenie z %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Nie udało się przetłumaczyć nazwy \"%s\"" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Tymczasowy błąd przy tłumaczeniu \"%s\"" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Nie udało się połączyć z %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Nie udało się uzyskać dostępu do bazy kluczy: \"%s\"" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Przerywanie instalacji" + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Lista argumentów Acquire::gpgv::Options zbyt długa. Zakończenie." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Błąd wewnętrzny: Prawidłowy podpis, ale nie nie udało się ustalić odcisku " "klucza?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Napotkano przynajmniej jeden nieprawidłowy podpis." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Nie udało się uruchomić \"%s\" by zweryfikować podpis (czy gpgv jest " "zainstalowane?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Nieznany błąd podczas uruchamiania gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Następujące podpisy były błędne:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2083,47 +2088,47 @@ msgstr "Ten serwer HTTP nieprawidłowo obsługuje zakresy (ranges)" msgid "Unknown date format" msgstr "Nieznany format daty" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Operacja select nie powiodła się" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Przekroczenie czasu połączenia" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Błąd przy pisaniu do pliku wyjściowego" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Błąd przy pisaniu do pliku" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Błąd przy pisaniu do pliku" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Błąd czytania z serwera: Zdalna strona zamknęła połączenie" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Błąd czytania z serwera" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Nie udało się uciąć zawartości pliku %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Błędne dane nagłówka" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Połączenie nie udało się" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Błąd wewnętrzny" @@ -2131,12 +2136,12 @@ msgstr "Błąd wewnętrzny" msgid "Can't mmap an empty file" msgstr "Nie można wykonać mmap na pustym pliku" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Nie udało się wykonać mmap %lu bajtów" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " @@ -2145,6 +2150,13 @@ msgstr "" "Brak miejsca dla dynamicznego MMap. Proszę zwiększyć rozmiar APT::Cache-" "Limit. Aktualna wartość: %lu. (man 5 apt.conf)" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2174,53 +2186,53 @@ msgstr "%lis" msgid "Selection %s not found" msgstr "Nie odnaleziono wyboru %s" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Nierozpoznany skrót typu: \"%c\"" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Otwieranie pliku konfiguracyjnego %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Błąd składniowy %s:%u: Blok nie zaczyna się nazwą." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Błąd składniowy %s:%u: Błędny znacznik" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Błąd składniowy %s:%u: Po wartości występują śmieci" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Błąd składniowy %s:%u: Dyrektywy mogą występować tylko na najwyższym poziomie" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Błąd składniowy %s:%u: Zbyt wiele zagnieżdżonych operacji include" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Błąd składniowy %s:%u: Włączony tutaj" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Błąd składniowy %s:%u: Nieobsługiwana dyrektywa \"%s\"" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Błąd składniowy %s:%u: Śmieci na końcu pliku" @@ -2296,75 +2308,75 @@ msgstr "Nie udało się przejść do %s" msgid "Failed to stat the cdrom" msgstr "Nie udało się wykonać operacji stat na CDROM-ie" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Dla pliku blokady %s tylko do odczytu nie zostanie użyta blokada" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Nie udało się otworzyć pliku blokady %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Dla pliku blokady %s montowanego przez NFS nie zostanie użyta blokada" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Nie udało się uzyskać blokady %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Oczekiwano na proces %s, ale nie było go" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s spowodował naruszenie segmentacji." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, c-format msgid "Sub-process %s received signal %u." msgstr "Podproces %s dostał sygnał %u." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s zwrócił kod błędu (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s zakończył się niespodziewanie" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Nie udało się otworzyć pliku %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "należało przeczytać jeszcze %lu, ale nic nie zostało" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "należało zapisać jeszcze %lu, ale nie udało się to" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problem przy zamykaniu pliku" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Problem przy usuwaniu pliku" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Problem przy zapisywaniu pliku na dysk" @@ -2481,52 +2493,52 @@ msgstr "Nie udało się zanalizować pliku pakietu %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Nie udało się zanalizować pliku pakietu %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (dystrybucja)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (bezwzględna dystrybucja)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza dystrybucji)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Otwieranie %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Linia %u w liście źródeł %s jest zbyt długa." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Nieprawidłowa linia %u w liście źródeł %s (identyfikator producenta)" @@ -2652,17 +2664,17 @@ msgstr "Nie udało się otworzyć lub zanalizować zawartości list pakietów." msgid "You may want to run apt-get update to correct these problems" msgstr "Należy uruchomić apt-get update aby naprawić te problemy." -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Nieprawidłowe informacje w pliku ustawień %s, brak nagłówka Package" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Nierozpoznany typ przypinania %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Brak (lub zerowy) priorytet przypięcia" @@ -2749,16 +2761,16 @@ msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Pakiet %s %s nie został odnaleziony podczas przetwarzania zależności plików" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nie udało się wykonać operacji stat na liście pakietów źródłowych %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Zbieranie zapewnień plików" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Błąd wejścia/wyjścia przy zapisywaniu podręcznego magazynu źródeł" @@ -2767,19 +2779,19 @@ msgstr "Błąd wejścia/wyjścia przy zapisywaniu podręcznego magazynu źróde msgid "rename failed, %s (%s -> %s)." msgstr "nie udało się zmienić nazwy, %s (%s -> %s)" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "Błędna suma MD5" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Błędna suma kontrolna" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Dla następujących identyfikatorów kluczy brakuje klucza publicznego:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2788,7 +2800,7 @@ msgstr "" "Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba " "będzie ręcznie naprawić ten pakiet (z powodu brakującej architektury)." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2797,14 +2809,14 @@ msgstr "" "Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba " "będzie ręcznie naprawić ten pakiet." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pliki indeksu pakietów są uszkodzone. Brak pola Filename: dla pakietu %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Błędny rozmiar" @@ -2941,7 +2953,6 @@ msgstr "Zapisano %i rekordów z %i brakującymi plikami i %i niepasującymi\n" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Otwieranie pliku konfiguracyjnego %s" @@ -2952,7 +2963,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Błędna suma kontrolna" @@ -2973,7 +2983,6 @@ msgstr "Usuwanie %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Całkowicie usunięto %s" @@ -3064,14 +3073,30 @@ msgstr "" msgid "Not locked" msgstr "Nie zablokowany" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Nie udało się nałożyć łatki na plik" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Połączenie zostało zamknięte przedwcześnie" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Nie udało się uzyskać dostępu do bazy kluczy: \"%s\"" + +#~ msgid "Could not patch file" +#~ msgstr "Nie udało się nałożyć łatki na plik" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/pt.po b/po/pt.po index 3eff616bd..4026e76ff 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-09-09 20:54+0100\n" "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" @@ -147,7 +147,7 @@ msgstr " Tabela de Versão:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s compilado em %s %s\n" @@ -304,7 +304,7 @@ msgstr "" " -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Não conseguiu escrever para %s" @@ -438,8 +438,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "A base de dados é antiga, a tentar actualizar %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "O formato da base de dados é inválido. Se actualizou a partir de uma versão " @@ -456,11 +457,11 @@ msgstr "Não foi possível abrir o ficheiro %s da base de dados: %s" msgid "Failed to stat %s" msgstr "Falha stat %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "O arquivo não tem registro de controlo" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Não foi possível obter um cursor" @@ -525,26 +526,26 @@ msgstr "*** Falhou ligar %s a %s" msgid " DeLink limit of %sB hit.\n" msgstr " Limite DeLink de %sB atingido.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Arquivo não possuía campo package" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s não possui entrada override\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " o maintainer de %s é %s, não %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s não possui fonte de entrada de 'override'\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s também não possui entrada binária de 'override'\n" @@ -648,7 +649,7 @@ msgstr "Falhou renomear %s para %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" @@ -809,11 +810,11 @@ msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado." msgid "Internal error, Ordering didn't finish" msgstr "Erro Interno, Ordering não terminou" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Impossível criar acesso exclusivo ao directório de downloads" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "A lista de fontes não pôde ser lida." @@ -844,8 +845,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Após esta operação, será libertado %sB de espaço em disco.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Não foi possível determinar o espaço livre em %s" @@ -882,7 +883,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "Deseja continuar [Y/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falhou obter %s %s\n" @@ -891,7 +892,7 @@ msgstr "Falhou obter %s %s\n" msgid "Some files failed to download" msgstr "Falhou o download de alguns ficheiros" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de fazer apenas o download" @@ -990,35 +991,35 @@ msgstr "Não foi encontrada a versão '%s' para '%s'" msgid "Selected version %s (%s) for %s\n" msgstr "Versão seleccionada %s (%s) para %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Impossível criar acesso exclusivo ao directório de listas" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Não é suposto nós apagarmos coisas, não pode iniciar o AutoRemover" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1026,18 +1027,18 @@ msgstr "" "Os seguintes pacotes foram instalados automaticamente e já não são " "necessários:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Os seguintes pacotes foram instalados automaticamente e já não são " "necessários:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Utilize 'apt-get autoremove' para os remover." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1055,43 +1056,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "A seguinte informação pode ajudar a resolver a situação:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Erro Interno, o AutoRemover estragou coisas" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro Interno, AllUpgrade estragou algo" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Não foi possível encontrar a tarefa %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Impossível encontrar o pacote %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, a seleccionar %s para a expressão regular '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s está definido para ser instalado manualmente.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Você deve querer executar `apt-get -f install' para corrigir estes:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1099,7 +1100,7 @@ msgstr "" "Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1111,119 +1112,119 @@ msgstr "" "distribuição unstable em que alguns pacotes pedidos ainda não foram \n" "criados ou foram movidos do Incoming." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Pacotes estragados" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Os seguintes pacotes extra serão instalados:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Pacotes sugeridos:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Pacotes recomendados:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "A calcular a actualização... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Falhou" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Pronto" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Erro Interno, o solucionador de problemas estragou coisas" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Não foi possível encontrar um pacote de código fonte para %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "A saltar o ficheiro '%s', já tinha sido feito download'\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "É necessário obter %sB/%sB de arquivos de código fonte.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "É necessário obter %sB de arquivos de código fonte.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Obter código fonte %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Falhou obter alguns arquivos." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "A saltar a descompactação do pacote de código fonte já descompactado em %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "O comando de descompactação '%s' falhou.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "O comando de compilação '%s' falhou.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "O processo filho falhou" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve especificar pelo menos um pacote para verificar as dependências de " "compilação" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Não foi possível obter informações de dependências de compilação para %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de compilação.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1232,7 +1233,7 @@ msgstr "" "a dependência de %s para %s não pôde ser satisfeita porque o pacote %s não " "pôde ser encontrado" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1241,32 +1242,32 @@ msgstr "" "a dependência de %s para %s não pode ser satisfeita porque nenhuma versão " "disponível do pacote %s pode satisfazer os requisitos de versão" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falha ao satisfazer a dependência %s para %s: O pacote instalado %s é " "demasiado novo" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falha ao satisfazer a dependência %s para %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Não foi possível satisfazer as dependências de compilação para %s." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Falhou processar as dependências de compilação" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Módulos Suportados:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1353,7 +1354,7 @@ msgstr "" "sources.list(5) e apt.conf(5)\n" " Este APT tem Poderes de Super Vaca.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1604,11 +1605,10 @@ msgstr "O ficheiro %s/%s substitui o que está no pacote %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Não foi possível ler %s" @@ -1639,9 +1639,9 @@ msgstr "" "Os directórios info e temp precisam estar no mesmo sistema de ficheiros" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "A ler as listas de pacotes" @@ -1775,11 +1775,11 @@ msgid "File not found" msgstr "Ficheiro não encontrado" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Falhou o stat" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Falhou definir hora de modificação" @@ -1841,7 +1841,7 @@ msgstr "Foi atingido o tempo limite de ligação" msgid "Server closed the connection" msgstr "O servidor fechou a ligação" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Erro de leitura" @@ -1853,7 +1853,7 @@ msgstr "Uma resposta sobrecarregou o buffer" msgid "Protocol corruption" msgstr "Corrupção de protocolo" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Erro de escrita" @@ -1907,7 +1907,7 @@ msgstr "Ligação de socket de dados expirou" msgid "Unable to accept connection" msgstr "Impossível aceitar ligação" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema ao calcular o hash do ficheiro" @@ -1971,63 +1971,68 @@ msgstr "Não foi possível ligar em %s:%s (%s)." msgid "Connecting to %s" msgstr "A ligar a %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Não foi possível resolver '%s'" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Falha temporária a resolver '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Não foi possível ligar a %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Não foi possível aceder à 'keyring': '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "A abortar a instalação." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: A lista de argumentos de Acquire::gpgv::Options é demasiado longa. A sair." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erro interno: Assinatura válida, mas não foi possível determinar a impressão " "digital da chave?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Pelo menos uma assinatura inválida foi encontrada." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Não foi possível executar '%s' para verificar a assinatura (o gpgv está " "instalado?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Erro desconhecido ao executar gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "As seguintes assinaturas eram inválidas:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2078,47 +2083,47 @@ msgstr "Este servidor HTTP possui suporte de range errado" msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "A selecção falhou" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "O tempo da ligação expirou" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Erro ao escrever para o ficheiro de saída" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Erro ao escrever para ficheiro" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Erro ao escrever para o ficheiro" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Erro ao ler do servidor. O lado remoto fechou a ligação" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Erro ao ler do servidor" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Falhou truncar o ficheiro" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Dados de cabeçalho errados" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "A ligação falhou" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Erro interno" @@ -2126,18 +2131,25 @@ msgstr "Erro interno" msgid "Can't mmap an empty file" msgstr "Não é possível fazer mmap a um ficheiro vazio" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Não foi possível fazer mmap de %lu bytes" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2167,53 +2179,53 @@ msgstr "" msgid "Selection %s not found" msgstr "A selecção %s não foi encontrada" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreviatura de tipo desconhecida: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "A abrir o ficheiro de configuração %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Erro de sintaxe %s:%u: O bloco começa sem nome." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Erro de sintaxe %s:%u: Tag malformada" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Erro de sintaxe %s:%u: Directivas só podem ser feitas no nível mais alto" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Erro de sintaxe %s:%u: Demasiados includes encadeados" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Erro de sintaxe %s:%u: Incluído a partir deste ponto" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Erro de sintaxe %s:%u: Directiva '%s' não suportada" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Erro de sintaxe %s:%u: Lixo extra no final do ficheiro" @@ -2289,78 +2301,78 @@ msgstr "Impossível mudar para %s" msgid "Failed to stat the cdrom" msgstr "Impossível executar stat ao cdrom" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Não está a ser utilizado acesso exclusivo para apenas leitura ao ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Não foi possível abrir ficheiro de lock %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Não está a ser utilizado o acesso exclusivo para o ficheiro %s, montado via " "nfs" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Não foi possível obter acesso exclusivo a %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperou por %s mas não estava lá" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "O sub-processo %s recebeu uma falha de segmentação." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "O sub-processo %s recebeu uma falha de segmentação." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "O sub-processo %s retornou um código de erro (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "O sub-processo %s terminou inesperadamente" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Não foi possível abrir ficheiro o %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "lido, ainda restam %lu para serem lidos mas não resta nenhum" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escrito, ainda restam %lu para escrever mas não foi possível" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problema ao fechar o ficheiro" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Problema ao remover o link ao ficheiro" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Problema sincronizando o ficheiro" @@ -2477,52 +2489,52 @@ msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Não foi possível fazer parse ao ficheiro de pacote %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linha malformada %lu na lista de fontes %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linha malformada %lu na lista de fontes %s (distribuição)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linha malformada %lu na lista de fontes %s (parse de URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linha malformada %lu na lista de fontes %s (distribuição absoluta)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linha malformada %lu na lista de fontes %s (dist parse)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "A abrir %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Linha %u é demasiado longa na lista de fontes %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linha malformada %u na lista de fontes %s (tipo)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linha malformada %u na lista de fontes %s (id de fornecedor)" @@ -2655,17 +2667,17 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Você terá que executar apt-get update para corrigir estes problemas" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Registro inválido no ficheiro de preferências, sem cabeçalho Package" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Não foi possível entender o tipo de marca (pin) %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Nenhuma prioridade (ou zero) especificada para marcação (pin)" @@ -2755,16 +2767,16 @@ msgid "Package %s %s was not found while processing file dependencies" msgstr "" "O pacote %s %s não foi encontrado ao processar as dependências de ficheiros" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "A obter File Provides" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Erro de I/O ao gravar a cache de código fonte" @@ -2773,21 +2785,21 @@ msgstr "Erro de I/O ao gravar a cache de código fonte" msgid "rename failed, %s (%s -> %s)." msgstr "falhou renomear, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum não coincide" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Código de verificação hash não coincide" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Não existe qualquer chave pública disponível para as seguintes IDs de " "chave:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2797,7 +2809,7 @@ msgstr "" "significar que você precisa corrigir manualmente este pacote. (devido a " "arquitectura em falta)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2806,7 +2818,7 @@ msgstr "" "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2814,7 +2826,7 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Tamanho incorrecto" @@ -2951,7 +2963,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "A abrir o ficheiro de configuração %s" @@ -2962,7 +2973,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Código de verificação hash não coincide" @@ -2983,7 +2993,6 @@ msgstr "A remover %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Remoção completa de %s" @@ -3069,14 +3078,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Não foi possível aplicar o 'patch' ao ficheiro" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Ligação encerrada prematuramente" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Não foi possível aceder à 'keyring': '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "Não foi possível aplicar o 'patch' ao ficheiro" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 6ca0c52ff..b02214a9b 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: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-11-17 02:33-0200\n" "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n" "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian." @@ -149,7 +149,7 @@ msgstr " Tabela de versão:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s compilado em %s %s\n" @@ -308,7 +308,7 @@ msgstr "" " -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Impossível escrever para %s" @@ -443,8 +443,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "BD é antigo, tentando atualizar %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "Formato do BD é inválido. Se você atualizou a partir de uma versão antiga do " @@ -461,11 +462,11 @@ msgstr "Impossível abrir o arquivo BD %s: %s" msgid "Failed to stat %s" msgstr "Falhou ao executar \"stat\" %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Repositório não possui registro de controle" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Impossível obter um cursor" @@ -530,26 +531,26 @@ msgstr "*** Falhou ao ligar %s a %s" msgid " DeLink limit of %sB hit.\n" msgstr " Limite DeLink de %sB atingido.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Repositório não possuía campo pacote" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s não possui entrada override\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " mantenedor de %s é %s, não %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s não possui entrada override fonte\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s também não possui entrada override binária\n" @@ -653,7 +654,7 @@ msgstr "Falhou ao renomear %s para %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" @@ -815,11 +816,11 @@ msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada." msgid "Internal error, Ordering didn't finish" msgstr "Erro interno, Ordenação não finalizou" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Impossível criar trava no diretório de download" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "A lista de fontes não pode ser lida." @@ -851,8 +852,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Depois desta operação, %sB de espaço em disco serão liberados.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Não foi possível determinar o espaço livre em %s" @@ -889,7 +890,7 @@ msgstr "Abortar." msgid "Do you want to continue [Y/n]? " msgstr "Você quer continuar [S/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falhou ao buscar %s %s\n" @@ -898,7 +899,7 @@ msgstr "Falhou ao buscar %s %s\n" msgid "Some files failed to download" msgstr "Alguns arquivos falharam ao baixar" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Baixar completo e no modo somente baixar (\"download only\")" @@ -995,35 +996,35 @@ msgstr "Versão '%s' para '%s' não foi encontrada" msgid "Selected version %s (%s) for %s\n" msgstr "Versão selecionada %s (%s) para %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Impossível criar trava no diretório de listas" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Nós não deveríamos apagar coisas, impossível iniciar AutoRemover" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1031,18 +1032,18 @@ msgstr "" "Os seguintes pacotes foram automaticamente instalados e não são mais " "requeridos:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Os seguintes pacotes foram automaticamente instalados e não são mais " "requeridos:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Use 'apt-get autoremove' para removê-los." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1060,43 +1061,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "A informação a seguir pode ajudar a resolver a situação:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Erro Interno, o AutoRemover quebrou coisas" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro interno, AllUpgrade quebrou coisas" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Impossível achar tarefa %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Impossível achar pacote %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, selecionando %s para expressão regular '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s configurado para instalar manualmente.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Você deve querer executar 'apt-get -f install' para corrigí-los:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1104,7 +1105,7 @@ msgstr "" "Dependências desencontradas. Tente 'apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1116,117 +1117,117 @@ msgstr "" "distribuição instável, que alguns pacotes requeridos não foram\n" "criados ainda ou foram retirados da \"Incoming\"." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Pacotes quebrados" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Os pacotes extra a seguir serão instalados:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Pacotes sugeridos:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Pacotes recomendados:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Calculando atualização... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Falhou" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Pronto" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Erro interno, o solucionador de problemas quebrou coisas" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossível encontrar um pacote fonte para %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Pulando arquivo já baixado '%s'\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Preciso obter %sB/%sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Preciso obter %sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Falhou ao buscar alguns arquivos." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pulando o desempacotamento de fontes já desempacotados em %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando de desempacotamento '%s' falhou.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando de construção '%s' falhou.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Processo filho falhou" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve-se especificar pelo menos um pacote para que se cheque as dependências " "de construção" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossível conseguir informações de dependência de construção para %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de construção.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1235,7 +1236,7 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque o pacote %s não " "pode ser encontrado" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1244,32 +1245,32 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque nenhuma versão " "disponível do pacote %s pode satisfazer os requerimentos de versão" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falhou ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito " "novo" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falhou ao satisfazer a dependência de %s por %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Não foi possível satisfazer as dependências de compilação para %s." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Falhou ao processar as dependências de construção" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Módulos para os quais há suporte:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1355,7 +1356,7 @@ msgstr "" "para mais informações e opções.\n" " Este APT tem Poderes de Super Vaca.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1607,11 +1608,10 @@ msgstr "Arquivo %s/%s sobrescreve arquivo no pacote %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Impossível ler %s" @@ -1641,9 +1641,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Os diretórios info e temp precisam estar no mesmo sistema de arquivos" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Lendo listas de pacotes" @@ -1778,11 +1778,11 @@ msgid "File not found" msgstr "Arquivo não encontrado" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Falhou ao executar \"stat\"" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Falhou ao definir hora de modificação" @@ -1844,7 +1844,7 @@ msgstr "Conexão expirou" msgid "Server closed the connection" msgstr "Servidor fechou a conexão" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Erro de leitura" @@ -1856,7 +1856,7 @@ msgstr "Uma resposta sobrecarregou o buffer" msgid "Protocol corruption" msgstr "Corrupção de protocolo" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Erro de escrita" @@ -1910,7 +1910,7 @@ msgstr "Conexão do socket de dados expirou" msgid "Unable to accept connection" msgstr "Impossível aceitar conexão" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema criando o hash do arquivo" @@ -1974,63 +1974,68 @@ msgstr "Não foi possível conectar em %s:%s (%s)." msgid "Connecting to %s" msgstr "Conectando a %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Não foi possível resolver '%s'" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Falha temporária resolvendo '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Impossível conectar em %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Não foi possível acessar o chaveiro: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Abortando instalação." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Lista de argumentos de Acquire::gpgv::Options muito extensa. Saindo." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erro interno: Assinatura boa, mas não foi possível determinar a impressão " "digital da chave?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Ao menos uma assinatura inválida foi encontrada." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Não foi possível executar '%s' para verificar a assinatura (o gpgv está " "instalado?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Erro desconhecido executando gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "As seguintes assinaturas eram inválidas:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2081,47 +2086,47 @@ msgstr "Este servidor HTTP possui suporte a \"range\" quebrado" msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Seleção falhou" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Conexão expirou" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Erro escrevendo para arquivo de saída" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Erro escrevendo para arquivo" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Erro escrevendo para o arquivo" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Falhou ao truncar arquivo" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Dados de cabeçalho ruins" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Conexão falhou" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Erro interno" @@ -2129,18 +2134,25 @@ msgstr "Erro interno" msgid "Can't mmap an empty file" msgstr "Não foi possível fazer \"mmap\" de um arquivo vazio" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Não foi possível fazer \"mmap\" de %lu bytes" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2170,53 +2182,53 @@ msgstr "" msgid "Selection %s not found" msgstr "Seleção %s não encontrada" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreviação de tipo desconhecida: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Abrindo arquivo de configuração %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Erro de sintaxe %s:%u: Bloco inicia sem nome." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Erro de sintaxe %s:%u: Tag mal formada" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Erro de sintaxe %s:%u: Diretivas podem ser feitas somente no nível mais alto" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Erro de sintaxe %s:%u: Muitos \"includes\" aninhados" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Erro de sintaxe %s:%u: Incluído a partir deste ponto" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Erro de sintaxe %s:%u: Não há suporte para a diretiva '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Erro de sintaxe %s:%u: Lixo extra no final do arquivo" @@ -2293,75 +2305,75 @@ msgstr "Impossível mudar para %s" msgid "Failed to stat the cdrom" msgstr "Impossível executar \"stat\" no cdrom" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Não usando travamento para arquivo de trava somente leitura %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Não foi possível abrir arquivo de trava %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Não usando travamento para arquivo de trava montado via nfs %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Não foi possível obter trava %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperado %s mas este não estava lá" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Sub-processo %s recebeu uma falha de segmentação." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Sub-processo %s recebeu uma falha de segmentação." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Sub-processo %s retornou um código de erro (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Sub-processo %s finalizou inesperadamente" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Não foi possível abrir arquivo %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "leitura, ainda restam %lu para serem lidos mas nenhum deixado" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escrita, ainda restam %lu para gravar mas não foi possível" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problema fechando o arquivo" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Problema removendo o arquivo" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Problema sincronizando o arquivo" @@ -2478,53 +2490,53 @@ msgstr "Impossível analisar arquivo de pacote %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Impossível analisar arquivo de pacote %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linha mal formada %lu no arquivo de fontes %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição absoluta)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Abrindo %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Linha %u muito longa na lista de fontes %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linha mal formada %u no arquivo de fontes %s (tipo)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linha mal formada %u na lista de fontes %s (id de fornecedor)" @@ -2654,17 +2666,17 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Você terá que executar apt-get update para corrigir estes problemas" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Registro inválido no arquivo de preferências, sem cabeçalho Package" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Não foi possível entender o tipo de \"pin\" %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Nenhuma prioridade (ou zero) especificada para \"pin\"" @@ -2754,16 +2766,16 @@ msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Pacote %s %s não foi encontrado enquanto processando dependências de arquivo" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Coletando Arquivo \"Provides\"" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Erro de E/S ao gravar cache fonte" @@ -2772,19 +2784,19 @@ msgstr "Erro de E/S ao gravar cache fonte" msgid "rename failed, %s (%s -> %s)." msgstr "renomeação falhou, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Hash Sum incorreto" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Não existem chaves públicas para os seguintes IDs de chaves:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2794,7 +2806,7 @@ msgstr "" "que você precisa consertar manualmente este pacote. (devido a arquitetura " "não especificada)." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2803,7 +2815,7 @@ msgstr "" "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2811,7 +2823,7 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:" "\" para o pacote %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Tamanho incorreto" @@ -2948,7 +2960,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Abrindo arquivo de configuração %s" @@ -2959,7 +2970,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Hash Sum incorreto" @@ -2980,7 +2990,6 @@ msgstr "Removendo %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "%s completamente removido" @@ -3064,14 +3073,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Não foi possível aplicar o patch" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Conexão encerrada prematuramente" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Não foi possível acessar o chaveiro: '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "Não foi possível aplicar o patch" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/ro.po b/po/ro.po index 776668d7e..f99371e7f 100644 --- a/po/ro.po +++ b/po/ro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ro\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-11-15 02:21+0200\n" "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n" "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n" @@ -150,7 +150,7 @@ msgstr " Tabela de versiuni:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pentru %s compilat la %s %s\n" @@ -304,7 +304,7 @@ msgstr "" " -c=? Citește acest fișier de configurare\n" " -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Nu s-a putut scrie în %s" @@ -445,8 +445,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB este vechi, se încearcă înnoirea %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "Formatul DB este nevalid. Dacă l-ați înnoit pe apt de la o versiune mai " @@ -463,11 +464,11 @@ msgstr "Nu s-a putut deschide fișierul DB %s: %s" msgid "Failed to stat %s" msgstr "Eșec la „stat” pentru %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arhiva nu are înregistrare de control" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Nu s-a putut obține un cursor" @@ -532,26 +533,26 @@ msgstr "*** Eșec la „link” între %s și %s" msgid " DeLink limit of %sB hit.\n" msgstr " Limita de %sB a dezlegării a fost atinsă.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Arhiva nu are câmp de pachet" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s nu are intrare de înlocuire\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s responsabil este %s nu %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s nu are nici o intrare sursă de înlocuire\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nu are nici intrare binară de înlocuire\n" @@ -655,7 +656,7 @@ msgstr "Eșec la redenumirea lui %s în %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Eroare de compilare expresie regulată - %s" @@ -816,11 +817,11 @@ msgstr "Pachete trebuiesc șterse dar ștergerea este dezactivată." msgid "Internal error, Ordering didn't finish" msgstr "Eroare internă, Ordering nu s-a terminat" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Nu s-a putut bloca directorul de descărcare" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Lista surselor nu poate fi citită." @@ -850,8 +851,8 @@ msgstr "După această operație vor fi folosiți din disc încă %sB.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "După această operație se vor elibera %sB din spațiul ocupat pe disc.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "N-am putut determina spațiul disponibil în %s" @@ -889,7 +890,7 @@ msgstr "Renunțare." msgid "Do you want to continue [Y/n]? " msgstr "Vreți să continuați [Y/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Eșec la aducerea lui %s %s\n" @@ -898,7 +899,7 @@ msgstr "Eșec la aducerea lui %s %s\n" msgid "Some files failed to download" msgstr "Descărcarea unor fișiere a eșuat" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Descărcare completă și în modul doar descărcare" @@ -995,51 +996,51 @@ msgstr "Versiunea '%s' pentru '%s' n-a fost găsită" msgid "Selected version %s (%s) for %s\n" msgstr "Versiune selectată %s (%s) pentru %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Nu pot determina starea listei surse de pachete %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Comanda de actualizare nu are argumente" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Nu pot încuia directorul cu lista" # XXX: orice sugestie este bine-venită -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Nu este voie să se șteargă lucruri, nu se poate porni AutoRemover" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Următoarele pachete au fost instalate automat și nu mai sunt necesare:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Următoarele pachete au fost instalate automat și nu mai sunt necesare:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Folosiți 'apt-get autoremove' pentru a le șterge." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1058,43 +1059,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Următoarele informații ar putea să vă ajute la rezolvarea situației:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Eroare internă, AutoRemover a deteriorat diverse chestiuni" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Nu s-a putut găsi sarcina %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Nu pot găsi pachetul %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Notă, selectare %s pentru expresie regulată '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s este marcat ca fiind instalat manual.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Ați putea porni 'apt-get -f install' pentru a corecta acestea:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1102,7 +1103,7 @@ msgstr "" "Dependențe neîndeplinite. Încercați 'apt-get -f install' fără nici un pachet " "(sau oferiți o altă soluție)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1115,118 +1116,118 @@ msgstr "" "pachete\n" "cerute n-au fost create încă sau au fost mutate din Incoming." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Pachete deteriorate" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Următoarele extra pachete vor fi instalate:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Pachete sugerate:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Pachete recomandate:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Calculez înnoirea... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Eșec" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Terminat" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "" "Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Trebuie specificat cel puțin un pachet pentru a-i aduce sursa" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Nu s-a putut găsi o sursă pachet pentru %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Sar peste fișierul deja descărcat '%s'\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Nu aveți suficient spațiu în %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Este nevoie să descărcați %sB/%sB din arhivele surselor.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Este nevoie să descărcați %sB din arhivele surselor.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Aducere sursa %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Eșec la aducerea unor arhive." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Sar peste despachetarea sursei deja despachetate în %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comanda de despachetare '%s' eșuată.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comanda de construire '%s' eșuată.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Procesul copil a eșuat" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Trebuie specificat cel puțin un pachet pentru a-i verifica dependențele " "înglobate" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nu pot prelua informațiile despre dependențele înglobate ale lui %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s nu are dependențe înglobate.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1235,7 +1236,7 @@ msgstr "" "Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1244,32 +1245,32 @@ msgstr "" "Dependența lui %s de %s nu poate fi satisfăcută deoarece nici o versiune " "disponibilă a pachetului %s nu poate satisface versiunile cerute" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Eșec la satisfacerea dependenței %s pentru %s: Pachetul instalat %s este " "prea nou" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Eșec la satisfacerea dependenței %s pentru %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Dependențele înglobate pentru %s nu pot fi satisfăcute." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Eșec la prelucrarea dependențelor de compilare" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Module suportate:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1356,7 +1357,7 @@ msgstr "" "pentru mai multe informații și opțiuni.\n" " Acest APT are puterile unei Super Vaci.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1608,11 +1609,10 @@ msgstr "Fișierul %s/%s îl suprascrie pe cel din pachetul %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Nu s-a putut citi %s" @@ -1642,9 +1642,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Directoarele info și temp trebuie să fie în același sistem de fișiere" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Citire liste de pachete" @@ -1783,11 +1783,11 @@ msgid "File not found" msgstr "Fișier negăsit" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Eșec la „stat”" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Eșec la ajustarea timpului de modificare" @@ -1849,7 +1849,7 @@ msgstr "Timpul de conectare a expirat" msgid "Server closed the connection" msgstr "Serverul a închis conexiunea" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Eroare de citire" @@ -1861,7 +1861,7 @@ msgstr "Un răspuns a depășit zona de tampon." msgid "Protocol corruption" msgstr "Protocol corupt" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Eroare de scriere" @@ -1917,7 +1917,7 @@ msgstr "Timpul de conectare la socket-ul de date expirat" msgid "Unable to accept connection" msgstr "Nu s-a putut accepta conexiune" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problemă la calcularea dispersiei pentru fișierul" @@ -1982,62 +1982,67 @@ msgstr "Nu s-a putut realiza conexiunea cu %s:%s (%s)." msgid "Connecting to %s" msgstr "Conectare la %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Nu s-a putut rezolva „%s”" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Eșec temporar la rezolvarea lui „%s”" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "S-a întâmplat ceva „necurat” la rezolvarea lui „%s:%s” (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Nu s-a putut realiza conexiunea cu %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Nu s-a putut accesa inelul de chei: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Abandonez instalarea." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Lista de argumente din Acquire::gpgv::Options este prea lungă. Se iese." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Eroare internă: Semnătură corespunzătoare, dar nu s-a putut determina " "amprenta digitale a cheii?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Cel puțin o semnătură nevalidă a fost întâlnită." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Nu s-a putut executa „%s” pentru verificarea semnăturii (gpgv este instalat?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Eroare necunoscută în timp ce se execută gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Următoarele semnături nu au fost valide:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2088,48 +2093,48 @@ msgstr "Acest server HTTP are un suport defect de intervale" msgid "Unknown date format" msgstr "Format dată necunoscut" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Selecția a eșuat" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Timp de conectare expirat" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Eroare la scrierea fișierului de rezultat" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Eroare la scrierea în fișier" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Eroare la scrierea în fișierul" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "" "Eroare la citirea de la server. Conexiunea a fost închisă de la distanță" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Eroare la citirea de la server" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Eșec la trunchierea fișierului" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Antet de date necorespunzător" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Conectare eșuată" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Eroare internă" @@ -2137,18 +2142,25 @@ msgstr "Eroare internă" msgid "Can't mmap an empty file" msgstr "Nu s-a putut executa „mmap” cu un fișier gol" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Nu s-a putut face mmap cu %lu octeți" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2178,53 +2190,53 @@ msgstr "" msgid "Selection %s not found" msgstr "Selecția %s nu a fost găsită" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreviere de tip nerecunoscut: „%c”" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Se deschide fișierul de configurare %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Eroare de sintaxă %s:%u: Blocul începe fără nume" -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Eroare de sintaxă %s:%u: etichetă greșită" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare după valoare" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Eroare de sintaxă %s:%u: Directivele pot fi date doar la nivelul superior" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Eroare de sintaxă %s:%u: prea multe imbricări incluse" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Eroare de sintaxă %s:%u: incluse de aici" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Eroare de sintaxă %s:%u: directivă nesuportată '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare la sfârșitul fișierului" @@ -2301,75 +2313,75 @@ msgstr "Nu pot schimba la %s" msgid "Failed to stat the cdrom" msgstr "Eșec la „stat” pentru CD" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nu s-a folosit închiderea pentru fișierul disponibil doar-citire %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Nu pot deschide fișierul blocat %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nu este folosit blocajul pentru fișierul montat nfs %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Nu pot determina blocajul %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Așteptat %s, dar n-a fost acolo" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Subprocesul %s a primit o eroare de segmentare." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Subprocesul %s a primit o eroare de segmentare." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Subprocesul %s a întors un cod de eroare (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Subprocesul %s s-a terminat brusc" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Nu s-a putut deschide fișierul %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "citire, încă mai am %lu de citit dar n-a mai rămas nimic" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "scriere, încă mai am %lu de scris dar nu pot" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problemă la închiderea fișierului" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Problemă la dezlegarea fișierului" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Problemă în timpul sincronizării fișierului" @@ -2486,52 +2498,52 @@ msgstr "Nu s-a putut analiza fișierul pachet %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Nu s-a putut analiza fișierul pachet %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linie greșită %lu în lista sursă %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linie greșită %lu în lista sursă %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linie greșită %lu în lista sursă %s (analiza URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linie greșită %lu în lista sursă %s (dist. absolută)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Deschidere %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Linia %u prea lungă în lista sursă %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linie greșită %u în lista sursă %s (tip)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linie greșită %u în lista sursă %s (identificator vânzător)" @@ -2661,17 +2673,17 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "" "Ați putea vrea să porniți 'apt-get update' pentru a corecta aceste probleme." -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Înregistrare invalidă în fișierul de preferințe, fără antet de pachet" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Nu s-a înțeles tipul de pin %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Fără prioritate (sau zero) specificată pentru pin" @@ -2761,16 +2773,16 @@ msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Nu s-a găsit pachetul %s %s în timpul procesării dependențelor de fișiere" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nu pot determina starea listei surse de pachete %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Colectare furnizori fișier" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Eroare IO în timpul salvării sursei cache" @@ -2779,21 +2791,21 @@ msgstr "Eroare IO în timpul salvării sursei cache" msgid "rename failed, %s (%s -> %s)." msgstr "redenumire eșuată, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "Nepotrivire MD5Sum" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Nepotrivire la suma de căutare" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Nu există nici o cheie publică disponibilă pentru următoarele " "identificatoare de chei:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2802,7 +2814,7 @@ msgstr "" "N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna " "că aveți nevoie să reparați manual acest pachet (din pricina unui arch lipsă)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2811,7 +2823,7 @@ msgstr "" "N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna " "că aveți nevoie să depanați manual acest pachet." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2819,7 +2831,7 @@ msgstr "" "Fișierele index de pachete sunt deteriorate. Fără câmpul 'nume fișier:' la " "pachetul %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Nepotrivire dimensiune" @@ -2956,7 +2968,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Se deschide fișierul de configurare %s" @@ -2967,7 +2978,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Nepotrivire la suma de căutare" @@ -2988,7 +2998,6 @@ msgstr "Se șterge %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Șters complet %s" @@ -3073,14 +3082,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Nu s-a putut peteci fișierul" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Conexiune închisă prematur" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Nu s-a putut accesa inelul de chei: '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "Nu s-a putut peteci fișierul" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/ru.po b/po/ru.po index ea2ba0b9c..60f73f7de 100644 --- a/po/ru.po +++ b/po/ru.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2010-01-08 09:47+0300\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" @@ -156,7 +156,7 @@ msgstr " Таблица версий:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s для %s скомпилирован %s %s\n" @@ -306,7 +306,7 @@ msgstr "" " -c=? Читать указанный файл настройки\n" " -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Невозможно записать в %s" @@ -447,11 +447,8 @@ msgstr "DB устарела, попытка обновить %s" #: ftparchive/cachedb.cc:72 #, fuzzy -#| msgid "" -#| "DB format is invalid. If you upgraded from an older version of apt, " -#| "please remove and re-create the database." msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "Некорректный формат базы данных (DB). Если вы обновляли версию apt, удалите " @@ -468,11 +465,11 @@ msgstr "Не удалось открыть DB файл %s: %s" msgid "Failed to stat %s" msgstr "Не удалось получить атрибуты %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "В архиве нет поля control" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Невозможно получить курсор" @@ -537,26 +534,26 @@ msgstr "*** Не удалось создать ссылку %s на %s" msgid " DeLink limit of %sB hit.\n" msgstr " Превышен лимит в %sB в DeLink.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "В архиве нет поля package" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " Нет записи о переназначении (override) для %s\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " пакет %s сопровождает %s, а не %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " Нет записи source override для %s\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " Нет записи binary override для %s\n" @@ -661,7 +658,7 @@ msgstr "Не удалось переименовать %s в %s" msgid "Y" msgstr "д" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Ошибка компиляции регулярного выражения - %s" @@ -827,11 +824,11 @@ msgstr "Пакеты необходимо удалить, но удаление msgid "Internal error, Ordering didn't finish" msgstr "Внутренняя ошибка, Ordering не завершилась" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Невозможно заблокировать каталог, куда складываются скачиваемые файлы" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Не читается перечень источников." @@ -864,8 +861,8 @@ msgstr "" "После данной операции, объём занятого дискового пространства уменьшится на %" "sB.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не удалось определить количество свободного места в %s" @@ -904,7 +901,7 @@ msgstr "Аварийное завершение." msgid "Do you want to continue [Y/n]? " msgstr "Хотите продолжить [Д/н]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не удалось получить %s %s\n" @@ -913,7 +910,7 @@ msgstr "Не удалось получить %s %s\n" msgid "Some files failed to download" msgstr "Некоторые файлы скачать не удалось" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Указан режим \"только скачивание\", и скачивание завершено" @@ -1010,50 +1007,50 @@ msgstr "Версия '%s' для '%s' не найдена" msgid "Selected version %s (%s) for %s\n" msgstr "Выбрана версия %s (%s) для %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "Игнорируется недоступная версия '%s' пакета '%s'" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Игнорируется недоступный выпуск '%s' пакета '%s'" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Используется '%s' в качестве исходного пакета вместо '%s'\n" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "Игнорируется недоступная версия '%s' пакета '%s'" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Команде update не нужны аргументы" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Невозможно заблокировать каталог со списками пакетов" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Не предполагалось удалять stuff, невозможно запустить AutoRemover" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Следующие пакеты устанавливались автоматически и больше не требуются:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "%lu пакетов было установлены автоматически и больше не требуются.\n" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Для их удаления используйте 'apt-get autoremove'." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1071,45 +1068,45 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Следующая информация, возможно, поможет вам:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Внутренняя ошибка, AutoRemover всё поломал" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Внутренняя ошибка, AllUpgrade всё поломал" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Не удалось найти задачу %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Не удалось найти пакет %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Заметьте, выбирается %s из-за регулярного выражения %s\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s установлен вручную.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -" "f install':" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1117,7 +1114,7 @@ msgstr "" "Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', " "не указывая имени пакета, (или найдите другое решение)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1128,118 +1125,118 @@ msgstr "" "или же используете нестабильную версию дистрибутива, где запрошенные вами\n" "пакеты ещё не созданы или были удалены из Incoming." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Сломанные пакеты" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Будут установлены следующие дополнительные пакеты:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Предлагаемые пакеты:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Рекомендуемые пакеты:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Расчёт обновлений... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Неудачно" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Готово" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Внутренняя ошибка, решатель проблем всё поломал" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "" "Укажите как минимум один пакет, исходный код которого необходимо получить" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Невозможно найти пакет с исходным кодом для %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаем уже скачанный файл '%s'\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостаточно места в %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо получить %sб/%sб архивов исходного кода.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо получить %sб архивов исходного кода.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Получение исходного кода %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Некоторые архивы не удалось получить." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Пропускается распаковка уже распакованного исходного кода в %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда распаковки '%s' завершилась неудачно.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверьте, установлен ли пакет 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда сборки '%s' завершилась неудачно.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Порождённый процесс завершился неудачно" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для проверки зависимостей для сборки необходимо указать как минимум один " "пакет" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Невозможно получить информацию о зависимостях для сборки %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s не имеет зависимостей для сборки.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1248,7 +1245,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "найден" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1257,32 +1254,32 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из " "версий пакета %s не удовлетворяет требованиям" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный " "пакет %s новее, чем надо" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимости для сборки %s не могут быть удовлетворены." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Обработка зависимостей для сборки завершилась неудачно" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Поддерживаемые модули:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1369,7 +1366,7 @@ msgstr "" "содержится подробная информация и описание параметров.\n" " В APT есть коровья СУПЕРСИЛА.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1621,11 +1618,10 @@ msgstr "Файл %s/%s переписывает файл в пакете %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Невозможно прочитать %s" @@ -1655,9 +1651,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Каталоги info и temp должны находиться на одной файловой системе" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Чтение списков пакетов" @@ -1792,11 +1788,11 @@ msgid "File not found" msgstr "Файл не найден" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Не удалось получить атрибуты" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Не удалось установить время модификации" @@ -1860,7 +1856,7 @@ msgstr "Допустимое время ожидания для соединен msgid "Server closed the connection" msgstr "Сервер прервал соединение" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Ошибка чтения" @@ -1872,7 +1868,7 @@ msgstr "Ответ переполнил буфер." msgid "Protocol corruption" msgstr "Искажение протокола" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Ошибка записи" @@ -1928,7 +1924,7 @@ msgstr "Время установления соединения для соке msgid "Unable to accept connection" msgstr "Невозможно принять соединение" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Проблема при хешировании файла" @@ -1992,62 +1988,67 @@ msgstr "Не удаётся соединиться с %s:%s (%s)." msgid "Connecting to %s" msgstr "Соединение с %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Не удалось найти IP адрес для %s" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Временная ошибка при попытке получить IP адрес '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Что-то странное произошло при определении '%s:%s' (%i - %s)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, c-format msgid "Unable to connect to %s:%s:" msgstr "Невозможно соединиться с %s: %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Нет доступа к связке (keyring) ключей: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Аварийное завершение установки." -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" + +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Слишком большой список параметров у Acquire::gpgv::Options. Завершение " "работы." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток " "ключа?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Найдена как минимум одна неправильная подпись." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "Не удалось выполнить '%s' для проверки подписи (gpgv установлена?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Неизвестная ошибка при выполнении gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Следующие подписи неверные:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2098,47 +2099,47 @@ msgstr "Этот HTTP-сервер не поддерживает скачива msgid "Unknown date format" msgstr "Неизвестный формат данных" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Ошибка в select" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Время ожидания для соединения истекло" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Ошибка записи в выходной файл" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Ошибка записи в файл" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Ошибка записи в файл" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Ошибка чтения, удалённый сервер прервал соединение" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Ошибка чтения с сервера" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Не удалось обрезать файл" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Неверный заголовок данных" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Соединение разорвано" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Внутренняя ошибка" @@ -2146,12 +2147,12 @@ msgstr "Внутренняя ошибка" msgid "Can't mmap an empty file" msgstr "Невозможно отобразить в память пустой файл" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Невозможно отобразить в память %lu байт" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " @@ -2160,6 +2161,13 @@ msgstr "" "Не хватает места для Dynamic MMap. Увеличьте значение APT::Cache-Limit. " "Текущее значение: %lu. (man 5 apt.conf)" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2189,54 +2197,54 @@ msgstr "%liс" msgid "Selection %s not found" msgstr "Не найдено: %s" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Неизвестная аббревиатура типа: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Открытие файла настройки %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Синтаксическая ошибка %s:%u: в начале блока нет имени." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Синтаксическая ошибка %s:%u: искажённый тег" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Синтаксическая ошибка %s:%u: лишние символы после значения" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Синтаксическая ошибка %s:%u: директивы могут задаваться только на верхнем " "уровне" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Синтаксическая ошибка %s:%u: слишком много вложенных include" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Синтаксическая ошибка %s:%u вызвана include из этого места" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Синтаксическая ошибка %s:%u: не поддерживаемая директива '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Синтаксическая ошибка %s:%u: лишние символы в конце файла" @@ -2312,81 +2320,81 @@ msgstr "Невозможно сменить текущий каталог на % msgid "Failed to stat the cdrom" msgstr "Невозможно получить атрибуты cdrom" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Блокировка не используется, так как файл блокировки %s доступен только для " "чтения" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Не удалось открыть файл блокировки %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Блокировка не используется, так как файл блокировки %s находится на файловой " "системе nfs" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Не удалось получить доступ к файлу блокировки %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ожидалось завершение процесса %s, но он не был запущен" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" "Нарушение защиты памяти (segmentation fault) в порождённом процессе %s." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, c-format msgid "Sub-process %s received signal %u." msgstr "Порождённый процесс %s получил сигнал %u." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Порождённый процесс %s вернул код ошибки (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Порождённый процесс %s неожиданно завершился" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Не удалось открыть файл %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "" "ошибка при чтении. собирались прочесть ещё %lu байт, но ничего больше нет" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "ошибка при записи, собирались записать ещё %lu байт, но не смогли" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Проблема закрытия файла" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Ошибка при удалении файла" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Проблема при синхронизации файловых буферов с диском" @@ -2503,53 +2511,53 @@ msgstr "Невозможно разобрать содержимое пакет msgid "Unable to parse package file %s (2)" msgstr "Невозможно разобрать содержимое пакета %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Искажённая строка %lu в списке источников %s (проблема в URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" "Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Искажённая строка %lu в списке источников %s (анализ URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Искажённая строка %lu в списке источников %s (absolute dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Искажённая строка %lu в списке источников %s (dist parse)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Открытие %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Строка %u в списке источников %s слишком длинна." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Искажённая строка %u в списке источников %s (тип)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Неизвестный тип '%s' в строке %u в списке источников %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Искажённая строка %u в списке источников %s (vendor id)" @@ -2680,17 +2688,17 @@ msgstr "Списки пакетов или status-файл не могут бы msgid "You may want to run apt-get update to correct these problems" msgstr "Вы можете запустить 'apt-get update' для исправления этих ошибок" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Неверная запись в файле параметров %s: отсутствует заголовок Package" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Неизвестный тип фиксации %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Для фиксации не указан приоритет (или указан нулевой)" @@ -2775,16 +2783,16 @@ msgstr "Произошла ошибка во время обработки %s (C msgid "Package %s %s was not found while processing file dependencies" msgstr "Во время обработки файла зависимостей не найден пакет %s %s" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Не удалось получить атрибуты списка пакетов исходного кода %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Сбор информации о Provides" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Ошибка ввода/вывода при попытке сохранить кэш источников" @@ -2793,19 +2801,19 @@ msgstr "Ошибка ввода/вывода при попытке сохран msgid "rename failed, %s (%s -> %s)." msgstr "переименовать не удалось, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum не совпадает" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Хеш сумма не совпадает" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Недоступен открытый ключ для следующих ID ключей:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2814,7 +2822,7 @@ msgstr "" "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " "вручную исправить этот пакет (возможно, пропущен arch)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2823,13 +2831,13 @@ msgstr "" "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " "вручную исправить этот пакет." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Не совпадает размер" @@ -3089,29 +3097,35 @@ msgstr "" msgid "Not locked" msgstr "Не заблокирован" -#: methods/rred.cc:219 -#, fuzzy -#| msgid "Could not open file %s" -msgid "Could not patch file" -msgstr "Не удалось открыть файл %s" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" +"Не удалось наложить заплату %s с использованием mmap и файловой операции -- " +"вероятно, повреждена заплата." + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" +"Не удалось наложить заплату %s с использованием mmap (но не из-за mmap) -- " +"вероятно, повреждена заплата." #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Соединение закрыто преждевременно" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Нет доступа к связке (keyring) ключей: '%s'" + +#, fuzzy +#~| msgid "Could not open file %s" +#~ msgid "Could not patch file" +#~ msgstr "Не удалось открыть файл %s" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" - -#~ msgid "" -#~ "Could not patch %s with mmap and with file operation usage - the patch " -#~ "seems to be corrupt." -#~ msgstr "" -#~ "Не удалось наложить заплату %s с использованием mmap и файловой операции " -#~ "-- вероятно, повреждена заплата." - -#~ msgid "" -#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " -#~ "seems to be corrupt." -#~ msgstr "" -#~ "Не удалось наложить заплату %s с использованием mmap (но не из-за mmap) " -#~ "-- вероятно, повреждена заплата." diff --git a/po/sk.po b/po/sk.po index 1d0aa1165..d5fe16c1a 100644 --- a/po/sk.po +++ b/po/sk.po @@ -436,9 +436,6 @@ msgstr "DB je neaktuálna, prebieha pokus o aktualizáciu %s" #: ftparchive/cachedb.cc:72 #, fuzzy -#| msgid "" -#| "DB format is invalid. If you upgraded from a older version of apt, please " -#| "remove and re-create the database." msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -1978,7 +1975,6 @@ msgstr "Nedá sa pripojiť k %s:%s:" #. TRANSLATOR: %s is the trusted keyring parts directory #: methods/gpgv.cc:78 #, fuzzy, c-format -#| msgid "Aborting install." msgid "No keyring installed in %s." msgstr "Inštalácia sa prerušuje." diff --git a/po/sl.po b/po/sl.po index 9b1505348..59351e42f 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: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2005-02-16 22:18+0100\n" "Last-Translator: Jure Cuhalev <gandalf@owca.info>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -145,7 +145,7 @@ msgstr " Tabela razli #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s za %s %s preveden na %s %s\n" @@ -302,7 +302,7 @@ msgstr "" " -c=? Prebere podano datoteko z nastavitvami\n" " -o=? Nastavi poljubno nastavitveno monost, npr. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Ni mogoe pisati na %s" @@ -437,7 +437,7 @@ msgstr "ZP je stara, posku #: ftparchive/cachedb.cc:72 msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" @@ -452,11 +452,11 @@ msgstr "Ni mogo msgid "Failed to stat %s" msgstr "Napaka pri postavitvi %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arhiv nima nadzornega zapisa" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Ni mogoe najti kazalca" @@ -521,26 +521,26 @@ msgstr "*** Napaka pri povezovanju %s z %s" msgid " DeLink limit of %sB hit.\n" msgstr " Doseena meja RazVezovanja %sB.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Arhiv ni imel polja s paketom" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s nima prekrivnega vnosa\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Vzdrevalec %s je %s in ne %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " %s nima prekrivnega vnosa\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " %s nima prekrivnega vnosa\n" @@ -644,7 +644,7 @@ msgstr "Ni mogo msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Napaka pri prevajanju regex - %s" @@ -807,11 +807,11 @@ msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogo msgid "Internal error, Ordering didn't finish" msgstr "Notranja napaka pri dodajanju odklona" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Ni mogoe zakleniti imenika za prenose" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Seznama virov ni mogoe brati." @@ -840,8 +840,8 @@ msgstr "Po odpakiranju bo uporabljenega %sB dodatnega prostora na disku.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po odpakiranju bo sproenega %sB prostora na disku.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Nimate dovolj prostora na %s" @@ -878,7 +878,7 @@ msgstr "Prekini." msgid "Do you want to continue [Y/n]? " msgstr "Ali elite nadaljevati [Y/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ni mogoe dobiti %s %s\n" @@ -887,7 +887,7 @@ msgstr "Ni mogo msgid "Some files failed to download" msgstr "Prenos nekaterih datotek ni uspel" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Prenos dokonan in uporabljen nain samo prenos" @@ -984,51 +984,51 @@ msgstr "Razli msgid "Selected version %s (%s) for %s\n" msgstr "Izbrana razliica %s (%s) za %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Ni mogoe doloiti seznama izvornih paketov %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Ukaz update ne potrebuje argumentov" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Imenika seznamov ni mogoe zakleniti" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Naslednji NOVI paketi bodo nameeni:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Naslednji NOVI paketi bodo nameeni:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1044,44 +1044,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Naslednji podatki vam bodo morda pomagali reiti teavo:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Ni mogoe najti paketa %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Ni mogoe najti paketa %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Opomba: izbran %s namesto regex '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "vendar bo paket %s nameen" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Poskusite zagnati 'apt-get -f install', e elite popraviti:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1089,7 +1089,7 @@ msgstr "" "Nereene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali " "podajte reitev)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1100,126 +1100,126 @@ msgstr "" "nemogo poloaj, e uporabljate nestabilno izdajo pa, da nekateri zahtevani " "paketi e niso ustvarjeni ali preneeni iz Prihajajoe." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Pokvarjeni paketi" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Naslednji dodatni paketi bodo nameeni:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Predlagani paketi:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Priporoeni paketi:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Preraunavanje nadgradnje ... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Spodletelo" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Opravljeno" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega elite dobiti izorno kodo" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Izvornega paketa za %s ni mogoe najti" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Nimate dovolj prostora na %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potrebno je dobiti %sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Dobi vir %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Nekaterih arhivov ni mogoe dobiti." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ukaz odpakiranja '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Ukaz gradnje '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Otroki proces ni uspel" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega elite preveriti odvisnosti " "za gradnjo" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni mogoe dobiti informacij o odvisnostih za gradnjo za %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s nima odvisnosti za gradnjo.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s odvisnosti za %s ni mogoe zadostiti, ker ni mogoe najti paketa %s" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1228,31 +1228,31 @@ msgstr "" "%s odvisnosti za %s ni mogoe zadostiti, ker nobena razliica paketa %s ne " "more zadostiti zahtevi po razliici" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Ni mogoe zadostiti %s odvisnosti za %s. Nameen paket %s je preve nov" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Ni mogoe zadostiti %s odvisnosti za %s. %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Odvisnostim za gradnjo %s ni mogoe zadostiti." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Obdelava odvisnosti za gradnjo ni uspela" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Podprti moduli:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1335,7 +1335,7 @@ msgstr "" "sources.list(5) in apt.conf(5).\n" " APT ima mo Super Krave.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1583,11 +1583,10 @@ msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Ni mogoe brati %s" @@ -1617,9 +1616,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Podatki in zaasni imeniki morajo biti v istem datotenem sistemu" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Branje seznama paketov" @@ -1753,11 +1752,11 @@ msgid "File not found" msgstr "Datoteke ni mogoe najti" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Doloitev ni uspela" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Nastavitev asa spremembe ni uspela" @@ -1819,7 +1818,7 @@ msgstr "Povezava potekla" msgid "Server closed the connection" msgstr "Strenik je zaprl povezavo" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Napaka pri branju" @@ -1831,7 +1830,7 @@ msgstr "Odgovor je prekora msgid "Protocol corruption" msgstr "Okvara protokola" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Napaka pri pisanju" @@ -1885,7 +1884,7 @@ msgstr "Povezava podatkovne vti msgid "Unable to accept connection" msgstr "Ni mogoe sprejeti povezave" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Teava pri razprevanju datoteke" @@ -1949,59 +1948,64 @@ msgstr "Ni se mogo msgid "Connecting to %s" msgstr "Povezujem se z %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Ni mogoe razreiti '%s'" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Zaasna napaka pri razreevanju '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Prilo je do napake pri razreevanju '%s:%s' (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Ni se mogoe povezati z %s %s:" -#: methods/gpgv.cc:71 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 #, fuzzy, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Ni mogoe razreiti '%s'" +msgid "No keyring installed in %s." +msgstr "Prekinjanje namestitve." -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" + +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Naslednji dodatni paketi bodo nameeni:" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2050,48 +2054,48 @@ msgstr "Ta stre msgid "Unknown date format" msgstr "Neznana oblika datuma" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Izbira ni uspela" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "as za povezavo se je iztekel" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Napaka pri pisanju v izhodno datoteko" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Napaka pri branju oddaljene in zaprte povezave s strenika " -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Napaka pri branju s strenika" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Napaka pri pisanju datoteke %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Napani podatki glave" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Povezava ni uspela" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Notranja napaka" @@ -2099,18 +2103,25 @@ msgstr "Notranja napaka" msgid "Can't mmap an empty file" msgstr "mmap prazne datoteke ni mogo" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Ni mogoe narediti mmap %lu bajtov" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2140,53 +2151,53 @@ msgstr "" msgid "Selection %s not found" msgstr "Izbira %s ni mogoe najti" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ne-prepoznan tip okrajave: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Odpiranje nastavitvene datoteke %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Skladenjska napaka %s:%u: Blok se zane brez imena." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Skladenjska napaka %s:%u: Nepravilna znaka." -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Skladenjska napaka %s:%u: Dodatno smetje za vrednostjo." -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Skladenjska napaka %s:%u: Napotki se lahko izvedejo le na vrhnjem nivoju." -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Skladenjska napaka %s:%u: Preve ugnezdenih vkljuitev." -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Skladenjska napaka %s:%u: Vkljuen od tu." -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Skladenjska napaka %s:%u: Nepodprt napotek '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Skladenjska napaka %s:%u: Dodatno smetje na koncu datoteke" @@ -2262,75 +2273,75 @@ msgstr "Ni mogo msgid "Failed to stat the cdrom" msgstr "Ni mogoe doloiti CD-ROM-a" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Brez uporabe zaklepanja za zaklenjeno datoteko samo za branje %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Ni mogoe odprti zaklenjene datoteke %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Brez uporabe zaklepanja za datoteko %s, priklopljeno z NTFS" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Ni mogoe dobiti zaklenjene datoteke %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "akal, a %s ni bil tam" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Napaka pri razlenjenosti podprocesa %s." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Napaka pri razlenjenosti podprocesa %s." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s je vrnil kodo napake (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s se je nepriakovano zakljuil" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Ne morem odpreti datoteke %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "berem, e vedno %lu za branje, a nobeden ostal" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "piem, e vedno %lu za pisanje, a ni mogoe" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Teava pri zapiranju datoteke" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Teava pri odvezovanju datoteke" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Teava pri usklajevanju datoteke" @@ -2448,52 +2459,52 @@ msgstr "Ni mogo msgid "Unable to parse package file %s (2)" msgstr "Ni mogoe razleniti paketne datoteke %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Napana vrstica %lu v seznamu virov %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Napana vrstica %lu v seznamu virov %s (distribucija)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Napana vrstica %lu v seznamu virov %s (razlenitev URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Napana vrstica %lu v seznamu virov %s (absolutna distribucija)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Napana vrstica %lu v seznamu virov %s (razlenitev distribucije)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Odpiram %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Vrstica %u v seznamu virov %s je predolga." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Napana vrstica %u v seznamu virov %s (vrsta)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Vrsta '%s' v vrstici %u v seznamu virov %s ni znana" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Napana vrstica %u v seznamu virov %s (ID ponudnika)" @@ -2621,17 +2632,17 @@ msgstr "Ni mogo msgid "You may want to run apt-get update to correct these problems" msgstr "e elite odpraviti teave, poskusite zagnati apt-get update." -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Napaen zapis v datoteki z nastavitvami. Ni glave paketa" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Ni mogoe razumeti vrste zaponke %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Prioriteta zaponke ni doloena ali pa je ni." @@ -2716,16 +2727,16 @@ msgstr "Pri msgid "Package %s %s was not found while processing file dependencies" msgstr "Paketa %s %s ni bilo mogoe najti med obdelavo odvisnosti" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Ni mogoe doloiti seznama izvornih paketov %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Zbiranje dobaviteljev datotek" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Napaka IO pri shranjevanju predpomnilnika virov" @@ -2734,20 +2745,20 @@ msgstr "Napaka IO pri shranjevanju predpomnilnika virov" msgid "rename failed, %s (%s -> %s)." msgstr "preimenovanje spodletelo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "Neujemanje vsote MD5" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 #, fuzzy msgid "Hash Sum mismatch" msgstr "Neujemanje vsote MD5" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2756,7 +2767,7 @@ msgstr "" "Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono " "popraviti ta paket (zaradi manjkajoega arhiva)." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2765,7 +2776,7 @@ msgstr "" "Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono " "popraviti ta paket." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2773,7 +2784,7 @@ msgstr "" "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket " "%s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Neujemanje velikosti" @@ -2909,7 +2920,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Odpiranje nastavitvene datoteke %s" @@ -3023,15 +3033,32 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "Ne morem odpreti datoteke %s" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Povezava se je prezgodaj zaprla" +#, fuzzy +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Ni mogoe razreiti '%s'" + +#, fuzzy +#~ msgid "Could not patch file" +#~ msgstr "Ne morem odpreti datoteke %s" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/sv.po b/po/sv.po index bc3dc6e37..e14b57df5 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2009-03-03 23:15+0100\n" "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" "Language-Team: Swedish <debian-l10n-swedish@debian.org>\n" @@ -147,7 +147,7 @@ msgstr " Versionstabell:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s för %s kompilerad den %s %s\n" @@ -300,7 +300,7 @@ msgstr "" " -c=? Läs denna konfigurationsfil.\n" " -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Kunde inte skriva till %s" @@ -434,8 +434,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB är gammal, försöker uppgradera %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "DB-formatet är ogiltigt. Ta bort och återskapa databasen om du uppgraderar " @@ -452,11 +453,11 @@ msgstr "Kunde inte öppna DB-filen %s: %s" msgid "Failed to stat %s" msgstr "Misslyckades med att ta status på %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arkivet har ingen styrpost" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Kunde inte få tag i någon markör" @@ -523,27 +524,27 @@ msgid " DeLink limit of %sB hit.\n" msgstr " Avlänkningsgränsen på %sB nåddes.\n" # Fält vid namn "Package" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Arkivet har inget package-fält" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen post i override-filen\n" # parametrar: paket, ny, gammal -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " ansvarig för paketet %s är %s ej %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s har ingen källåsidosättningspost\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s har heller ingen binär åsidosättningspost\n" @@ -649,7 +650,7 @@ msgstr "Misslyckades med att byta namn på %s till %s" msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Fel vid kompilering av reguljärt uttryck - %s" @@ -811,11 +812,11 @@ msgstr "Paketen måste tas bort men \"Remove\" är inaktiverat." msgid "Internal error, Ordering didn't finish" msgstr "Internt fel. Sorteringen färdigställdes inte" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Kunde inte låsa hämtningskatalogen" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Listan över källor kunde inte läsas." @@ -847,8 +848,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Efter denna åtgärd kommer %sB att frigöras på disken.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunde inte fastställa ledigt utrymme i %s" @@ -886,7 +887,7 @@ msgstr "Avbryter." msgid "Do you want to continue [Y/n]? " msgstr "Vill du fortsätta [J/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Misslyckades med att hämta %s %s\n" @@ -895,7 +896,7 @@ msgstr "Misslyckades med att hämta %s %s\n" msgid "Some files failed to download" msgstr "Misslyckades med att hämta vissa filer" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Hämtningen färdig i \"endast-hämta\"-läge" @@ -993,53 +994,53 @@ msgstr "Version \"%s\" för \"%s\" hittades inte" msgid "Selected version %s (%s) for %s\n" msgstr "Vald version %s (%s) för %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Kunde inte ta status på källkodspaketlistan %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Uppdateringskommandot tar inga argument" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Kunde inte låsa listkatalogen" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Det är inte meningen att vi ska ta bort något, kan inte starta AutoRemover" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" "Följande paket har installerats automatiskt och är inte längre nödvändiga:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Följande paket har installerats automatiskt och är inte längre nödvändiga:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Använd \"apt-get autoremove\" för att ta bort dem." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1057,44 +1058,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Följande information kan vara till hjälp för att lösa situationen:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Internt fel, AutoRemover förstörde något" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internt fel, AllUpgrade förstörde något" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Kunde inte hitta funktionen %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Kunde inte hitta paketet %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Observera, väljer %s för det reguljära uttrycket \"%s\"\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s är satt till manuellt installerad.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Du kan möjligen rätta till detta genom att köra \"apt-get -f install\":" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1102,7 +1103,7 @@ msgstr "" "Otillfredsställda beroenden. Prova med \"apt-get -f install\" utan paket " "(eller ange en lösning)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1114,115 +1115,115 @@ msgstr "" "att några nödvändiga paket ännu inte har skapats eller flyttats\n" "ut från \"Incoming\"." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Trasiga paket" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Följande ytterligare paket kommer att installeras:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Föreslagna paket:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Rekommenderade paket:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Beräknar uppgradering... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Misslyckades" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Färdig" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Internt fel, problemlösaren förstörde någonting" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Du måste ange minst ett paket att hämta källkod för" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunde inte hitta något källkodspaket för %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar över redan hämtade filen \"%s\"\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Behöver hämta %sB källkodsarkiv.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Hämtar källkoden %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Misslyckades med att hämta vissa arkiv." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Packar inte upp redan uppackad källkod i %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uppackningskommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggkommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Barnprocessen misslyckades" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "Du måste ange minst ett paket att kontrollera byggberoenden för" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunde inte hämta information om byggberoenden för %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s har inga byggberoenden.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1231,7 +1232,7 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1240,32 +1241,32 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga " "versioner av paketet %s tillfredsställer versionskraven" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Misslyckades med att tillfredsställa %s-beroendet för %s: Det installerade " "paketet %s är för nytt" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Misslyckades med att tillfredsställa %s-beroendet för %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggberoenden för %s kunde inte tillfredsställas." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Misslyckades med att behandla byggberoenden" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Moduler som stöds:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1349,7 +1350,7 @@ msgstr "" "för mer information och flaggor.\n" " Denna APT har Speciella Ko-Krafter.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1602,11 +1603,10 @@ msgstr "Filen %s/%s skriver över den i paketet %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Kunde inte läsa %s" @@ -1636,9 +1636,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Katalogerna info och temp måste vara på samma filsystem" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Läser paketlistor" @@ -1773,11 +1773,11 @@ msgid "File not found" msgstr "Filen hittades inte" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Kunde inte ta status" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Misslyckades ställa in ändringstid" @@ -1839,7 +1839,7 @@ msgstr "Tidsgränsen för anslutningen överskreds" msgid "Server closed the connection" msgstr "Servern stängde anslutningen" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Läsfel" @@ -1851,7 +1851,7 @@ msgstr "Ett svar spillde bufferten." msgid "Protocol corruption" msgstr "Protokollet skadat" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivfel" @@ -1905,7 +1905,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgränsen" msgid "Unable to accept connection" msgstr "Kunde inte ta emot anslutningen" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem med att lägga filen till hashtabellen" @@ -1972,62 +1972,67 @@ msgstr "Kunde inte ansluta till %s:%s (%s)." msgid "Connecting to %s" msgstr "Ansluter till %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Kunde inte slå upp \"%s\"" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Temporärt fel vid uppslagning av \"%s\"" # Okänd felkod; %i = koden -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Kunde inte ansluta till %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Kunde inte komma åt nyckelring: \"%s\"" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Avbryter installationen." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Argumentslistan från Acquire::gpgv::Options är för lång. Avslutar." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Internt fel: Korrekt signatur men kunde inte fastställa nyckelns " "fingeravtryck?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Minst en ogiltig signatur träffades på." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Kunde inte köra \"%s\" för att verifiera signatur (är gpgv installerad?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Okänt fel vid körning av gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Följande signaturer är ogiltiga:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2079,47 +2084,47 @@ msgstr "Den här http-serverns stöd för delvis hämtning fungerar inte" msgid "Unknown date format" msgstr "Okänt datumformat" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "\"Select\" misslyckades" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Anslutningen överskred tidsgränsen" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Fel vid skrivning till utdatafil" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Fel vid skrivning till fil" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Fel vid skrivning till filen" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Fel vid läsning från server: Andra änden stängde förbindelsen" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Fel vid läsning från server" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Misslyckades med att kapa av filen" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Felaktiga data i huvud" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Anslutningen misslyckades" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Internt fel" @@ -2127,12 +2132,12 @@ msgstr "Internt fel" msgid "Can't mmap an empty file" msgstr "Kan inte utföra mmap på en tom fil" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Kunde inte utföra mmap på %lu byte" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " @@ -2141,6 +2146,13 @@ msgstr "" "Dynamisk MMap fick slut på utrymme. Öka storleken för APT::Cache-Limit. " "Aktuellt värde: %lu. (man 5 apt.conf)" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2170,52 +2182,52 @@ msgstr "" msgid "Selection %s not found" msgstr "Valet %s hittades inte" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Okänd typförkortning: \"%c\"" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Öppnar konfigurationsfilen %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaxfel %s:%u: Block börjar utan namn." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaxfel %s:%u: Felformat märke" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaxfel %s:%u: Överflödigt skräp efter värde" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaxfel %s:%u: Direktiv kan endast utföras på toppnivån" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaxfel %s:%u: För många nästlade inkluderingar" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaxfel %s:%u: Inkluderad härifrån" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaxfel %s:%u: Direktivet \"%s\" stöds inte" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaxfel %s:%u: Överflödigt skräp vid filens slut" @@ -2293,75 +2305,75 @@ msgstr "Kunde inte byta till %s" msgid "Failed to stat the cdrom" msgstr "Kunde inte ta status på cd-romen." -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Använder inte låsning för skrivskyddade låsfilen %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Kunde inte öppna låsfilen %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Använder inte låsning för nfs-monterade låsfilen %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Kunde inte erhålla låset %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Väntade på %s men den fanns inte där" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprocessen %s råkade ut för ett segmenteringsfel." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Underprocessen %s råkade ut för ett segmenteringsfel." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprocessen %s svarade med en felkod (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprocessen %s avslutades oväntat" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Kunde inte öppna filen %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "läsning, har fortfarande %lu att läsa men ingenting finns kvar" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skrivning, har fortfarande %lu att skriva men kunde inte" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problem med att stänga filen" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Problem med att länka ut filen" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Problem med att synkronisera filen" @@ -2481,52 +2493,52 @@ msgstr "Kunde inte tolka paketfilen %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Kunde inte tolka paketfilen %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Rad %lu i källistan %s har (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Rad %lu i källistan %s har fel format (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Rad %lu i källistan %s har fel format (Absolut dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Rad %lu i källistan %s har fel format (dist-tolkning)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Öppnar %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Rad %u är för lång i källistan %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Rad %u i källistan %s har fel format (typ)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Rad %u i källistan %s har fel format (leverantörs-id)" @@ -2655,17 +2667,17 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "Du kan möjligen rätta till problemet genom att köra \"apt-get update\"" # "Package" är en sträng i konfigurationsfilen -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Ogiltig post i konfigurationsfilen, \"Package\"-rubriken saknas" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Förstod inte nåltypen %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Prioritet ej angiven (eller noll) för nål" @@ -2751,17 +2763,17 @@ msgstr "Fel uppstod vid hantering av %s (CollectFileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "Paketet %s %s hittades inte när filberoenden hanterades" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunde inte ta status på källkodspaketlistan %s" # Bättre ord? -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Samlar filtillhandahållningar" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "In-/utfel vid lagring av källcache" @@ -2770,19 +2782,19 @@ msgstr "In-/utfel vid lagring av källcache" msgid "rename failed, %s (%s -> %s)." msgstr "namnbyte misslyckades, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5-kontrollsumman stämmer inte" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Hash-kontrollsumman stämmer inte" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Det finns ingen öppen nyckel tillgänglig för följande nyckel-id:n:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2791,7 +2803,7 @@ msgstr "" "Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du " "manuellt måste reparera detta paket (på grund av saknad arkitektur)." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2800,13 +2812,13 @@ msgstr "" "Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du " "manuellt måste reparera detta paket." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Paketindexfilerna är skadede. Inget \"Filename:\"-fält för paketet %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Storleken stämmer inte" @@ -2941,7 +2953,6 @@ msgstr "Skrev %i poster med %i saknade filer och %i filer som inte stämmer\n" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Öppnar konfigurationsfilen %s" @@ -2952,7 +2963,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Hash-kontrollsumman stämmer inte" @@ -2973,7 +2983,6 @@ msgstr "Tar bort %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Tog bort hela %s" @@ -3058,14 +3067,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Kunde inte lägga på programfix på filen" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Anslutningen stängdes i förtid" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Kunde inte komma åt nyckelring: \"%s\"" + +#~ msgid "Could not patch file" +#~ msgstr "Kunde inte lägga på programfix på filen" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/th.po b/po/th.po index 8a98257fa..5cd9e120b 100644 --- a/po/th.po +++ b/po/th.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-11-06 15:54+0700\n" "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n" "Language-Team: Thai <thai-l10n@googlegroups.com>\n" @@ -147,7 +147,7 @@ msgstr " ตารางรุ่น:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s สำหรับ %s คอมไพล์เมื่อ %s %s\n" @@ -301,7 +301,7 @@ msgstr "" " -c=? อ่านแฟ้มค่าตั้งนี้\n" " -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "ไม่สามารถเขียนลงแฟ้ม %s" @@ -431,8 +431,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB เป็นรุ่นเก่า จะพยายามปรับรุ่น %s ขึ้น" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "ฟอร์แมตของ DB ผิด ถ้าคุณเพิ่งปรับรุ่นมาจาก apt รุ่นเก่า กรุณาลบฐานข้อมูลแล้วสร้างใหม่" @@ -447,11 +448,11 @@ msgstr "ไม่สามารถเปิดแฟ้ม DB %s: %s" msgid "Failed to stat %s" msgstr "stat %s ไม่สำเร็จ" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "แพกเกจไม่มีระเบียนควบคุม" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "ไม่สามารถนำตัวชี้ตำแหน่งมาใช้ได้" @@ -516,26 +517,26 @@ msgstr "*** ลิงก์ %s ไปยัง %s ไม่สำเร็จ" msgid " DeLink limit of %sB hit.\n" msgstr " มาถึงขีดจำกัดการ DeLink ที่ %sB แล้ว\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "แพกเกจไม่มีช่องข้อมูล 'Package'" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s ไม่มีข้อมูล override\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " ผู้ดูแล %s คือ %s ไม่ใช่ %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s ไม่มีข้อมูล override สำหรับซอร์ส\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s ไม่มีข้อมูล override สำหรับไบนารีเช่นกัน\n" @@ -639,7 +640,7 @@ msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไป msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s" @@ -800,11 +801,11 @@ msgstr "มีแพกเกจที่จำเป็นต้องถอด msgid "Internal error, Ordering didn't finish" msgstr "ข้อผิดพลาดภายใน: การเรียงลำดับไม่เสร็จสิ้น" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "ไม่สามารถล็อคไดเรกทอรีดาวน์โหลด" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "ไม่สามารถอ่านรายชื่อแหล่งแพกเกจได้" @@ -833,8 +834,8 @@ msgstr "หลังจากการกระทำนี้ ต้องใ msgid "After this operation, %sB disk space will be freed.\n" msgstr "หลังจากการกระทำนี้ เนื้อที่บนดิสก์จะว่างเพิ่มอีก %sB\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s" @@ -871,7 +872,7 @@ msgstr "เลิกทำ" msgid "Do you want to continue [Y/n]? " msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่ [Y/n]?" -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "ไม่สามารถดาวน์โหลด %s %s\n" @@ -880,7 +881,7 @@ msgstr "ไม่สามารถดาวน์โหลด %s %s\n" msgid "Some files failed to download" msgstr "ดาวน์โหลดบางแฟ้มไม่สำเร็จ" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "ดาวน์โหลดสำเร็จแล้ว และอยู่ในโหมดดาวน์โหลดอย่างเดียว" @@ -976,50 +977,50 @@ msgstr "ไม่พบรุ่น '%s' ของ '%s'" msgid "Selected version %s (%s) for %s\n" msgstr "เลือกรุ่น %s (%s) สำหรับ %s แล้ว\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "ไม่สามารถล็อคไดเรกทอรีรายชื่อแพกเกจ" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "apt ถูกกำหนดไม่ให้มีการลบใดๆ จึงไม่สามารถดำเนินการถอดถอนอัตโนมัติได้" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "ใช้ 'apt-get autoremove' เพื่อลบแพกเกจดังกล่าวได้" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1037,43 +1038,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "ข้อมูลต่อไปนี้อาจช่วยแก้ปัญหาได้:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "เกิดข้อผิดพลาดภายใน: AutoRemover ทำความเสียหาย" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "เกิดข้อผิดพลาดภายใน: AllUpgrade ทำความเสียหาย" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "ไม่พบงาน %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "ไม่พบแพกเกจ %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "หมายเหตุ: จะเลือก %s สำหรับนิพจน์เรกิวลาร์ '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "คุณอาจเรียก `apt-get -f install' เพื่อแก้ปัญหานี้ได้:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1081,7 +1082,7 @@ msgstr "" "มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ กรุณาลองใช้ 'apt-get -f install' โดยไม่ระบุแพกเกจ " "(หรือจะระบุทางแก้ก็ได้)" -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1092,122 +1093,122 @@ msgstr "" "หรือถ้าคุณกำลังใช้รุ่น unstable ก็เป็นไปได้ว่าแพกเกจที่จำเป็นบางรายการ\n" "ยังไม่ถูกสร้างขึ้น หรือถูกย้ายออกจาก Incoming" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "แพกเกจมีปัญหา" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "จะติดตั้งแพกเกจเพิ่มเติมต่อไปนี้:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "แพกเกจที่แนะนำ:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "แพกเกจที่ควรใช้ร่วมกัน:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "กำลังคำนวณการปรับรุ่น... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "ล้มเหลว" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "เสร็จแล้ว" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "เกิดข้อผิดพลาดภายใน: กลไกการแก้ปัญหาทำความเสียหาย" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "ไม่พบแพกเกจซอร์สโค้ดสำหรับ %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB/%sB\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "ดาวน์โหลดซอร์ส %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม" -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "จะข้ามการแตกซอร์สของซอร์สที่แตกไว้แล้วใน %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "คำสั่งแตกแฟ้ม '%s' ล้มเหลว\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "คำสั่ง build '%s' ล้มเหลว\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "โพรเซสลูกล้มเหลว" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะตรวจสอบสิ่งที่ต้องการสำหรับการ build" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องการสำหรับการ build ของ %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s ไม่ต้องการสิ่งใดสำหรับ build\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่พบแพกเกจ %s" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1216,30 +1217,30 @@ msgstr "" "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีแพกเกจ %s " "รุ่นที่จะสอดคล้องกับความต้องการรุ่นของแพกเกจได้" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: แพกเกจ %s ที่ติดตั้งไว้ใหม่เกินไป" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับการ build ของ %s ได้" -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "มอดูลที่รองรับ:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1323,7 +1324,7 @@ msgstr "" "และ apt.conf(5)\n" " APT นี้มีพลังของ Super Cow\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1568,11 +1569,10 @@ msgstr "แฟ้ม %s/%s เขียนทับแฟ้มในแพก #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "ไม่สามารถอ่าน %s" @@ -1602,9 +1602,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "ไดเรกทอรี info และ temp ต้องอยู่ในระบบแฟ้มเดียวกัน" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "กำลังอ่านรายชื่อแพกเกจ" @@ -1736,11 +1736,11 @@ msgid "File not found" msgstr "ไม่พบแฟ้ม" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "stat ไม่สำเร็จ" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "กำหนดเวลาแก้ไขไม่สำเร็จ" @@ -1800,7 +1800,7 @@ msgstr "หมดเวลารอเชื่อมต่อ" msgid "Server closed the connection" msgstr "เซิร์ฟเวอร์ปิดการเชื่อมต่อ" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "การอ่านข้อมูลผิดพลาด" @@ -1812,7 +1812,7 @@ msgstr "คำตอบท่วมบัฟเฟอร์" msgid "Protocol corruption" msgstr "มีความเสียหายของโพรโทคอล" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "การเขียนข้อมูลผิดพลาด" @@ -1866,7 +1866,7 @@ msgstr "หมดเวลารอเชื่อมต่อซ็อกเก msgid "Unable to accept connection" msgstr "ไม่สามารถรับการเชื่อมต่อ" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "เกิดปัญหาขณะคำนวณค่าแฮชของแฟ้ม" @@ -1930,58 +1930,63 @@ msgstr "ไม่สามารถเชื่อมต่อไปยัง %s msgid "Connecting to %s" msgstr "เชื่อมต่อไปยัง %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "ไม่สามารถเปิดหาที่อยู่ '%s'" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "เกิดข้อผิดพลาดชั่วคราวขณะเปิดหาที่อยู่ '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "เกิดปัญหาร้ายแรงบางอย่างขณะเปิดหาที่อยู่ '%s:%s' (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "ไม่สามารถเชื่อมต่อไปยัง %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "ไม่สามารถเข้าใช้พวงกุญแจ: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "จะล้มเลิกการติดตั้ง" + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: รายการอาร์กิวเมนต์ใน Acquire::gpgv::Options ยาวเกินไป จะจบการทำงาน" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "ข้อผิดพลาดภายใน: ลายเซ็นใช้การได้ แต่ไม่สามารถระบุลายนิ้วมือของกุญแจ?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "พบลายเซ็นที่ใช้การไม่ได้อย่างน้อยหนึ่งรายการ" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "ไม่สามารถเรียก '%s' เพื่อตรวจสอบลายเซ็น (ได้ติดตั้ง gpgv ไว้หรือไม่?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะเรียก gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "ลายเซ็นต่อไปนี้ใช้การไม่ได้:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2030,47 +2035,47 @@ msgstr "การสนับสนุน Content-Range ที่เซิร์ msgid "Unknown date format" msgstr "พบรูปแบบวันที่ที่ไม่รู้จัก" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "select ไม่สำเร็จ" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "หมดเวลารอเชื่อมต่อ" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้มผลลัพธ์" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์ ปลายทางอีกด้านหนึ่งปิดการเชื่อมต่อ" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "ไม่สามารถตัดท้ายแฟ้ม" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "ข้อมูลส่วนหัวผิดพลาด" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "เชื่อมต่อไม่สำเร็จ" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "ข้อผิดพลาดภายใน" @@ -2078,18 +2083,25 @@ msgstr "ข้อผิดพลาดภายใน" msgid "Can't mmap an empty file" msgstr "ไม่สามารถ mmap แฟ้มเปล่า" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "ไม่สามารถสร้าง mmap ขนาด %lu ไบต์" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2119,52 +2131,52 @@ msgstr "" msgid "Selection %s not found" msgstr "ไม่พบรายการเลือก %s" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "พบตัวย่อของชนิดที่ข้อมูลไม่รู้จัก: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "ขณะเปิดแฟ้มค่าตั้ง %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "ไวยากรณ์ผิดพลาด %s:%u: เริ่มบล็อคโดยไม่มีชื่อ" -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "ไวยากรณ์ผิดพลาด %s:%u: แท็กผิดรูปแบบ" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังค่า" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "ไวยากรณ์ผิดพลาด %s:%u: สามารถใช้ directive ที่ระดับบนสุดได้เท่านั้น" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "ไวยากรณ์ผิดพลาด %s:%u: ใช้ include ซ้อนกันมากเกินไป" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "ไวยากรณ์ผิดพลาด %s:%u: include จากที่นี่" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "ไวยากรณ์ผิดพลาด %s:%u: พบ directive '%s' ที่ไม่รองรับ" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังจบแฟ้ม" @@ -2240,75 +2252,75 @@ msgstr "ไม่สามารถเปลี่ยนไดเรกทอร msgid "Failed to stat the cdrom" msgstr "ไม่สามารถ stat ซีดีรอม" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่อ่านได้อย่างเดียว" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "ไม่สามารถเปิดแฟ้มล็อค %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่เมานท์ผ่าน nfs" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "ไม่สามารถล็อค %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "โพรเซสย่อย %s เกิดข้อผิดพลาดของการใช้ย่านหน่วยความจำ (segmentation fault)" -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "โพรเซสย่อย %s เกิดข้อผิดพลาดของการใช้ย่านหน่วยความจำ (segmentation fault)" -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "โพรเซสย่อย %s คืนค่าข้อผิดพลาด (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "โพรเซสย่อย %s จบการทำงานกระทันหัน" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "ไม่สามารถเปิดแฟ้ม %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "read: ยังเหลือ %lu ที่ยังไม่ได้อ่าน แต่ข้อมูลหมดแล้ว" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "write: ยังเหลือ %lu ที่ยังไม่ได้เขียน แต่ไม่สามารถเขียนได้" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "เกิดปัญหาขณะปิดแฟ้ม" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "เกิดปัญหาขณะลบแฟ้ม" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "เกิดปัญหาขณะ sync แฟ้ม" @@ -2425,52 +2437,52 @@ msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1 msgid "Unable to parse package file %s (2)" msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist แบบสัมบูรณ์)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง dist)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "กำลังเปิด %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ยาวเกินไป" -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ชนิด)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (id ผู้ผลิต)" @@ -2593,17 +2605,17 @@ msgstr "ไม่สามารถแจงหรือเปิดรายช msgid "You may want to run apt-get update to correct these problems" msgstr "คุณอาจเรียก `apt-get update' เพื่อแก้ปัญหาเหล่านี้ได้" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "ระเบียนผิดรูปแบบในแฟ้มค่าปรับแต่ง: ไม่มีข้อมูลส่วนหัว 'Package'" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "ไม่เข้าใจชนิดการตรึง %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "ไม่ได้ระบุลำดับความสำคัญ (หรือค่าศูนย์) สำหรับการตรึง" @@ -2687,16 +2699,16 @@ msgstr "เกิดข้อผิดพลาดขณะประมวลผ msgid "Package %s %s was not found while processing file dependencies" msgstr "ไม่พบแพกเกจ %s %s ขณะประมวลผลความขึ้นต่อแฟ้ม" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "กำลังเก็บข้อมูลแฟ้มที่ตระเตรียมให้" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส" @@ -2705,39 +2717,39 @@ msgstr "เกิดข้อผิดพลาด IO ขณะบันทึ msgid "rename failed, %s (%s -> %s)." msgstr "เปลี่ยนชื่อไม่สำเร็จ: %s (%s -> %s)" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum ไม่ตรงกัน" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "ผลรวมแฮชไม่ตรงกัน" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "ไม่มีกุญแจสาธารณะสำหรับกุญแจหมายเลขต่อไปนี้:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง (ไม่มี arch)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "แฟ้มดัชนีแพกเกจเสียหาย ไม่มีข้อมูล Filename: (ชื่อแฟ้ม) สำหรับแพกเกจ %s" -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "ขนาดไม่ตรงกัน" @@ -2872,7 +2884,6 @@ msgstr "เขียนแล้ว %i ระเบียน โดยมีแ #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "ขณะเปิดแฟ้มค่าตั้ง %s" @@ -2883,7 +2894,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "ผลรวมแฮชไม่ตรงกัน" @@ -2904,7 +2914,6 @@ msgstr "กำลังถอดถอน %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว" @@ -2990,14 +2999,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "ไม่สามารถแพตช์แฟ้ม" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "การเชื่อมต่อถูกปิดก่อนเวลาอันควร" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "ไม่สามารถเข้าใช้พวงกุญแจ: '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "ไม่สามารถแพตช์แฟ้ม" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/tl.po b/po/tl.po index 03799ebea..a44d44b07 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: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n" "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n" @@ -152,7 +152,7 @@ msgstr " Talaang Bersyon:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para sa %s %s kinompile noong %s %s\n" @@ -309,7 +309,7 @@ msgstr "" " -c=? Basahin ang talaksang pagkaayos na ito\n" " -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Hindi makapagsulat sa %s" @@ -447,8 +447,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "Luma ang DB, sinusubukang maupgrade ang %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "Hindi tanggap ang anyo ng DB. Kung kayo ay nagsariwa mula sa nakaraang " @@ -465,11 +466,11 @@ msgstr "Hindi mabuksan ang talaksang DB %s: %s" msgid "Failed to stat %s" msgstr "Bigo ang pag-stat ng %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Walang kontrol rekord ang arkibo" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Hindi makakuha ng cursor" @@ -534,26 +535,26 @@ msgstr "*** Bigo ang pag-link ng %s sa %s" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink limit na %sB tinamaan.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Walang field ng pakete ang arkibo" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s ay walang override entry\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Tagapangalaga ng %s ay %s hindi %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s ay walang override entry para sa pinagmulan\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s ay wala ring override entry na binary\n" @@ -657,7 +658,7 @@ msgstr "Bigo ang pagpangalan muli ng %s tungong %s" msgid "Y" msgstr "O" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Error sa pag-compile ng regex - %s" @@ -822,11 +823,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Hindi maaldaba ang directory ng download" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)." @@ -858,8 +859,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Hindi matantsa ang libreng puwang sa %s" @@ -896,7 +897,7 @@ msgstr "Abort." msgid "Do you want to continue [Y/n]? " msgstr "Nais niyo bang magpatuloy [O/h]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Bigo sa pagkuha ng %s %s\n" @@ -905,7 +906,7 @@ msgstr "Bigo sa pagkuha ng %s %s\n" msgid "Some files failed to download" msgstr "May mga talaksang hindi nakuha" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang" @@ -1003,51 +1004,51 @@ msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap" msgid "Selected version %s (%s) for %s\n" msgstr "Ang napiling bersyon %s (%s) para sa %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Hindi maaldaba ang directory ng talaan" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1063,46 +1064,46 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "" "Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Error na internal, may nasira ang problem resolver" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Hindi mahanap ang paketeng %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Hindi mahanap ang paketeng %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Paunawa, pinili ang %s para sa regex '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ngunit ang %s ay iluluklok" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Maaaring patakbuhin niyo ang `apt-get -f install' upang ayusin ang mga ito:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1110,7 +1111,7 @@ msgstr "" "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang " "mga pakete (o magtakda ng solusyon)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1121,115 +1122,115 @@ msgstr "" "o kung kayo'y gumagamit ng pamudmod na unstable ay may ilang mga paketeng\n" "kailangan na hindi pa nalikha o linipat mula sa Incoming." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Sirang mga pakete" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Mga paketeng mungkahi:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Mga paketeng rekomendado:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Sinusuri ang pag-upgrade... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Bigo" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Tapos" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Error na internal, may nasira ang problem resolver" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Hindi mahanap ang paketeng source para sa %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Linaktawan ang nakuha na na talaksan '%s'\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Kulang kayo ng libreng puwang sa %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibong source.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Kunin ang Source %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Bigo sa pagkuha ng ilang mga arkibo." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Bigo ang utos ng pagbuklat '%s'.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Utos na build '%s' ay bigo.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Bigo ang prosesong anak" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "Kailangang magtakda ng kahit isang pakete na susuriin ang builddeps" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Hindi makuha ang impormasyong build-dependency para sa %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "Walang build depends ang %s.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1238,7 +1239,7 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1247,32 +1248,32 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon " "ng paketeng %s na tumutugon sa kinakailangang bersyon" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %" "s ay bagong-bago pa lamang." -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Hindi mabuo ang build-dependencies para sa %s." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Bigo sa pagproseso ng build dependencies" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Suportadong mga Module:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1355,7 +1356,7 @@ msgstr "" "para sa karagdagang impormasyon at mga option.\n" " Ang APT na ito ay may Kapangyarihan Super Kalabaw.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1604,11 +1605,10 @@ msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Hindi mabasa ang %s" @@ -1638,9 +1638,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Ang info at temp directory ay kailangang nasa parehong filesystem" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Binabasa ang Listahan ng mga Pakete" @@ -1775,11 +1775,11 @@ msgid "File not found" msgstr "Hindi Nahanap ang Talaksan" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Bigo ang pag-stat" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Bigo ang pagtakda ng oras ng pagbago" @@ -1841,7 +1841,7 @@ msgstr "Lumipas ang koneksyon" msgid "Server closed the connection" msgstr "Sinarhan ng server ang koneksyon" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Error sa pagbasa" @@ -1853,7 +1853,7 @@ msgstr "May sagot na bumubo sa buffer." msgid "Protocol corruption" msgstr "Sira ang protocol" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Error sa pagsulat" @@ -1907,7 +1907,7 @@ msgstr "Nag-timeout ang socket ng datos" msgid "Unable to accept connection" msgstr "Hindi makatanggap ng koneksyon" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema sa pag-hash ng talaksan" @@ -1971,63 +1971,68 @@ msgstr "Hindi maka-konekta sa %s:%s (%s)." msgid "Connecting to %s" msgstr "Kumokonekta sa %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Hindi maresolba ang '%s'" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Pansamantalang kabiguan sa pagresolba ng '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Hindi maka-konekta sa %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Hindi mabasa ang keyring: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Ina-abort ang pag-instol." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Sobrang haba ng talaan ng argumento mula sa Acquire::gpgv::Options. " "Lalabas." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error na internal: Tanggap na lagda, ngunit hindi malaman ang key " "fingerprint?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Hindi maitakbo ang '%s' upang maberipika ang lagda (nakaluklok ba ang gpgv?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Hindi kilalang error sa pag-execute ng gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Ang sumusunod na mga lagda ay imbalido:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2078,48 +2083,48 @@ msgstr "Sira ang range support ng HTTP server na ito" msgid "Unknown date format" msgstr "Di kilalang anyo ng petsa" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Bigo ang pagpili" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Nag-timeout ang koneksyon" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Error sa pagsulat ng talaksang output" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Error sa pagsulat sa talaksan" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Error sa pagsusulat sa talaksan" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Error sa pagbasa mula sa server" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Bigo sa pagsulat ng talaksang %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Maling datos sa panimula" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Bigo ang koneksyon" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Internal na error" @@ -2127,18 +2132,25 @@ msgstr "Internal na error" msgid "Can't mmap an empty file" msgstr "Hindi mai-mmap ang talaksang walang laman" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Hindi makagawa ng mmap ng %lu na byte" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2168,53 +2180,53 @@ msgstr "" msgid "Selection %s not found" msgstr "Piniling %s ay hindi nahanap" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Hindi kilalang katagang uri: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Binubuksan ang talaksang pagsasaayos %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntax error %s:%u: Nag-umpisa ang block na walang pangalan." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntax error %s:%u: Maling anyo ng Tag" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntax error %s:%u: May basura matapos ng halaga" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntax error %s:%u: Maaari lamang gawin ang mga direktiba sa tuktok na antas" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntax error %s:%u: Labis ang pagkaka-nest ng mga include" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntax error %s:%u: Sinama mula dito" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntax error %s:%u: Di suportadong direktiba '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntax error %s:%u: May basura sa dulo ng talaksan" @@ -2292,78 +2304,78 @@ msgstr "Di makalipat sa %s" msgid "Failed to stat the cdrom" msgstr "Bigo sa pag-stat ng cdrom" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Hindi ginagamit ang pagaldaba para sa basa-lamang na talaksang aldaba %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Hindi mabuksan ang talaksang aldaba %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Hindi gumagamit ng pag-aldaba para sa talaksang aldaba %s na naka-mount sa " "nfs" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "hindi makuha ang aldaba %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Naghintay, para sa %s ngunit wala nito doon" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Nakatanggap ang sub-process %s ng segmentation fault." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Nakatanggap ang sub-process %s ng segmentation fault." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Naghudyat ang sub-process %s ng error code (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Ang sub-process %s ay lumabas ng di inaasahan" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Hindi mabuksan ang talaksang %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problema sa pagsara ng talaksan" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Problema sa pag-unlink ng talaksan" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Problema sa pag-sync ng talaksan" @@ -2481,52 +2493,52 @@ msgstr "Hindi ma-parse ang talaksang pakete %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Hindi ma-parse ang talaksang pakete %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (absolute dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Binubuksan %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (vendor id)" @@ -2658,17 +2670,17 @@ msgstr "" "Maaaring patakbuhin niyo ang apt-get update upang ayusin ang mga problemang " "ito" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Di tanggap na record sa talaksang pagtatangi, walang Package header" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Hindi naintindihan ang uri ng pin %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Walang prioridad (o sero) na nakatakda para sa pin" @@ -2755,16 +2767,16 @@ msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Hindi nahanap ang paketeng %s %s habang prinoseso ang mga dependensiya." -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Kinukuha ang Talaksang Provides" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "IO Error sa pag-imbak ng source cache" @@ -2773,20 +2785,20 @@ msgstr "IO Error sa pag-imbak ng source cache" msgid "rename failed, %s (%s -> %s)." msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "Di tugmang MD5Sum" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 #, fuzzy msgid "Hash Sum mismatch" msgstr "Di tugmang MD5Sum" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Walang public key na magamit para sa sumusunod na key ID:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2795,7 +2807,7 @@ msgstr "" "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2804,7 +2816,7 @@ msgstr "" "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2812,7 +2824,7 @@ msgstr "" "Sira ang talaksang index ng mga pakete. Walang Filename: field para sa " "paketeng %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Di tugmang laki" @@ -2950,7 +2962,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Binubuksan ang talaksang pagsasaayos %s" @@ -2981,7 +2992,6 @@ msgstr "Tinatanggal ang %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Natanggal ng lubusan ang %s" @@ -3065,14 +3075,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Hindi mai-patch ang talaksan" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Nagsara ng maaga ang koneksyon" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Hindi mabasa ang keyring: '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "Hindi mai-patch ang talaksan" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/uk.po b/po/uk.po index 976b44b44..84ee8e0ce 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-all\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2006-07-29 15:57+0300\n" "Last-Translator: Artem Bondarenko <artem.brz@gmail.com>\n" "Language-Team: Українська <uk@li.org>\n" @@ -148,7 +148,7 @@ msgstr " Таблиця версій:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s для %s %s скомпільовано %s %s\n" @@ -302,7 +302,7 @@ msgstr "" " -c=? Читати зазначений конфігураційний файл\n" " -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Неможливо записати в %s" @@ -445,8 +445,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB застаріла, намагаюсь оновити %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "Формати DB не є правильним. Якщо ви оновилися зі старої версії apt, будь-" @@ -463,11 +464,11 @@ msgstr "Не вдалося відкрити DB файл %s: %s" msgid "Failed to stat %s" msgstr "Не вдалося одержати атрибути %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "В архіві немає поля control" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Неможливо одержати курсор" @@ -532,26 +533,26 @@ msgstr "*** Не вдалося створити посилання %s на %s" msgid " DeLink limit of %sB hit.\n" msgstr "Перевищено ліміт в %s в DeLink.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "В архіві немає поля package" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " Відсутній запис про перепризначення для %s\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " пакунок %s супроводжує %s, а не %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -655,7 +656,7 @@ msgstr "Не вдалося перейменувати %s в %s" msgid "Y" msgstr "Т" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Помилка компіляції регулярного виразу - %s" @@ -820,11 +821,11 @@ msgstr "Пакунки необхідно видалити, але видале msgid "Internal error, Ordering didn't finish" msgstr "Внутрішня помилка, Ordering не завершилася" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Неможливо заблокувати теку для завантаження" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Неможливо прочитати перелік джерел." @@ -854,8 +855,8 @@ msgid "After this operation, %sB disk space will be freed.\n" msgstr "" "Після розпакування об'єм зайнятого дискового простору зменшиться на %sB.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не вдалося визначити кількість вільного місця в %s" @@ -894,7 +895,7 @@ msgstr "Перервано." msgid "Do you want to continue [Y/n]? " msgstr "Бажаєте продовжити [Т/н]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не вдалося завантажити %s %s\n" @@ -903,7 +904,7 @@ msgstr "Не вдалося завантажити %s %s\n" msgid "Some files failed to download" msgstr "Деякі файли не вдалося завантажити" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Вказано режим \"тільки завантаження\", і завантаження завершено" @@ -1003,51 +1004,51 @@ msgstr "Версія '%s' для '%s' не знайдена" msgid "Selected version %s (%s) for %s\n" msgstr "Обрана версія %s (%s) для %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Не вдалося прочитати атрибути переліку вихідних текстів%s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Команді update не потрібні аргументи" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Неможливо заблокувати теку з переліками пакунків" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "НОВІ пакунки були встановлені автоматично і більше не потрібні:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "НОВІ пакунки були встановлені автоматично і більше не потрібні:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Використовуйте 'apt-get autoremove' щоб видалити їх." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1065,46 +1066,46 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Наступна інформація можливо допоможе Вам:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Внутрішня помилка, вирішувач проблем все поламав" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Внутрішня помилка, AllUpgrade все поламав" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Не можу знайти пакунок %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Не можу знайти пакунок %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Помітьте, регулярний вираз %2$s призводить до вибору %1$s\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "але %s буде встановлений" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Можливо, для виправлення цих помилок Ви захочете скористатися 'apt-get -f " "install':" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1112,7 +1113,7 @@ msgstr "" "Незадоволені залежності. Спробуйте виконати 'apt-get -f install', не " "вказуючи імені пакунка (або знайдіть інше рішення)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1123,121 +1124,121 @@ msgstr "" "або ж використаєте нестабільний дистрибутив, і запитані Вами пакунки\n" "ще не створені або були вилучені з Incoming." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Зламані пакунки" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Будуть встановлені наступні додаткові пакунки:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Пропоновані пакунки:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Рекомендовані пакунки:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Обчислення оновлень... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Невдача" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Виконано" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Внутрішня помилка, вирішувач проблем все поламав" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "" "Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні " "тексти" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Неможливо знайти пакунок з вихідними текстами для %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаємо вже завантажений файл '%s'\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостатньо місця в %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необхідно завантажити %sB/%sB з архівів вихідних текстів.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Завантаження вихідних текстів %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Деякі архіви не вдалося завантажити." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Розпакування вихідних текстів пропущено, тому що в %s вже перебувають " "розпаковані вихідні тексти\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда розпакування '%s' завершилася невдало.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда побудови '%s' закінчилася невдало.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Породжений процес завершився невдало" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для перевірки залежностей для побудови необхідно вказати як мінімум один " "пакунок" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Неможливо одержати інформацію про залежності для побудови %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s не має залежностей для побудови.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1245,7 +1246,7 @@ msgid "" msgstr "" "Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1254,32 +1255,32 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо ні одна з версій " "пакунка %s не задовольняє умови" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не вдалося задовольнити залежність типу %s для пакунка %s: Встановлений " "пакунок %s новіше, аніж треба" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Залежності для побудови %s не можуть бути задоволені." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Обробка залежностей для побудови закінчилася невдало" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Підтримувані модулі:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1366,7 +1367,7 @@ msgstr "" "містять більше інформації.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1617,11 +1618,10 @@ msgstr "Файл %s/%s перезаписує інший з пакету %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Неможливо прочитати %s" @@ -1651,9 +1651,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Теки info і temp повинні бути на тій самій файловій системі" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Читання переліків пакетів" @@ -1790,11 +1790,11 @@ msgid "File not found" msgstr "Файл не знайдено" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Не вдалося одержати атрибути" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Не вдалося встановити час модифікації" @@ -1856,7 +1856,7 @@ msgstr "Час з'єднання вичерпався" msgid "Server closed the connection" msgstr "Сервер закрив з'єднання" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Помилка читання" @@ -1868,7 +1868,7 @@ msgstr "Відповідь переповнила буфер." msgid "Protocol corruption" msgstr "Спотворений протокол" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Помилка запису" @@ -1924,7 +1924,7 @@ msgstr "Час з'єднання з сокетом даних вичерпавс msgid "Unable to accept connection" msgstr "Неможливо прийняти з'єднання" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Проблема хешування файла" @@ -1988,61 +1988,66 @@ msgstr "Не можливо під'єднатися до %s:%s (%s)." msgid "Connecting to %s" msgstr "З'єднання з %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Не можу знайти IP адрес для %s" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Тимчасова помилка при отриманні IP адреси '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Сталося щось дивне при спробі отримати IP адрес для '%s:%s' (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Не можливо під'єднатися до %s %s:" -#: methods/gpgv.cc:71 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 #, fuzzy, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Неможливо отримати доступ до keyring: '%s'" +msgid "No keyring installed in %s." +msgstr "Переривається встановлення." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Перелік аргументів з Acquire::gpgv::Options занадто довгий. Відміна." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Внутрішня помилка: Вірний підпис (signature), але не можливо визначити його " "відбиток?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Знайдено як мінімум один невірний підпис." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "Неможливо виконати '%s' для перевірки підпису, gpgv встановлено?" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Невідома помилка виконання gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Слідуючі підписи були невірними:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2093,50 +2098,50 @@ msgstr "Цей HTTP сервер має поламану підтримку 'ran msgid "Unknown date format" msgstr "Невідомий формат дати" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Вибір не вдався" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Час очікування з'єднання вийшов" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Помилка запису в вихідний файл" -#: methods/http.cc:849 +#: methods/http.cc:850 #, fuzzy msgid "Error writing to file" msgstr "Помилка запису в файл" -#: methods/http.cc:877 +#: methods/http.cc:878 #, fuzzy msgid "Error writing to the file" msgstr "Помилка запису в файл" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Помилка читання з сервера. Віддалена сторона закрила з'єднання" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Помилка читання з сервера" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Не вдалося записати файл %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Погана заголовкова інформація" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "З'єднання не вдалося" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Внутрішня помилка" @@ -2144,18 +2149,25 @@ msgstr "Внутрішня помилка" msgid "Can't mmap an empty file" msgstr "Неможливо відобразити в пам'яті пустий файл" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Неможливо відобразити в пам'яті %lu байт" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2185,54 +2197,54 @@ msgstr "" msgid "Selection %s not found" msgstr "Вибір %s не знайдено" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Нерозпізнаваний тип абревіатури: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Відкривається конфігураційний файл %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Синтаксова помилка %s:%u: Блок починається без назви." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Синтаксова помилка %s:%u: спотворений тег" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Синтаксова помилка %s:%u: зайві символи після величини" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, fuzzy, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Синтаксова помилка %s:%u: Директиви можуть бути виконані тільки на " "найвищому рівні" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Синтаксова помилка %s:%u: Забагато вмонтованих включень" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Синтаксова помилка %s:%u: Включена звідси" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Синтаксова помилка %s:%u: Директива '%s' не підтримується" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Синтаксова помилка %s:%u: зайві символи в кінці файла" @@ -2308,80 +2320,80 @@ msgstr "Неможливо зробити зміни у %s" msgid "Failed to stat the cdrom" msgstr "Не вдалося прочитати атрибути cdrom" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Блокування не використовується, так як файл блокування %s доступний тільки " "для читання" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Не можливо відкрити lock файл %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Блокування не використовується, так як файл блокування %s знаходиться на " "файловій системі nfs" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, fuzzy, c-format msgid "Could not get lock %s" msgstr "Не можливо отримати lock %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Очікується на %s але його тут немає" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Підпроцес %s отримав segmentation fault." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Підпроцес %s отримав segmentation fault." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Підпроцес %s повернув код помилки (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Підпроцес %s раптово завершився" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Не можливо відкрити файл %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "" "помилка при читанні. мали прочитати ще %lu байт, але нічого більше нема" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "помилка при записі, мали прочитати ще %lu байт, але не змогли" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Проблема з закриттям файла" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Проблема з роз'єднанням файла" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Проблема з синхронізацією файла" @@ -2499,53 +2511,53 @@ msgstr "Неможливо обробити файл %s пакунку (1)" msgid "Unable to parse package file %s (2)" msgstr "Неможливо обробити файл %s пакунку (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Спотворена лінія %lu у переліку джерел %s (проблема в URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" "Спотворена лінія %lu у переліку джерел %s (проблема в назві дистрибутиву)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Спотворена лінія %lu у переліку джерел %s (обробка URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Спотворена лінія %lu у переліку джерел %s (absolute dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Спотворена лінія %lu у переліку джерел %s (dist parse)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Відкриття %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Лінія %u занадто довга в переліку джерел %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Спотворена лінія %u у переліку джерел %s (тип)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Невідомий тип '%s' в лінії %u в переліку джерел %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Спотворена лінія %u у переліку джерел %s (vendor id)" @@ -2673,17 +2685,17 @@ msgstr "Не можу обробити чи відкрити перелік па msgid "You may want to run apt-get update to correct these problems" msgstr "Можливо, для виправлення цих помилок Ви захочете запустити apt-get" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Невірний запис в preferences файлі, відсутній заголовок Package" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Не зрозумів тип %s для pin" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Не встановлено пріоритету (або встановлено 0) для pin" @@ -2768,17 +2780,17 @@ msgstr "Помилка, яка була викликана внаслідок о msgid "Package %s %s was not found while processing file dependencies" msgstr "Пакунок %s %s не був знайдений під час обробки залежностей файла" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Не вдалося прочитати атрибути переліку вихідних текстів%s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 #, fuzzy msgid "Collecting File Provides" msgstr "Збирання інформації про файлів " -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Помилка IO під час збереження джерельного кешу" @@ -2787,21 +2799,21 @@ msgstr "Помилка IO під час збереження джерельно msgid "rename failed, %s (%s -> %s)." msgstr "Не вдалося перейменувати, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "Невідповідність MD5Sum" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 #, fuzzy msgid "Hash Sum mismatch" msgstr "Невідповідність MD5Sum" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 #, fuzzy msgid "There is no public key available for the following key IDs:\n" msgstr "Відсутній публічний ключ для заданих ID ключа:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2810,7 +2822,7 @@ msgstr "" "Я не можу знайти файл для пакунку %s. Можливо, Ви захочете власноруч " "виправити цей пакунок. (due to missing arch)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2819,14 +2831,14 @@ msgstr "" "Я не можу знайти файл для пакунку %s. Можливо, Ви захочете власноруч " "виправити цей пакунок." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Індексні файли пакунків пошкоджені. Немає поля Filename для пакунку %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Невідповідність розміру" @@ -2960,7 +2972,6 @@ msgstr "Записано %i записів з %i відсутніми і %i не #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Відкривається конфігураційний файл %s" @@ -2991,7 +3002,6 @@ msgstr "Видаляється %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Повністю видалено %s" @@ -3076,14 +3086,31 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Неможливо накласти латку на файл" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "З'єднання завершено передчасно" +#, fuzzy +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Неможливо отримати доступ до keyring: '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "Неможливо накласти латку на файл" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/vi.po b/po/vi.po index 07e7870fe..eb509c29b 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-12-22 19:04+1030\n" "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" @@ -148,7 +148,7 @@ msgstr " Bảng phiên bản:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s cho %s được biên dịch trên %s %s\n" @@ -314,7 +314,7 @@ msgstr "" " -c=? \t\tĐọc tập tin cấu hình này\n" " -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Không thể ghi vào %s" @@ -463,8 +463,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "Cơ sở dữ liệu cũ nên đang cố nâng cấp lên %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "Dạng thức co sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản " @@ -481,11 +482,11 @@ msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s." msgid "Failed to stat %s" msgstr "Việc lấy thông tin toàn bộ cho %s bị lỗi" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Kho không có mục ghi điều khiển" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Không thể lấy con chạy" @@ -550,26 +551,26 @@ msgstr "*** Việc liên kết %s đến %s bị lỗi" msgid " DeLink limit of %sB hit.\n" msgstr " Hết hạn bỏ liên kết của %sB.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Kho không có trường gói" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s không có mục ghi đè\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " người bảo quản %s là %s không phải %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s không có mục ghi đè nguồn\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s cũng không có mục ghi đè nhị phân\n" @@ -673,7 +674,7 @@ msgstr "Việc đổi tên %s thành %s bị lỗi" msgid "Y" msgstr "C" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Lỗi biên dich biểu thức chính quy - %s" @@ -836,11 +837,11 @@ msgstr "Cần phải gỡ bỏ một số gói, nhưng mà khả năng Gỡ bỏ msgid "Internal error, Ordering didn't finish" msgstr "Gặp lỗi nội bộ: tiến trình Sắp xếp chưa xong" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Không thể khóa thư mục tải về" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Không thể đọc danh sách nguồn." @@ -870,8 +871,8 @@ msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được chiếm.\ msgid "After this operation, %sB disk space will be freed.\n" msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được giải phóng.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Không thể quyết định chỗ rảnh trong %s" @@ -909,7 +910,7 @@ msgstr "Hủy bỏ." msgid "Do you want to continue [Y/n]? " msgstr "Bạn có muốn tiếp tục không? [Y/n] [C/k] " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Việc gói %s bị lỗi %s\n" @@ -918,7 +919,7 @@ msgstr "Việc gói %s bị lỗi %s\n" msgid "Some files failed to download" msgstr "Một số tập tin không tải về được" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Mới tải về xong và trong chế độ chỉ tải về" @@ -1017,52 +1018,52 @@ msgstr "Không tìm thấy phiên bản « %s » cho « %s »" msgid "Selected version %s (%s) for %s\n" msgstr "Đã chọn phiên bản %s (%s) cho %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Lệnh cập nhật không chấp nhật đối số" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Không thể khóa thư mục danh sách" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Không nên xoá gì thì không thể khởi chạy Bộ Gỡ bỏ Tự động" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" "Theo đây có những gói đã được cài đặt tự động nên không còn cần thiết lại:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Theo đây có những gói đã được cài đặt tự động nên không còn cần thiết lại:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Hãy sử dụng lệnh « apt-get autoremove » để gỡ bỏ chúng." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1080,43 +1081,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định trường hợp:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Lỗi nội bộ : Bộ Gỡ bỏ Tự động đã làm hư gì." -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Không tìm thấy tác vụ %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Không tìm thấy gói %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Ghi chú : đang chọn %s cho biểu thức chính quy « %s »\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s được đặt thành « được cài đặt bằng tay ».\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Có lẽ bạn hãy chạy lênh « apt-get -f install » để sửa hết:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1124,7 +1125,7 @@ msgstr "" "Gói còn phụ thuộc vào phần mềm chưa có. Hãy cố chạy lệnh « apt-get -f install " "» mà không có gói nào (hoặc ghi rõ cách quyết định)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1136,123 +1137,123 @@ msgstr "" "bất định, có lẽ chưa tạo một số gói cần thiết,\n" "hoặc chưa di chuyển chúng ra phần Incoming (Đến)." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Gói bị ngắt" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Những gói thêm theo đây sẽ được cài đặt:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Gói được đệ nghị:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Gói được khuyên:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Đang tính nâng cấp... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Bị lỗi" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Xong" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Phải ghi rõ ít nhất một gói cần lấy nguồn cho nó" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Không tìm thấy gói nguồn cho %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Đang bỏ qua tập tin đã được tải về « %s »\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Không đủ sức chứa còn rảnh trong %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Cần phải lấy %sB/%sB kho nguồn.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Cần phải lấy %sB kho nguồn.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Lấy nguồn %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Việc lấy một số kho bị lỗi." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Lệnh giải nén « %s » bị lỗi.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Hãy kiểm tra xem gói « dpkg-dev » có được cài đặt chưa.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Lệnh xây dụng « %s » bị lỗi.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Tiến trình con bị lỗi" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Phải ghi rõ ít nhất một gói cần kiểm tra cách phụ thuộc khi xây dụng cho nó" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Không thể lấy thông tin về cách phụ thuộc khi xây dụng cho %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s không phụ thuộc vào gì khi xây dụng.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "cách phụ thuộc %s cho %s không thể được thỏa vì không tìm thấy gọi %s" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1261,31 +1262,31 @@ msgstr "" "cách phụ thuộc %s cho %s không thể được thỏa vì không có phiên bản sẵn sàng " "của gói %s có thể thỏa điều kiện phiên bản." -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s quá mới" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s." -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Không thể thỏa cách phụ thuộc khi xây dụng cho %s." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Việc xử lý cách phụ thuộc khi xây dụng bị lỗi" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Mô-đun đã hỗ trợ :" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1377,7 +1378,7 @@ msgstr "" "sources.list(5) và apt.conf(5).\n" " Trình APT này có năng lực của siêu bò.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1628,11 +1629,10 @@ msgstr "Tập tin %s/%s ghi đè lên điều trong gói %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Không thể đọc %s" @@ -1664,9 +1664,9 @@ msgstr "" "thống tập tin" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Đang đọc các danh sách gói..." @@ -1802,11 +1802,11 @@ msgid "File not found" msgstr "Không tìm thấy tập tin" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Việc lấy các thông tin bị lỗi" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Việc lập giờ sửa đổi bị lỗi" @@ -1868,7 +1868,7 @@ msgstr "Thời hạn kết nối" msgid "Server closed the connection" msgstr "Máy phục vụ đã đóng kết nối" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Lỗi đọc" @@ -1880,7 +1880,7 @@ msgstr "Một trả lời đã tràn bộ đệm." msgid "Protocol corruption" msgstr "Giao thức bị hỏng" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Lỗi ghi" @@ -1934,7 +1934,7 @@ msgstr "Kết nối ổ cắm dữ liệu đã quá giờ" msgid "Unable to accept connection" msgstr "Không thể chấp nhận kết nối" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Gặp khó khăn băm tập tin" @@ -1998,59 +1998,64 @@ msgstr "Không thể kết nối đến %s:%s (%s)." msgid "Connecting to %s" msgstr "Đang kết nối đến %s..." -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Không thể tháo gỡ « %s »" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Việc tháo gỡ « %s » bị lỗi tạm thời" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ « %s:%s » (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Không thể kết nối đến %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Không thể truy cập vòng khoá « %s »" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Đang hủy bỏ cài đặt." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Danh sách lệnh từ « Acquire::gpgv::Options » quá dài nên thoát." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Lỗi nội bộ: chữ ký đúng, nhưng không thể quyết định vân tay khóa ?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Gặp ít nhất một chữ ký không hợp lệ." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Không thể thực hiện « %s » để kiểm chứng chữ ký (gpgv có được cài đặt chưa?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Gặp lỗi lạ khi thực hiện gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Những chữ ký theo đây là không hợp lệ:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2104,47 +2109,47 @@ msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vị" msgid "Unknown date format" msgstr "Không biết dạng ngày" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Việc chọn bị lỗi" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Kết nối đã quá giờ" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Gặp lỗi khi ghi vào tập tin xuất" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Gặp lỗi khi ghi vào tập tin" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Gặp lỗi khi ghi vào tập tin đó" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Gặp lỗi khi đọc từ máy phục vụ : cuối ở xa đã đóng kết nối" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Gặp lỗi khi đọc từ máy phục vụ" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Lỗi cắt ngắn tập tin" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Dữ liệu dòng đầu sai" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Kết nối bị ngắt" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Gặp lỗi nội bộ" @@ -2152,18 +2157,25 @@ msgstr "Gặp lỗi nội bộ" msgid "Can't mmap an empty file" msgstr "Không thể mmap (ảnh xạ bộ nhớ) tâp tin rỗng" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Không thể tạo mmap (ảnh xạ bộ nhớ) kích cỡ %lu byte" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2193,52 +2205,52 @@ msgstr "" msgid "Selection %s not found" msgstr "Không tìm thấy vùng chọn %s" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Không nhận biết viết tắt kiểu: « %c »" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Đang mở tập tin cấu hình %s..." -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Gặp lỗi cú pháp %s:%u: khối bắt đầu không có tên." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Gặp lỗi cú pháp %s:%u: thẻ dạng sai" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Gặp lỗi cú pháp %s:%u: có rác thêm sau giá trị" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Gặp lỗi cú pháp %s:%u: có thể thực hiện chỉ thị chỉ tại mức đầu" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Gặp lỗi cú pháp %s:%u: quá nhiều điều bao gồm lồng nhau" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Gặp lỗi cú pháp %s:%u: đã bao gồm từ đây" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Gặp lỗi cú pháp %s:%u: chưa hỗ trợ chỉ thị « %s »" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Gặp lỗi cú pháp %s:%u: rác thêm tại kết thúc tập tin" @@ -2314,75 +2326,75 @@ msgstr "Không thể chuyển đổi sang %s" msgid "Failed to stat the cdrom" msgstr "Việc lấy cac thông tin cho đĩa CD-ROM bị lỗi" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Không thể mở tập tin khóa %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Không thể lấy khóa %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Đã đợi %s nhưng mà chưa gặp nó" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Tiến trình con %s đã nhận một lỗi chia ra từng đoạn." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Tiến trình con %s đã nhận một lỗi chia ra từng đoạn." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Tiến trình con %s đã trả lời mã lỗi (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Tiến trình con %s đã thoát bất ngờ" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Không thể mở tập tin %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "đọc, còn cần đọc %lu nhưng mà không có điều còn lại" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "ghi, còn cần ghi %lu nhưng mà không thể" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Gặp lỗi khi đóng tập tin đó" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Gặp lỗi khi bỏ liên kết tập tin đó" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Gặp lỗi khi đồng bộ hóa tập tin đó" @@ -2499,55 +2511,55 @@ msgstr "Không thể phân tách tập tin gói %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Không thể phân tách tập tin gói %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s (địa chỉ URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s (bản phân phối)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" "Gặp dòng dạng sai %lu trong danh sách nguồn %s (phân tách địa chỉ URI)." -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Gặp dòng dạng sai %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Gặp dòng dạng sai %lu trong danh sách nguồn %s (phân tách bản phân phối)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Đang mở %s..." -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Dòng %u quá dài trong danh sách nguồn %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (kiểu)." -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Không biết kiểu « %s » trên dòng %u trong danh sách nguồn %s." -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (mã nhận biết nhà bán)" @@ -2674,19 +2686,19 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "" "Có lẽ bạn muốn chạy « apt-get update » (lấy cập nhật) để sửa các vấn đề này" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" "Gặp mục ghi không hợp lệ trong tập tin tùy thích: không có phần đầu Package " "(Gói)." -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Không hiểu kiểu ghim %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim" @@ -2772,16 +2784,16 @@ msgstr "" msgid "Package %s %s was not found while processing file dependencies" msgstr "Không tìm thấy gói %s %s khi xử lý cách phụ thuộc của/vào tập tin" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Đang tập hợp các trường hợp « tập tin miễn là »" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn" @@ -2790,19 +2802,19 @@ msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn" msgid "rename failed, %s (%s -> %s)." msgstr "việc thay đổi tên bị lỗi, %s (%s → %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum (tổng kiểm) không khớp được" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Sai khớp tổng băm (hash sum)" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Không có khóa công sẵn sàng cho những ID khóa theo đây:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2811,7 +2823,7 @@ msgstr "" "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói " "này, do thiếu kiến trúc." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2820,7 +2832,7 @@ msgstr "" "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói " "này." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2828,7 +2840,7 @@ msgstr "" "Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập " "tin:) cho gói %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Kích cỡ không khớp được" @@ -2964,7 +2976,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Đang mở tập tin cấu hình %s..." @@ -2975,7 +2986,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Sai khớp tổng băm (hash sum)" @@ -2996,7 +3006,6 @@ msgstr "Đang gỡ bỏ %s..." #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Mới gỡ bỏ hoàn toàn %s" @@ -3080,14 +3089,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Không thể vá lỗi trong tập tin %s" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Kết nối bị đóng quá sớm." +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Không thể truy cập vòng khoá « %s »" + +#~ msgid "Could not patch file" +#~ msgstr "Không thể vá lỗi trong tập tin %s" + # Variable: do not translate/ biến: đừng dịch #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 8f4e1440c..56c64e451 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2009-12-02 01:00+0800\n" "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n" "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n" @@ -148,7 +148,7 @@ msgstr " 版本列表：" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s，用于 %s 构架，编译于 %s %s\n" @@ -300,7 +300,7 @@ msgstr "" " -c=? 读指定的配置文件\n" " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "无法写入 %s" @@ -433,8 +433,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "数据库已过期，现尝试进行升级 %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "数据库格式无效。如果您是从一个老版本的 apt 升级而来，请删除数据库并重建它。" @@ -450,11 +451,11 @@ msgstr "无法打开数据库文件 %s：%s" msgid "Failed to stat %s" msgstr "无法获得 %s 的状态" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "归档文件没有包含控制字段" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "无法获得游标" @@ -519,26 +520,26 @@ msgstr "*** 无法将 %s 链接到 %s" msgid " DeLink limit of %sB hit.\n" msgstr " 达到了 DeLink 的上限 %sB。\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "归档文件没有包含 package 字段" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s 中没有 override 项\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 的维护者 %s 并非 %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s 没有源代码的 override 项\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s 中没有二进制文件的 override 项\n" @@ -642,7 +643,7 @@ msgstr "无法将 %s 重命名为 %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "编译正则表达式时出错 - %s" @@ -803,11 +804,11 @@ msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止 msgid "Internal error, Ordering didn't finish" msgstr "内部错误，Ordering 未能完成" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "无法锁定下载目录" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "无法读取源列表。" @@ -836,8 +837,8 @@ msgstr "解压缩后会消耗掉 %sB 的额外空间。\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "解压缩后将会空出 %sB 的空间。\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "无法获知您在 %s 上的可用空间" @@ -874,7 +875,7 @@ msgstr "中止执行。" msgid "Do you want to continue [Y/n]? " msgstr "您希望继续执行吗？[Y/n]" -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" @@ -883,7 +884,7 @@ msgstr "无法下载 %s %s\n" msgid "Some files failed to download" msgstr "有一些文件无法下载" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "下载完毕，目前是“仅下载”模式" @@ -980,51 +981,50 @@ msgstr "未找到“%2$s”的“%1$s”版本" msgid "Selected version %s (%s) for %s\n" msgstr "选定了版本为 %s (%s) 的 %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format -#| msgid "Couldn't stat source package list %s" msgid "Picking '%s' as source package instead of '%s'\n" msgstr "无法获取源软件包列表 %s 的状态" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr " update 命令不需要参数" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "无法对状态列表目录加锁" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "我们不应该进行删除，无法启动自动删除器" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "下列软件包是自动安装的并且现在不需要了：" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "%lu 个自动安装的的软件包现在不需要了\n" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "使用'apt-get autoremove'来删除它们" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1040,43 +1040,43 @@ msgstr "似乎自动删除工具损坏了一些软件，这不应该发生。请 #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "下列信息可能会对解决问题有所帮助：" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "内部错误，自动删除工具坏事了" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "内部错误，全部升级工具坏事了" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "无法找到任务 %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "无法找到软件包 %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s 被设置为手动安装。\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "您可能需要运行“apt-get -f install”来纠正下列错误：" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1084,7 +1084,7 @@ msgstr "" "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可" "以指定一个解决办法)。" -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1095,122 +1095,122 @@ msgstr "" "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n" "包尚未被创建或是它们已被从新到(Incoming)目录移出。" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "破损的软件包" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "将会安装下列额外的软件包：" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "建议安装的软件包：" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "推荐安装的软件包：" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "正在对升级进行计算... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "失败" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "内部错误，问题解决工具坏事了" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码，必须指定至少一个对应的软件包" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "无法找到与 %s 对应的源代码包" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "忽略已下载过的文件“%s”\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的可用空间" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下载 %sB/%sB 的源代码包。\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "忽略已经被解包到 %s 目录的源代码包\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "请检查是否安装了“dpkg-dev”软件包。\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "子进程出错" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系信息" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建依赖关系信息。\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1219,30 +1219,30 @@ msgstr "" "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1" "$s 依赖关系" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "支持的模块：" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1325,7 +1325,7 @@ msgstr "" "以获取更多信息和选项。\n" " 本 APT 具有超级牛力。\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1571,11 +1571,10 @@ msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "无法读取 %s" @@ -1605,9 +1604,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "info 和 temp 目录要求处于同一文件系统之下" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "正在读取软件包列表" @@ -1740,11 +1739,11 @@ msgid "File not found" msgstr "无法找到该文件" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "无法读取状态" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "无法设置文件的修改日期" @@ -1805,7 +1804,7 @@ msgstr "连接超时" msgid "Server closed the connection" msgstr "服务器关闭了连接" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "读错误" @@ -1817,7 +1816,7 @@ msgstr "回应超出了缓存区大小。" msgid "Protocol corruption" msgstr "协议有误" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "写出错" @@ -1871,7 +1870,7 @@ msgstr "数据套接字连接超时" msgid "Unable to accept connection" msgstr "无法接受连接" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "把文件加入哈希表时出错" @@ -1935,59 +1934,63 @@ msgstr "无法连接上 %s:%s (%s)。" msgid "Connecting to %s" msgstr "正在连接 %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "无法解析域名“%s”" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "暂时不能解析域名“%s”" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format -#| msgid "Something wicked happened resolving '%s:%s' (%i)" msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "解析“%s:%s”时，出现了某些故障(%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, c-format msgid "Unable to connect to %s:%s:" msgstr "不能连接到 %s：%s：" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "无法访问密钥环：“%s”" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "中止安装。" + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "错误：Acquire::gpgv::Options 的参数列表太长。结束运行。" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "内部错误：签名正确无误，但是无法确认密钥指纹？！" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "至少发现一个无效的签名。" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "无法运行“%s”以验证签名(您安装了 gpgv 吗？)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "运行 gpgv 时发生未知错误" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "下列签名无效：\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2036,47 +2039,47 @@ msgstr "该 HTTP 服务器的 range 支持不正常" msgid "Unknown date format" msgstr "无法识别的日期格式" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "select 调用出错" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "连接超时" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "写输出文件时出错" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "写入文件出错" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "写入文件出错" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "从服务器读取数据时出错，对方关闭了连接" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "从服务器读取数据出错" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "无法截断文件" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "错误的报头数据" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "连接失败" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "内部错误" @@ -2084,12 +2087,12 @@ msgstr "内部错误" msgid "Can't mmap an empty file" msgstr "无法 mmap 一个空文件" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "无法 mmap %lu 字节的数据" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " @@ -2098,6 +2101,13 @@ msgstr "" "动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大小。当前值：%lu。(man 5 " "apt.conf)" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2127,52 +2137,52 @@ msgstr "%li秒" msgid "Selection %s not found" msgstr "找不到您选则的 %s" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "无法识别的类型缩写：“%c”" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "正在打开配置文件 %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "语法错误 %s:%u：配置小节没有以名字开头" -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "语法错误 %s:%u：标签格式有误" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "语法错误 %s:%u: 配置值后有多余的无意义数据" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "语法错误 %s:%u: 只能在顶层配置文件中使用指示" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "语法错误 %s:%u：太多的嵌套 include 命令" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "语法错误 %s:%u: Included from here" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "语法错误 %s:%u: 不支持的指令“%s”" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "语法错误 %s:%u: 文件尾部有多余的无意义的数据" @@ -2248,75 +2258,75 @@ msgstr "无法切换工作目录到 %s" msgid "Failed to stat the cdrom" msgstr "无法读取盘片的状态" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "由于文件系统为只读，因而无法使用文件锁 %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "无法打开锁文件 %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "无法在 nfs 文件系统上使用文件锁 %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "无法获得锁 %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "等待子进程 %s 的退出，但是它并不存在" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子进程 %s 发生了段错误" -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, c-format msgid "Sub-process %s received signal %u." msgstr "子进程 %s 收到信号 %u。" -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子进程 %s 返回了一个错误号 (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子进程 %s 异常退出" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "无法打开文件 %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "读取文件出错，还剩 %lu 字节没有读出" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "写入文件出错，还剩 %lu 字节没有保存" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "关闭文件出错" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "用 unlink 删除文件出错" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "同步文件出错" @@ -2433,52 +2443,52 @@ msgstr "无法解析软件包文件 %s (1)" msgid "Unable to parse package file %s (2)" msgstr "无法解析软件包文件 %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "正在打开 %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "源列表 %2$s 的第 %1$u 行太长了。" -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "在源列表中 %2$s 中第 %1$u 行的格式有误(供应商 ID)" @@ -2603,17 +2613,17 @@ msgstr "无法解析或打开软件包的列表或是状态文件。" msgid "You may want to run apt-get update to correct these problems" msgstr "您可能需要运行 apt-get update 来解决这些问题" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "首选项文件 %s 中发现有无效的记录，无 Package 字段头" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "无法识别锁定的类型 %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "没有为版本锁定指定优先级(或为零)" @@ -2697,16 +2707,16 @@ msgstr "处理 %s (CollectFileProvides)时出错" msgid "Package %s %s was not found while processing file dependencies" msgstr "当处理文件依赖关系时，无法找到软件包 %s %s" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "无法获取源软件包列表 %s 的状态" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "正在收集文件所提供的软件包" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "无法读取或写入软件源缓存" @@ -2715,19 +2725,19 @@ msgstr "无法读取或写入软件源缓存" msgid "rename failed, %s (%s -> %s)." msgstr "无法重命名文件，%s (%s -> %s)。" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5 校验和不符" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Hash 校验和不符" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "以下 ID 的密钥没有可用的公钥：\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2736,7 +2746,7 @@ msgstr "" "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" "包。(缘于架构缺失)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2744,13 +2754,13 @@ msgid "" msgstr "" "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。" -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "大小不符" @@ -3000,14 +3010,30 @@ msgstr "dpkg 被中断，您必须手工运行 'dpkg --configure -a' 解决此 msgid "Not locked" msgstr "未锁定" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "无法打开补丁文件" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "连接被永久关闭" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "无法访问密钥环：“%s”" + +#~ msgid "Could not patch file" +#~ msgstr "无法打开补丁文件" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 2a5c87e59..7033d8d7b 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: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2009-01-28 10:41+0800\n" "Last-Translator: Tetralet <tetralet@gmail.com>\n" "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists." @@ -148,7 +148,7 @@ msgstr " 版本列表：" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s 是用於 %s 並在 %s %s 上編譯的\n" @@ -301,7 +301,7 @@ msgstr "" " -c=? 讀取指定的設定檔\n" " -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "無法寫入 %s" @@ -432,8 +432,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB 過舊，嘗試升級 %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "資料庫格式不正確。如果您是由舊版的 apt 升級上來的，請移除並重新建立資料庫。" @@ -449,11 +450,11 @@ msgstr "無法開啟 DB 檔 %s: %s" msgid "Failed to stat %s" msgstr "無法取得 %s 的狀態" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "套件檔沒有 control 記錄" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "無法取得遊標" @@ -518,26 +519,26 @@ msgstr "*** 無法將 %s 連結到 %s" msgid " DeLink limit of %sB hit.\n" msgstr " 達到了 DeLink 的上限 %sB。\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "套件檔裡沒有套件資訊" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s 沒有重新定義項目\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 的維護者是 %s，而非 %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s 沒有原始碼重新定義項目\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s 也沒有二元碼重新定義項目\n" @@ -641,7 +642,7 @@ msgstr "無法將 %s 更名為 %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "編譯正規表示式時發生錯誤 - %s" @@ -802,11 +803,11 @@ msgstr "有套件需要被移除，但卻被禁止移除。" msgid "Internal error, Ordering didn't finish" msgstr "內部錯誤，排序未能完成" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "無法鎖定下載目錄" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "無法讀取來源列表。" @@ -835,8 +836,8 @@ msgstr "此操作完成之後，會多佔用 %sB 的磁碟空間。\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "此操作完成之後，會空出 %sB 的磁碟空間。\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "無法確認 %s 的未使用空間" @@ -873,7 +874,7 @@ msgstr "放棄執行。" msgid "Do you want to continue [Y/n]? " msgstr "是否繼續進行 [Y/n]？" -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "無法取得 %s，%s\n" @@ -882,7 +883,7 @@ msgstr "無法取得 %s，%s\n" msgid "Some files failed to download" msgstr "有部份檔案無法下載" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "下載完成，且這是『僅下載』模式" @@ -978,50 +979,50 @@ msgstr "找不到 '%s' 版的 '%s'" msgid "Selected version %s (%s) for %s\n" msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "無法取得來源套件列表 %s 的狀態" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "update 指令不需任何參數" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "無法鎖定列表目錄" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "我們沒有計劃要刪除任何東西，無法啟動 AutoRemover" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "以下套件是被自動安裝進來的，且已不再會被用到了：" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "以下套件是被自動安裝進來的，且已不再會被用到了：" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "使用 'apt-get autoremove' 來將其移除。" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1039,43 +1040,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "以下的資訊或許有助於解決當前的情況：" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "內部錯誤，AutoRemover 處理失敗" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "內部錯誤，AllUpgrade 造成了損壞" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "無法找到主題 %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "無法找到套件 %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意，根據正規表示式 '%2$s' 而選擇了 %1$s\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s 被設定為手動安裝。\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "您也許得執行 `apt-get -f install' 以修正這些問題：" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1083,7 +1084,7 @@ msgstr "" "未能滿足相依關係。請試著不指定套件來執行 'apt-get -f install'（或採取其它的解" "決方案）。" -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1093,122 +1094,122 @@ msgstr "" "有些套件無法安裝。這可能意謂著您的要求難以解決，或是若您使用的是\n" "unstable 發行版，可能有些必要的套件尚未建立，或是被移出 Incoming 了。" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "損毀的套件" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "下列的額外套件將被安裝：" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "建議套件：" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "推薦套件：" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "籌備升級中... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "失敗" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "內部錯誤，問題排除器造成了損壞" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "在取得原始碼時必須至少指定一個套件" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "無法找到 %s 的原始碼套件" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "略過已下載的檔案 '%s'\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "在 %s 裡沒有足夠的的未使用空間" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下載 %sB/%sB 的原始套件檔。\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下載 %sB 的原始套件檔。\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "取得原始碼 %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "無法取得某些套件檔。" -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "不解開，因原始碼已解開至 %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "解開指令 '%s' 失敗。\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "編譯指令 '%s' 失敗。\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "子程序失敗" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "在檢查編譯相依關係時必須至少指定一個套件" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "無法取得 %s 的編譯相依關係資訊" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s 沒有編譯相依關係。\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1216,30 +1217,30 @@ msgid "" msgstr "" "無法滿足 %2$s 所要求的 %1$s 相依關係，因為套件 %3$s 沒有版本符合其版本需求" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "無法滿足 %2$s 的相依關係 %1$s：已安裝的套件 %3$s 太新了" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "無法滿足 %2$s 的相依關係 %1$s：%3$s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "無法滿足套件 %s 的編譯相依關係。" -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "無法處理編譯相依關係" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "已支援模組：" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1323,7 +1324,7 @@ msgstr "" "以取得更多資訊和選項。\n" " 該 APT 有著超級牛力。\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1567,11 +1568,10 @@ msgstr "檔案 %s/%s 覆寫了套件 %s 中的相同檔案" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 -#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "無法讀取 %s" @@ -1601,9 +1601,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "資料目錄與暫存目錄需位於同一檔案系統中" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "正在讀取套件清單" @@ -1735,11 +1735,11 @@ msgid "File not found" msgstr "找不到檔案" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "無法取得狀態" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "無法設定修改時間" @@ -1800,7 +1800,7 @@ msgstr "連線逾時" msgid "Server closed the connection" msgstr "伺服器已關閉連線" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "讀取錯誤" @@ -1812,7 +1812,7 @@ msgstr "回應超過緩衝區長度。" msgid "Protocol corruption" msgstr "協定失敗" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "寫入錯誤" @@ -1866,7 +1866,7 @@ msgstr "Data socket 連線逾時" msgid "Unable to accept connection" msgstr "無法接受連線" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "有問題的雜湊檔" @@ -1930,58 +1930,63 @@ msgstr "無法和 %s:%s (%s) 連線。" msgid "Connecting to %s" msgstr "正連線至 %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "無法解析 '%s'" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "暫時無法解析 '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "在解析 '%s:%s' (%i) 時出了怪事" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "無法連線至 %s %s：" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "無法存取鑰匙圈：'%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "放棄安裝。" + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "錯誤：Acquire::gpgv::Options 的參數列表過長。結束執行。" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "內部錯誤：簽章無誤，但卻無法辨識密鑰的指紋碼？！" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "至少發現一個無效的簽章。" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "無法執行 '%s' 來驗證簽章（gpgv 是否安裝了？）" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "在執行 gpgv 時發生未知的錯誤" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "以下簽名無效：\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2030,47 +2035,47 @@ msgstr "這個 HTTP 伺服器的範圍支援有問題" msgid "Unknown date format" msgstr "未知的資料格式" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "選擇失敗" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "連線逾時" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "在寫入輸出檔時發生錯誤" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "在寫入檔案時發生錯誤" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "在寫入該檔時發生錯誤" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "在讀取伺服器時發生錯誤，遠端主機已關閉連線" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "在讀取伺服器時發生錯誤" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "無法截短檔案" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "錯誤的標頭資料" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "連線失敗" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "內部錯誤" @@ -2078,12 +2083,12 @@ msgstr "內部錯誤" msgid "Can't mmap an empty file" msgstr "不能 mmap 空白檔案" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "無法 mmap 到 %lu 位元組" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " @@ -2092,6 +2097,13 @@ msgstr "" "動態 MMap 已用完所有空間。請增加 APT::Cache-Limit 的大小。目前大小為：%lu。" "(man 5 apt.conf)" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2121,52 +2133,52 @@ msgstr "" msgid "Selection %s not found" msgstr "選項 %s 找不到" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "無法辨識的縮寫類型：'%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "開啟設定檔 %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "語法錯誤 %s:%u：區塊開頭沒有名稱。" -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "語法錯誤 %s:%u：標籤格式錯誤" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "語法錯誤 %s:%u：數值後有多餘的垃圾" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "語法錯誤 %s:%u：指令只能於最高層級執行" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "語法錯誤 %s:%u: 太多巢狀引入檔" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "語法錯誤 %s:%u：從此引入" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "語法錯誤 %s:%u：不支援的指令 '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "語法錯誤 %s:%u：在檔案結尾有多餘的垃圾" @@ -2242,75 +2254,75 @@ msgstr "無法切換至 %s" msgid "Failed to stat the cdrom" msgstr "無法取得 CD-ROM 的狀態" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "不在唯讀檔案 %s 上使用檔案鎖定" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "無法開啟鎖定檔 %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "不在以 nfs 掛載的檔案 %s 上使用檔案鎖定" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "無法將 %s 鎖定" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "等待 %s 但是它並不存在" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子程序 %s 收到一個記憶體錯誤。" -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "子程序 %s 收到一個記憶體錯誤。" -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子程序 %s 傳回錯誤碼 (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子程序 %s 不預期得結束" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "無法開啟檔案 %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "讀取，仍有 %lu 未讀但已無空間" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "寫入，仍有 %lu 待寫入但已沒辨法" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "在關閉檔案時發生問題" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "在刪除檔案時發生問題" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "在同步檔案時發生問題" @@ -2427,52 +2439,52 @@ msgstr "無法辨識套件檔 %s (1)" msgid "Unable to parse package file %s (2)" msgstr "無法辨識套件檔 %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤 (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版）" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（URI 分析）" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（絕對發行版）" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "正在開啟 %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "來源列表 %2$s 中的第 %1$u 行太長。" -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤（類型）" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "未知的類型 '%1$s'，位於在來源列表 %3$s 中的第 %2$u 行" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤（提供者 ID）" @@ -2593,17 +2605,17 @@ msgstr "無法分析或開啟套件清單或狀況檔。" msgid "You may want to run apt-get update to correct these problems" msgstr "您也許得執行 apt-get update 以修正這些問題" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "個人設定檔中有些不正確資料，沒有以 Package 開頭" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "無法分析鎖定類型 %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "銷定並沒有優先順序之分（或零）" @@ -2687,16 +2699,16 @@ msgstr "在處理 %s 時發生錯誤 (CollectFileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "在計算檔案相依性時找不到套件 %s %s" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "無法取得來源套件列表 %s 的狀態" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "正在收集檔案提供者" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "在儲存來源快取時 IO 錯誤" @@ -2705,19 +2717,19 @@ msgstr "在儲存來源快取時 IO 錯誤" msgid "rename failed, %s (%s -> %s)." msgstr "無法重新命名，%s (%s -> %s)。" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum 不符" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Hash Sum 不符" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "無法取得以下的密鑰 ID 的公鑰：\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2726,20 +2738,20 @@ msgstr "" "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。（因為找不到平" "台）" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "這個套件的索引檔損壞了。沒有套件 %s 的 Filename: 欄位。" -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "大小不符" @@ -2872,7 +2884,6 @@ msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案遺失了，有 %i 個檔案 #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "開啟設定檔 %s" @@ -2883,7 +2894,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Hash Sum 不符" @@ -2904,7 +2914,6 @@ msgstr "正在移除 %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "已完整移除 %s" @@ -2988,14 +2997,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "無法修補檔案" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "連線突然終止" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "無法存取鑰匙圈：'%s'" + +#~ msgid "Could not patch file" +#~ msgstr "無法修補檔案" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" -- cgit v1.2.3 From a100bb98eac562817ebb3139b82259cf0222cc2b Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Thu, 18 Feb 2010 22:08:25 +0100 Subject: fix crash when LANGUAGE is not set --- apt-pkg/aptconfiguration.cc | 3 ++- debian/changelog | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index b5f29472d..10613f11d 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -217,7 +217,8 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All, environment.push_back(envLong); environment.push_back(envShort); // take care of LANGUAGE - string envLang = Locale == 0 ? getenv("LANGUAGE") : *(Locale+1); + const char *language_env = getenv("LANGUAGE") == 0 ? "" : getenv("LANGUAGE"); + string envLang = Locale == 0 ? language_env : *(Locale+1); if (envLang.empty() == false) { std::vector<string> env = ExplodeString(envLang,':'); short addedLangs = 0; // add a maximum of 3 fallbacks from the environment diff --git a/debian/changelog b/debian/changelog index 558fd8b10..ca731d11b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.7.26~exp2) experimental; urgency=low + + * fix crash when LANGUAGE is not set + + -- Michael Vogt <mvo@debian.org> Thu, 18 Feb 2010 22:07:23 +0100 + apt (0.7.26~exp1) experimental; urgency=low [ David Kalnischkies ] -- cgit v1.2.3 From 6563d0d4899d5b787842f16135fd05da878cfb45 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 19 Feb 2010 21:21:53 +0100 Subject: "Switch" to dpkg-source 3.0 (native) format --- debian/changelog | 6 ++++++ debian/source/format | 1 + 2 files changed, 7 insertions(+) create mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog index ca731d11b..2b5f6fd25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.7.26) UNRELEASED; urgency=low + + * Switch to dpkg-source 3.0 (native) format + + -- David Kalnischkies <kalnischkies@gmail.com> Fri, 19 Feb 2010 21:21:43 +0100 + apt (0.7.26~exp2) experimental; urgency=low * fix crash when LANGUAGE is not set diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) -- cgit v1.2.3 From 216a8c89c3c7f15e705c800a1f458f0577bc24b1 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Wed, 24 Feb 2010 22:14:21 +0100 Subject: German translation update --- debian/changelog | 6 + po/de.po | 489 +++++++++++++++++++++++++++---------------------------- 2 files changed, 247 insertions(+), 248 deletions(-) diff --git a/debian/changelog b/debian/changelog index ca731d11b..c855c77d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.7.26~exp3) UNRELEASED; urgency=low + + * German translation update. Closes: #571037 + + -- Christian Perrier <bubulle@debian.org> Wed, 24 Feb 2010 22:13:50 +0100 + apt (0.7.26~exp2) experimental; urgency=low * fix crash when LANGUAGE is not set diff --git a/po/de.po b/po/de.po index 4ba47bceb..0d5653554 100644 --- a/po/de.po +++ b/po/de.po @@ -1,6 +1,6 @@ # German messages for the apt suite. # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others. -# Holger Wansing <linux@wansing-online.de>, 2008, 2009. +# Holger Wansing <linux@wansing-online.de>, 2008, 2009, 2010. # Jens Seidel <jensseidel@users.sf.net>, 2008. # Michael Piefel <piefel@informatik.hu-berlin.de>, 2001, 2002, 2003, 2004, 2006. # Rüdiger Kuhlmann <Uebersetzung@ruediger-kuhlmann.de>, 2002. @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-01-11 15:17+0100\n" -"PO-Revision-Date: 2009-10-20 21:55+0200\n" +"PO-Revision-Date: 2010-02-23 00:00+0100\n" "Last-Translator: Holger Wansing <linux@wansing-online.de>\n" "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -85,7 +85,7 @@ msgstr "Gesamtzahl an Mustern: " #: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " -msgstr "Gesamtmenge an Abhängigkeits-/Versionsspeicher: " +msgstr "Gesamtmenge des Abhängigkeits-/Versionsspeichers: " #: cmdline/apt-cache.cc:333 msgid "Total slack space: " @@ -114,12 +114,12 @@ msgstr "Paketdateien:" #: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622 msgid "Cache is out of sync, can't x-ref a package file" -msgstr "Cache ist nicht sychron, Querverweisen einer Paketdatei nicht möglich" +msgstr "Cache ist nicht synchron, Querverweisen einer Paketdatei nicht möglich" #. Show any packages have explicit pins #: cmdline/apt-cache.cc:1549 msgid "Pinned packages:" -msgstr "Per Pinning verwaltete Pakete:" +msgstr "Mit Pinning verwaltete Pakete:" #: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602 msgid "(not found)" @@ -146,7 +146,7 @@ msgstr " Paket-Pinning: " #. Show the priority tables #: cmdline/apt-cache.cc:1608 msgid " Version table:" -msgstr " Versions-Tabelle:" +msgstr " Versionstabelle:" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 @@ -203,21 +203,21 @@ msgstr "" "\n" "Befehle:\n" " add – Paket-Datei dem Quell-Cache hinzufügen\n" -" gencaches – Paket- und Quell-Cache neu erzeugen\n" -" showpkg – grundsätzliche Informationen für ein einzelnes Paket zeigen\n" -" showsrc – Aufzeichnungen zu Quellen zeigen\n" -" stats – einige grundlegenden Statistiken zeigen\n" -" dump – gesamte Datei in Kurzform zeigen\n" -" dumpavail – gesamte Datei verfügbarer Pakete ausgeben\n" -" unmet – unerfüllte Abhängigkeiten zeigen\n" -" search – in der Paketliste mittels regulären Ausdrucks suchen\n" -" show – einen lesbaren Datensatz für das Paket zeigen\n" -" depends – normale Abhängigkeitsinformationen für ein Paket zeigen\n" -" rdepends – umgekehrte Abhängigkeitsinformationen für ein Paket zeigen\n" +" gencaches – Paket- und Quell-Cache erzeugen\n" +" showpkg – grundsätzliche Informationen eines einzelnen Pakets ausgeben\n" +" showsrc – Aufzeichnungen zu Quellen ausgeben\n" +" stats – einige grundlegenden Statistiken ausgeben\n" +" dump – gesamte Datei in Kurzform ausgeben\n" +" dumpavail – Datei »available« mit allen verfügbaren Paketen ausgeben\n" +" unmet – unerfüllte Abhängigkeiten ausgeben\n" +" search – die Paketliste mittels regulärem Ausdruck durchsuchen\n" +" show – einen lesbaren Datensatz für das Paket ausgeben\n" +" depends – rohe Abhängigkeitsinformationen eines Pakets ausgeben\n" +" rdepends – umgekehrte Abhängigkeitsinformationen eines Pakets ausgeben\n" " pkgnames – die Namen aller Pakete im System auflisten\n" -" dotty – einen Paketgraph zur Verwendung mit GraphViz erzeugen\n" -" xvcg – einen Paketgraph zur Verwendung mit xvcg erzeugen\n" -" policy – »policy«-Einstellungen zeigen\n" +" dotty – Paketgraph zur Verwendung mit GraphViz erzeugen\n" +" xvcg – Paketgraph zur Verwendung mit xvcg erzeugen\n" +" policy – »policy«-Einstellungen ausgeben\n" "\n" "Optionen:\n" " -h dieser Hilfe-Text.\n" @@ -226,24 +226,25 @@ msgstr "" " -q Fortschrittsanzeige abschalten\n" " -i nur wichtige Abhängigkeiten für den »unmet«-Befehl zeigen\n" " -c=? diese Konfigurationsdatei lesen\n" -" -o=? eine beliebige Konfigurationsoption setzen, z. B. -o dir::cache=/tmp\n" +" -o=? eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" "Weitere Informationen finden Sie unter apt-cache(8) und apt.conf(5).\n" #: cmdline/apt-cdrom.cc:77 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" -"Bitte geben Sie einen Namen für diese Disk an, wie zum Beispiel »Debian " +"Bitte geben Sie einen Namen für dieses Medium an, wie zum Beispiel »Debian " "5.0.3 Disk 1«" #: cmdline/apt-cdrom.cc:92 msgid "Please insert a Disc in the drive and press enter" msgstr "" "Bitte legen Sie ein Medium in das Laufwerk ein und drücken Sie die " -"Eingabetaste" +"Eingabetaste (Enter)" #: cmdline/apt-cdrom.cc:114 msgid "Repeat this process for the rest of the CDs in your set." -msgstr "Wiederholen Sie dieses Prozedere für die restlichen CDs Ihres Satzes." +msgstr "" +"Wiederholen Sie dieses Prozedere für die restlichen Disks Ihres Satzes." #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" @@ -276,8 +277,7 @@ msgstr "" "Optionen:\n" " -h Dieser Hilfetext\n" " -c=? Diese Konfigurationsdatei lesen\n" -" -o=? Eine beliebige Konfigurationsoption setzen, z. B. -o dir::cache=/" -"tmp\n" +" -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" #: cmdline/apt-extracttemplates.cc:98 #, c-format @@ -299,16 +299,14 @@ msgid "" msgstr "" "Aufruf: apt-extracttemplates datei1 [datei2 ...]\n" "\n" -"apt-extracttemplates ist ein Werkzeug zum Extrahieren von Konfigurations- " -"und\n" -"Template-Informationen aus Debian-Paketen.\n" +"apt-extracttemplates ist ein Werkzeug, um Informationen zu Konfiguration\n" +"und Vorlagen (Templates) aus Debian-Paketen zu extrahieren.\n" "\n" "Optionen:\n" " -h Dieser Hilfetext\n" " -t Das temporäre Verzeichnis setzen\n" " -c=? Diese Konfigurationsdatei lesen\n" -" -o=? Eine beliebige Konfigurationsoption setzen, z. B. -o dir::cache=/" -"tmp\n" +" -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format @@ -318,7 +316,7 @@ msgstr "Schreiben nach %s nicht möglich" #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" msgstr "" -"debconf-Version konnte nicht ermittelt werden. Ist debconf installiert?" +"Debconf-Version konnte nicht ermittelt werden. Ist debconf installiert?" #: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" @@ -342,7 +340,7 @@ msgstr "Fehler beim Schreiben der Kopfzeilen in die Inhaltsdatei" #: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" -msgstr "Fehler beim Verarbeiten der Inhaltsdatei %s" +msgstr "Fehler beim Verarbeiten der Inhalte %s" #: ftparchive/apt-ftparchive.cc:553 msgid "" @@ -393,29 +391,29 @@ msgstr "" " generate Konfigurationsdatei [Gruppen]\n" " clean Konfigurationsdatei\n" "\n" -"apt-ftparchive generiert Indexdateien für Debian-Archive. Es unterstützt " +"apt-ftparchive erstellt Indexdateien für Debian-Archive. Es unterstützt " "viele\n" -"verschiedene Arten der Generierung, von vollautomatisch bis hin zu den\n" +"verschiedene Arten der Erstellung, von vollautomatisch bis hin zu den\n" "funktionalen Äquivalenten von dpkg-scanpackages und dpkg-scansources.\n" "\n" -"apt-ftparchive generiert Package-Dateien aus einem Baum von .debs. Die " +"apt-ftparchive erstellt Package-Dateien aus einem Baum von .debs. Die " "Package-\n" -"Datei enthält den Inhalt aller Kontrollfelder aus jedem Paket sowie einen " +"Datei enthält den Inhalt aller Steuerfelder aus jedem Paket sowie einen " "MD5-\n" "Hashwert und die Dateigröße. Eine Override-Datei wird unterstützt, um Werte " "für\n" -"Priorität und Sektion zu erzwingen.\n" +"Priorität und Bereich (Section) zu erzwingen.\n" "\n" -"Auf ganz ähnliche Weise erzeugt apt-ftparchive Sources-Dateien aus einem " +"Auf ganz ähnliche Weise erstellt apt-ftparchive Sources-Dateien aus einem " "Baum\n" "von .dscs. Die Option --source-override kann benutzt werden, um eine " "Override-\n" "Datei für Quellen anzugeben.\n" "\n" -"Die Befehle »packages« und »source« sollten in der Wurzel des Baumes " -"aufgerufen\n" -"werden. Binärpfad sollte auf die Basis der rekursiven Suche zeigen und\n" -"Override-Datei sollte die Override-Flags enthalten. Pfadpräfix wird, so\n" +"Die Befehle »packages« und »source« sollten von der Wurzel des Baums aus\n" +"aufgerufen werden. Binärpfad sollte auf die Basis der rekursiven Suche " +"zeigen\n" +"und Override-Datei sollte die Override-Flags enthalten. Pfadpräfix wird, so\n" "vorhanden, jedem Dateinamen vorangestellt. Beispielaufruf im Debian-Archiv:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" @@ -426,14 +424,14 @@ msgstr "" " -s=? Override-Datei für Quellen\n" " -q ruhig\n" " -d=? optionale Cache-Datenbank auswählen\n" -" --no-delink Debug-Modus für Delinking setzen\n" +" --no-delink Debug-Modus für Delinking aktivieren\n" " --contents Inhaltsdatei erzeugen\n" " -c=? diese Konfigurationsdatei lesen\n" " -o=? eine beliebige Konfigurationsoption setzen" #: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" -msgstr "Keine Auswahl passend" +msgstr "Keine Auswahl traf zu" #: ftparchive/apt-ftparchive.cc:832 #, c-format @@ -448,36 +446,35 @@ msgstr "Datenbank wurde beschädigt, Datei umbenannt in %s.old" #: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "Datenbank ist veraltet, versuche %s zu erneuern" +msgstr "Datenbank ist veraltet; es wird versucht, %s zu erneuern" #: ftparchive/cachedb.cc:72 -#, fuzzy msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" -"Datenbank-Format ist ungültig. Wenn Sie ein Update basierend auf einer " -"älteren Version von apt gemacht haben, entfernen Sie bitte die Datenbank und " -"erstellen Sie sie neu." +"Datenbankformat ist ungültig. Wenn Sie ein Upgrade (Paketaktualisierung) von " +"einer älteren apt-Version gemacht haben, entfernen Sie bitte die Datenbank " +"und erstellen Sie sie neu." #: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" -msgstr "Datenbank-Datei %s kann nicht geöffnet werden: %s" +msgstr "Datenbankdatei %s kann nicht geöffnet werden: %s" #: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 #: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 #, c-format msgid "Failed to stat %s" -msgstr "Ausführen von »stat« auf %s fehlgeschlagen." +msgstr "Ausführen von »stat« auf %s fehlgeschlagen" #: ftparchive/cachedb.cc:242 msgid "Archive has no control record" -msgstr "Archiv hat keinen Steuerungs-Datensatz" +msgstr "Archiv hat keinen Steuerungsdatensatz" #: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" -msgstr "Bekommen eines Cursors nicht möglich" +msgstr "Unmöglich, einen Cursor zu bekommen" #: ftparchive/writer.cc:76 #, c-format @@ -508,7 +505,7 @@ msgstr "%s konnte nicht aufgelöst werden" #: ftparchive/writer.cc:170 msgid "Tree walking failed" -msgstr "Verzeichniswechsel im Verzeichnisbaum fehlgeschlagen" +msgstr "Durchlaufen des Verzeichnisbaums fehlgeschlagen" #: ftparchive/writer.cc:195 #, c-format @@ -523,7 +520,7 @@ msgstr " DeLink %s [%s]\n" #: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" -msgstr "readlink auf %s fehlgeschlagen" +msgstr "readlink von %s fehlgeschlagen" #: ftparchive/writer.cc:266 #, c-format @@ -538,11 +535,11 @@ msgstr "*** Erzeugen einer Verknüpfung von %s zu %s fehlgeschlagen" #: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" -msgstr " DeLink-Limit von %sB erreicht.\n" +msgstr " DeLink-Limit von %s B erreicht.\n" #: ftparchive/writer.cc:389 msgid "Archive had no package field" -msgstr "Archiv hatte kein Paket-Feld" +msgstr "Archiv hatte kein Feld »package«" #: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format @@ -552,7 +549,7 @@ msgstr " %s hat keinen Eintrag in der Override-Liste.\n" #: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" -msgstr " %s-Betreuer ist %s und nicht %s\n" +msgstr " %s-Betreuer ist %s und nicht %s.\n" #: ftparchive/writer.cc:638 #, c-format @@ -571,7 +568,7 @@ msgstr "Interner Fehler, Bestandteil %s konnte nicht gefunden werden" #: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" -msgstr "realloc – Speicheranforderung fehlgeschlagen" +msgstr "realloc - Speicheranforderung fehlgeschlagen" #: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format @@ -596,7 +593,7 @@ msgstr "Missgestaltetes Override %s Zeile %lu #3" #: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" -msgstr "Override-Datei %s konnte nicht gelesen werden." +msgstr "Override-Datei %s konnte nicht gelesen werden" #: ftparchive/multicompress.cc:72 #, c-format @@ -637,7 +634,7 @@ msgstr "" #: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " -msgstr "Komprimierer konnte nicht ausgeführt werden" +msgstr "Fehler beim Ausführen von Komprimierer " #: ftparchive/multicompress.cc:360 msgid "decompressor" @@ -654,7 +651,7 @@ msgstr "Lesevorgang während der MD5-Berechnung fehlgeschlagen" #: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" -msgstr "Problem beim Unlinking von %s" +msgstr "Problem beim Entfernen (unlink) von %s" #: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format @@ -668,11 +665,11 @@ msgstr "J" #: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" -msgstr "Fehler beim Kompilieren eines regulären Ausdrucks – %s" +msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s" #: cmdline/apt-get.cc:244 msgid "The following packages have unmet dependencies:" -msgstr "Die folgenden Pakete haben nicht-erfüllte Abhängigkeiten:" +msgstr "Die folgenden Pakete haben nicht erfüllte Abhängigkeiten:" #: cmdline/apt-get.cc:334 #, c-format @@ -718,7 +715,7 @@ msgstr "Die folgenden Pakete sind zurückgehalten worden:" #: cmdline/apt-get.cc:451 msgid "The following packages will be upgraded:" -msgstr "Die folgenden Pakete werden aktualisiert:" +msgstr "Die folgenden Pakete werden aktualisiert (Upgrade):" #: cmdline/apt-get.cc:472 msgid "The following packages will be DOWNGRADED:" @@ -840,27 +837,27 @@ msgstr "Die Liste der Quellen konnte nicht gelesen werden." msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Wie merkwürdig ... die Größen haben nicht übereingestimmt; schreiben Sie " -"eine E-Mail an apt@packages.debian.org" +"eine E-Mail an apt@packages.debian.org (auf Englisch bitte)." #: cmdline/apt-get.cc:841 #, c-format msgid "Need to get %sB/%sB of archives.\n" -msgstr "Es müssen noch %sB von %sB an Archiven heruntergeladen werden.\n" +msgstr "Es müssen noch %s B von %s B an Archiven heruntergeladen werden.\n" #: cmdline/apt-get.cc:844 #, c-format msgid "Need to get %sB of archives.\n" -msgstr "Es müssen %sB an Archiven heruntergeladen werden.\n" +msgstr "Es müssen %s B an Archiven heruntergeladen werden.\n" #: cmdline/apt-get.cc:849 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "Nach dieser Operation werden %sB Plattenplatz zusätzlich benutzt.\n" +msgstr "Nach dieser Operation werden %s B Plattenplatz zusätzlich benutzt.\n" #: cmdline/apt-get.cc:852 #, c-format msgid "After this operation, %sB disk space will be freed.\n" -msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n" +msgstr "Nach dieser Operation werden %s B Plattenplatz freigegeben.\n" #: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 #: cmdline/apt-get.cc:2262 @@ -888,7 +885,7 @@ msgid "" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"Sie sind im Begriff, etwas potenziell Schädliches zu tun.\n" +"Sie sind im Begriff, etwas potentiell Schädliches zu tun.\n" "Zum Fortfahren geben Sie bitte »%s« ein.\n" " ?] " @@ -998,7 +995,7 @@ msgstr "%s ist schon die neueste Version.\n" #: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" -msgstr "Release »%s« für »%s« konnte nicht gefunden werden" +msgstr "Veröffentlichung »%s« für »%s« konnte nicht gefunden werden" #: cmdline/apt-get.cc:1229 #, c-format @@ -1013,18 +1010,18 @@ msgstr "Gewählte Version %s (%s) für %s\n" #: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" -msgstr "" +msgstr "Nicht verfügbare Veröffentlichung »%s« von Paket »%s« wird ignoriert" #: cmdline/apt-get.cc:1352 -#, fuzzy, c-format +#, c-format msgid "Picking '%s' as source package instead of '%s'\n" -msgstr "»stat« konnte nicht auf die Liste %s der Quellpakete ausgeführt werden." +msgstr "Als Quellpaket wird »%s« statt »%s« gewählt\n" #. if (VerTag.empty() == false && Last == 0) #: cmdline/apt-get.cc:1389 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" +msgstr "Nicht verfügbare Version »%s« von Paket »%s« wird ignoriert" #: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" @@ -1062,9 +1059,9 @@ msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -"Hmm, es sieht so aus, als ob der AutoRemover etwas zerstört hat, was\n" +"Hmm, es sieht so aus, als ob der AutoRemover etwas beschädigt hat, was\n" "wirklich nicht geschehen sollte. Bitte erstellen Sie einen Fehlerbericht\n" -"gegen apt." +"über apt." #. #. if (Packages == 1) @@ -1083,11 +1080,11 @@ msgstr "" #: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" -msgstr "Interner Fehler, AutoRemover hat was kaputt gemacht" +msgstr "Interner Fehler, AutoRemover hat etwas beschädigt" #: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" -msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht" +msgstr "Interner Fehler, AllUpgrade hat etwas beschädigt" #: cmdline/apt-get.cc:1612 #, c-format @@ -1102,7 +1099,7 @@ msgstr "Paket %s konnte nicht gefunden werden" #: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" -msgstr "Hinweis: %s wird für regulären Ausdruck »%s« gewählt\n" +msgstr "Hinweis: %s wird für regulären Ausdruck »%s« gewählt.\n" #: cmdline/apt-get.cc:1781 #, c-format @@ -1118,8 +1115,8 @@ msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"Nicht erfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne " -"jegliche Pakete (oder geben Sie eine Lösung an)." +"Nicht erfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne Angabe " +"eines Pakets (oder geben Sie eine Lösung an)." #: cmdline/apt-get.cc:1809 msgid "" @@ -1129,13 +1126,13 @@ msgid "" "or been moved out of Incoming." msgstr "" "Einige Pakete konnten nicht installiert werden. Das kann bedeuten, dass\n" -"Sie eine unmögliche Situation angefordert haben oder dass, wenn Sie die\n" -"Unstable-Distribution verwenden, einige erforderliche Pakete noch nicht\n" -"erstellt wurden oder Incoming noch nicht verlassen haben." +"Sie eine unmögliche Situation angefordert haben oder, wenn Sie die\n" +"Unstable-Distribution verwenden, dass einige erforderliche Pakete noch\n" +"nicht erstellt wurden oder Incoming noch nicht verlassen haben." #: cmdline/apt-get.cc:1827 msgid "Broken packages" -msgstr "Kaputte Pakete" +msgstr "Beschädigte Pakete" #: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" @@ -1151,7 +1148,7 @@ msgstr "Empfohlene Pakete:" #: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " -msgstr "Berechne Upgrade (Paketaktualisierung) ..." +msgstr "Paketaktualisierung (Upgrade) wird berechnet... " #: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" @@ -1163,7 +1160,7 @@ msgstr "Fertig" #: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" -msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht" +msgstr "Interner Fehler, der Problemlöser hat etwas beschädigt" #: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" @@ -1179,27 +1176,28 @@ msgstr "Quellpaket für %s kann nicht gefunden werden" #: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "Überspringe schon heruntergeladene Datei »%s«\n" +msgstr "Bereits heruntergeladene Datei »%s« wird übersprungen.\n" #: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" -msgstr "Sie haben nicht genug freien Platz in %s" +msgstr "Sie haben nicht genügend freien Speicherplatz in %s" #: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" -msgstr "Es müssen noch %sB von %sB an Quellarchiven heruntergeladen werden.\n" +msgstr "" +"Es müssen noch %s B von %s B an Quellarchiven heruntergeladen werden.\n" #: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" -msgstr "Es müssen %sB an Quellarchiven heruntergeladen werden.\n" +msgstr "Es müssen %s B an Quellarchiven heruntergeladen werden.\n" #: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" -msgstr "Quelle %s wird heruntergeladen\n" +msgstr "Quelle %s wird heruntergeladen.\n" #: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." @@ -1208,12 +1206,12 @@ msgstr "Einige Archive konnten nicht heruntergeladen werden." #: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" -msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n" +msgstr "Das Entpacken der bereits entpackten Quelle in %s wird übersprungen.\n" #: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" -msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n" +msgstr "Entpackbefehl »%s« fehlgeschlagen.\n" #: cmdline/apt-get.cc:2359 #, c-format @@ -1232,19 +1230,19 @@ msgstr "Kindprozess fehlgeschlagen" #: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" -"Es muss zumindest ein Paket angegeben werden, dessen Bau-Abhängigkeiten\n" +"Es muss mindestens ein Paket angegeben werden, dessen Bauabhängigkeiten " "überprüft werden sollen." #: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -"Informationen zu Bau-Abhängigkeiten für %s konnten nicht gefunden werden." +"Informationen zu Bauabhängigkeiten für %s konnten nicht gefunden werden." #: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" -msgstr "%s hat keine Bau-Abhängigkeiten.\n" +msgstr "%s hat keine Bauabhängigkeiten.\n" #: cmdline/apt-get.cc:2511 #, c-format @@ -1268,22 +1266,22 @@ msgstr "" #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -"Die »%s«-Abhängigkeit für %s kann nicht erfüllt werden: Installiertes Paket %" -"s ist zu neu." +"»%s«-Abhängigkeit für %s kann nicht erfüllt werden: Installiertes Paket %s " +"ist zu neu." #: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "Die »%s«-Abhängigkeit für %s konnte nicht erfüllt werden: %s" +msgstr "»%s«-Abhängigkeit für %s konnte nicht erfüllt werden: %s" #: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "Bau-Abhängigkeiten für %s konnten nicht erfüllt werden." +msgstr "Bauabhängigkeiten für %s konnten nicht erfüllt werden." #: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" -msgstr "Verarbeitung der Bau-Abhängigkeiten fehlgeschlagen" +msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen" #: cmdline/apt-get.cc:2680 msgid "Supported modules:" @@ -1341,37 +1339,35 @@ msgstr "" "sind update und install.\n" "\n" "Befehle:\n" -" update – neue Paketinformationen einlesen\n" -" upgrade – ein Upgrade (Paketaktualisierung) durchführen\n" +" update – neue Paketinformationen holen\n" +" upgrade – Upgrade (Paketaktualisierung) durchführen\n" " install – neue Pakete installieren (paket ist libc6, nicht libc6." "deb)\n" " remove – Pakete entfernen\n" " autoremove – alle nicht mehr verwendeten Pakete automatisch " "entfernen\n" -" purge – entferne Pakete restlos (inkl. Konfigurationsdateien)\n" +" purge – Pakete vollständig entfernen (inkl. " +"Konfigurationsdateien)\n" " source – Quellarchive herunterladen\n" -" build-dep – die Bau-Abhängigkeiten für Quellpakete konfigurieren\n" -" dist-upgrade – spezielles Upgrade (Paketaktualisierung) für die " -"komplette\n" +" build-dep – Bauabhängigkeiten für Quellpakete konfigurieren\n" +" dist-upgrade – Upgrade (Paketaktualisierung) für die komplette\n" " Distribution durchführen, siehe apt-get(8)\n" " dselect-upgrade – der Auswahl von »dselect« folgen\n" " clean – heruntergeladene Archive löschen\n" " autoclean – veraltete heruntergeladene Archive löschen\n" -" check – überprüfen, dass es keine nicht-erfüllten " -"Abhängigkeiten\n" -" gibt\n" +" check – überprüfen, ob es nicht erfüllte Abhängigkeiten gibt\n" "\n" "Optionen:\n" " -h dieser Hilfetext\n" " -q protokollierbare Ausgabe – keine Fortschrittsanzeige\n" " -qq keine Ausgabe außer bei Fehlern\n" " -d nur herunterladen – Archive NICHT installieren oder entpacken\n" -" -s nichts tun; nur eine Simulation der Vorgänge durchführen\n" +" -s nichts tun, nur eine Simulation der Aktionen durchführen\n" " -y für alle Antworten »Ja« annehmen und nicht nachfragen\n" " -f versuchen, ein System mit defekten Abhängigkeiten zu korrigieren\n" " -m versuchen fortzufahren, wenn Archive nicht auffindbar sind\n" -" -u auch eine Liste der aktualisierten Pakete mit anzeigen\n" -" -b ein Quellpaket nach dem Herunterladen übersetzen\n" +" -u auch eine Liste der aktualisierten Pakete anzeigen\n" +" -b ein Quellpaket nach dem Herunterladen bauen\n" " -V ausführliche Versionsnummern anzeigen\n" " -c=? Diese Konfigurationsdatei benutzen\n" " -o=? Beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" @@ -1390,8 +1386,8 @@ msgstr "" "HINWEIS: Dies ist nur eine Simulation!\n" " apt-get benötigt root-Privilegien für die reale Ausführung.\n" " Behalten Sie ebenfalls in Hinterkopf, dass die Sperren deaktiviert\n" -" sind, verlassen Sie sich also bezüglich des realen aktuellen\n" -" Status' der Sperre nicht darauf!" +" sind, verlassen Sie sich also bezüglich des reellen aktuellen\n" +" Status der Sperre nicht darauf!" #: cmdline/acqprogress.cc:55 msgid "Hit " @@ -1412,7 +1408,7 @@ msgstr "Fehl " #: cmdline/acqprogress.cc:135 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Es wurden %sB in %s geholt (%sB/s)\n" +msgstr "Es wurden %s B in %s geholt (%s B/s)\n" #: cmdline/acqprogress.cc:225 #, c-format @@ -1428,7 +1424,7 @@ msgid "" msgstr "" "Medienwechsel: Bitte legen Sie das Medium mit dem Namen\n" " »%s«\n" -"in Laufwerk »%s« ein und drücken Sie die Eingabetaste.\n" +"in Laufwerk »%s« ein und drücken Sie die Eingabetaste (Enter).\n" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" @@ -1457,7 +1453,7 @@ msgstr "" " -h Dieser Hilfetext\n" " -s Quelldateisortierung benutzen\n" " -c=? Diese Konfigurationsdatei lesen\n" -" -o=? Eine beliebige Konfigurationsoption setzen, z. B. -o dir::cache=/tmp\n" +" -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" #: dselect/install:32 msgid "Bad default setting!" @@ -1466,7 +1462,7 @@ msgstr "Fehlerhafte Voreinstellung!" #: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 #: dselect/install:105 dselect/update:45 msgid "Press enter to continue." -msgstr "Zum Fortfahren Enter drücken." +msgstr "Zum Fortfahren die Eingabetaste (Enter) drücken." #: dselect/install:91 msgid "Do you want to erase any previously downloaded .deb files?" @@ -1495,7 +1491,7 @@ msgstr "" #: dselect/update:30 msgid "Merging available information" -msgstr "Führe verfügbare Information zusammen" +msgstr "Verfügbare Informationen werden zusammengeführt" #: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" @@ -1516,7 +1512,7 @@ msgstr "Tar-Prüfsumme fehlgeschlagen, Archiv beschädigt" #: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" -msgstr "Unbekannter Tar-Header-Typ %u, Bestandteil %s" +msgstr "Unbekannter Tar-Kopfzeilen-Typ %u, Bestandteil %s" #: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" @@ -1592,7 +1588,7 @@ msgstr "Der Pfad %s ist zu lang" #: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" -msgstr "%s mehr als einmal ausgepackt" +msgstr "%s mehr als einmal entpackt" #: apt-inst/extract.cc:134 #, c-format @@ -1602,7 +1598,7 @@ msgstr "Das Verzeichnis %s ist umgeleitet" #: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Vom Paket wird versucht, auf das Umleitungsziel %s/%s zu schreiben" +msgstr "Schreibversuch vom Paket auf das Umleitungsziel %s/%s" #: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" @@ -1624,7 +1620,7 @@ msgstr "Der Pfad ist zu lang" #: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" -msgstr "Paket-Treffer ohne Version für %s wird überschrieben" +msgstr "Pakettreffer ohne Version für %s wird überschrieben" #: apt-inst/extract.cc:431 #, c-format @@ -1681,11 +1677,11 @@ msgstr "Wechsel in das Administrationsverzeichnis %sinfo fehlgeschlagen" #: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 #: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" -msgstr "Interner Fehler beim Holen des Paketnamens" +msgstr "Interner Fehler beim Holen eines Paketnamens" #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" -msgstr "Paketlisten werden gelesen" +msgstr "Paketauflistung wird gelesen" #: apt-inst/deb/dpkgdb.cc:212 #, c-format @@ -1694,14 +1690,14 @@ msgid "" "then make it empty and immediately re-install the same version of the " "package!" msgstr "" -"Fehler beim Öffnen der Listendatei »%sinfo/%s«. Wenn Sie diese Datei nicht " +"Öffnen der Listendatei »%sinfo/%s« fehlgeschlagen. Wenn Sie diese Datei nicht " "wiederherstellen können, dann leeren Sie sie und installieren Sie sofort " "dieselbe Version des Paketes erneut!" #: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" -msgstr "Fehler beim Lesen der Listendatei »%sinfo/%s«." +msgstr "Fehler beim Lesen der Listendatei %sinfo/%s" #: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" @@ -1799,7 +1795,7 @@ msgstr "" #: methods/cdrom.cc:250 msgid "Disk not found." -msgstr "Disk nicht gefunden." +msgstr "Medium nicht gefunden." #: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" @@ -1809,7 +1805,7 @@ msgstr "Datei nicht gefunden" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 #: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" -msgstr "»stat« konnte nicht ausgeführt werden." +msgstr "»stat« konnte nicht ausgeführt werden" #: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" @@ -1835,17 +1831,17 @@ msgstr "Lokaler Name kann nicht bestimmt werden" #: methods/ftp.cc:210 methods/ftp.cc:238 #, c-format msgid "The server refused the connection and said: %s" -msgstr "Verbindung durch Server abgelehnt: %s" +msgstr "Verbindung durch Server abgelehnt; Server meldet: %s" #: methods/ftp.cc:216 #, c-format msgid "USER failed, server said: %s" -msgstr "Befehl USER fehlgeschlagen: %s" +msgstr "Befehl USER fehlgeschlagen, Server meldet: %s" #: methods/ftp.cc:223 #, c-format msgid "PASS failed, server said: %s" -msgstr "Befehl PASS fehlgeschlagen: %s" +msgstr "Befehl PASS fehlgeschlagen, Server meldet: %s" #: methods/ftp.cc:243 msgid "" @@ -1858,7 +1854,7 @@ msgstr "" #: methods/ftp.cc:271 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "Befehl »%s« des Login-Skriptes fehlgeschlagen: %s" +msgstr "Befehl »%s« des Login-Skriptes fehlgeschlagen, Server meldet: %s" #: methods/ftp.cc:297 #, c-format @@ -1935,7 +1931,7 @@ msgstr "Befehl EPRT fehlgeschlagen: %s" #: methods/ftp.cc:824 msgid "Data socket connect timed out" -msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung" +msgstr "Zeitüberschreitung bei Datenverbindungsaufbau" #: methods/ftp.cc:831 msgid "Unable to accept connection" @@ -1948,16 +1944,16 @@ msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf" #: methods/ftp.cc:883 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "Datei konnte nicht heruntergeladen werden; Antwort vom Server: »%s«" +msgstr "Datei konnte nicht heruntergeladen werden; Server meldet: »%s«" #: methods/ftp.cc:898 methods/rsh.cc:322 msgid "Data socket timed out" -msgstr "Datenverbindung erlitt Zeitüberschreitung" +msgstr "Zeitüberschreitung bei Datenverbindung" #: methods/ftp.cc:928 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "Datenübertragung fehlgeschlagen; Antwort vom Server: »%s«" +msgstr "Datenübertragung fehlgeschlagen; Server meldet: »%s«" #. Get the files information #: methods/ftp.cc:1005 @@ -1966,7 +1962,7 @@ msgstr "Abfrage" #: methods/ftp.cc:1117 msgid "Unable to invoke " -msgstr "Kann nicht aufgerufen werden: " +msgstr "Aufruf nicht möglich: " #: methods/connect.cc:70 #, c-format @@ -2018,9 +2014,9 @@ msgid "Temporary failure resolving '%s'" msgstr "Temporärer Fehlschlag beim Auflösen von »%s«" #: methods/connect.cc:194 -#, fuzzy, c-format +#, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" -msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i)" +msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i - %s)" #: methods/connect.cc:241 #, c-format @@ -2029,17 +2025,17 @@ msgstr "Verbindung mit %s:%s nicht möglich:" #. TRANSLATOR: %s is the trusted keyring parts directory #: methods/gpgv.cc:78 -#, fuzzy, c-format +#, c-format msgid "No keyring installed in %s." -msgstr "Installation abgebrochen." +msgstr "Kein Schlüsselring in %s installiert." #: methods/gpgv.cc:104 msgid "E: Too many keyrings should be passed to gpgv. Exiting." -msgstr "" +msgstr "F: Zu viele Schlüsselringe sollten an gpgv übergeben werden. Abbruch." #: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "F: Argumentliste von Acquire::gpgv::Options zu lang. Abbruch." +msgstr "F: Argumentenliste von Acquire::gpgv::Options zu lang. Abbruch." #: methods/gpgv.cc:237 msgid "" @@ -2101,7 +2097,7 @@ msgstr "Ungültige Kopfzeile" #: methods/http.cc:558 methods/http.cc:565 msgid "The HTTP server sent an invalid reply header" -msgstr "Vom·HTTP-Server wurde eine ungültige Antwort-Kopfzeile gesandt" +msgstr "Vom HTTP-Server wurde eine ungültige Antwort-Kopfzeile gesandt" #: methods/http.cc:594 msgid "The HTTP server sent an invalid Content-Length header" @@ -2114,7 +2110,7 @@ msgstr "Vom HTTP-Server wurde eine ungültige »Content-Range«-Kopfzeile gesand #: methods/http.cc:611 msgid "This HTTP server has broken range support" msgstr "" -"Teilweise Dateiübertragung·wird vom HTTP-Server nur fehlerhaft unterstützt." +"Teilweise Dateiübertragung wird vom HTTP-Server nur fehlerhaft unterstützt." #: methods/http.cc:635 msgid "Unknown date format" @@ -2126,7 +2122,7 @@ msgstr "Auswahl fehlgeschlagen" #: methods/http.cc:796 msgid "Connection timed out" -msgstr "Verbindung erlitt Zeitüberschreitung" +msgstr "Zeitüberschreitung bei Verbindung" #: methods/http.cc:819 msgid "Error writing to output file" @@ -2134,7 +2130,7 @@ msgstr "Fehler beim Schreiben der Ausgabedatei" #: methods/http.cc:850 msgid "Error writing to file" -msgstr "Fehler beim Schreiben einer Datei" +msgstr "Fehler beim Schreiben in Datei" #: methods/http.cc:878 msgid "Error writing to the file" @@ -2181,7 +2177,7 @@ msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" -"Nicht genügend Platz für Dynamic MMap. Bitte erhöhen Sie den Wert von APT::" +"Nicht genügend Platz für »Dynamic MMap«. Bitte erhöhen Sie den Wert von APT::" "Cache-Limit. Aktueller Wert: %lu. (Siehe auch man 5 apt.conf.)" #: apt-pkg/contrib/mmap.cc:347 @@ -2195,25 +2191,25 @@ msgstr "" #: apt-pkg/contrib/strutl.cc:346 #, c-format msgid "%lid %lih %limin %lis" -msgstr "%liT %liS %liMin %lis" +msgstr "%li d %li h %li min %li s" #. h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:353 #, c-format msgid "%lih %limin %lis" -msgstr "%liS %liMin %lis" +msgstr "%li h %li min %li s" #. min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:360 #, c-format msgid "%limin %lis" -msgstr "%liMin %lis" +msgstr "%li min %li s" #. s means seconds #: apt-pkg/contrib/strutl.cc:365 #, c-format msgid "%lis" -msgstr "%lis" +msgstr "%li s" #: apt-pkg/contrib/strutl.cc:1040 #, c-format @@ -2228,7 +2224,7 @@ msgstr "Nicht erkannte Typabkürzung: »%c«" #: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" -msgstr "Öffne Konfigurationsdatei %s" +msgstr "Konfigurationsdatei %s wird geöffnet" #: apt-pkg/contrib/configuration.cc:678 #, c-format @@ -2238,12 +2234,12 @@ msgstr "Syntaxfehler %s:%u: Block beginnt ohne Namen." #: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" -msgstr "Syntaxfehler %s:%u: Missgestaltetes Tag" +msgstr "Syntaxfehler %s:%u: Missgestaltete Markierung" #: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Syntaxfehler %s:%u: Zusätzlicher Müll nach Wert" +msgstr "Syntaxfehler %s:%u: Zusätzlicher Unsinn nach Wert" #: apt-pkg/contrib/configuration.cc:754 #, c-format @@ -2269,7 +2265,7 @@ msgstr "Syntaxfehler %s:%u: Nicht unterstützte Direktive »%s«" #: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "Syntaxfehler %s:%u: Zusätzlicher Müll am Dateiende" +msgstr "Syntaxfehler %s:%u: Zusätzlicher Unsinn am Dateiende" #: apt-pkg/contrib/progress.cc:153 #, c-format @@ -2305,7 +2301,7 @@ msgstr "Option %s erfordert ein Argument." #: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." -msgstr "Option %s: Konfigurationswertspezifikation benötigt ein »=<wert>«." +msgstr "Option %s: Konfigurationswertspezifikation benötigt ein »=<Wert>«." #: apt-pkg/contrib/cmndline.cc:234 #, c-format @@ -2326,12 +2322,12 @@ msgstr "Der Sinn von »%s« ist nicht klar, versuchen Sie »true« oder »false #: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" -msgstr "Ungültige Operation %s." +msgstr "Ungültige Operation %s" #: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" -msgstr "»stat« konnte nicht auf den Einhängepunkt %s ausgeführt werden." +msgstr "»stat« konnte nicht auf den Einbindungspunkt %s ausgeführt werden" #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/contrib/cdromutl.cc:187 #: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39 @@ -2346,22 +2342,22 @@ msgstr "»stat« konnte nicht auf die CD-ROM ausgeführt werden" #: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" -msgstr "Es wird keine Sperre für schreibgeschützte Lockdatei %s verwendet" +msgstr "Es wird keine Sperre für schreibgeschützte Sperrdatei %s verwendet" #: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" -msgstr "Lockdatei %s konnte nicht geöffnet werden" +msgstr "Sperrdatei %s konnte nicht geöffnet werden" #: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" -msgstr "Es wird keine Sperre für per NFS eingebundene Lockdatei %s verwendet" +msgstr "Es wird keine Sperre für per NFS eingebundene Sperrdatei %s verwendet" #: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" -msgstr "Konnte Lock %s nicht bekommen" +msgstr "Konnte Sperre %s nicht bekommen" #: apt-pkg/contrib/fileutl.cc:568 #, c-format @@ -2376,7 +2372,7 @@ msgstr "Unterprozess %s hat einen Speicherzugriffsfehler empfangen." #: apt-pkg/contrib/fileutl.cc:582 #, c-format msgid "Sub-process %s received signal %u." -msgstr "Unterprozess %s hat Signal %u empfangen." +msgstr "Unterprozess %s hat das Signal %u empfangen." #: apt-pkg/contrib/fileutl.cc:586 #, c-format @@ -2411,7 +2407,7 @@ msgstr "Beim Schließen der Datei trat ein Problem auf" #: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" -msgstr "Beim Unlinking der Datei trat ein Problem auf" +msgstr "Beim Entfernen (unlink) der Datei trat ein Problem auf" #: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" @@ -2432,7 +2428,7 @@ msgstr "Die Paket-Cache-Datei liegt in einer inkompatiblen Version vor" #: apt-pkg/pkgcache.cc:149 #, c-format msgid "This APT does not support the versioning system '%s'" -msgstr "Das·Versionssystem·»%s« wird durch dieses APT nicht unterstützt" +msgstr "Das Versionssystem »%s« wird durch dieses APT nicht unterstützt" #: apt-pkg/pkgcache.cc:154 msgid "The package cache was built for a different architecture" @@ -2440,11 +2436,11 @@ msgstr "Der Paket-Cache wurde für eine andere Architektur aufgebaut" #: apt-pkg/pkgcache.cc:225 msgid "Depends" -msgstr "Hängt ab" +msgstr "Hängt ab von" #: apt-pkg/pkgcache.cc:225 msgid "PreDepends" -msgstr "Hängt ab (vorher)" +msgstr "Hängt ab von (vorher)" #: apt-pkg/pkgcache.cc:225 msgid "Suggests" @@ -2456,7 +2452,7 @@ msgstr "Empfiehlt" #: apt-pkg/pkgcache.cc:226 msgid "Conflicts" -msgstr "Kollidiert" +msgstr "Kollidiert mit" #: apt-pkg/pkgcache.cc:226 msgid "Replaces" @@ -2504,21 +2500,21 @@ msgstr "Mögliche Versionen" #: apt-pkg/depcache.cc:153 msgid "Dependency generation" -msgstr "Abhängigkeits-Generierung" +msgstr "Abhängigkeitsgenerierung" #: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197 msgid "Reading state information" -msgstr "Status-Informationen einlesen" +msgstr "Statusinformationen werden eingelesen" #: apt-pkg/depcache.cc:223 #, c-format msgid "Failed to open StateFile %s" -msgstr "Statusdatei %s konnte nicht geöffnet werden" +msgstr "StateFile %s konnte nicht geöffnet werden" #: apt-pkg/depcache.cc:229 #, c-format msgid "Failed to write temporary StateFile %s" -msgstr "Temporäre Statusdatei %s konnte nicht geschrieben werden" +msgstr "Temporäres StateFile %s konnte nicht geschrieben werden" #: apt-pkg/tagfile.cc:102 #, c-format @@ -2563,7 +2559,7 @@ msgstr "%s wird geöffnet" #: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." -msgstr "Zeile %u zu lang in der Quellliste %s." +msgstr "Zeile %u in Quellliste %s zu lang." #: apt-pkg/sourcelist.cc:236 #, c-format @@ -2573,7 +2569,7 @@ msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)" #: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Typ »%s« ist unbekannt in Zeile %u der Quellliste %s" +msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt" #: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format @@ -2586,6 +2582,8 @@ msgid "" "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" +"»%s« konnte nicht unmittelbar konfiguriert werden. Lesen Sie »man 5 apt.conf« " +"unter APT::Immediate-Configure bezüglich weiterer Details. (%d)" #: apt-pkg/packagemanager.cc:440 #, c-format @@ -2605,6 +2603,9 @@ msgid "" "Could not perform immediate configuration on already unpacked '%s'.Please " "see man 5 apt.conf under APT::Immediate-Configure for details." msgstr "" +"»%s« (bereits entpackt) konnte nicht unmittelbar konfiguriert werden. Lesen " +"Sie »man 5 apt.conf« unter APT::Immediate-Configure bezüglich weiterer " +"Details." #: apt-pkg/pkgrecords.cc:32 #, c-format @@ -2624,8 +2625,8 @@ msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -"Fehler: Unterbrechungen hervorgerufen durch pkgProblemResolver::Resolve; " -"dies könnte durch gehaltene Pakete hervorgerufen worden sein." +"Fehler: Unterbrechungen durch pkgProblemResolver::Resolve hervorgerufen; " +"dies könnte durch gehaltene Pakete verursacht worden sein." #: apt-pkg/algorithms.cc:1140 msgid "Unable to correct problems, you have held broken packages." @@ -2677,7 +2678,7 @@ msgstr "Methode %s ist nicht korrekt gestartet" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Bitte legen Sie das Medium mit dem Namen »%s« in Laufwerk »%s« ein und drücken " -"Sie die Eingabetaste." +"Sie die Eingabetaste (Enter)." #: apt-pkg/init.cc:133 #, c-format @@ -2686,7 +2687,7 @@ msgstr "Paketierungssystem »%s« wird nicht unterstützt" #: apt-pkg/init.cc:149 msgid "Unable to determine a suitable packaging system type" -msgstr "Bestimmung eines passenden Paketierungssystem-Typs nicht möglich" +msgstr "Bestimmung eines passenden Paketierungssystemtyps nicht möglich" #: apt-pkg/clean.cc:56 #, c-format @@ -2697,7 +2698,7 @@ msgstr "»stat« kann nicht auf %s ausgeführt werden." msgid "You must put some 'source' URIs in your sources.list" msgstr "" "Sie müssen einige »source«-URIs für Quellpakete in die sources.list-Datei " -"eintragen." +"eintragen" #: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." @@ -2707,17 +2708,18 @@ msgstr "" #: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" -msgstr "Probieren Sie »apt-get update«, um diese Probleme zu korrigieren." +msgstr "Probieren Sie »apt-get update«, um diese Probleme zu korrigieren" #: apt-pkg/policy.cc:316 #, c-format msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Ungültiger Eintrag in Einstellungsdatei %s, keine »Package«-Kopfzeilen" +msgstr "" +"Ungültiger Eintrag in Einstellungsdatei %s, keine »Package«-Kopfzeile(n)" #: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" -msgstr "Pinning-Typ (pin type) %s nicht verständlich" +msgstr "Pinning-Typ %s kann nicht interpretiert werden" #: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" @@ -2730,96 +2732,96 @@ msgstr "Cache hat ein inkompatibles Versionssystem" #: apt-pkg/pkgcachegen.cc:117 #, c-format msgid "Error occurred while processing %s (NewPackage)" -msgstr "Ein Fehler trat beim Verarbeiten von %s auf (NewPackage)" +msgstr "Ein Fehler trat auf beim Verarbeiten von %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:132 #, c-format msgid "Error occurred while processing %s (UsePackage1)" -msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage1)" +msgstr "Ein Fehler trat auf beim Verarbeiten von %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:166 #, c-format msgid "Error occurred while processing %s (NewFileDesc1)" -msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileDesc1)" +msgstr "Ein Fehler trat auf beim Verarbeiten von %s (NewFileDesc1)" #: apt-pkg/pkgcachegen.cc:191 #, c-format msgid "Error occurred while processing %s (UsePackage2)" -msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage2)" +msgstr "Ein Fehler trat auf beim Verarbeiten von %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:195 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileVer1)" +msgstr "Ein Fehler trat auf beim Verarbeiten von %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:226 #, c-format msgid "Error occurred while processing %s (NewVersion1)" -msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewVersion1)" +msgstr "Ein Fehler trat auf beim Verarbeiten von %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:230 #, c-format msgid "Error occurred while processing %s (UsePackage3)" -msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage3)" +msgstr "Ein Fehler trat auf beim Verarbeiten von %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:234 #, c-format msgid "Error occurred while processing %s (NewVersion2)" -msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewVersion2)" +msgstr "Ein Fehler trat auf beim Verarbeiten von %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:258 #, c-format msgid "Error occurred while processing %s (NewFileDesc2)" -msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileDesc2)" +msgstr "Ein Fehler trat auf beim Verarbeiten von %s (NewFileDesc2)" #: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -"Na so was, Sie haben die Anzahl an Paketen überschritten, mit denen APT " -"umgehen kann." +"Na so was, Sie haben die Anzahl an Paketen überschritten, mit denen diese " +"APT-Version umgehen kann." #: apt-pkg/pkgcachegen.cc:267 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -"Na so was, Sie haben die Anzahl an Versionen überschritten, mit denen APT " -"umgehen kann." +"Na so was, Sie haben die Anzahl an Versionen überschritten, mit denen diese " +"APT-Version umgehen kann." #: apt-pkg/pkgcachegen.cc:270 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" "Na so was, Sie haben die Anzahl an Beschreibungen überschritten, mit denen " -"APT umgehen kann." +"diese APT-Version umgehen kann." #: apt-pkg/pkgcachegen.cc:273 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Na so was, Sie haben die Anzahl an Abhängigkeiten überschritten, mit denen " -"APT umgehen kann." +"diese APT-Version umgehen kann." #: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (FindPkg)" -msgstr "Fehler trat beim Bearbeiten von %s auf (FindPkg)" +msgstr "Ein Fehler trat auf beim Verarbeiten von %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:314 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "Fehler trat beim Bearbeiten von %s auf (CollectFileProvides)" +msgstr "Ein Fehler trat auf beim Verarbeiten von %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:320 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -"Paket %s %s wurde nicht gefunden beim Verarbeiten der Dateiabhängigkeiten" +"Paket %s %s wurde beim Verarbeiten der Dateiabhängigkeiten nicht gefunden" #: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" -msgstr "»stat« konnte nicht auf die Liste %s der Quellpakete ausgeführt werden." +msgstr "»stat« konnte nicht auf die Liste %s der Quellpakete ausgeführt werden" #: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" -msgstr "Sammle Datei-Provides" +msgstr "Sammeln der angebotenen Funktionalitäten (Provides) aus den Dateien" #: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" @@ -2850,8 +2852,7 @@ msgid "" "to manually fix this package. (due to missing arch)" msgstr "" "Es konnte keine Datei für Paket %s gefunden werden. Das könnte heißen, dass " -"Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender " -"Architektur)." +"Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender Architektur)" #: apt-pkg/acquire-item.cc:1319 #, c-format @@ -2881,7 +2882,7 @@ msgstr "Release-Datei %s kann nicht verarbeitet werden" #: apt-pkg/indexrecords.cc:47 #, c-format msgid "No sections in Release file %s" -msgstr "Keine Abschnitte in Release-Datei %s" +msgstr "Keine Bereiche (Sections) in Release-Datei %s" #: apt-pkg/indexrecords.cc:81 #, c-format @@ -2899,8 +2900,8 @@ msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -"Verwendeter CD-ROM-Einhängepunkt: %s\n" -"CD-ROM wird eingehangen\n" +"Verwendeter CD-ROM-Einbindungspunkt: %s\n" +"CD-ROM wird eingebunden\n" #: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622 msgid "Identifying.. " @@ -2913,29 +2914,29 @@ msgstr "Gespeicherte Kennzeichnung: %s\n" #: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836 msgid "Unmounting CD-ROM...\n" -msgstr "CD-ROM wird ausgehangen ...\n" +msgstr "Einbindung der CD-ROM wird gelöst ...\n" #: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" -msgstr "Verwendeter CD-ROM-Einhängepunkt: %s\n" +msgstr "Verwendeter CD-ROM-Einbindungspunkt: %s\n" #: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" -msgstr "CD-ROM wird ausgehangen\n" +msgstr "Lösen der CD-ROM-Einbindung\n" #: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" -msgstr "Warten auf Disk ...\n" +msgstr "Warten auf Medium ...\n" #. Mount the new CDROM #: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" -msgstr "CD-ROM wird eingehangen ...\n" +msgstr "CD-ROM wird eingebunden ...\n" #: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" -msgstr "Durchsuchung der CD nach Index-Dateien ...\n" +msgstr "Durchsuchen des Mediums nach Index-Dateien ...\n" #: apt-pkg/cdrom.cc:673 #, c-format @@ -2952,7 +2953,7 @@ msgid "" "wrong architecture?" msgstr "" "Es konnten keine Paketdateien gefunden werden; möglicherweise ist dies keine " -"Debian-CD oder eine für die falsche Architektur?" +"Debian-Disk oder eine für die falsche Architektur?" #: apt-pkg/cdrom.cc:710 #, c-format @@ -2969,12 +2970,12 @@ msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -"Diese Disk heißt: \n" +"Dieses Medium heißt: \n" "»%s«\n" #: apt-pkg/cdrom.cc:759 msgid "Copying package lists..." -msgstr "Kopieren der Paketlisten..." +msgstr "Kopieren der Paketlisten ..." #: apt-pkg/cdrom.cc:785 msgid "Writing new source list\n" @@ -2982,7 +2983,7 @@ msgstr "Schreiben der neuen Quellliste\n" #: apt-pkg/cdrom.cc:794 msgid "Source list entries for this disc are:\n" -msgstr "Quelllisteneinträge für diese Disk sind:\n" +msgstr "Quelllisteneinträge für dieses Medium sind:\n" #: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835 #, c-format @@ -3007,29 +3008,29 @@ msgstr "" "geschrieben.\n" #: apt-pkg/indexcopy.cc:530 -#, fuzzy, c-format +#, c-format msgid "Skipping nonexistent file %s" -msgstr "Öffne Konfigurationsdatei %s" +msgstr "Nicht vorhandene Datei %s wird übersprungen" #: apt-pkg/indexcopy.cc:536 #, c-format msgid "Can't find authentication record for: %s" -msgstr "" +msgstr "Authentifizierungs-Datensatz konnte nicht gefunden werden für: %s" #: apt-pkg/indexcopy.cc:542 -#, fuzzy, c-format +#, c-format msgid "Hash mismatch for: %s" -msgstr "Hash-Summe stimmt nicht überein" +msgstr "Hash-Summe stimmt nicht überein für: %s" #: apt-pkg/deb/dpkgpm.cc:49 #, c-format msgid "Installing %s" -msgstr "Installieren von %s" +msgstr "%s wird installiert" #: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661 #, c-format msgid "Configuring %s" -msgstr "Konfigurieren von %s" +msgstr "%s wird konfiguriert" #: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668 #, c-format @@ -3037,9 +3038,9 @@ msgid "Removing %s" msgstr "%s wird entfernt" #: apt-pkg/deb/dpkgpm.cc:52 -#, fuzzy, c-format +#, c-format msgid "Completely removing %s" -msgstr "%s vollständig entfernt" +msgstr "%s wird vollständig entfernt" #: apt-pkg/deb/dpkgpm.cc:53 #, c-format @@ -3094,8 +3095,8 @@ msgstr "%s vollständig entfernt" #: apt-pkg/deb/dpkgpm.cc:879 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -"Schreiben des Protokolls nicht möglich, openpty() schlug fehl (/dev/pts " -"nicht eingehangen?)\n" +"Schreiben des Protokolls nicht möglich, openpty() fehlgeschlagen (/dev/pts " +"nicht eingebunden?)\n" #: apt-pkg/deb/dpkgpm.cc:909 msgid "Running dpkg" @@ -3121,7 +3122,7 @@ msgid "" "dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct " "the problem. " msgstr "" -"Der dpkg-Prozess wurde abgebrochen; Sie müssen »dpkg --configure -a« manuell " +"Der dpkg-Prozess wurde unterbrochen; Sie müssen »dpkg --configure -a« manuell " "ausführen, um das Problem zu beheben." #: apt-pkg/deb/debsystem.cc:100 @@ -3134,6 +3135,8 @@ msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "" +"Patch konnte nicht mit mmap und unter Verwendung von Dateioperationen auf %s " +"angewendet werden - der Patch scheint beschädigt zu sein." #: methods/rred.cc:470 #, c-format @@ -3141,19 +3144,9 @@ msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " "to be corrupt." msgstr "" +"Patch konnte nicht mit mmap auf %s angewendet werden (es ist jedoch nichts " +"mmap-spezifisches fehlgeschlagen) - der Patch scheint beschädigt zu sein." #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Verbindung vorzeitig beendet" - -#~ msgid "Couldn't access keyring: '%s'" -#~ msgstr "Zugriff auf Schlüsselring nicht möglich: »%s«" - -#~ msgid "Could not patch file" -#~ msgstr "Datei konnte nicht gepatcht werden" - -#~ msgid " %4i %s\n" -#~ msgstr " %4i %s\n" - -#~ msgid "No source package '%s' picking '%s' instead\n" -#~ msgstr "Kein Quellpaket »%s«, wähle stattdessen »%s«\n" -- cgit v1.2.3 From a94263ba750c561ecf40241104970bc303cbc0b7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Thu, 25 Feb 2010 19:51:05 +0100 Subject: * cmdline/apt-mark: - don't crash if no arguments are given (Closes: #570962) --- cmdline/apt-mark | 4 ++++ debian/changelog | 2 ++ 2 files changed, 6 insertions(+) diff --git a/cmdline/apt-mark b/cmdline/apt-mark index 2326ece38..f4f6aa576 100755 --- a/cmdline/apt-mark +++ b/cmdline/apt-mark @@ -76,6 +76,10 @@ if __name__ == "__main__": help="print verbose status messages to stdout") (options, args) = parser.parse_args() + if not args: + parser.print_help() + sys.exit(1) + # get the state-file if not options.filename: STATE_FILE = apt_pkg.Config.FindDir("Dir::State") + "extended_states" diff --git a/debian/changelog b/debian/changelog index 2b5f6fd25..c59b81af5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ apt (0.7.26) UNRELEASED; urgency=low * Switch to dpkg-source 3.0 (native) format + * cmdline/apt-mark: + - don't crash if no arguments are given (Closes: #570962) -- David Kalnischkies <kalnischkies@gmail.com> Fri, 19 Feb 2010 21:21:43 +0100 -- cgit v1.2.3 From d1082b44827dc90ddeffb246f3eacfff387a9c5e Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 26 Feb 2010 20:19:06 +0100 Subject: * debian/control: - remove some years old and obsolete Replaces --- debian/changelog | 2 ++ debian/control | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c59b81af5..9fc481276 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ apt (0.7.26) UNRELEASED; urgency=low * Switch to dpkg-source 3.0 (native) format * cmdline/apt-mark: - don't crash if no arguments are given (Closes: #570962) + * debian/control: + - remove some years old and obsolete Replaces -- David Kalnischkies <kalnischkies@gmail.com> Fri, 19 Feb 2010 21:21:43 +0100 diff --git a/debian/control b/debian/control index de2bf6544..daff242f0 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,6 @@ Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Package: apt Architecture: any Depends: ${shlibs:Depends}, debian-archive-keyring, ${misc:Depends} -Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt Description: Advanced front-end for dpkg @@ -27,7 +26,6 @@ Package: apt-doc Architecture: all Priority: optional Depends: ${misc:Depends} -Replaces: apt (<< 0.5.4.9) Section: doc Description: Documentation for APT This package contains the user guide and offline guide, for APT, an @@ -56,7 +54,6 @@ Package: apt-utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Provides: ${libapt-inst:provides} -Replaces: apt (<< 0.5.9) Description: APT utility programs This package contains some APT utility programs such as apt-ftparchive, apt-sortpkgs and apt-extracttemplates. -- cgit v1.2.3 From 75ce206243e409b170d06723430eb85a4a747882 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 26 Feb 2010 20:47:19 +0100 Subject: move ShowPkg() from apt-get to the PkgIterator and rename it to FullName() responseable for displaying a package name and the architecture in a uniform way. Pretty option can be used to not append the architecture if it is the native architecture or all - and use it all over the place in the commandline tools. --- apt-pkg/cacheiterators.h | 1 + apt-pkg/pkgcache.cc | 12 ++++++++ cmdline/apt-cache.cc | 59 +++++++++++++++++------------------ cmdline/apt-get.cc | 80 ++++++++++++++++++++---------------------------- 4 files changed, 75 insertions(+), 77 deletions(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 43cbe1377..a64326a44 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -151,6 +151,7 @@ class pkgCache::PkgIterator: public Iterator<Package, PkgIterator> { //Nice printable representation friend std::ostream& operator <<(std::ostream& out, PkgIterator i); + std::string FullName(bool const &Pretty = false) const; // Constructors inline PkgIterator(pkgCache &Owner,Package *Trg) : Iterator<Package, PkgIterator>(Owner, Trg), HashIndex(0) { diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 29c27b58e..24d9e0329 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -445,6 +445,18 @@ operator<<(ostream& out, pkgCache::PkgIterator Pkg) return out; } /*}}}*/ +// PkgIterator::FullName - Returns Name and (maybe) Architecture /*{{{*/ +// --------------------------------------------------------------------- +/* Returns a name:arch string */ +std::string pkgCache::PkgIterator::FullName(bool const &Pretty) const +{ + string fullname = Name(); + if (Pretty == false || + (strcmp(Arch(), "all") != 0 && _config->Find("APT::Architecture") != Arch())) + return fullname.append(":").append(Arch()); + return fullname; +} + /*}}}*/ // DepIterator::IsCritical - Returns true if the dep is important /*{{{*/ // --------------------------------------------------------------------- /* Currently critical deps are defined as depends, predepends and diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 8323a740e..355e9aefb 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -139,7 +139,7 @@ bool UnMet(CommandLine &CmdL) // Oops, it failed.. if (Header == false) ioprintf(cout,_("Package %s version %s has an unmet dep:\n"), - P.Name(),V.VerStr()); + P.FullName(true).c_str(),V.VerStr()); Header = true; // Print out the dep type @@ -149,7 +149,7 @@ bool UnMet(CommandLine &CmdL) Start = RealStart; do { - cout << Start.TargetPkg().Name(); + cout << Start.TargetPkg().FullName(true); if (Start.TargetVer() != 0) cout << " (" << Start.CompType() << " " << Start.TargetVer() << ")"; @@ -182,7 +182,7 @@ bool DumpPackage(CommandLine &CmdL) continue; } - cout << "Package: " << Pkg.Name() << endl; + cout << "Package: " << Pkg.FullName(true) << endl; cout << "Versions: " << endl; for (pkgCache::VerIterator Cur = Pkg.VersionList(); Cur.end() != true; Cur++) { @@ -204,7 +204,7 @@ bool DumpPackage(CommandLine &CmdL) cout << "Reverse Depends: " << endl; for (pkgCache::DepIterator D = Pkg.RevDependsList(); D.end() != true; D++) { - cout << " " << D.ParentPkg().Name() << ',' << D.TargetPkg().Name(); + cout << " " << D.ParentPkg().FullName(true) << ',' << D.TargetPkg().FullName(true); if (D->Version != 0) cout << ' ' << DeNull(D.TargetVer()) << endl; else @@ -216,7 +216,7 @@ bool DumpPackage(CommandLine &CmdL) { cout << Cur.VerStr() << " - "; for (pkgCache::DepIterator Dep = Cur.DependsList(); Dep.end() != true; Dep++) - cout << Dep.TargetPkg().Name() << " (" << (int)Dep->CompareOp << " " << DeNull(Dep.TargetVer()) << ") "; + cout << Dep.TargetPkg().FullName(true) << " (" << (int)Dep->CompareOp << " " << DeNull(Dep.TargetVer()) << ") "; cout << endl; } @@ -225,12 +225,12 @@ bool DumpPackage(CommandLine &CmdL) { cout << Cur.VerStr() << " - "; for (pkgCache::PrvIterator Prv = Cur.ProvidesList(); Prv.end() != true; Prv++) - cout << Prv.ParentPkg().Name() << " "; + cout << Prv.ParentPkg().FullName(true) << " "; cout << endl; } cout << "Reverse Provides: " << endl; for (pkgCache::PrvIterator Prv = Pkg.ProvidesList(); Prv.end() != true; Prv++) - cout << Prv.OwnerPkg().Name() << " " << Prv.OwnerVer().VerStr() << endl; + cout << Prv.OwnerPkg().FullName(true) << " " << Prv.OwnerVer().VerStr() << endl; } return true; @@ -353,13 +353,13 @@ bool Dump(CommandLine &Cmd) for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++) { - cout << "Package: " << P.Name() << endl; + cout << "Package: " << P.FullName(true) << endl; for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; V++) { cout << " Version: " << V.VerStr() << endl; cout << " File: " << V.FileList().File().FileName() << endl; for (pkgCache::DepIterator D = V.DependsList(); D.end() == false; D++) - cout << " Depends: " << D.TargetPkg().Name() << ' ' << + cout << " Depends: " << D.TargetPkg().FullName(true) << ' ' << DeNull(D.TargetVer()) << endl; for (pkgCache::DescIterator D = V.DescriptionList(); D.end() == false; D++) { @@ -570,11 +570,11 @@ bool Depends(CommandLine &CmdL) pkgCache::VerIterator Ver = Pkg.VersionList(); if (Ver.end() == true) { - cout << '<' << Pkg.Name() << '>' << endl; + cout << '<' << Pkg.FullName(true) << '>' << endl; continue; } - cout << Pkg.Name() << endl; + cout << Pkg.FullName(true) << endl; for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++) { @@ -596,9 +596,9 @@ bool Depends(CommandLine &CmdL) // Show the package if (Trg->VersionList == 0) - cout << D.DepType() << ": <" << Trg.Name() << ">" << endl; + cout << D.DepType() << ": <" << Trg.FullName(true) << ">" << endl; else - cout << D.DepType() << ": " << Trg.Name() << endl; + cout << D.DepType() << ": " << Trg.FullName(true) << endl; if (Recurse == true) Colours[D.TargetPkg()->ID]++; @@ -614,7 +614,7 @@ bool Depends(CommandLine &CmdL) if (V != Cache.VerP + V.ParentPkg()->VersionList || V->ParentPkg == D->Package) continue; - cout << " " << V.ParentPkg().Name() << endl; + cout << " " << V.ParentPkg().FullName(true) << endl; if (Recurse == true) Colours[D.ParentPkg()->ID]++; @@ -663,11 +663,11 @@ bool RDepends(CommandLine &CmdL) pkgCache::VerIterator Ver = Pkg.VersionList(); if (Ver.end() == true) { - cout << '<' << Pkg.Name() << '>' << endl; + cout << '<' << Pkg.FullName(true) << '>' << endl; continue; } - cout << Pkg.Name() << endl; + cout << Pkg.FullName(true) << endl; cout << "Reverse Depends:" << endl; for (pkgCache::DepIterator D = Pkg.RevDependsList(); D.end() == false; D++) @@ -684,9 +684,9 @@ bool RDepends(CommandLine &CmdL) cout << " "; if (Trg->VersionList == 0) - cout << D.DepType() << ": <" << Trg.Name() << ">" << endl; + cout << D.DepType() << ": <" << Trg.FullName(true) << ">" << endl; else - cout << Trg.Name() << endl; + cout << Trg.FullName(true) << endl; if (Recurse == true) Colours[D.ParentPkg()->ID]++; @@ -702,7 +702,7 @@ bool RDepends(CommandLine &CmdL) if (V != Cache.VerP + V.ParentPkg()->VersionList || V->ParentPkg == D->Package) continue; - cout << " " << V.ParentPkg().Name() << endl; + cout << " " << V.ParentPkg().FullName(true) << endl; if (Recurse == true) Colours[D.ParentPkg()->ID]++; @@ -863,7 +863,7 @@ bool XVcg(CommandLine &CmdL) // Only graph critical deps if (D.IsCritical() == true) { - printf ("edge: { sourcename: \"%s\" targetname: \"%s\" class: 2 ",Pkg.Name(), D.TargetPkg().Name() ); + printf ("edge: { sourcename: \"%s\" targetname: \"%s\" class: 2 ",Pkg.FullName(true).c_str(), D.TargetPkg().FullName(true).c_str() ); // Colour the node for recursion if (Show[D.TargetPkg()->ID] <= DoneNR) @@ -922,10 +922,10 @@ bool XVcg(CommandLine &CmdL) continue; if (Show[Pkg->ID] == DoneNR) - printf("node: { title: \"%s\" label: \"%s\" color: orange shape: %s }\n", Pkg.Name(), Pkg.Name(), + printf("node: { title: \"%s\" label: \"%s\" color: orange shape: %s }\n", Pkg.FullName(true).c_str(), Pkg.FullName(true).c_str(), Shapes[ShapeMap[Pkg->ID]]); else - printf("node: { title: \"%s\" label: \"%s\" shape: %s }\n", Pkg.Name(), Pkg.Name(), + printf("node: { title: \"%s\" label: \"%s\" shape: %s }\n", Pkg.FullName(true).c_str(), Pkg.FullName(true).c_str(), Shapes[ShapeMap[Pkg->ID]]); } @@ -1084,7 +1084,7 @@ bool Dotty(CommandLine &CmdL) // Only graph critical deps if (D.IsCritical() == true) { - printf("\"%s\" -> \"%s\"",Pkg.Name(),D.TargetPkg().Name()); + printf("\"%s\" -> \"%s\"",Pkg.FullName(true).c_str(),D.TargetPkg().FullName(true).c_str()); // Colour the node for recursion if (Show[D.TargetPkg()->ID] <= DoneNR) @@ -1138,10 +1138,10 @@ bool Dotty(CommandLine &CmdL) // Orange box for early recursion stoppage if (Show[Pkg->ID] == DoneNR) - printf("\"%s\" [color=orange,shape=%s];\n",Pkg.Name(), + printf("\"%s\" [color=orange,shape=%s];\n",Pkg.FullName(true).c_str(), Shapes[ShapeMap[Pkg->ID]]); else - printf("\"%s\" [shape=%s];\n",Pkg.Name(), + printf("\"%s\" [shape=%s];\n",Pkg.FullName(true).c_str(), Shapes[ShapeMap[Pkg->ID]]); } @@ -1561,7 +1561,7 @@ bool Policy(CommandLine &CmdL) continue; // Print the package name and the version we are forcing to - cout << " " << I.Name() << " -> "; + cout << " " << I.FullName(true) << " -> "; pkgCache::VerIterator V = Plcy.GetMatch(I); if (V.end() == true) @@ -1590,10 +1590,7 @@ bool Policy(CommandLine &CmdL) if (strcmp(Pkg.Arch(),"all") == 0) continue; - if (myArch == Pkg.Arch()) - cout << Pkg.Name() << ":" << endl; - else - cout << Pkg.Name() << ": [" << Pkg.Arch() << "]" << endl; + cout << Pkg.FullName(true) << ":" << endl; // Installed version cout << _(" Installed: "); @@ -1691,7 +1688,7 @@ bool Madison(CommandLine &CmdL) { if ((*IF)->FindInCache(*(VF.File().Cache())) == VF.File()) { - cout << setw(10) << Pkg.Name() << " | " << setw(10) << V.VerStr() << " | " + cout << setw(10) << Pkg.FullName(true) << " | " << setw(10) << V.VerStr() << " | " << (*IF)->Describe(true) << endl; } } diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index c8c733716..4596c3d61 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -227,17 +227,6 @@ bool ShowList(ostream &out,string Title,string List,string VersionsList) return false; } /*}}}*/ -// ShowPkg - display a package name /*{{{*/ -// --------------------------------------------------------------------- -/* Displays the package name and maybe also the architecture - if it is not the main architecture */ -string ShowPkg(pkgCache::PkgIterator const Pkg) { - string p = Pkg.Name(); - if (strcmp(Pkg.Arch(),"all") != 0 && _config->Find("APT::Architecture") != Pkg.Arch()) - p.append(":").append(Pkg.Arch()); - return p; -} - /*}}}*/ // ShowBroken - Debugging aide /*{{{*/ // --------------------------------------------------------------------- /* This prints out the names of all the packages that are broken along @@ -269,8 +258,8 @@ void ShowBroken(ostream &out,CacheFile &Cache,bool Now) } // Print out each package and the failed dependencies - out << " " << ShowPkg(I) << " :"; - unsigned const Indent = ShowPkg(I).size() + 3; + out << " " << I.FullName(true) << " :"; + unsigned const Indent = I.FullName(true).size() + 3; bool First = true; pkgCache::VerIterator Ver; @@ -323,7 +312,7 @@ void ShowBroken(ostream &out,CacheFile &Cache,bool Now) out << ' ' << End.DepType() << ": "; FirstOr = false; - out << ShowPkg(Start.TargetPkg()); + out << Start.TargetPkg().FullName(true); // Show a quick summary of the version requirements if (Start.TargetVer() != 0) @@ -387,7 +376,7 @@ void ShowNew(ostream &out,CacheFile &Cache) if (Cache[I].NewInstall() == true) { if (Cache[I].CandidateVerIter(Cache).Pseudo() == true) continue; - List += ShowPkg(I) + " "; + List += I.FullName(true) + " "; VersionsList += string(Cache[I].CandVersion) + "\n"; } } @@ -412,9 +401,9 @@ void ShowDel(ostream &out,CacheFile &Cache) if (Cache[I].CandidateVerIter(Cache).Pseudo() == true) continue; if ((Cache[I].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge) - List += ShowPkg(I) + "* "; + List += I.FullName(true) + "* "; else - List += ShowPkg(I) + " "; + List += I.FullName(true) + " "; VersionsList += string(Cache[I].CandVersion)+ "\n"; } @@ -439,7 +428,7 @@ void ShowKept(ostream &out,CacheFile &Cache) I->CurrentVer == 0 || Cache[I].Delete() == true) continue; - List += ShowPkg(I) + " "; + List += I.FullName(true) + " "; VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; } ShowList(out,_("The following packages have been kept back:"),List,VersionsList); @@ -462,7 +451,7 @@ void ShowUpgraded(ostream &out,CacheFile &Cache) if (Cache[I].CandidateVerIter(Cache).Pseudo() == true) continue; - List += ShowPkg(I) + " "; + List += I.FullName(true) + " "; VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; } ShowList(out,_("The following packages will be upgraded:"),List,VersionsList); @@ -485,7 +474,7 @@ bool ShowDowngraded(ostream &out,CacheFile &Cache) if (Cache[I].CandidateVerIter(Cache).Pseudo() == true) continue; - List += ShowPkg(I) + " "; + List += I.FullName(true) + " "; VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; } return ShowList(out,_("The following packages will be DOWNGRADED:"),List,VersionsList); @@ -503,7 +492,7 @@ bool ShowHold(ostream &out,CacheFile &Cache) pkgCache::PkgIterator I(Cache,Cache.List[J]); if (Cache[I].InstallVer != (pkgCache::Version *)I.CurrentVer() && I->SelectedState == pkgCache::State::Hold) { - List += ShowPkg(I) + " "; + List += I.FullName(true) + " "; VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; } } @@ -537,7 +526,7 @@ bool ShowEssential(ostream &out,CacheFile &Cache) if (Added[I->ID] == false) { Added[I->ID] = true; - List += ShowPkg(I) + " "; + List += I.FullName(true) + " "; //VersionsList += string(Cache[I].CurVersion) + "\n"; ??? } } @@ -561,7 +550,7 @@ bool ShowEssential(ostream &out,CacheFile &Cache) Added[P->ID] = true; char S[300]; - snprintf(S,sizeof(S),_("%s (due to %s) "),P.Name(),I.Name()); + snprintf(S,sizeof(S),_("%s (due to %s) "),P.FullName(true).c_str(),I.FullName(true).c_str()); List += S; //VersionsList += "\n"; ??? } @@ -1106,7 +1095,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, if (found_one == true) { ioprintf(c1out,_("Note, selecting %s instead of %s\n"), - Prov.Name(),Pkg.Name()); + Prov.FullName(true).c_str(),Pkg.FullName(true).c_str()); Pkg = Prov; } } @@ -1117,7 +1106,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, { if (AllowFail == true) ioprintf(c1out,_("Skipping %s, it is already installed and upgrade is not set.\n"), - Pkg.Name()); + Pkg.FullName(true).c_str()); return true; } @@ -1134,7 +1123,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, if (AllowFail == false) return false; - ioprintf(c1out,_("Package %s is not installed, so not removed\n"),Pkg.Name()); + ioprintf(c1out,_("Package %s is not installed, so not removed\n"),Pkg.FullName(true).c_str()); return true; } @@ -1146,7 +1135,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, if (Pkg->ProvidesList != 0) { ioprintf(c1out,_("Package %s is a virtual package provided by:\n"), - Pkg.Name()); + Pkg.FullName(true).c_str()); pkgCache::PrvIterator I = Pkg.ProvidesList(); for (; I.end() == false; I++) @@ -1156,10 +1145,10 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, if (Cache[Pkg].CandidateVerIter(Cache) == I.OwnerVer()) { if (Cache[Pkg].Install() == true && Cache[Pkg].NewInstall() == false) - c1out << " " << Pkg.Name() << " " << I.OwnerVer().VerStr() << + c1out << " " << Pkg.FullName(true) << " " << I.OwnerVer().VerStr() << _(" [Installed]") << endl; else - c1out << " " << Pkg.Name() << " " << I.OwnerVer().VerStr() << endl; + c1out << " " << Pkg.FullName(true) << " " << I.OwnerVer().VerStr() << endl; } } c1out << _("You should explicitly select one to install.") << endl; @@ -1169,7 +1158,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, ioprintf(c1out, _("Package %s is not available, but is referred to by another package.\n" "This may mean that the package is missing, has been obsoleted, or\n" - "is only available from another source\n"),Pkg.Name()); + "is only available from another source\n"),Pkg.FullName(true).c_str()); string List; string VersionsList; @@ -1183,13 +1172,13 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, if (Seen[Dep.ParentPkg()->ID] == true) continue; Seen[Dep.ParentPkg()->ID] = true; - List += string(Dep.ParentPkg().Name()) + " "; + List += Dep.ParentPkg().FullName(true) + " "; //VersionsList += string(Dep.ParentPkg().CurVersion) + "\n"; ??? } ShowList(c1out,_("However the following packages replace it:"),List,VersionsList); } - _error->Error(_("Package %s has no installation candidate"),Pkg.Name()); + _error->Error(_("Package %s has no installation candidate"),Pkg.FullName(true).c_str()); return false; } @@ -1210,7 +1199,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, { if (Pkg->CurrentVer == 0 || Pkg.CurrentVer().Downloadable() == false) ioprintf(c1out,_("Reinstallation of %s is not possible, it cannot be downloaded.\n"), - Pkg.Name()); + Pkg.FullName(true).c_str()); else Cache.SetReInstall(Pkg,true); } @@ -1218,7 +1207,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, { if (AllowFail == true) ioprintf(c1out,_("%s is already the newest version.\n"), - Pkg.Name()); + Pkg.FullName(true).c_str()); } } else @@ -1247,15 +1236,15 @@ bool TryToChangeVer(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, { if (IsRel == true) return _error->Error(_("Release '%s' for '%s' was not found"), - VerTag,Pkg.Name()); + VerTag,Pkg.FullName(true).c_str()); return _error->Error(_("Version '%s' for '%s' was not found"), - VerTag,Pkg.Name()); + VerTag,Pkg.FullName(true).c_str()); } if (strcmp(VerTag,Ver.VerStr()) != 0) { ioprintf(c1out,_("Selected version %s (%s) for %s\n"), - Ver.VerStr(),Ver.RelStr().c_str(),Pkg.Name()); + Ver.VerStr(),Ver.RelStr().c_str(),Pkg.FullName(true).c_str()); } Cache.SetCandidateVersion(Ver); @@ -1511,7 +1500,7 @@ bool DoAutomaticRemove(CacheFile &Cache) { if(Pkg.CurrentVer() != 0 || Cache[Pkg].Install()) if(Debug) - std::cout << "We could delete %s" << Pkg.Name() << std::endl; + std::cout << "We could delete %s" << Pkg.FullName(true).c_str() << std::endl; if (doAutoRemove) { @@ -1530,7 +1519,7 @@ bool DoAutomaticRemove(CacheFile &Cache) // we don't need to fill the strings if we don't need them if (smallList == false) { - autoremovelist += string(Pkg.Name()) + " "; + autoremovelist += Pkg.FullName(true) + " "; autoremoveversions += string(Cache[Pkg].CandVersion) + "\n"; } } @@ -1804,7 +1793,7 @@ bool DoInstall(CommandLine &CmdL) _config->FindB("APT::Get::Download-Only",false) == false) { ioprintf(c1out,_("%s set to manually installed.\n"), - Pkg.Name()); + Pkg.FullName(true).c_str()); Cache->MarkAuto(Pkg,false); AutoMarkChanged++; } @@ -1873,7 +1862,7 @@ bool DoInstall(CommandLine &CmdL) break; if (*J == 0) { - List += string(I.Name()) + " "; + List += I.FullName(true) + " "; VersionsList += string(Cache[I].CandVersion) + "\n"; } } @@ -1909,7 +1898,7 @@ bool DoInstall(CommandLine &CmdL) for(;;) { /* Skip if package is installed already, or is about to be */ - string target = string(Start.TargetPkg().Name()) + " "; + string target = Start.TargetPkg().FullName(true) + " "; if ((*Start.TargetPkg()).SelectedState == pkgCache::State::Install || Cache[Start.TargetPkg()].Install()) @@ -2559,7 +2548,7 @@ bool DoBuildDep(CommandLine &CmdL) for (; Prv.end() != true; Prv++) { if (_config->FindB("Debug::BuildDeps",false) == true) - cout << " Checking provider " << Prv.OwnerPkg().Name() << endl; + cout << " Checking provider " << Prv.OwnerPkg().FullName() << endl; if ((*Cache)[Prv.OwnerPkg()].InstVerIter(*Cache).end() == false) break; @@ -2600,7 +2589,7 @@ bool DoBuildDep(CommandLine &CmdL) if (Prv.end() == false) { if (_config->FindB("Debug::BuildDeps",false) == true) - cout << " Is provided by installed package " << Prv.OwnerPkg().Name() << endl; + cout << " Is provided by installed package " << Prv.OwnerPkg().FullName() << endl; skipAlternatives = hasAlternatives; continue; } @@ -2625,7 +2614,7 @@ bool DoBuildDep(CommandLine &CmdL) return _error->Error(_("Failed to satisfy %s dependency for %s: Installed package %s is too new"), Last->BuildDepType((*D).Type), Src.c_str(), - Pkg.Name()); + Pkg.FullName(true).c_str()); } } @@ -2674,7 +2663,6 @@ bool DoBuildDep(CommandLine &CmdL) return true; } /*}}}*/ - // DoMoo - Never Ask, Never Tell /*{{{*/ // --------------------------------------------------------------------- /* */ -- cgit v1.2.3 From 06afffcc24f339e8735acd4698af6e5995ad24aa Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 27 Feb 2010 02:02:25 +0100 Subject: =?UTF-8?q?*=20apt-pkg/contrib/mmap.{h,cc}:=20=20=20-=20add=20char?= =?UTF-8?q?[]=20fallback=20for=20filesystems=20without=20shared=20writable?= =?UTF-8?q?=20=20=20=20=20mmap()=20like=20JFFS2.=20Thanks=20to=20Marius=20?= =?UTF-8?q?Vollmer=20for=20writing=20=20=20=20=20and=20to=20Lo=C3=AFc=20Mi?= =?UTF-8?q?nier=20for=20pointing=20to=20the=20patch!=20(Closes:=20#314334)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apt-pkg/contrib/mmap.cc | 70 +++++++++++++++++++++++++++++++++++++++++-------- apt-pkg/contrib/mmap.h | 5 ++++ debian/changelog | 4 +++ 3 files changed, 68 insertions(+), 11 deletions(-) diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index f440f9489..b3f29032c 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -27,6 +27,7 @@ #include <unistd.h> #include <fcntl.h> #include <stdlib.h> +#include <errno.h> #include <cstring> /*}}}*/ @@ -35,7 +36,7 @@ // --------------------------------------------------------------------- /* */ MMap::MMap(FileFd &F,unsigned long Flags) : Flags(Flags), iSize(0), - Base(0) + Base(0), SyncToFd(NULL) { if ((Flags & NoImmMap) != NoImmMap) Map(F); @@ -45,7 +46,7 @@ MMap::MMap(FileFd &F,unsigned long Flags) : Flags(Flags), iSize(0), // --------------------------------------------------------------------- /* */ MMap::MMap(unsigned long Flags) : Flags(Flags), iSize(0), - Base(0) + Base(0), SyncToFd(NULL) { } /*}}}*/ @@ -78,7 +79,24 @@ bool MMap::Map(FileFd &Fd) // Map it. Base = mmap(0,iSize,Prot,Map,Fd.Fd(),0); if (Base == (void *)-1) - return _error->Errno("mmap",_("Couldn't make mmap of %lu bytes"),iSize); + { + if (errno == ENODEV || errno == EINVAL) + { + // The filesystem doesn't support this particular kind of mmap. + // So we allocate a buffer and read the whole file into it. + int const dupped_fd = dup(Fd.Fd()); + if (dupped_fd == -1) + return _error->Errno("mmap", _("Couldn't duplicate file descriptor %i"), Fd.Fd()); + + Base = new unsigned char[iSize]; + SyncToFd = new FileFd (dupped_fd); + if (!SyncToFd->Seek(0L) || !SyncToFd->Read(Base, iSize)) + return false; + } + else + return _error->Errno("mmap",_("Couldn't make mmap of %lu bytes"), + iSize); + } return true; } @@ -93,10 +111,19 @@ bool MMap::Close(bool DoSync) if (DoSync == true) Sync(); - - if (munmap((char *)Base,iSize) != 0) - _error->Warning("Unable to munmap"); - + + if (SyncToFd != NULL) + { + delete[] (char *)Base; + delete SyncToFd; + SyncToFd = NULL; + } + else + { + if (munmap((char *)Base, iSize) != 0) + _error->WarningE("mmap", _("Unable to close mmap")); + } + iSize = 0; Base = 0; return true; @@ -113,8 +140,18 @@ bool MMap::Sync() #ifdef _POSIX_SYNCHRONIZED_IO if ((Flags & ReadOnly) != ReadOnly) - if (msync((char *)Base,iSize,MS_SYNC) < 0) - return _error->Errno("msync","Unable to write mmap"); + { + if (SyncToFd != NULL) + { + if (!SyncToFd->Seek(0) || !SyncToFd->Write(Base, iSize)) + return false; + } + else + { + if (msync((char *)Base, iSize, MS_SYNC) < 0) + return _error->Errno("msync", _("Unable to synchronize mmap")); + } + } #endif return true; } @@ -130,8 +167,19 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop) #ifdef _POSIX_SYNCHRONIZED_IO unsigned long PSize = sysconf(_SC_PAGESIZE); if ((Flags & ReadOnly) != ReadOnly) - if (msync((char *)Base+(int)(Start/PSize)*PSize,Stop - Start,MS_SYNC) < 0) - return _error->Errno("msync","Unable to write mmap"); + { + if (SyncToFd != 0) + { + if (!SyncToFd->Seek(0) || + !SyncToFd->Write (((char *)Base)+Start, Stop-Start)) + return false; + } + else + { + if (msync((char *)Base+(int)(Start/PSize)*PSize,Stop - Start,MS_SYNC) < 0) + return _error->Errno("msync", _("Unable to synchronize mmap")); + } + } #endif return true; } diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h index cd2b15ba2..5ca951204 100644 --- a/apt-pkg/contrib/mmap.h +++ b/apt-pkg/contrib/mmap.h @@ -44,6 +44,11 @@ class MMap unsigned long iSize; void *Base; + // In case mmap can not be used, we keep a dup of the file + // descriptor that should have been mmaped so that we can write to + // the file in Sync(). + FileFd *SyncToFd; + bool Map(FileFd &Fd); bool Close(bool DoSync = true); diff --git a/debian/changelog b/debian/changelog index 9fc481276..39cc70da9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,10 @@ apt (0.7.26) UNRELEASED; urgency=low - don't crash if no arguments are given (Closes: #570962) * debian/control: - remove some years old and obsolete Replaces + * apt-pkg/contrib/mmap.{h,cc}: + - add char[] fallback for filesystems without shared writable + mmap() like JFFS2. Thanks to Marius Vollmer for writing + and to Loïc Minier for pointing to the patch! (Closes: #314334) -- David Kalnischkies <kalnischkies@gmail.com> Fri, 19 Feb 2010 21:21:43 +0100 -- cgit v1.2.3 From 9d9f7bf85dfe6e8b4de2dbb0158ef32830293259 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sat, 27 Feb 2010 07:23:30 +0100 Subject: Correct translation error --- po/fr.po | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/po/fr.po b/po/fr.po index 3b5bb2837..eaf56d22e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,9 +9,9 @@ msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-01-11 15:17+0100\n" -"PO-Revision-Date: 2010-01-29 19:53+0100\n" +"PO-Revision-Date: 2010-02-27 07:22+0100\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" -"Language-Team: French <debian-l10n-french@lists.debian.org>\n" +"Language-Team: fr <debian-l10n-french@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -1275,8 +1275,7 @@ msgstr "Impossible de satisfaire les dépendances %s pour %s : %s" #: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "" -"Les dépendances de compilation pour %s ne peuvent pas être satisfaites." +msgstr "Les dépendances de compilation pour %s ne peuvent pas être satisfaites." #: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" @@ -2385,7 +2384,7 @@ msgstr "Le sous-processus %s s'est arrêté prématurément" #: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" -msgstr "Impossible de verrouiller %s" +msgstr "Impossible d'ouvrir le fichier %s" #: apt-pkg/contrib/fileutl.cc:688 #, c-format @@ -2845,8 +2844,7 @@ msgstr "Somme de contrôle de hachage incohérente" #: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" -msgstr "" -"Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n" +msgstr "Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n" #: apt-pkg/acquire-item.cc:1260 #, c-format -- cgit v1.2.3 From b2da30953052730d225c4d0681f2624a7edebe9b Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sat, 27 Feb 2010 07:25:20 +0100 Subject: Correct translation error --- po/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index eaf56d22e..26c52fe3c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-01-11 15:17+0100\n" -"PO-Revision-Date: 2010-02-27 07:22+0100\n" +"PO-Revision-Date: 2010-02-27 07:25+0100\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: fr <debian-l10n-french@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -2354,7 +2354,7 @@ msgstr "Verrou non utilisé pour le fichier %s se situant sur une partition nfs" #: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" -msgstr "Impossible de verrouiller %s" +msgstr "Impossible d'obtenir le verrou %s" #: apt-pkg/contrib/fileutl.cc:568 #, c-format -- cgit v1.2.3 From e0b94b97b179812e5a0b3b72ea9fcae106d545c5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 27 Feb 2010 17:01:12 +0100 Subject: Enable the AutoRemover to talk "Multi-Arch" by marking all pseudo packages in a group if one is marked. The auto-installed flag is from now on Architecture bound: A section without an architecture tag will be treated as applying to all architectures - the next write operation will take care of this by creating separate sections for the architectures. --- apt-pkg/depcache.cc | 170 +++++++++++++++++++++++++++++++++------------------- apt-pkg/depcache.h | 4 +- 2 files changed, 109 insertions(+), 65 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index eeb74a434..45c614c6f 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -165,34 +165,46 @@ bool pkgDepCache::Init(OpProgress *Prog) bool pkgDepCache::readStateFile(OpProgress *Prog) /*{{{*/ { FileFd state_file; - string state = _config->FindDir("Dir::State") + "extended_states"; + string const state = _config->FindDir("Dir::State") + "extended_states"; if(FileExists(state)) { state_file.Open(state, FileFd::ReadOnly); - int file_size = state_file.Size(); + int const file_size = state_file.Size(); if(Prog != NULL) Prog->OverallProgress(0, file_size, 1, _("Reading state information")); pkgTagFile tagfile(&state_file); pkgTagSection section; - int amt=0; - bool debug_autoremove=_config->FindB("Debug::pkgAutoRemove",false); + int amt = 0; + bool const debug_autoremove = _config->FindB("Debug::pkgAutoRemove",false); while(tagfile.Step(section)) { - string pkgname = section.FindS("Package"); - pkgCache::PkgIterator pkg=Cache->FindPkg(pkgname); - // Silently ignore unknown packages and packages with no actual - // version. - if(!pkg.end() && !pkg.VersionList().end()) { - short reason = section.FindI("Auto-Installed", 0); - if(reason > 0) - PkgState[pkg->ID].Flags |= Flag::Auto; - if(debug_autoremove) - std::cout << "Auto-Installed : " << pkgname << std::endl; - amt+=section.size(); - if(Prog != NULL) - Prog->OverallProgress(amt, file_size, 1, - _("Reading state information")); + string const pkgname = section.FindS("Package"); + string pkgarch = section.FindS("Architecture"); + if (pkgarch.empty() == true) + pkgarch = "any"; + pkgCache::PkgIterator pkg = Cache->FindPkg(pkgname, pkgarch); + // Silently ignore unknown packages and packages with no actual version. + if(pkg.end() == true || pkg->VersionList == 0) + continue; + + short const reason = section.FindI("Auto-Installed", 0); + if(reason > 0) + { + PkgState[pkg->ID].Flags |= Flag::Auto; + if (unlikely(debug_autoremove)) + std::cout << "Auto-Installed : " << pkg.FullName() << std::endl; + if (pkgarch == "any") + { + pkgCache::GrpIterator G = pkg.Group(); + for (pkg = G.NextPkg(pkg); pkg.end() != true; pkg = G.NextPkg(pkg)) + if (pkg->VersionList != 0) + PkgState[pkg->ID].Flags |= Flag::Auto; + } } + amt += section.size(); + if(Prog != NULL) + Prog->OverallProgress(amt, file_size, 1, + _("Reading state information")); } if(Prog != NULL) Prog->OverallProgress(file_size, file_size, 1, @@ -204,13 +216,13 @@ bool pkgDepCache::readStateFile(OpProgress *Prog) /*{{{*/ /*}}}*/ bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly) /*{{{*/ { - bool debug_autoremove = _config->FindB("Debug::pkgAutoRemove",false); + bool const debug_autoremove = _config->FindB("Debug::pkgAutoRemove",false); if(debug_autoremove) std::clog << "pkgDepCache::writeStateFile()" << std::endl; FileFd StateFile; - string state = _config->FindDir("Dir::State") + "extended_states"; + string const state = _config->FindDir("Dir::State") + "extended_states"; // if it does not exist, create a empty one if(!FileExists(state)) @@ -225,7 +237,7 @@ bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly) /*{{{*/ state.c_str()); FILE *OutFile; - string outfile = state + ".tmp"; + string const outfile = state + ".tmp"; if((OutFile = fopen(outfile.c_str(),"w")) == NULL) return _error->Error(_("Failed to write temporary StateFile %s"), outfile.c_str()); @@ -236,46 +248,54 @@ bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly) /*{{{*/ std::set<string> pkgs_seen; const char *nullreorderlist[] = {0}; while(tagfile.Step(section)) { - string pkgname = section.FindS("Package"); + string const pkgname = section.FindS("Package"); + string pkgarch = section.FindS("Architecture"); + if (pkgarch.empty() == true) + pkgarch = "native"; // Silently ignore unknown packages and packages with no actual // version. - pkgCache::PkgIterator pkg=Cache->FindPkg(pkgname); + pkgCache::PkgIterator pkg = Cache->FindPkg(pkgname, pkgarch); if(pkg.end() || pkg.VersionList().end()) continue; - bool newAuto = (PkgState[pkg->ID].Flags & Flag::Auto); + bool const newAuto = (PkgState[pkg->ID].Flags & Flag::Auto); if(_config->FindB("Debug::pkgAutoRemove",false)) std::clog << "Update existing AutoInstall info: " - << pkg.Name() << std::endl; - TFRewriteData rewrite[2]; - rewrite[0].Tag = "Auto-Installed"; - rewrite[0].Rewrite = newAuto ? "1" : "0"; + << pkg.FullName() << std::endl; + TFRewriteData rewrite[3]; + rewrite[0].Tag = "Architecture"; + rewrite[0].Rewrite = pkg.Arch(); rewrite[0].NewTag = 0; - rewrite[1].Tag = 0; + rewrite[1].Tag = "Auto-Installed"; + rewrite[1].Rewrite = newAuto ? "1" : "0"; + rewrite[1].NewTag = 0; + rewrite[2].Tag = 0; TFRewrite(OutFile, section, nullreorderlist, rewrite); fprintf(OutFile,"\n"); - pkgs_seen.insert(pkgname); + pkgs_seen.insert(pkg.FullName()); } // then write the ones we have not seen yet std::ostringstream ostr; for(pkgCache::PkgIterator pkg=Cache->PkgBegin(); !pkg.end(); pkg++) { if(PkgState[pkg->ID].Flags & Flag::Auto) { - if (pkgs_seen.find(pkg.Name()) != pkgs_seen.end()) { + if (pkgs_seen.find(pkg.FullName()) != pkgs_seen.end()) { if(debug_autoremove) - std::clog << "Skipping already written " << pkg.Name() << std::endl; + std::clog << "Skipping already written " << pkg.FullName() << std::endl; continue; } - // skip not installed ones if requested - if(InstalledOnly && pkg->CurrentVer == 0) - continue; + // skip not installed ones if requested + if(InstalledOnly && pkg->CurrentVer == 0) + continue; + const char* const pkgarch = pkg.Arch(); + if (strcmp(pkgarch, "all") == 0) + continue; if(debug_autoremove) - std::clog << "Writing new AutoInstall: " - << pkg.Name() << std::endl; + std::clog << "Writing new AutoInstall: " << pkg.FullName() << std::endl; ostr.str(string("")); - ostr << "Package: " << pkg.Name() + ostr << "Package: " << pkg.Name() + << "\nArchitecture: " << pkgarch << "\nAuto-Installed: 1\n\n"; fprintf(OutFile,"%s",ostr.str().c_str()); - fprintf(OutFile,"\n"); } } fclose(OutFile); @@ -1426,7 +1446,7 @@ bool pkgDepCache::MarkRequired(InRootSetFunc &userFunc) // debug output if(debug_autoremove && PkgState[p->ID].Flags & Flag::Auto) - std::clog << "AutoDep: " << p.Name() << std::endl; + std::clog << "AutoDep: " << p.FullName() << std::endl; } // init vars @@ -1460,13 +1480,18 @@ bool pkgDepCache::MarkRequired(InRootSetFunc &userFunc) // MarkPackage - mark a single package in Mark-and-Sweep /*{{{*/ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, const pkgCache::VerIterator &ver, - bool follow_recommends, - bool follow_suggests) + bool const &follow_recommends, + bool const &follow_suggests) { pkgDepCache::StateCache &state = PkgState[pkg->ID]; - VerIterator currver = pkg.CurrentVer(); - VerIterator candver = state.CandidateVerIter(*this); - VerIterator instver = state.InstVerIter(*this); + + // if we are marked already we are done + if(state.Marked) + return; + + VerIterator const currver = pkg.CurrentVer(); + VerIterator const candver = state.CandidateVerIter(*this); + VerIterator const instver = state.InstVerIter(*this); #if 0 // If a package was garbage-collected but is now being marked, we @@ -1492,15 +1517,11 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, !(ver == currver && instver.end() && !ver.end())) return; - // if we are marked already we are done - if(state.Marked) - return; + bool const debug_autoremove = _config->FindB("Debug::pkgAutoRemove", false); - bool debug_autoremove = _config->FindB("Debug::pkgAutoRemove", false); - if(debug_autoremove) { - std::clog << "Marking: " << pkg.Name(); + std::clog << "Marking: " << pkg.FullName(); if(!ver.end()) std::clog << " " << ver.VerStr(); if(!currver.end()) @@ -1512,8 +1533,34 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, state.Marked=true; - if(!ver.end()) + if(ver.end() == true) + return; + + // If the version belongs to a Multi-Arch all package + // we will mark all others in this Group with this version also + // Beware: We compare versions here the lazy way: string comparision + // this is bad if multiple repositories provide different versions + // of the package with an identical version number - but even in this + // case the dependencies are likely the same. + if (ver->MultiArch == pkgCache::Version::All && + strcmp(ver.Arch(true), "all") == 0) { + GrpIterator G = pkg.Group(); + const char* const VerStr = ver.VerStr(); + for (PkgIterator P = G.FindPkg("any"); + P.end() != true; P = G.NextPkg(P)) + { + for (VerIterator V = P.VersionList(); + V.end() != true; ++V) + { + if (strcmp(VerStr, V.VerStr()) != 0) + continue; + MarkPackage(P, V, follow_recommends, follow_suggests); + break; + } + } + } + for(DepIterator d = ver.DependsList(); !d.end(); ++d) { if(d->Type == Dep::Depends || @@ -1531,10 +1578,9 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, { if(debug_autoremove) { - std::clog << "Following dep: " << d.ParentPkg().Name() + std::clog << "Following dep: " << d.ParentPkg().FullName() << " " << d.ParentVer().VerStr() << " " - << d.DepType() << " " - << d.TargetPkg().Name(); + << d.DepType() << " " << d.TargetPkg().FullName(); if((d->CompareOp & ~pkgCache::Dep::Or) != pkgCache::Dep::NoOp) { std::clog << " (" << d.CompType() << " " @@ -1542,7 +1588,7 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, } std::clog << std::endl; } - MarkPackage(V.ParentPkg(), V, + MarkPackage(V.ParentPkg(), V, follow_recommends, follow_suggests); } } @@ -1555,17 +1601,16 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, { if(debug_autoremove) { - std::clog << "Following dep: " << d.ParentPkg().Name() - << " " << d.ParentVer().VerStr() << " " - << d.DepType() << " " - << d.TargetPkg().Name(); + std::clog << "Following dep: " << d.ParentPkg().FullName() << " " + << d.ParentVer().VerStr() << " " + << d.DepType() << " " << d.TargetPkg().FullName() << " "; if((d->CompareOp & ~pkgCache::Dep::Or) != pkgCache::Dep::NoOp) { std::clog << " (" << d.CompType() << " " << d.TargetVer() << ")"; } std::clog << ", provided by " - << prv.OwnerPkg().Name() << " " + << prv.OwnerPkg().FullName() << " " << prv.OwnerVer().VerStr() << std::endl; } @@ -1576,7 +1621,6 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, } } } - } } /*}}}*/ bool pkgDepCache::Sweep() /*{{{*/ @@ -1598,7 +1642,7 @@ bool pkgDepCache::Sweep() /*{{{*/ { state.Garbage=true; if(debug_autoremove) - std::cout << "Garbage: " << p.Name() << std::endl; + std::cout << "Garbage: " << p.FullName() << std::endl; } } diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index ab1021a44..23b29cc13 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -79,8 +79,8 @@ class pkgDepCache : protected pkgCache::Namespace */ void MarkPackage(const pkgCache::PkgIterator &pkg, const pkgCache::VerIterator &ver, - bool follow_recommends, - bool follow_suggests); + bool const &follow_recommends, + bool const &follow_suggests); /** \brief Update the Marked field of all packages. * -- cgit v1.2.3 From b07740deb6debca95441a90f4bfd89f497ad36f4 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sun, 28 Feb 2010 11:18:34 +0100 Subject: Completed translation --- po/de.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 0d5653554..17d4c9b24 100644 --- a/po/de.po +++ b/po/de.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-01-11 15:17+0100\n" -"PO-Revision-Date: 2010-02-23 00:00+0100\n" +"PO-Revision-Date: 2010-02-27 13:17+0100\n" "Last-Translator: Holger Wansing <linux@wansing-online.de>\n" "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -2186,6 +2186,8 @@ msgid "" "The size of a MMap has already reached the defined limit of %lu bytes,abort " "the try to grow the MMap." msgstr "" +"Die MMap-Größe hat bereits das festgelegte Limit von %lu Byte erreicht. Der " +"Versuch, die MMap zu vergrößern, wird abgebrochen." #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 -- cgit v1.2.3 From a04cd1f9a580867d65be8f1ecb3eac25a86eb953 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 28 Feb 2010 19:45:05 +0100 Subject: Fix the PkgFileIterator Constructor which defaults to the wrong value. (0 instead of the HeaderP) This breaks the Cache Validation functionality as the end() doesn't test for NULL. (The fault was introduced with the rewriting of the CacheIterators) --- apt-pkg/cacheiterators.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index a64326a44..28e062f3c 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -345,7 +345,8 @@ class pkgCache::PkgFileIterator : public Iterator<PackageFile, PkgFileIterator> // Constructors inline PkgFileIterator() : Iterator<PackageFile, PkgFileIterator>() {}; - inline PkgFileIterator(pkgCache &Owner,PackageFile *Trg = 0) : Iterator<PackageFile, PkgFileIterator>(Owner, Trg) {}; + inline PkgFileIterator(pkgCache &Owner) : Iterator<PackageFile, PkgFileIterator>(Owner, Owner.PkgFileP) {}; + inline PkgFileIterator(pkgCache &Owner,PackageFile *Trg) : Iterator<PackageFile, PkgFileIterator>(Owner, Trg) {}; }; /*}}}*/ // Version File /*{{{*/ -- cgit v1.2.3 From 4a6d21639f807ae82d5a51a92c4bbbd0ca2a4494 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 28 Feb 2010 22:45:34 +0100 Subject: Create Pins for all group members instead of only for native architecture --- apt-pkg/policy.cc | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index f9901bc9a..0b8c1a81b 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -187,35 +187,38 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg) void pkgPolicy::CreatePin(pkgVersionMatch::MatchType Type,string Name, string Data,signed short Priority) { - Pin *P = 0; - if (Name.empty() == true) - P = &*Defaults.insert(Defaults.end(),PkgPin()); - else { - // Get a spot to put the pin - pkgCache::PkgIterator Pkg = Cache->FindPkg(Name); - if (Pkg.end() == true) + Pin *P = &*Defaults.insert(Defaults.end(),PkgPin()); + P->Type = Type; + P->Priority = Priority; + P->Data = Data; + return; + } + + // Get a spot to put the pin + pkgCache::GrpIterator Grp = Cache->FindGrp(Name); + for (pkgCache::PkgIterator Pkg = Grp.FindPkg("any"); + Pkg.end() != true; Pkg = Grp.NextPkg(Pkg)) + { + Pin *P = 0; + if (Pkg.end() == false) + P = Pins + Pkg->ID; + else { // Check the unmatched table - for (vector<PkgPin>::iterator I = Unmatched.begin(); + for (vector<PkgPin>::iterator I = Unmatched.begin(); I != Unmatched.end() && P == 0; I++) if (I->Pkg == Name) P = &*I; - + if (P == 0) - P = &*Unmatched.insert(Unmatched.end(),PkgPin()); + P = &*Unmatched.insert(Unmatched.end(),PkgPin()); } - else - { - P = Pins + Pkg->ID; - } + P->Type = Type; + P->Priority = Priority; + P->Data = Data; } - - // Set.. - P->Type = Type; - P->Priority = Priority; - P->Data = Data; } /*}}}*/ // Policy::GetMatch - Get the matching version for a package pin /*{{{*/ -- cgit v1.2.3 From 946b0e068e431df81badf88ab795cbad7cd846dd Mon Sep 17 00:00:00 2001 From: Julian Andres Klode <jak@debian.org> Date: Mon, 1 Mar 2010 13:47:56 +0100 Subject: * cmdline/apt-mark: - Use the new python-apt API (and conflict with python-apt << 0.7.93.2). --- cmdline/apt-mark | 22 +++++++++++----------- debian/changelog | 5 +++++ debian/control | 1 + 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/cmdline/apt-mark b/cmdline/apt-mark index 2326ece38..0e73dda78 100755 --- a/cmdline/apt-mark +++ b/cmdline/apt-mark @@ -19,10 +19,10 @@ def show_automatic(filename): if not os.path.exists(STATE_FILE): return auto = set() - tagfile = apt_pkg.ParseTagFile(open(STATE_FILE)) - while tagfile.Step(): - pkgname = tagfile.Section.get("Package") - autoInst = tagfile.Section.get("Auto-Installed") + tagfile = apt_pkg.TagFile(open(STATE_FILE)) + for section in tagfile: + pkgname = section.get("Package") + autoInst = section.get("Auto-Installed") if int(autoInst): auto.add(pkgname) print "\n".join(sorted(auto)) @@ -33,24 +33,24 @@ def mark_unmark_automatic(filename, action, pkgs): # open the statefile if os.path.exists(STATE_FILE): try: - tagfile = apt_pkg.ParseTagFile(open(STATE_FILE)) + tagfile = apt_pkg.TagFile(open(STATE_FILE)) outfile = open(STATE_FILE+".tmp","w") except IOError, msg: print "%s, are you root?" % (msg) sys.exit(1) - while tagfile.Step(): - pkgname = tagfile.Section.get("Package") - autoInst = tagfile.Section.get("Auto-Installed") + for section in tagfile: + pkgname = section.get("Package") + autoInst = section.get("Auto-Installed") if pkgname in pkgs: if options.verbose: print "changing %s to %s" % (pkgname,action) - newsec = apt_pkg.RewriteSection(tagfile.Section, + newsec = apt_pkg.rewrite_section(section, [], [ ("Auto-Installed",str(action)) ]) pkgs.remove(pkgname) outfile.write(newsec+"\n") else: - outfile.write(str(tagfile.Section)+"\n") + outfile.write(str(section)+"\n") if action == 1: for pkgname in pkgs: if options.verbose: @@ -78,7 +78,7 @@ if __name__ == "__main__": # get the state-file if not options.filename: - STATE_FILE = apt_pkg.Config.FindDir("Dir::State") + "extended_states" + STATE_FILE = apt_pkg.config.find_dir("Dir::State") + "extended_states" else: STATE_FILE=options.filename diff --git a/debian/changelog b/debian/changelog index c855c77d5..6003477ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,12 @@ apt (0.7.26~exp3) UNRELEASED; urgency=low + [ Christian Perrier ] * German translation update. Closes: #571037 + [ Julian Andres Klode ] + * cmdline/apt-mark: + - Use the new python-apt API (and conflict with python-apt << 0.7.93.2). + -- Christian Perrier <bubulle@debian.org> Wed, 24 Feb 2010 22:13:50 +0100 apt (0.7.26~exp2) experimental; urgency=low diff --git a/debian/control b/debian/control index de2bf6544..c2b6c17a5 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,7 @@ Architecture: any Depends: ${shlibs:Depends}, debian-archive-keyring, ${misc:Depends} Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} +Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt Description: Advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. -- cgit v1.2.3 From 70ae240915df3ef89715d71d5fe7a6910cbf057e Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Mon, 1 Mar 2010 15:27:55 +0100 Subject: Remove and Unpack operations should not be ignored for pseudo packages - they should trigger the remove/unpack of the "all" package. Otherwise - as this package has no dependencies - it will be triggered to late. The Configuration step doesn't need it as the "all" package is a dependency of the pseudo-package, so it will be configured before the pseudo packages are tried: So at this step the ignorance is okay. Also IsMissing() should report the status of the all package if an pseudo package is checked instead of always reporting no-miss. --- apt-pkg/orderlist.cc | 11 ++++++----- apt-pkg/packagemanager.cc | 13 +++++++++---- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index 2e7618b55..7c950292a 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -127,8 +127,9 @@ bool pkgOrderList::IsMissing(PkgIterator Pkg) if (FileList[Pkg->ID].empty() == false) return false; + // Missing Pseudo packages are missing if the real package is missing if (pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == true) - return false; + return IsMissing(Pkg.Group().FindPkg("all")); return true; } @@ -203,7 +204,7 @@ bool pkgOrderList::OrderCritical() { PkgIterator P(Cache,*I); if (IsNow(P) == true) - clog << " " << P.Name() << ' ' << IsMissing(P) << ',' << IsFlag(P,After) << endl; + clog << " " << P.FullName() << ' ' << IsMissing(P) << ',' << IsFlag(P,After) << endl; } } @@ -276,7 +277,7 @@ bool pkgOrderList::OrderUnpack(string *FileList) { PkgIterator P(Cache,*I); if (IsNow(P) == true) - clog << " " << P.Name() << ' ' << IsMissing(P) << ',' << IsFlag(P,After) << endl; + clog << " " << P.FullName() << ' ' << IsMissing(P) << ',' << IsFlag(P,After) << endl; } } @@ -547,7 +548,7 @@ bool pkgOrderList::VisitNode(PkgIterator Pkg) if (Debug == true) { for (int j = 0; j != Depth; j++) clog << ' '; - clog << "Visit " << Pkg.Name() << endl; + clog << "Visit " << Pkg.FullName() << endl; } Depth++; @@ -606,7 +607,7 @@ bool pkgOrderList::VisitNode(PkgIterator Pkg) if (Debug == true) { for (int j = 0; j != Depth; j++) clog << ' '; - clog << "Leave " << Pkg.Name() << ' ' << IsFlag(Pkg,Added) << ',' << IsFlag(Pkg,AddPending) << endl; + clog << "Leave " << Pkg.FullName() << ' ' << IsFlag(Pkg,Added) << ',' << IsFlag(Pkg,AddPending) << endl; } return true; diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index db882721e..35cc24550 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -470,6 +470,8 @@ bool pkgPackageManager::SmartRemove(PkgIterator Pkg) if (pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == false) return Remove(Pkg,(Cache[Pkg].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge); + else + return SmartRemove(Pkg.Group().FindPkg("all")); return true; } /*}}}*/ @@ -584,11 +586,14 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg) for (PrvIterator P = Cache[Pkg].InstVerIter(Cache).ProvidesList(); P.end() == false; P++) CheckRConflicts(Pkg,P.ParentPkg().RevDependsList(),P.ProvideVersion()); - - if (pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == false && - Install(Pkg,FileNames[Pkg->ID]) == false) + + if (pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == false) + { + if(Install(Pkg,FileNames[Pkg->ID]) == false) + return false; + } else if (SmartUnPack(Pkg.Group().FindPkg("all")) == false) return false; - + List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States); // Perform immedate configuration of the package. -- cgit v1.2.3 From 1ec1653cd4849423e0d5f769ecbfab2d6f16c4ad Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Mon, 1 Mar 2010 21:59:03 +0100 Subject: We need to kill also pseudo packages which have no dependency, no installed reverse dependency and which also doesn't provide something. They cause problems if this pseudo packages get new dependencies. As a consequence we also need to recheck the dependencies of a killed pseudo package (and especially the providers of these dependencies) to really kill all non required packages. --- apt-pkg/depcache.cc | 77 ++++++++++++++++++++++++++++++++++++++++++++--------- apt-pkg/depcache.h | 1 + 2 files changed, 66 insertions(+), 12 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 45c614c6f..893164ea1 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -630,11 +630,46 @@ bool pkgDepCache::RemovePseudoInstalledPkg(PkgIterator &Pkg, std::set<unsigned l if (V->MultiArch != Version::All) return false; - unsigned char const DepState = VersionState(V.DependsList(),DepInstall,DepInstMin,DepInstPolicy); - if ((DepState & DepInstMin) == DepInstMin) + // Never ever kill an "all" package - they have no dependency so they can't be broken + if (strcmp(Pkg.Arch(),"all") == 0) return false; - // Dependencies for this arch all are not statisfied +// std::cout << "CHECK " << Pkg << std::endl; + + unsigned char const DepState = VersionState(V.DependsList(),DepInstall,DepInstMin,DepInstPolicy); + if ((DepState & DepInstMin) == DepInstMin) { + // okay, the package isn't broken, but is the package also required? + // If it has no real dependencies, no installed rdepends and doesn't + // provide something of value, we will kill it as not required. + // These pseudopackages have otherwise interesting effects if they get + // a new dependency in a newer version… + for (pkgCache::DepIterator D = V.DependsList(); + D.end() != true; ++D) + if ((D->Type == pkgCache::Dep::Depends || + D->Type == pkgCache::Dep::PreDepends) && + D.ParentPkg()->Group != Pkg->Group) + return false; + for (DepIterator D = Pkg.RevDependsList(); D.end() != true; ++D) + { + if (D->Type != pkgCache::Dep::Depends && + D->Type != pkgCache::Dep::PreDepends) + continue; + PkgIterator const P = D.ParentPkg(); + if (P->CurrentVer != 0) + return false; + } + for (PrvIterator Prv = V.ProvidesList(); Prv.end() != true; Prv++) + for (DepIterator d = Prv.ParentPkg().RevDependsList(); + d.end() != true; ++d) + { + PkgIterator const P = d.ParentPkg(); + if (P->CurrentVer != 0 && + P->Group != Pkg->Group) + return false; + } + } + + // Dependencies for this arch all package are not statisfied // so we installed it only for our convenience: get right of it now. RemoveSizes(Pkg); RemoveStates(Pkg); @@ -655,15 +690,33 @@ bool pkgDepCache::RemovePseudoInstalledPkg(PkgIterator &Pkg, std::set<unsigned l recheck.insert(P.Index()); } - if (V.end() != true) - for (PrvIterator Prv = V.ProvidesList(); Prv.end() != true; Prv++) - for (DepIterator d = Prv.ParentPkg().RevDependsList(); - d.end() != true; ++d) - { - PkgIterator const P = d.ParentPkg(); - if (P->CurrentVer != 0) - recheck.insert(P.Index()); - } + for (DepIterator d = V.DependsList(); d.end() != true; ++d) + { + PkgIterator const P = d.TargetPkg(); + for (PrvIterator Prv = P.ProvidesList(); Prv.end() != true; ++Prv) + { + PkgIterator const O = Prv.OwnerPkg(); + if (O->CurrentVer != 0) + recheck.insert(O.Index()); + } + + if (P->CurrentVer != 0) + recheck.insert(P.Index()); + } + + for (PrvIterator Prv = V.ProvidesList(); Prv.end() != true; Prv++) + { + for (DepIterator d = Prv.ParentPkg().RevDependsList(); + d.end() != true; ++d) + { + PkgIterator const P = d.ParentPkg(); + if (P->CurrentVer == 0) + continue; + + recheck.insert(P.Index()); + } + } + return true; } diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 23b29cc13..ea605f199 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -332,6 +332,7 @@ class pkgDepCache : protected pkgCache::Namespace inline operator pkgCache &() {return *Cache;}; inline Header &Head() {return *Cache->HeaderP;}; inline PkgIterator PkgBegin() {return Cache->PkgBegin();}; + inline GrpIterator FindGrp(string const &Name) {return Cache->FindGrp(Name);}; inline PkgIterator FindPkg(string const &Name) {return Cache->FindPkg(Name);}; inline PkgIterator FindPkg(string const &Name, string const &Arch) {return Cache->FindPkg(Name, Arch);}; -- cgit v1.2.3 From 5e5d20643487fd1693af418bd1201be5802c232d Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Mon, 1 Mar 2010 22:47:17 +0100 Subject: fix compiler error if compiled with -std=c++0x --- apt-pkg/algorithms.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index c905cffa9..f8a9e210c 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -535,11 +535,11 @@ void pkgProblemResolver::MakeScores() // Important Required Standard Optional Extra signed short PrioMap[] = { 0, - _config->FindI("pkgProblemResolver::Scores::Important",3), - _config->FindI("pkgProblemResolver::Scores::Required",2), - _config->FindI("pkgProblemResolver::Scores::Standard",1), - _config->FindI("pkgProblemResolver::Scores::Optional",-1), - _config->FindI("pkgProblemResolver::Scores::Extra",-2) + (signed short) _config->FindI("pkgProblemResolver::Scores::Important",3), + (signed short) _config->FindI("pkgProblemResolver::Scores::Required",2), + (signed short) _config->FindI("pkgProblemResolver::Scores::Standard",1), + (signed short) _config->FindI("pkgProblemResolver::Scores::Optional",-1), + (signed short) _config->FindI("pkgProblemResolver::Scores::Extra",-2) }; signed short PrioEssentials = _config->FindI("pkgProblemResolver::Scores::Essentials",100); signed short PrioInstalledAndNotObsolete = _config->FindI("pkgProblemResolver::Scores::NotObsolete",1); -- cgit v1.2.3 From 37049546fc18d93f4387917bc9b8181e8adeb3fa Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 2 Mar 2010 18:55:18 +0100 Subject: * doc/apt_preferences.5.xml: - fix two typos and be more verbose in the novice warning. Thanks to Osamu Aoki for pointing it out! (Closes: #567669) --- debian/changelog | 3 +++ doc/apt_preferences.5.xml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 39cc70da9..417c23e8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ apt (0.7.26) UNRELEASED; urgency=low - add char[] fallback for filesystems without shared writable mmap() like JFFS2. Thanks to Marius Vollmer for writing and to Loïc Minier for pointing to the patch! (Closes: #314334) + * doc/apt_preferences.5.xml: + - fix two typos and be more verbose in the novice warning. + Thanks to Osamu Aoki for pointing it out! (Closes: #567669) -- David Kalnischkies <kalnischkies@gmail.com> Fri, 19 Feb 2010 21:21:43 +0100 diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 3d7896226..e773ad144 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -59,6 +59,9 @@ APT will not questioning the preferences so wrong settings will therefore lead to uninstallable packages or wrong decisions while upgrading packages. Even more problems will arise if multiply distribution releases are mixed without a good understanding of the following paragraphs. +Packages included in a specific release aren't tested in and +therefore doesn't always work as expected in older or newer releases or +together with other packages from different releases. You have been warned.</para> <para>Note that the files in the <filename>/etc/apt/preferences.d</filename> -- cgit v1.2.3 From 5bdd31d56d4ae367f85195de327017c748ad7e89 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 2 Mar 2010 18:57:27 +0100 Subject: ignore the autogenerated files and directories in abicheck/ --- .bzrignore | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bzrignore b/.bzrignore index ac276b3fb..c4cd052a7 100644 --- a/.bzrignore +++ b/.bzrignore @@ -11,6 +11,15 @@ configure buildlib/config.sub buildlib/config.guess +# abichecker related files/dir +abicheck/apt_build.xml +abicheck/apt_installed.xml +abicheck/compat_reports/ +abicheck/descriptors_storage/ +abicheck/header_compile_errors/ +abicheck/test_results/ +abicheck/tests/ + # generated files in the progress to build all # apt man pages and other documentation doc/*.1 -- cgit v1.2.3 From cf0e078c440226e0009bb861486b974a03842f7b Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 3 Mar 2010 21:29:01 +0100 Subject: fix memory leak in getLanguages() by closing the directory after checking --- apt-pkg/aptconfiguration.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 10613f11d..f3f94dce3 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -152,6 +152,7 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All, builtin.push_back(c); } } + closedir(D); // get the environment language codes: LC_MESSAGES (and later LANGUAGE) // we extract both, a long and a short code and then we will -- cgit v1.2.3 From f23e1e940214c7abbf87c28bc71a5d37d117aa57 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Wed, 10 Mar 2010 22:39:44 +0100 Subject: Spanish manpages translation update --- debian/changelog | 1 + doc/po/es.po | 5604 +++++++++++++++++++++++++++++++----------------------- 2 files changed, 3220 insertions(+), 2385 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6003477ba..faeac0e2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ apt (0.7.26~exp3) UNRELEASED; urgency=low [ Christian Perrier ] * German translation update. Closes: #571037 + * Spanish manpages translation update. Closes: #573293 [ Julian Andres Klode ] * cmdline/apt-mark: diff --git a/doc/po/es.po b/doc/po/es.po index c162dca97..f7b1bd17a 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -1,72 +1,95 @@ -# Translation of apt package man pages -# Copyright (C) 2003, 2004 Debian Italian l10n team <debian-l10n-spanish@lists.debian.org> +# apt man pages translation to Spanish +# Copyright (C) 2003, 2004, 2009, 2010 Software in the Public Interest # This file is distributed under the same license as the apt package. # -# Translators: -# Ismael Fanlo, 2003 -# Carlos Mestre, 2003 -# Rudy Godoy <rudy@kernel-panik.org>, 2003 -# Gustavo Saldumbide <gsal@adinet.com.uy>, 2003 -# Javier Fernández-Sanguino <jfs@computer.org>, 2003 -# Rubén Porras Campo <nahoo@inicia.es>, 2003, 2004 +# Changes: +# - Initial translation +# Ismael Fanlo, 2003 +# Carlos Mestre, 2003 +# Rudy Godoy <rudy@kernel-panik.org>, 2003 +# Gustavo Saldumbide <gsal@adinet.com.uy>, 2003 +# Javier Fernández-Sanguino <jfs@computer.org>, 2003 +# Rubén Porras Campo <nahoo@inicia.es>, 2003, 2004 +# +# - Updates +# Francisco Javier Cuadrado <fcocuadrado@gmail.com>, 2009, 2010 +# Omar Campagne <ocampagne@gmail.com>, 2009, 2010 +# +# Traductores, si no conocen el formato PO, merece la pena leer la +# documentación de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Equipo de traducción al español, por favor lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducción de Debian al español +# http://www.debian.org/intl/spanish/ +# especialmente las notas y normas de traducción en +# http://www.debian.org/intl/spanish/notas +# +# - La guía de traducción de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt\n" +"Project-Id-Version: apt 0.7.25\n" "POT-Creation-Date: 2010-02-18 20:53+0100\n" -"PO-Revision-Date: 2004-09-20 17:05+0000\n" -"Last-Translator: Rubén Porras Campo <nahoo@inicia.es>\n" -"Language-Team: <debian-l10n-spanish@lists.debian.org>\n" +"PO-Revision-Date: 2010-03-02 18:43+0200\n" +"Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n" +"Language-Team: Debian Spanish l10n <debian-l10n-spanish@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.5.2\n" #. type: TH #: apt.8:17 -#, fuzzy, no-wrap +#, no-wrap msgid "apt" -msgstr "B<apt>" +msgstr "apt" #. type: TH #: apt.8:17 -#, fuzzy, no-wrap +#, no-wrap msgid "16 June 1998" -msgstr "16 Junio 1998" +msgstr "16 de Junio de 1998" #. type: TH #: apt.8:17 -#, fuzzy, no-wrap +#, no-wrap msgid "Debian GNU/Linux" msgstr "Debian GNU/Linux" #. type: SH #: apt.8:18 -#, fuzzy, no-wrap +#, no-wrap msgid "NAME" msgstr "NOMBRE" #. type: Plain text #: apt.8:20 -#, fuzzy msgid "apt - Advanced Package Tool" -msgstr "apt - Herramienta Avanzada de Paquetes" +msgstr "apt - Herramienta avanzada de paquetes" #. type: SH #: apt.8:20 -#, fuzzy, no-wrap +#, no-wrap msgid "SYNOPSIS" msgstr "SINOPSIS" #. type: Plain text #: apt.8:22 -#, fuzzy msgid "B<apt>" msgstr "B<apt>" #. type: SH #: apt.8:22 -#, fuzzy, no-wrap +#, no-wrap msgid "DESCRIPTION" msgstr "DESCRIPCIÓN" @@ -78,97 +101,92 @@ msgid "" "(8) for the command line or B<synaptic>(8) for the X Window System. Some " "options are only implemented in B<apt-get>(8) though." msgstr "" +"APT es un sistema de gestión de paquetes de software. Dispone de varias " +"interfaces para la gestión de paquetes normal del día a día, tales como " +"B<aptitude>(8) para la línea de órdenes o B<synaptic>(8) para el sistema de " +"ventanas de X. Algunas opciones sólo están implementadas en B<apt-get>(8)." #. type: SH #: apt.8:31 -#, fuzzy, no-wrap +#, no-wrap msgid "OPTIONS" msgstr "OPCIONES" #. type: Plain text #: apt.8:33 apt.8:35 -#, fuzzy msgid "None." -msgstr "" -"#-#-#-#-# apt.es.8:31 #-#-#-#-#\n" -"Ninguna.\n" -"#-#-#-#-# apt.es.8:33 #-#-#-#-#\n" -"Ninguno." +msgstr "Ninguna." #. type: SH #: apt.8:33 -#, fuzzy, no-wrap +#, no-wrap msgid "FILES" msgstr "FICHEROS" #. type: SH #: apt.8:35 -#, fuzzy, no-wrap +#, no-wrap msgid "SEE ALSO" -msgstr "LEA TAMBIEN" +msgstr "VÉASE TAMBIÉN" #. type: Plain text #: apt.8:42 -#, fuzzy msgid "" "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), " "B<apt_preferences>(5), B<apt-secure>(8)" -msgstr "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5)" +msgstr "" +"B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), " +"B<apt_preferences>(5), B<apt-secure>(8)" #. type: SH #: apt.8:42 -#, fuzzy, no-wrap +#, no-wrap msgid "DIAGNOSTICS" -msgstr "DIAGNÓSTICO" +msgstr "DIAGNÓSTICOS" #. type: Plain text #: apt.8:44 -#, fuzzy msgid "apt returns zero on normal operation, decimal 100 on error." msgstr "" -"apt devuelve cero cuando no ocurre ningún error. Si hay algún error devuelve " -"el valor 100." +"apt devuelve cero si no hay ningún error, y el valor 100 en caso de error." #. type: SH #: apt.8:44 -#, fuzzy, no-wrap +#, no-wrap msgid "BUGS" -msgstr "ERRATAS" +msgstr "FALLOS" #. type: Plain text #: apt.8:46 -#, fuzzy msgid "This manpage isn't even started." -msgstr "Esta página de manual no está siquiera iniciada." +msgstr "Esta página de manual ni siquiera está iniciada." #. type: Plain text #: apt.8:55 -#, fuzzy msgid "" "See E<lt>http://bugs.debian.org/aptE<gt>. If you wish to report a bug in " "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the " "B<reportbug>(1) command." msgstr "" "Consulte E<lt>http://bugs.debian.org/aptE<gt>. Si desea enviar un informe de " -"error en B<apt>, por favor lea I</usr/share/doc/debian/bug-reporting.txt> o " -"el programa B<reportbug>(1)" +"error sobre B<apt>, por favor lea I</usr/share/doc/debian/bug-reporting.txt> " +"o use la orden B<reportbug>(1)." #. type: SH #: apt.8:55 -#, fuzzy, no-wrap +#, no-wrap msgid "AUTHOR" msgstr "AUTOR" #. type: Plain text #: apt.8:56 -#, fuzzy msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>." msgstr "El equipo APT E<lt>apt@packages.debian.orgE<gt> escribió apt." #. type: Plain text #: apt.ent:2 msgid "<!-- -*- mode: sgml; mode: fold -*- -->" -msgstr "" +msgstr "<!-- -*- mode: sgml; mode: fold -*- -->" #. type: Plain text #: apt.ent:10 @@ -179,6 +197,11 @@ msgid "" "aptconfdir \"<filename>/etc/apt.conf</filename>\"> <!ENTITY statedir \"/var/" "lib/apt\"> <!ENTITY cachedir \"/var/cache/apt\">" msgstr "" +"<!-- Some common paths.. --> <!ENTITY docdir \"/usr/share/doc/apt/\"> <!" +"ENTITY guidesdir \"/usr/share/doc/apt-doc/\"> <!ENTITY configureindex " +"\"<filename>&docdir;examples/configure-index.gz</filename>\"> <!ENTITY " +"aptconfdir \"<filename>/etc/apt.conf</filename>\"> <!ENTITY statedir \"/var/" +"lib/apt\"> <!ENTITY cachedir \"/var/cache/apt\">" #. type: Plain text #: apt.ent:17 @@ -191,6 +214,12 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!-- Cross references to other man pages -->\n" +"<!ENTITY apt-conf \"<citerefentry>\n" +" <refentrytitle><filename>apt.conf</filename></refentrytitle>\n" +" <manvolnum>5</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:23 @@ -202,6 +231,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY apt-get \"<citerefentry>\n" +" <refentrytitle><command>apt-get</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:29 @@ -213,6 +247,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY apt-config \"<citerefentry>\n" +" <refentrytitle><command>apt-config</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:35 @@ -224,6 +263,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY apt-cdrom \"<citerefentry>\n" +" <refentrytitle><command>apt-cdrom</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:41 @@ -235,6 +279,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY apt-cache \"<citerefentry>\n" +" <refentrytitle><command>apt-cache</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:47 @@ -246,6 +295,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY apt-preferences \"<citerefentry>\n" +" <refentrytitle><command>apt_preferences</command></refentrytitle>\n" +" <manvolnum>5</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:53 @@ -257,6 +311,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY apt-key \"<citerefentry>\n" +" <refentrytitle><command>apt-key</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:59 @@ -268,6 +327,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY apt-secure \"<citerefentry>\n" +" <refentrytitle>apt-secure</refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:65 @@ -279,6 +343,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY apt-ftparchive \"<citerefentry>\n" +" <refentrytitle><filename>apt-ftparchive</filename></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:72 @@ -290,6 +359,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY sources-list \"<citerefentry>\n" +" <refentrytitle><filename>sources.list</filename></refentrytitle>\n" +" <manvolnum>5</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:78 @@ -301,6 +375,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY reportbug \"<citerefentry>\n" +" <refentrytitle><command>reportbug</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:84 @@ -312,6 +391,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY dpkg \"<citerefentry>\n" +" <refentrytitle><command>dpkg</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:90 @@ -323,6 +407,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY dpkg-buildpackage \"<citerefentry>\n" +" <refentrytitle><command>dpkg-buildpackage</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:96 @@ -334,6 +423,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY gzip \"<citerefentry>\n" +" <refentrytitle><command>gzip</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:102 @@ -345,6 +439,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY dpkg-scanpackages \"<citerefentry>\n" +" <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:108 @@ -356,6 +455,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY dpkg-scansources \"<citerefentry>\n" +" <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:114 @@ -367,6 +471,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY dselect \"<citerefentry>\n" +" <refentrytitle><command>dselect</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:120 @@ -378,6 +487,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY aptitude \"<citerefentry>\n" +" <refentrytitle><command>aptitude</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:126 @@ -389,6 +503,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY synaptic \"<citerefentry>\n" +" <refentrytitle><command>synaptic</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:132 @@ -400,6 +519,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY debsign \"<citerefentry>\n" +" <refentrytitle><command>debsign</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:138 @@ -411,6 +535,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY debsig-verify \"<citerefentry>\n" +" <refentrytitle><command>debsig-verify</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:144 @@ -422,6 +551,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY gpg \"<citerefentry>\n" +" <refentrytitle><command>gpg</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:150 @@ -433,6 +567,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY gnome-apt \"<citerefentry>\n" +" <refentrytitle><command>gnome-apt</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:156 @@ -444,10 +583,15 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY wajig \"<citerefentry>\n" +" <refentrytitle><command>wajig</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:168 -#, fuzzy, no-wrap +#, no-wrap msgid "" "<!-- Boiler plate docinfo section -->\n" "<!ENTITY apt-docinfo \"\n" @@ -461,13 +605,17 @@ msgid "" " <date>28 October 2008</date>\n" " <productname>Linux</productname>\n" msgstr "" -"\n" -" <docinfo>\n" -" <address><email>apt@packages.debian.org</></address>\n" -" <author><firstname>Jason</> <surname>Gunthorpe</></>\n" -" <copyright><year>1998-2001</> <holder>Jason Gunthorpe</></>\n" -" <date>12 March 2001</>\n" -" </docinfo>\n" +"<!-- Boiler plate docinfo section -->\n" +"<!ENTITY apt-docinfo \"\n" +" <refentryinfo>\n" +" <address><email>apt@packages.debian.org</email></address>\n" +" <author>\n" +" <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n" +" <contrib></contrib>\n" +" </author>\n" +" <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n" +" <date>28 de Octubre de 2008</date>\n" +" <productname>Linux</poductname>\n" #. type: Plain text #: apt.ent:171 @@ -476,6 +624,8 @@ msgid "" " </refentryinfo>\n" "\"> \n" msgstr "" +" </refentryinfo>\n" +"\"> \n" #. type: Plain text #: apt.ent:177 @@ -487,6 +637,11 @@ msgid "" " </address>\n" "\">\n" msgstr "" +"<!ENTITY apt-email \"\n" +" <address>\n" +" <email>apt@packages.debian.org</email>\n" +" </address>\n" +"\">\n" #. type: Plain text #: apt.ent:185 @@ -500,6 +655,13 @@ msgid "" " </author>\n" "\">\n" msgstr "" +"<!ENTITY apt-author.jgunthorpe \"\n" +" <author>\n" +" <firstname>Jason</firstname>\n" +" <surname>Gunthorpe</surname>\n" +" <contrib></contrib>\n" +" </author>\n" +"\">\n" #. type: Plain text #: apt.ent:193 @@ -513,6 +675,13 @@ msgid "" " </author>\n" "\">\n" msgstr "" +"<!ENTITY apt-author.moconnor \"\n" +" <author>\n" +" <firstname>Mike</firstname>\n" +" <surname>O'Connor</surname>\n" +" <contrib></contrib>\n" +" </author>\n" +"\">\n" #. type: Plain text #: apt.ent:200 @@ -525,6 +694,12 @@ msgid "" " </author>\n" "\">\n" msgstr "" +"<!ENTITY apt-author.team \"\n" +" <author>\n" +" <othername>Equipo de APT</othername>\n" +" <contrib></contrib>\n" +" </author>\n" +"\">\n" #. type: Plain text #: apt.ent:204 apt.ent:215 @@ -534,6 +709,9 @@ msgid "" " <productname>Linux</productname>\n" "\">\n" msgstr "" +"<!ENTITY apt-product \"\n" +" <productname>Linux</productname>\n" +"\">\n" #. type: Plain text #: apt.ent:211 @@ -546,6 +724,12 @@ msgid "" " </copyright>\n" "\">\n" msgstr "" +"<!ENTITY apt-copyright \"\n" +" <copyright>\n" +" <holder>Jason Gunthorpe</holder>\n" +" <year>1998-2001</year>\n" +" </copyright>\n" +"\">\n" #. type: Plain text #: apt.ent:221 @@ -557,10 +741,15 @@ msgid "" "\t</para>\n" "\">\n" msgstr "" +"<!ENTITY apt-qapage \"\n" +"\t<para>\n" +"\t\t<ulink url='http://packages.qa.debian.org/a/apt.html'>Página de QA</ulink>\n" +"\t</para>\n" +"\">\n" #. type: Plain text #: apt.ent:232 -#, fuzzy, no-wrap +#, no-wrap msgid "" "<!-- Boiler plate Bug reporting section -->\n" "<!ENTITY manbugs \"\n" @@ -572,11 +761,21 @@ msgid "" " </para>\n" " </refsect1>\n" "\">\n" -msgstr "Consulte E<lt>http://bugs.debian.org/aptE<gt>. Si desea enviar un informe de error en B<apt>, por favor lea I</usr/share/doc/debian/bug-reporting.txt> o el programa B<reportbug>(1)" +msgstr "" +"<!-- Boiler plate Bug reporting section -->\n" +"<!ENTITY manbugs \"\n" +" <refsect1><title>Bugs\n" +" Página de errores de APT. \n" +" Si quiere informar de un error en APT, consulte\n" +" /usr/share/doc/debian/bug-reporting.txt o use la orden\n" +" &reportbug;.\n" +" \n" +" \n" +"\">\n" #. type: Plain text #: apt.ent:240 -#, fuzzy, no-wrap +#, no-wrap msgid "" "\n" "\n" " \n" "\">\n" -msgstr "El equipo APT Eapt@packages.debian.orgE escribió apt." +msgstr "" +"\n" +"Autor\n" +" El equipo APT apt@packages.debian.org escribió apt.\n" +" \n" +" \n" +"\">\n" #. type: Plain text #: apt.ent:250 @@ -601,6 +807,15 @@ msgid "" " \n" " \n" msgstr "" +"\n" +"\n" +" \n" +" Muestra un mensaje corto sobre el uso.\n" +" \n" +" \n" +" \n" #. type: Plain text #: apt.ent:258 @@ -614,6 +829,13 @@ msgid "" " \n" " \n" msgstr "" +" \n" +" \n" +" \n" +" Muestra la versión del programa.\n" +" \n" +" \n" +" \n" #. type: Plain text #: apt.ent:268 @@ -629,6 +851,15 @@ msgid "" " \n" " \n" msgstr "" +" \n" +" \n" +" \n" +" Fichero de configuración: Especifica el fichero de configuración a usar. \n" +" El programa leerá el fichero de configuración predeterminado y, después, este \n" +" fichero de configuración. Consulte &apt-conf; para información sobre la sintaxis. \n" +" \n" +" \n" +" \n" #. type: Plain text #: apt.ent:280 @@ -646,10 +877,21 @@ msgid "" " \n" "\">\n" msgstr "" +" \n" +" \n" +" \n" +" Define una opción de configuración: Esto definirá una opción\n" +" arbitraria de configuración. La sintaxis es .\n" +" y se pueden usar varias\n" +" veces para definir diferentes opciones.\n" +" \n" +" \n" +" \n" +"\">\n" #. type: Plain text #: apt.ent:291 -#, fuzzy, no-wrap +#, no-wrap msgid "" "\n" @@ -662,15 +904,17 @@ msgid "" " \n" "\">\n" msgstr "" -"\n" -" \n" -" Todas las opciones de línea de órdenes pueden ser especificadas\n" -" mediante el fichero de configuración, en la descripción de cada opción\n" -" se indica la opción de configuración que hay que modificar. Para\n" -" opciones booleanas puedes modificar el fichero de configuración usando\n" -" cosas parecidas a ,, \n" +" u otras muchas variaciones.\n" " \n" +"\">\n" #. type: Plain text #: apt.ent:297 @@ -682,6 +926,11 @@ msgid "" " Configuration Item: Dir::Etc::Main.\n" " \n" msgstr "" +"/etc/apt/apt.conf\n" +" Fichero de configuración de APT.\n" +" Opción de configuración: Dir::Etc::Main.\n" +" \n" #. type: Plain text #: apt.ent:303 @@ -693,6 +942,11 @@ msgid "" " \n" "\">\n" msgstr "" +" /etc/apt/apt.conf.d/\n" +" Fragmentos del fichero de configuración de APT.\n" +" Opción de configuración: Dir::Etc::Parts.\n" +" \n" +"\">\n" #. type: Plain text #: apt.ent:309 @@ -704,21 +958,31 @@ msgid "" " Configuration Item: Dir::Cache::Archives.\n" " \n" msgstr "" +"&cachedir;/archives/\n" +" Área de almacenamiento para los ficheros de paquetes descargados.\n" +" Opción de configuración: Dir::Cache::Archives.\n" +" \n" #. type: Plain text #: apt.ent:315 -#, fuzzy, no-wrap +#, no-wrap msgid "" " &cachedir;/archives/partial/\n" " Storage area for package files in transit.\n" " Configuration Item: Dir::Cache::Archives (implicit partial). \n" " \n" "\">\n" -msgstr "Directorio donde se guardan los ficheros en tránsito. Opción de Configuración: Dir::Cache::Archives (Implica partial)." +msgstr "" +" &cachedir;/archives/partial/\n" +" Área de almacenamiento para los ficheros de paquete en tránsito.\n" +" Opción de configuración: Dir::Cache::Archives (parcialmente implícito). \n" +" \n" +"\">\n" #. type: Plain text #: apt.ent:325 -#, fuzzy, no-wrap +#, no-wrap msgid "" "/etc/apt/preferences\n" @@ -729,7 +993,15 @@ msgid "" " or from a different version of a distribution.\n" " Configuration Item: Dir::Etc::Preferences.\n" " \n" -msgstr "Fichero de configuración que contiene preferencias sobre versiones de paquetes, por ejemplo, puede especificar que un cierto paquete se descargue de un sitio diferente, o de una distribución con una versión diferente. Opción de Configuración: Dir::Etc::Preferences." +msgstr "" +"/etc/apt/preferences\n" +" Ficheros de preferencias de versión.\n" +" Aquí puede especificar el anclaje ("pinning"),\n" +" una preferencia para conseguir ciertos paquetes a partir de\n" +" una fuente diferente o de una versión diferente de una distribución.\n" +" Opción de configuración: Dir::Etc::Preferences.\n" +" \n" #. type: Plain text #: apt.ent:331 @@ -741,6 +1013,11 @@ msgid "" " \n" "\">\n" msgstr "" +" /etc/apt/preferences.d/\n" +" Fragmentos de fichero para las preferencias de la versión.\n" +" Opción de configuración: Dir::Etc::PreferencesParts.\n" +" \n" +"\">\n" #. type: Plain text #: apt.ent:337 @@ -752,6 +1029,11 @@ msgid "" " Configuration Item: Dir::Etc::SourceList.\n" " \n" msgstr "" +"/etc/apt/sources.list\n" +" Ubicaciones de dónde conseguir los paquetes.\n" +" Opción de configuración: Dir::Etc::SourceList.\n" +" \n" #. type: Plain text #: apt.ent:343 @@ -763,10 +1045,15 @@ msgid "" " \n" "\">\n" msgstr "" +" /etc/apt/sources.list.d/\n" +" Fragmentos de fichero para las ubicaciones de dónde descargar los paquetes.\n" +" Opción de configuración: Dir::Etc::SourceParts.\n" +" \n" +"\">\n" #. type: Plain text #: apt.ent:350 -#, fuzzy, no-wrap +#, no-wrap msgid "" "&statedir;/lists/\n" @@ -775,22 +1062,16 @@ msgid "" " Configuration Item: Dir::State::Lists.\n" " \n" msgstr "" -"#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n" -"Directorio donde se almacena la información del estado de cada paquete fuente por cada sitio especificado &sources-list; Opción de configuración: Dir::State::Lists.\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n" -"Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: Dir::State::Lists.\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n" -"Directorio donde se almacena la información del estado de cada paquete fuente por cada sitio especificado &sources-list; Opción de configuración: Dir::State::Lists.\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n" -"Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: Dir::State::Lists.\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n" -"Directorio donde se almacena la información del estado de cada paquete fuente por cada sitio especificado &sources-list; Opción de configuración: Dir::State::Lists.\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n" -"Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: Dir::State::Lists." +"&statedir;/lists/\n" +" Área de almacenamiento para la información del estado\n" +" de cada fuente de paquetes especificado en &sources-list;\n" +" Opción de configuración: Dir::State::Lists.\n" +" \n" #. type: Plain text #: apt.ent:356 -#, fuzzy, no-wrap +#, no-wrap msgid "" " &statedir;/lists/partial/\n" " Storage area for state information in transit.\n" @@ -798,22 +1079,21 @@ msgid "" " \n" "\">\n" msgstr "" -"#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n" -"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: Dir::State::Lists (lo que implica que no estarán completos).\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" -"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: Dir::State::Lists (Implica partial).\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n" -"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: Dir::State::Lists (lo que implica que no estarán completos).\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" -"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: Dir::State::Lists (Implica partial).\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n" -"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: Dir::State::Lists (lo que implica que no estarán completos).\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" -"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: Dir::State::Lists (Implica partial)." +" &statedir;/lists/partial/\n" +" Área de almacenamiento para la información del estado en tránsito.\n" +" Opción de configuración: Dir::State::Lists (parcialmente implícito).\n" +" \n" +"\">\n" #. type: Plain text #: apt.ent:362 #, fuzzy, no-wrap +#| msgid "" +#| "/etc/apt/sources.list\n" +#| " Locations to fetch packages from.\n" +#| " Configuration Item: Dir::Etc::SourceList.\n" +#| " \n" msgid "" "/etc/apt/trusted.gpg\n" @@ -821,22 +1101,21 @@ msgid "" " Configuration Item: Dir::Etc::Trusted.\n" " \n" msgstr "" -"#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n" -"Directorio donde se almacena la información del estado de cada paquete fuente por cada sitio especificado &sources-list; Opción de configuración: Dir::State::Lists.\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n" -"Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: Dir::State::Lists.\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n" -"Directorio donde se almacena la información del estado de cada paquete fuente por cada sitio especificado &sources-list; Opción de configuración: Dir::State::Lists.\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n" -"Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: Dir::State::Lists.\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n" -"Directorio donde se almacena la información del estado de cada paquete fuente por cada sitio especificado &sources-list; Opción de configuración: Dir::State::Lists.\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n" -"Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: Dir::State::Lists." +"/etc/apt/sources.list\n" +" Ubicaciones de dónde conseguir los paquetes.\n" +" Opción de configuración: Dir::Etc::SourceList.\n" +" \n" #. type: Plain text #: apt.ent:369 #, fuzzy, no-wrap +#| msgid "" +#| " /etc/apt/sources.list.d/\n" +#| " File fragments for locations to fetch packages from.\n" +#| " Configuration Item: Dir::Etc::SourceParts.\n" +#| " \n" +#| "\">\n" msgid "" " /etc/apt/trusted.gpg.d/\n" " File fragments for the trusted keys, additional keyrings can\n" @@ -845,18 +1124,11 @@ msgid "" " \n" "\">\n" msgstr "" -"#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n" -"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: Dir::State::Lists (lo que implica que no estarán completos).\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" -"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: Dir::State::Lists (Implica partial).\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n" -"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: Dir::State::Lists (lo que implica que no estarán completos).\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" -"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: Dir::State::Lists (Implica partial).\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n" -"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: Dir::State::Lists (lo que implica que no estarán completos).\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" -"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: Dir::State::Lists (Implica partial)." +" /etc/apt/sources.list.d/\n" +" Fragmentos de fichero para las ubicaciones de dónde descargar los paquetes.\n" +" Opción de configuración: Dir::Etc::SourceParts.\n" +" \n" +"\">\n" #. type: Plain text #: apt.ent:371 @@ -865,7 +1137,7 @@ msgstr "" #. type: Plain text #: apt.ent:380 -#, fuzzy, no-wrap +#, no-wrap msgid "" "" -msgstr "" +msgstr "" #. type: Plain text #: apt.ent:10 @@ -157,6 +178,11 @@ msgid "" "aptconfdir \"/etc/apt.conf\"> " msgstr "" +" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " #. type: Plain text #: apt.ent:17 @@ -169,6 +195,12 @@ msgid "" " \"\n" ">\n" msgstr "" +"\n" +"\n" +" apt.conf\n" +" 5\n" +" \"\n" +">\n" #. type: Plain text #: apt.ent:23 @@ -180,6 +212,11 @@ msgid "" " \"\n" ">\n" msgstr "" +"\n" +" apt-get\n" +" 8\n" +" \"\n" +">\n" #. type: Plain text #: apt.ent:29 @@ -191,6 +228,11 @@ msgid "" " \"\n" ">\n" msgstr "" +"\n" +" apt-config\n" +" 8\n" +" \"\n" +">\n" #. type: Plain text #: apt.ent:35 @@ -202,6 +244,11 @@ msgid "" " \"\n" ">\n" msgstr "" +"\n" +" apt-cdrom\n" +" 8\n" +" \"\n" +">\n" #. type: Plain text #: apt.ent:41 @@ -213,6 +260,11 @@ msgid "" " \"\n" ">\n" msgstr "" +"\n" +" apt-cache\n" +" 8\n" +" \"\n" +">\n" #. type: Plain text #: apt.ent:47 @@ -224,6 +276,11 @@ msgid "" " \"\n" ">\n" msgstr "" +"\n" +" apt_preferences\n" +" 5\n" +" \"\n" +">\n" #. type: Plain text #: apt.ent:53 @@ -235,6 +292,11 @@ msgid "" " \"\n" ">\n" msgstr "" +"\n" +" apt-key\n" +" 8\n" +" \"\n" +">\n" #. type: Plain text #: apt.ent:59 @@ -246,6 +308,11 @@ msgid "" " \"\n" ">\n" msgstr "" +"\n" +" apt-secure\n" +" 8\n" +" \"\n" +">\n" #. type: Plain text #: apt.ent:65 @@ -257,6 +324,11 @@ msgid "" " \"\n" ">\n" msgstr "" +"\n" +" apt-ftparchive\n" +" 1\n" +" \"\n" +">\n" #. type: Plain text #: apt.ent:72 @@ -268,6 +340,11 @@ msgid "" " \"\n" ">\n" msgstr "" +"\n" +" sources.list\n" +" 5\n" +" \"\n" +">\n" #. type: Plain text #: apt.ent:78 @@ -279,6 +356,11 @@ msgid "" " \"\n" ">\n" msgstr "" +"\n" +" reportbug\n" +" 1\n" +" \"\n" +">\n" #. type: Plain text #: apt.ent:84 @@ -290,6 +372,11 @@ msgid "" " \"\n" ">\n" msgstr "" +"\n" +" dpkg\n" +" 1\n" +" \"\n" +">\n" #. type: Plain text #: apt.ent:90 @@ -301,6 +388,11 @@ msgid "" " \"\n" ">\n" msgstr "" +"\n" +" dpkg-buildpackage\n" +" 1\n" +" \"\n" +">\n" #. type: Plain text #: apt.ent:96 @@ -312,6 +404,11 @@ msgid "" " \"\n" ">\n" msgstr "" +"\n" +" gzip\n" +" 1\n" +" \"\n" +">\n" #. type: Plain text #: apt.ent:102 @@ -323,6 +420,11 @@ msgid "" " \"\n" ">\n" msgstr "" +"\n" +" dpkg-scanpackages\n" +" 1\n" +" \"\n" +">\n" #. type: Plain text #: apt.ent:108 @@ -334,6 +436,11 @@ msgid "" " \"\n" ">\n" msgstr "" +"\n" +" dpkg-scansources\n" +" 1\n" +" \"\n" +">\n" #. type: Plain text #: apt.ent:114 @@ -345,6 +452,11 @@ msgid "" " \"\n" ">\n" msgstr "" +"\n" +" dselect\n" +" 1\n" +" \"\n" +">\n" #. type: Plain text #: apt.ent:120 @@ -356,6 +468,11 @@ msgid "" " \"\n" ">\n" msgstr "" +"\n" +" aptitude\n" +" 8\n" +" \"\n" +">\n" #. type: Plain text #: apt.ent:126 @@ -367,6 +484,11 @@ msgid "" " \"\n" ">\n" msgstr "" +"\n" +" synaptic\n" +" 8\n" +" \"\n" +">\n" #. type: Plain text #: apt.ent:132 @@ -378,6 +500,11 @@ msgid "" " \"\n" ">\n" msgstr "" +"\n" +" debsign\n" +" 1\n" +" \"\n" +">\n" #. type: Plain text #: apt.ent:138 @@ -389,6 +516,11 @@ msgid "" " \"\n" ">\n" msgstr "" +"\n" +" debsig-verify\n" +" 1\n" +" \"\n" +">\n" #. type: Plain text #: apt.ent:144 @@ -400,6 +532,11 @@ msgid "" " \"\n" ">\n" msgstr "" +"\n" +" gpg\n" +" 1\n" +" \"\n" +">\n" #. type: Plain text #: apt.ent:150 @@ -411,6 +548,11 @@ msgid "" " \"\n" ">\n" msgstr "" +"\n" +" gnome-apt\n" +" 1\n" +" \"\n" +">\n" #. type: Plain text #: apt.ent:156 @@ -422,6 +564,11 @@ msgid "" " \"\n" ">\n" msgstr "" +"\n" +" wajig\n" +" 1\n" +" \"\n" +">\n" #. type: Plain text #: apt.ent:168 @@ -439,6 +586,17 @@ msgid "" " 28 October 2008\n" " Linux\n" msgstr "" +"\n" +"\n" +"

apt@packages.debian.org
\n" +" \n" +" Jason Gunthorpe\n" +" \n" +" \n" +" 1998-2001 Jason Gunthorpe\n" +" 28 października 2008\n" +" Linux\n" #. type: Plain text #: apt.ent:171 @@ -447,6 +605,8 @@ msgid "" " \n" "\"> \n" msgstr "" +" \n" +"\"> \n" #. type: Plain text #: apt.ent:177 @@ -458,6 +618,11 @@ msgid "" " \n" "\">\n" msgstr "" +"\n" +" apt@packages.debian.org\n" +" \n" +"\">\n" #. type: Plain text #: apt.ent:185 @@ -471,6 +636,13 @@ msgid "" " \n" "\">\n" msgstr "" +"\n" +" Jason\n" +" Gunthorpe\n" +" \n" +" \n" +"\">\n" #. type: Plain text #: apt.ent:193 @@ -484,6 +656,13 @@ msgid "" " \n" "\">\n" msgstr "" +"\n" +" Mike\n" +" O'Connor\n" +" \n" +" \n" +"\">\n" #. type: Plain text #: apt.ent:200 @@ -496,6 +675,12 @@ msgid "" " \n" "\">\n" msgstr "" +"\n" +" zespół APT\n" +" \n" +" \n" +"\">\n" #. type: Plain text #: apt.ent:204 apt.ent:215 @@ -505,6 +690,9 @@ msgid "" " Linux\n" "\">\n" msgstr "" +"Linux\n" +"\">\n" #. type: Plain text #: apt.ent:211 @@ -517,6 +705,12 @@ msgid "" " \n" "\">\n" msgstr "" +"\n" +" Jason Gunthorpe\n" +" 1998-2001\n" +" \n" +"\">\n" #. type: Plain text #: apt.ent:221 @@ -528,7 +722,13 @@ msgid "" "\t\n" "\">\n" msgstr "" +"\n" +"\t\tStrona QA\n" +"\t\n" +"\">\n" +# #. type: Plain text #: apt.ent:232 #, no-wrap @@ -544,6 +744,16 @@ msgid "" " \n" "\">\n" msgstr "" +"\n" +"Bugs\n" +" Strona błędów APT. \n" +" Aby zgłosić błąd w APT, proszę przeczytać\n" +" /usr/share/doc/debian/bug-reporting.txt lub opis polecenia\n" +" &reportbug;.\n" +" \n" +" \n" +"\">\n" #. type: Plain text #: apt.ent:240 @@ -557,6 +767,13 @@ msgid "" " \n" "\">\n" msgstr "" +"\n" +"Autor\n" +" APT zostało napisane przez zespół APT apt@packages.debian.org.\n" +" \n" +" \n" +"\">\n" #. type: Plain text #: apt.ent:250 @@ -572,6 +789,15 @@ msgid "" " \n" " \n" msgstr "" +"\n" +"\n" +" \n" +" Wyświetla krótkie informacje o użyciu.\n" +" \n" +" \n" +" \n" #. type: Plain text #: apt.ent:258 @@ -585,7 +811,15 @@ msgid "" " \n" " \n" msgstr "" +" \n" +" \n" +" \n" +" Wyświetla wersję programu.\n" +" \n" +" \n" +" \n" +# #. type: Plain text #: apt.ent:268 #, no-wrap @@ -600,6 +834,15 @@ msgid "" " \n" " \n" msgstr "" +" \n" +" \n" +" \n" +" Plik konfiguracyjny. Podaje plik konfiguracyjny do użycia.\n" +" Program najpierw przeczyta swój domyślny plik konfiguracyjny, a następnie plik podany jako argument tej opcji.\n" +" Informacje o składni pliku można znaleźć w &apt-conf; \n" +" \n" +" \n" +" \n" #. type: Plain text #: apt.ent:280 @@ -617,7 +860,19 @@ msgid "" " \n" "\">\n" msgstr "" +" \n" +" \n" +" \n" +" Ustawia opcję konfiguracji. Pozwala ustawić dowolną\n" +" opcję konfiguracji. Składnia jest następująca: .\n" +" i można podać wielokrotnie - \n" +" do ustawiania różnych opcji.\n" +" \n" +" \n" +" \n" +"\">\n" +# #. type: Plain text #: apt.ent:291 #, no-wrap @@ -633,6 +888,16 @@ msgid "" " \n" "\">\n" msgstr "" +"\n" +"Wszystkie opcje linii poleceń mogą być ustawione w pliku konfiguracyjnym.\n" +" Poniższe opisy wskazują, którą opcję w pliku konfiguracyjnym należy ustawić.\n" +" W przypadku opcji logicznych, można unieważnić ustawienia pliku konfiguracyjnego,\n" +" używając , , \n" +" albo czegoś podobnego.\n" +" \n" +"\">\n" #. type: Plain text #: apt.ent:297 @@ -644,6 +909,11 @@ msgid "" " Configuration Item: Dir::Etc::Main.\n" " \n" msgstr "" +"/etc/apt/apt.conf\n" +" Plik konfiguracyjny APT.\n" +" Pozycja w pliku konfiguracyjnym: Dir::Etc::Main.\n" +" \n" #. type: Plain text #: apt.ent:303 @@ -655,6 +925,11 @@ msgid "" " \n" "\">\n" msgstr "" +" /etc/apt/apt.conf.d/\n" +" Części pliku konfiguracyjnego.\n" +" Pozycja w pliku konfiguracyjnym: Dir::Etc::Parts.\n" +" \n" +"\">\n" #. type: Plain text #: apt.ent:309 @@ -666,6 +941,11 @@ msgid "" " Configuration Item: Dir::Cache::Archives.\n" " \n" msgstr "" +"&cachedir;/archives/\n" +" Składnica pobranych plików pakietów.\n" +" Pozycja w pliku konfiguracyjnym: Dir::Cache::Archives.\n" +" \n" #. type: Plain text #: apt.ent:315 @@ -677,7 +957,13 @@ msgid "" " \n" "\">\n" msgstr "" +" &cachedir;/archives/partial/\n" +" Składnica obecnie pobieranych plików pakietów.\n" +" Pozycja w pliki konfiguracyjnym: Dir::Cache::Archives (implikuje partial). \n" +" \n" +"\">\n" +# #. type: Plain text #: apt.ent:325 #, no-wrap @@ -692,6 +978,15 @@ msgid "" " Configuration Item: Dir::Etc::Preferences.\n" " \n" msgstr "" +"/etc/apt/preferences\n" +" Plik zawierający preferencje wyboru wersji.\n" +" Jest to miejsce, w którym określa się tzw. "pinning",\n" +" tj. preferencje, skąd brać pewne pakiety -\n" +" z innego źródła,\n" +" z innej dystrybucji lub o innej wersji.\n" +" Pozycja w pliku konfiguracyjnym:Dir::Etc::Preferences.\n" +" \n" #. type: Plain text #: apt.ent:331 @@ -703,6 +998,11 @@ msgid "" " \n" "\">\n" msgstr "" +" /etc/apt/preferences.d/\n" +" Części pliku preferencji wyboru wersji.\n" +" Pozycja w pliku konfiguracyjnym: Dir::Etc::PreferencesParts.\n" +" \n" +"\">\n" #. type: Plain text #: apt.ent:337 @@ -714,6 +1014,11 @@ msgid "" " Configuration Item: Dir::Etc::SourceList.\n" " \n" msgstr "" +"/etc/apt/sources.list\n" +" Lokalizacje, z których będą ściągane pakiety.\n" +" Pozycja w pliku konfiguracyjnym: Dir::Etc::SourceList.\n" +" \n" #. type: Plain text #: apt.ent:343 @@ -725,6 +1030,11 @@ msgid "" " \n" "\">\n" msgstr "" +" /etc/apt/sources.list.d/\n" +" Części pliku zawierającego lokalizacje, z której są pobierane pakiety.\n" +" Pozycja w pliku konfiguracyjnym: Dir::Etc::SourceParts.\n" +" \n" +"\">\n" #. type: Plain text #: apt.ent:350 @@ -737,6 +1047,12 @@ msgid "" " Configuration Item: Dir::State::Lists.\n" " \n" msgstr "" +"&statedir;/lists/\n" +" Składnica zawierająca informacje o każdym zasobie pakietów podanym w\n" +" &sources-list;\n" +" Pozycja w pliku konfiguracyjnym: Dir::State::Lists.\n" +" \n" #. type: Plain text #: apt.ent:356 @@ -748,6 +1064,11 @@ msgid "" " \n" "\">\n" msgstr "" +" &statedir;/lists/partial/\n" +" Składnica obecnie pobieranych informacji o stanie pakietów.\n" +" Pozycja w pliku konfiguracyjnym: Dir::State::Lists (implikuje partial).\n" +" \n" +"\">\n" #. type: Plain text #: apt.ent:362 @@ -759,6 +1080,11 @@ msgid "" " Configuration Item: Dir::Etc::Trusted.\n" " \n" msgstr "" +"/etc/apt/trusted.gpg\n" +" Składnica lokalnych zaufanych kluczy gpg; będą tu dodawane nowe klucze.\n" +" Pozycja w pliku konfiguracyjnym: Dir::Etc::Trusted.\n" +" \n" #. type: Plain text #: apt.ent:369 @@ -771,11 +1097,17 @@ msgid "" " \n" "\">\n" msgstr "" +" /etc/apt/trusted.gpg.d/\n" +" Fragmenty plików zawierających zaufane klucze gpg, można tu składować\n" +" dodatkowe klucze (dodane przez administratora bądź inne pakiety).\n" +" Pozycja w pliku konfiguracyjnym: Dir::Etc::TrustedParts.\n" +" \n" +"\">\n" #. type: Plain text #: apt.ent:371 msgid "" -msgstr "" +msgstr "" #. type: Plain text #: apt.ent:380 @@ -790,6 +1122,13 @@ msgid "" " Debian Dummy l10n Team debian-l10n-dummy@lists.debian.org.\n" "\">\n" msgstr "" +"\n" +"robert@debian.org, 2000-2010.\n" +" Tłumaczenie przewodnika offline: Krzysztof Fiertek akfedux@megapolis.pl, 2004\n" +"\">\n" #. type: Plain text #: apt.ent:387 @@ -803,6 +1142,13 @@ msgid "" " translation is lagging behind the original content.\n" "\">\n" msgstr "" +"\n" +"\n" #. The last update date #. type: Content of: @@ -812,17 +1158,19 @@ msgid "" "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; 29 " "February 2004" msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; " +"29 lutego 2004" #. type: Content of: #: apt-cache.8.xml:22 apt-cache.8.xml:29 msgid "apt-cache" -msgstr "" +msgstr "apt-cache" #. type: Content of: #: apt-cache.8.xml:23 apt-cdrom.8.xml:22 apt-config.8.xml:23 apt-get.8.xml:23 #: apt-key.8.xml:15 apt-mark.8.xml:23 apt-secure.8.xml:15 msgid "8" -msgstr "" +msgstr "8" #. type: Content of: #: apt-cache.8.xml:24 apt-cdrom.8.xml:23 apt-config.8.xml:24 @@ -831,12 +1179,13 @@ msgstr "" #: apt-sortpkgs.1.xml:24 apt.conf.5.xml:30 apt_preferences.5.xml:23 #: sources.list.5.xml:24 msgid "APT" -msgstr "" +msgstr "APT" +# #. type: Content of: #: apt-cache.8.xml:30 msgid "APT package handling utility -- cache manipulator" -msgstr "" +msgstr "Narzędzie zarządzania pakietami APT -- manipulator bufora" #. type: Content of: #: apt-cache.8.xml:36 @@ -862,6 +1211,27 @@ msgid "" "\">pkgs madison pkgs " msgstr "" +"apt-cache " +"add plik gencaches showpkg pakiet " +"showsrc pakiet stats dump dumpavail unmet search wyrażenie-regularne show pakiet depends pakiet rdepends pakiet pkgnames prefiks dotty pakiet xvcg pakiet policy pakiety madison pakiety " #. type: Content of: #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 @@ -869,10 +1239,10 @@ msgstr "" #: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 #: sources.list.5.xml:33 -#, fuzzy msgid "Description" -msgstr "Kolejne kroki" +msgstr "Opis" +# #. type: Content of: <refentry><refsect1><para> #: apt-cache.8.xml:63 msgid "" @@ -881,31 +1251,42 @@ msgid "" "the system but does provide operations to search and generate interesting " "output from the package metadata." msgstr "" +"<command>apt-cache</command> wykonuje różnorodne operacje na buforze (cache) " +"pakietów programu APT. <command>apt-cache</command> nie zmienia stanu " +"systemu, ale dostarcza mechanizmów przeszukiwania metadanych pakietów i " +"generowania interesującego wyjścia." +# #. type: Content of: <refentry><refsect1><para> #: apt-cache.8.xml:68 apt-get.8.xml:131 msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given, " "one of the commands below must be present." msgstr "" +"Jedno z poniższych poleceń musi być użyte, chyba że została podana opcja " +"<option>-h</option> albo <option>--help</option>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:72 msgid "add <replaceable>file(s)</replaceable>" -msgstr "" +msgstr "add <replaceable>plik(i)</replaceable>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:73 msgid "" "<literal>add</literal> adds the named package index files to the package " "cache. This is for debugging only." msgstr "" +"<literal>add</literal> dodaje pliki zawierające indeks nazw pakietów do " +"bufora. Ta opcja jest przydatna głównie w celu odpluskwiania." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:77 msgid "gencaches" -msgstr "" +msgstr "gencaches" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:78 msgid "" @@ -913,12 +1294,17 @@ msgid "" "check</command>. It builds the source and package caches from the sources in " "&sources-list; and from <filename>/var/lib/dpkg/status</filename>." msgstr "" +"<literal>gencaches</literal> wykonuje te same operacje, co <command>apt-get " +"check</command>. Buduje bufor pakietów oraz źródeł pakietów na podstawie " +"źródeł wymienionych w &sources-list; oraz pliku <filename>/var/lib/dpkg/" +"status</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:84 msgid "showpkg <replaceable>pkg(s)</replaceable>" -msgstr "" +msgstr "showpkg <replaceable>pakiet(y)</replaceable>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:85 msgid "" @@ -932,6 +1318,15 @@ msgid "" "dependencies need not be. For instance, <command>apt-cache showpkg " "libreadline2</command> would produce output similar to the following:" msgstr "" +"<literal>showpkg</literal> wyświetla informacje na temat pakietów podanych w " +"linii poleceń. Pozostałymi argumentami są nazwy pakietów. Wyświetlane są " +"dostępne wersje oraz odwrotne zależności każdego z podanych pakietów, jak " +"również zwykłe zależności dla każdej z wersji Normalne (zwykłe) zależności " +"to są pakiety, od których dany pakiet zależy, odwrotne zależności stanowią " +"te pakiety, które zależą od danego pakietu. Tak więc, pakiet musi spełniać " +"normalne zależności, ale odwrotnych zależności - nie musi. Na przykład, " +"<command>apt-cache showpkg libreadline2</command> wypisze wyjście podobne do " +"poniższego:" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> #: apt-cache.8.xml:97 @@ -948,7 +1343,18 @@ msgid "" "2.1-12 - \n" "Reverse Provides: \n" msgstr "" +"Package: libreadline2\n" +"Versions: 2.1-12(/var/state/apt/lists/foo_Packages),\n" +"Reverse Depends: \n" +" libreadlineg2,libreadline2\n" +" libreadline2-altdev,libreadline2\n" +"Dependencies:\n" +"2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null))\n" +"Provides:\n" +"2.1-12 - \n" +"Reverse Provides: \n" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:109 msgid "" @@ -960,26 +1366,40 @@ msgid "" "installed. For the specific meaning of the remainder of the output it is " "best to consult the apt source code." msgstr "" +"Jak widać libreadline2 w wersji 2.1-12 zależy od libc5 i ncurses3.0, które " +"muszą być zainstalowane, aby libreadline2 działała. Z kolei libreadlineg2 i " +"libreadline2-altdev zależą od libreadline2. Jeżeli libreadline2 jest " +"zainstalowany, to libc5 i ncurses3.0 (i ldso) muszą być także zainstalowane; " +"natomiast libreadlineg2 oraz libreadline2-altdev nie muszą być " +"zainstalowane. W celu zrozumienia, co oznaczają pozostałe linie, najlepiej " +"przejrzeć kod źródłowy programu apt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:118 msgid "stats" -msgstr "" +msgstr "stats" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:118 msgid "" "<literal>stats</literal> displays some statistics about the cache. No " "further arguments are expected. Statistics reported are:" msgstr "" +"<literal>stats</literal> wyświetla statystyki dotyczące bufora pakietów. " +"Nie wymaga żadnych argumentów. Wypisywane są następujące statystyki:" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:121 msgid "" "<literal>Total package names</literal> is the number of package names found " "in the cache." msgstr "" +"<literal>Całkowita liczba nazw pakietów (Total package names)</literal> - " +"liczba nazw pakietów znajdujących się w buforze." +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:125 msgid "" @@ -988,7 +1408,12 @@ msgid "" "between their names and the names used by other packages for them in " "dependencies. The majority of packages fall into this category." msgstr "" +"<literal>Zwykłe pakiety (Normal packages)</literal> jest to liczba zwykłych, " +"regularnych nazw pakietów; są to pakiety, dla których istnieje relacja " +"\"jeden do jednego\" między ich nazwami a nazwami używanymi przez inne " +"pakiety jako zależności. Większość pakietów należy do tej kategorii." +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:131 msgid "" @@ -999,7 +1424,14 @@ msgid "" "package; several packages provide \"mail-transport-agent\", but there is no " "package named \"mail-transport-agent\"." msgstr "" +"<literal>Czyste pakiety wirtualne (Pure virtual packages)</literal> określa " +"liczbę pakietów, które istnieją tylko jako nazwa pakietu wirtualnego; to " +"jest pewne pakiety \"dostarczają\" tej nazwy wirtualnej, ale żaden pakiet " +"nie używa tej nazwy. Na przykład \"mail-transport-agent\" w systemie Debian " +"GNU/Linux jest czystym pakietem wirtualnym; kilka pakietów dostarcza \"mail-" +"transport-agenta\", ale żaden pakiet nie nazywa się \"mail-transport-agent\"." +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:139 msgid "" @@ -1008,7 +1440,13 @@ msgid "" "Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only " "one package, xless, provides \"X11-text-viewer\"." msgstr "" +"<literal>Pojedyncze pakiety wirtualne (Single virtual packages)</literal> - " +"liczba pakietów, dla których istnieje tylko jeden pakiet, który dostarcza " +"danego pakietu wirtualnego. Na przykład, w systemie Debian GNU/Linux \"X11-" +"text-viewer\" jest pakietem wirtualnym, ale tylko jeden pakiet - xless - " +"dostarcza \"X11-text-viewer\"." +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:145 msgid "" @@ -1017,7 +1455,13 @@ msgid "" "as the package name. For instance, in the Debian GNU/Linux system, \"debconf" "\" is both an actual package, and provided by the debconf-tiny package." msgstr "" +"<literal>Mieszane pakiety wirtualne (Mixed virtual packages)</literal> - " +"liczba pakietów, które albo dostarczają poszczególnych pakietów wirtualnych, " +"albo nazywają się tak, jak nazwa pakietu wirtualnego. Na przykład w " +"systemie Debian GNU/Linux \"debconf\" jest zarówno zwykłym pakietem, jak i " +"jest pakietem dostarczanym przez pakiet debconf-tiny." +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:152 msgid "" @@ -1027,7 +1471,14 @@ msgid "" "package (real or virtual) has been dropped from the distribution. Usually " "they are referenced from Conflicts or Breaks statements." msgstr "" +"<literal>Brakujące (Missing)</literal> jest liczbą nazw pakietów, do których " +"odnoszą się jakieś zależności, ale które nie są spełnione przez żaden z " +"dostępnych pakietów. Brakujące pakiety mogą być dowodem, że nie ma dostępu " +"do całej dystrybucji albo że pakiet (rzeczywisty lub wirtualny) został " +"usunięty z dystrybucji. Zazwyczaj odniesienia takie znajdują się w " +"zależnościach typu \"Conflicts\" lub \"Breaks\"." +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:159 msgid "" @@ -1037,19 +1488,29 @@ msgid "" "\"unstable\", for instance), is being accessed, this value can be " "considerably larger than the number of total package names." msgstr "" +"<literal>Całkowita liczba różnych wersji (Total distinct versions)</literal> " +"jest to liczba wersji pakietów znajdujących się w buforze, tak więc ta " +"wartość jest co najmniej równa liczbie wszystkich nazw pakietów. Jeżeli " +"pobierane są pakiety z więcej niż jednej dystrybucji (na przykład zarówno " +"\"stable\", jak i \"unstable\"), wartość ta może być znacznie większa niż " +"liczba wszystkich nazw pakietów." +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:166 msgid "" "<literal>Total dependencies</literal> is the number of dependency " "relationships claimed by all of the packages in the cache." msgstr "" +"<literal>Całkowite zależności (Total dependencies)</literal> to liczba " +"więzów zależności wymaganych przez wszystkie pakiety w buforze." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:173 msgid "showsrc <replaceable>pkg(s)</replaceable>" -msgstr "" +msgstr "showsrc <replaceable>pakiet(y)</replaceable>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:174 msgid "" @@ -1057,60 +1518,79 @@ msgid "" "match the given package names. All versions are shown, as well as all " "records that declare the name to be a Binary." msgstr "" +"<literal>showsrc</literal> wyświetla wszystkie pakiety źródłowe, które " +"odpowiadają podanym nazwom pakietów. Wyświetlone zostaną wszystkie wersje " +"tych pakietów oraz pakiety binarne, które są z tych pakietów budowane." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:179 apt-config.8.xml:84 msgid "dump" -msgstr "" +msgstr "dump" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:180 msgid "" "<literal>dump</literal> shows a short listing of every package in the cache. " "It is primarily for debugging." msgstr "" +"<literal>dump</literal> pokazuje krótką listę wszystkich pakietów w buforze. " +"Jest używany głównie w celu odpluskwiania." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:184 msgid "dumpavail" -msgstr "" +msgstr "dumpavail" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:185 msgid "" "<literal>dumpavail</literal> prints out an available list to stdout. This is " "suitable for use with &dpkg; and is used by the &dselect; method." msgstr "" +"<literal>dumpavail</literal> wypisuje na standardowe wyjście (stdout) listę " +"dostępnych pakietów. Jest to polecenie odpowiednie do użycia z programem " +"&dpkg; i jest używane w metodzie &dselect; tego programu." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:189 msgid "unmet" -msgstr "" +msgstr "unmet" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:190 msgid "" "<literal>unmet</literal> displays a summary of all unmet dependencies in the " "package cache." msgstr "" +"<literal>unmet</literal> pokazuje podsumowanie wszystkich niespełnionych " +"zależności w buforze pakietów" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:194 msgid "show <replaceable>pkg(s)</replaceable>" -msgstr "" +msgstr "show <replaceable>pakiet(y)</replaceable>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:195 msgid "" "<literal>show</literal> performs a function similar to <command>dpkg --print-" "avail</command>; it displays the package records for the named packages." msgstr "" +"<literal>show</literal> spełnia funkcje podobne do <command>dpkg --print-" +"avail</command>; pokazuje szczegółowe informacje o podanych pakietach." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:200 msgid "search <replaceable>regex [ regex ... ]</replaceable>" msgstr "" +"search <replaceable>wyrażenie regularne [ wyrażenie regularne ... ]</" +"replaceable>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:201 msgid "" @@ -1125,43 +1605,64 @@ msgid "" "<option>--names-only</option> is given then the long description is not " "searched, only the package name is." msgstr "" +"<literal>search</literal> wykonuje pełne wyszukiwanie podanego wzorca " +"będącego wyrażeniem regularnym POSIX (patrz " +"<citerefentry><refentrytitle><command>regex</command></refentrytitle> " +"<manvolnum>7</manvolnum></citerefentry>) we wszystkich dostępnych listach " +"pakietów. Przeszukuje nazwy pakietów (w tym pakietów wirtualnych) i ich " +"szczegółowe (długie) opisy, szukając w nich podanego wyrażenia regularnego i " +"wypisuje nazwę pakietu i jego krótki opis. Jeżeli podana jest opcja " +"<option>--full</option>, to wtedy dla każdego znalezionego pakietu " +"informacje na wyjściu są podobne do tego, co pokazuje akcja <literal>show</" +"literal>. Jeżeli podano opcję <option>--names-only</option>, to są " +"przeszukiwane tylko nazwy pakietów, bez ich długich opisów." +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:214 msgid "" "Separate arguments can be used to specify multiple search patterns that are " "and'ed together." msgstr "" +"Oddzielne argumenty mogą być używane do podania kilku wzorców, które będą " +"traktowane jakby były połączone spójnikiem logicznym \"i\"." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:218 msgid "depends <replaceable>pkg(s)</replaceable>" -msgstr "" +msgstr "depends <replaceable>pakiet(y)</replaceable>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:219 msgid "" "<literal>depends</literal> shows a listing of each dependency a package has " "and all the possible other packages that can fulfill that dependency." msgstr "" +"<literal>depends</literal> wyświetla listę wszystkich zależności danego " +"pakietu i wszystkie możliwe pakiety, które mogą spełnić te zależności." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:223 msgid "rdepends <replaceable>pkg(s)</replaceable>" -msgstr "" +msgstr "rdepends <replaceable>pakiet(y)</replaceable>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:224 msgid "" "<literal>rdepends</literal> shows a listing of each reverse dependency a " "package has." msgstr "" +"<literal>rdepends</literal> pokazuje listę wszystkich odwrotnych zależności " +"danego pakietu." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:228 msgid "pkgnames <replaceable>[ prefix ]</replaceable>" -msgstr "" +msgstr "pkgnames <replaceable>[ prefiks ]</replaceable>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:229 msgid "" @@ -1171,6 +1672,11 @@ msgid "" "extremely quickly. This command is best used with the <option>--generate</" "option> option." msgstr "" +"To polecenie wyświetla nazwy wszystkich pakietów znanych systemowi APT. " +"Opcjonalnym argumentem jest przedrostek nazwy pakietów. Wynik jest " +"odpowiedni do użycia z funkcją powłoki (shella) uzupełniania nazw za pomocą " +"klawisza tabulacji i jest wypisywany bardzo szybko. Tego polecenia najlepiej " +"używać z opcją <option>--generate</option>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:234 @@ -1179,12 +1685,17 @@ msgid "" "download, installable or installed, e.g. virtual packages are also listed in " "the generated list." msgstr "" +"Proszę zauważyć, że to, iż pakiet jest znany systemowi APT, niekoniecznie " +"oznacza, że jest dostępny do pobrania i zainstalowania albo zainstalowany. " +"Może być np. pakietem wirtualnym, które także są wypisane w wygenerowanej " +"liście." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:239 msgid "dotty <replaceable>pkg(s)</replaceable>" -msgstr "" +msgstr "dotty <replaceable>pakiet(y)</replaceable>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:240 msgid "" @@ -1197,7 +1708,16 @@ msgid "" "the packages listed on the command line, set the <literal>APT::Cache::" "GivenOnly</literal> option." msgstr "" +"<literal>dotty</literal> bierze jako argument listę pakietów i generuje " +"wyjście odpowiednie dla programu dotty z pakietu <ulink url=\"http://www." +"research.att.com/sw/tools/graphviz/\">GraphViz</ulink>. Wynikiem będzie " +"zbiór wierzchołków i krawędzi reprezentujących powiązania między pakietami. " +"Domyślnie podane pakiety wyśledzą wszystkie pakiety zależne. Może to " +"spowodować wypisanie bardzo dużego grafu. Aby wypisać powiązania tylko " +"pomiędzy pakietami podanymi w linii poleceń, należy użyć opcji <literal>APT::" +"Cache::GivenOnly</literal>." +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:249 msgid "" @@ -1206,16 +1726,22 @@ msgid "" "are hexagons. Orange boxes mean recursion was stopped [leaf packages], blue " "lines are pre-depends, green lines are conflicts." msgstr "" +"Wynikowe wierzchołki będą miały różnorakie kształty: zwykłe pakiety są " +"prostokątami, czyste pakiety wirtualne to trójkąty, mieszane pakiety " +"wirtualne są rombami, sześciokąty oznaczają brakujące pakiety . Pomarańczowe " +"prostokąty oznaczają koniec rekurencji (liście), niebieskie linie to pre-" +"zależności, linie zielone to konflikty." +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:254 msgid "Caution, dotty cannot graph larger sets of packages." -msgstr "" +msgstr "Uwaga: dotty nie potrafi narysować większego zbioru pakietów." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:257 msgid "xvcg <replaceable>pkg(s)</replaceable>" -msgstr "" +msgstr "xvcg <replaceable>pakiet(y)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:258 @@ -1223,12 +1749,16 @@ msgid "" "The same as <literal>dotty</literal>, only for xvcg from the <ulink url=" "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>." msgstr "" +"Robi to samo, co <literal>dotty</literal>, tylko dla xvcg z <ulink url=" +"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">narzędzia VCG</" +"ulink>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:262 msgid "policy <replaceable>[ pkg(s) ]</replaceable>" -msgstr "" +msgstr "policy <replaceable>[ pakiet(y) ]</replaceable>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:263 msgid "" @@ -1237,12 +1767,17 @@ msgid "" "source. Otherwise it prints out detailed information about the priority " "selection of the named package." msgstr "" +"<literal>policy</literal> jest pomyślane w celu debugowania zagadnień " +"związanych z plikiem preferencji. Jeżeli nie podano żadnych opcji, wypisane " +"zostaną informacje o priorytecie każdego źródła. W przeciwnym wypadku, " +"wypisuje szczegółowe informacje o priorytecie danego pakietu." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:269 msgid "madison <replaceable>/[ pkg(s) ]</replaceable>" -msgstr "" +msgstr "madison <replaceable>/[ pakiet(y) ]</replaceable>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:270 msgid "" @@ -1254,25 +1789,31 @@ msgid "" "architecture for which APT has retrieved package lists (<literal>APT::" "Architecture</literal>)." msgstr "" +"polecenie <literal>madison</literal> z <literal>apt-cache</literal> próbuje " +"naśladować format wyjścia i część funkcjonalności programu <literal>madison</" +"literal> - narzędzia zarządzania archiwum Debiana. Wyświetla dostępne wersje " +"pakietów w formacie tabeli. W przeciwieństwie do oryginału, może wyświetlić " +"informacje tylko dla tych architektur, dla których APT pobrało listy " +"pakietów (<literal>APT::Architecture</literal>)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 #: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 #: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 -#, fuzzy msgid "options" -msgstr "Kolejne kroki" +msgstr "opcje" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:285 msgid "<option>-p</option>" -msgstr "" +msgstr "<option>-p</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:285 msgid "<option>--pkg-cache</option>" -msgstr "" +msgstr "<option>--pkg-cache</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:286 msgid "" @@ -1280,18 +1821,22 @@ msgid "" "cache used by all operations. Configuration Item: <literal>Dir::Cache::" "pkgcache</literal>." msgstr "" +"Podaje nazwę pliku to przechowywania bufora pakietów, który jest podstawowym " +"buforem używanym we wszystkich operacjach. Pozycja w pliku konfiguracyjnym: " +"<literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376 #: apt-sortpkgs.1.xml:58 msgid "<option>-s</option>" -msgstr "" +msgstr "<option>-s</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:291 msgid "<option>--src-cache</option>" -msgstr "" +msgstr "<option>--src-cache</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:292 msgid "" @@ -1301,17 +1846,24 @@ msgid "" "cache is used to avoid reparsing all of the package files. Configuration " "Item: <literal>Dir::Cache::srcpkgcache</literal>." msgstr "" +"Podaje nazwę pliku to przechowywania bufora źródeł. Jest używany tylko przez " +"akcję <literal>gencaches</literal> i przechowuje sparsowaną wersję " +"informacji o pakietach pobraną ze zdalnych źródeł. Podczas budowania bufora " +"pakietów, bufor źródeł jest używany w celu uniknięcia ponownego parsowania " +"wszystkich plików pakietów. Pozycja w pliku konfiguracyjnym: <literal>Dir::" +"Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>-q</option>" -msgstr "" +msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>--quiet</option>" -msgstr "" +msgstr "<option>--quiet</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:300 msgid "" @@ -1320,17 +1872,23 @@ msgid "" "<option>-q=#</option> to set the quietness level, overriding the " "configuration file. Configuration Item: <literal>quiet</literal>." msgstr "" +"Cichy; wypisuje tylko informacje potrzebne do logowania, opuszczając " +"wskaźniki postępu. Więcej znaków q spowoduje jeszcze bardziej ciche wyjście, " +"maksimum jest 2. Można także ustawić poziom cichości za pomocą <option>-q=#</" +"option>,nadpisując tym samym opcję z pliku konfiguracyjnego. Pozycja w " +"pliku konfiguracyjnym: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:306 msgid "<option>-i</option>" -msgstr "" +msgstr "<option>-i</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:306 msgid "<option>--important</option>" -msgstr "" +msgstr "<option>--important</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:307 msgid "" @@ -1338,34 +1896,41 @@ msgid "" "only Depends and Pre-Depends relations to be printed. Configuration Item: " "<literal>APT::Cache::Important</literal>." msgstr "" +"Wyświetla tylko ważne zależności; do używania z akcją unmet. Powoduje " +"wypisanie tylko zależności typu Depends i Pre-Depends. Pozycja w pliku " +"konfiguracyjnym: <literal>APT::Cache::Important</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:312 apt-cdrom.8.xml:121 apt-get.8.xml:333 msgid "<option>-f</option>" -msgstr "" +msgstr "<option>-f</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:312 msgid "<option>--full</option>" -msgstr "" +msgstr "<option>--full</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:313 msgid "" "Print full package records when searching. Configuration Item: " "<literal>APT::Cache::ShowFull</literal>." msgstr "" +"Podczas szukania wypisuj pełną informację o pakiecie. Pozycja w pliku " +"konfiguracyjnym: <literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548 msgid "<option>-a</option>" -msgstr "" +msgstr "<option>-a</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:317 msgid "<option>--all-versions</option>" -msgstr "" +msgstr "<option>--all-versions</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:318 msgid "" @@ -1376,17 +1941,25 @@ msgid "" "applicable to the <literal>show</literal> command. Configuration Item: " "<literal>APT::Cache::AllVersions</literal>." msgstr "" +"Akcja show wypisuje wszystkie rekordy dla wszystkich dostępnych wersji. " +"Jest to opcja domyślna, aby ją wyłączyć, proszę użyć <option>--no-all-" +"versions</option>. Jeżeli podano <option>--no-all-versions</option>, to " +"będzie wyświetlana tylko wersja-kandydat (czyli ta, która byłaby wybrana do " +"instalacji). Ta opcja ma znaczenie tylko dla polecenia <literal>show</" +"literal>. Pozycja w pliku konfiguracyjnym: <literal>APT::Cache::" +"AllVersions</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:326 msgid "<option>-g</option>" -msgstr "" +msgstr "<option>-g</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:326 msgid "<option>--generate</option>" -msgstr "" +msgstr "<option>--generate</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:327 msgid "" @@ -1394,29 +1967,37 @@ msgid "" "it is. This is the default; to turn it off, use <option>--no-generate</" "option>. Configuration Item: <literal>APT::Cache::Generate</literal>." msgstr "" +"Automatycznie odbudowuje bufor pakietów, zamiast używać istniejącego " +"bufora. Ta opcja jest domyślnie włączona, aby ją wyłączyć, należy użyć " +"<option>--no-generate</option>. Pozycja w pliku konfiguracyjnym: " +"<literal>APT::Cache::Generate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:332 msgid "<option>--names-only</option>" -msgstr "" +msgstr "<option>--names-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:332 apt-cdrom.8.xml:139 msgid "<option>-n</option>" -msgstr "" +msgstr "<option>-n</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:333 msgid "" "Only search on the package names, not the long descriptions. Configuration " "Item: <literal>APT::Cache::NamesOnly</literal>." msgstr "" +"Przeszukaj tylko nazwy pakietów, pomijając szczegółowe opisy. Pozycja w " +"pliku konfiguracyjnym: <literal>APT::Cache::NamesOnly</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:337 msgid "<option>--all-names</option>" -msgstr "" +msgstr "<option>--all-names</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:338 msgid "" @@ -1424,12 +2005,17 @@ msgid "" "and missing dependencies. Configuration Item: <literal>APT::Cache::" "AllNames</literal>." msgstr "" +"Powoduje, że akcja <literal>pkgnames</literal> wypisze nazwy wszystkich " +"pakietów, łącznie z pakietami wirtualnymi oraz pakietami mającymi brakujące " +"zależności. Pozycja w pliku konfiguracyjnym: <literal>APT::Cache::AllNames</" +"literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:343 msgid "<option>--recurse</option>" -msgstr "" +msgstr "<option>--recurse</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:344 msgid "" @@ -1437,12 +2023,17 @@ msgid "" "that all packages mentioned are printed once. Configuration Item: " "<literal>APT::Cache::RecurseDepends</literal>." msgstr "" +"Powoduje, że zależności w poleceniach <literal>depends</literal> i " +"<literal>rdepends</literal> będą zależnościami rekurencyjnymi, tak że " +"wszystkie wymienione pakiety zostaną wypisane tylko raz. Pozycja w pliku " +"konfiguracyjnym: <literal>APT::Cache::RecurseDepends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:349 msgid "<option>--installed</option>" -msgstr "" +msgstr "<option>--installed</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:351 msgid "" @@ -1450,24 +2041,27 @@ msgid "" "literal> to packages which are currently installed. Configuration Item: " "<literal>APT::Cache::Installed</literal>." msgstr "" +"Ogranicza wyjście poleceń <literal>depends</literal> i <literal>rdepends</" +"literal> tylko do pakietów, które są obecnie zainstalowane. Pozycja w pliku " +"konfiguracyjnym: <literal>APT::Cache::Installed</literal>." #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 #: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:554 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" -msgstr "" +msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 #: apt.conf.5.xml:1035 apt_preferences.5.xml:630 msgid "Files" -msgstr "" +msgstr "Pliki" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:363 msgid "&file-sourceslist; &file-statelists;" -msgstr "" +msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 @@ -1476,26 +2070,30 @@ msgstr "" #: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637 #: sources.list.5.xml:233 msgid "See Also" -msgstr "" +msgstr "Zobacz także" +# #. type: Content of: <refentry><refsect1><para> #: apt-cache.8.xml:369 msgid "&apt-conf;, &sources-list;, &apt-get;" -msgstr "" +msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 #: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:575 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" -msgstr "" +msgstr "Diagnostyka" +# #. type: Content of: <refentry><refsect1><para> #: apt-cache.8.xml:374 msgid "" "<command>apt-cache</command> returns zero on normal operation, decimal 100 " "on error." msgstr "" +"<command>apt-cache</command> zwraca zero, gdy zakończyło się pomyślnie, 100 " +"- w przypadku błędu." #. type: Content of: <refentry><refentryinfo> #: apt-cdrom.8.xml:13 @@ -1503,16 +2101,19 @@ msgid "" "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 " "February 2004</date>" msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; " +"<date>14 lutego 2004</date>" #. type: Content of: <refentry><refnamediv><refname> #: apt-cdrom.8.xml:21 apt-cdrom.8.xml:28 msgid "apt-cdrom" -msgstr "" +msgstr "apt-cdrom" +# #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-cdrom.8.xml:29 msgid "APT CDROM management utility" -msgstr "" +msgstr "Narzędzie APT do zarządzania źródłami typu CDROM" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-cdrom.8.xml:35 @@ -1523,7 +2124,13 @@ msgid "" "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> " "<arg>add</arg> <arg>ident</arg> </group>" msgstr "" +"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> " +"<arg><option>-d=<replaceable>punkt montowania CD-ROM-u</replaceable></" +"option></arg> <arg><option>-o=<replaceable>opcja konfiguracji</replaceable></" +"option></arg> <arg><option>-c=<replaceable>plik</replaceable></option></arg> " +"<group> <arg>add</arg> <arg>identyfikator</arg> </group>" +# #. type: Content of: <refentry><refsect1><para> #: apt-cdrom.8.xml:48 msgid "" @@ -1532,7 +2139,12 @@ msgid "" "the structure of the disc as well as correcting for several possible mis-" "burns and verifying the index files." msgstr "" +"<command>apt-cdrom</command> jest używany w celu dodania nowego CD-ROM-u do " +"listy dostępnych źródeł programu APT. <command>apt-cdrom</command> określa " +"strukturę dysku, poprawia ewentualne błędy powstałe podczas produkcji CD-ROM-" +"u i weryfikuje pliki indeksów." +# #. type: Content of: <refentry><refsect1><para> #: apt-cdrom.8.xml:55 msgid "" @@ -1540,14 +2152,25 @@ msgid "" "system, it cannot be done by hand. Furthermore each disk in a multi-cd set " "must be inserted and scanned separately to account for possible mis-burns." msgstr "" +"Dodanie nowych CD do systemu APT nie może być zrobione ręcznie, tak więc " +"używanie <command>apt-cdrom</command> jest konieczne. Co więcej, każdy dysk " +"w wielodyskowym archiwum musi być włożony i zeskanowany oddzielnie." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt-cdrom.8.xml:65 msgid "add" -msgstr "" +msgstr "add" +# #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:66 +#, fuzzy +#| msgid "" +#| "<literal>add</literal> is used to add a new disc to the source list. It " +#| "will unmount the CDROM device, prompt for a disk to be inserted and then " +#| "procceed to scan it and copy the index files. If the disc does not have a " +#| "proper <filename>disk</filename> directory you will be prompted for a " +#| "descriptive title." msgid "" "<literal>add</literal> is used to add a new disc to the source list. It will " "unmount the CDROM device, prompt for a disk to be inserted and then proceed " @@ -1555,7 +2178,13 @@ msgid "" "<filename>disk</filename> directory you will be prompted for a descriptive " "title." msgstr "" +"<literal>add</literal> jest używane do dodania nowego dysku do listy źródeł. " +"<literal>add</literal> odmontuje urządzenie CDROM, poprosi o włożenie dysku, " +"a następnie zeskanuje go i skopiuje pliki indeksu. Jeżeli dysk nie ma " +"właściwego katalogu <filename>disk</filename>, użytkownik zostanie " +"poproszony o podanie opisu dysku." +# #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:74 msgid "" @@ -1563,19 +2192,26 @@ msgid "" "maintains a database of these IDs in <filename>&statedir;/cdroms.list</" "filename>" msgstr "" +"APT używa identyfikatora CDROM-u do określenia, który dysk obecnie znajduje " +"się w napędzie, oraz przechowuje bazę tych identyfikatorów w pliku " +"<filename>&statedir;/cdroms.list</filename>" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt-cdrom.8.xml:81 msgid "ident" -msgstr "" +msgstr "ident" +# #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:82 msgid "" "A debugging tool to report the identity of the current disc as well as the " "stored file name" msgstr "" +"Narzędzie debugujące, wyświetlające identyfikator włożonego dysku oraz nazwę " +"pliku, w którym jest przechowywany." +# #. type: Content of: <refentry><refsect1><para> #: apt-cdrom.8.xml:61 msgid "" @@ -1583,23 +2219,26 @@ msgid "" "one of the commands below must be present. <placeholder type=\"variablelist" "\" id=\"0\"/>" msgstr "" +"Jedno z poniższych poleceń musi być użyte, chyba że została podana opcja " +"<option>-h</option> lub <option>--help</option>. <placeholder type=" +"\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> #: apt-cdrom.8.xml:91 apt-key.8.xml:139 -#, fuzzy msgid "Options" -msgstr "Kolejne kroki" +msgstr "Opcje" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328 msgid "<option>-d</option>" -msgstr "" +msgstr "<option>-d</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cdrom.8.xml:95 msgid "<option>--cdrom</option>" -msgstr "" +msgstr "<option>--cdrom</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:96 msgid "" @@ -1607,17 +2246,22 @@ msgid "" "be listed in <filename>/etc/fstab</filename> and properly configured. " "Configuration Item: <literal>Acquire::cdrom::mount</literal>." msgstr "" +"Punkt montowania. Podaje lokalizację katalogu, w którym będzie zamontowany " +"cdrom. Musi istnieć odpowiednia konfiguracja dla tego punktu montowania w " +"pliku <filename>/etc/fstab</filename>. Pozycja w pliku konfiguracyjnym: " +"<literal>Acquire::cdrom::mount</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cdrom.8.xml:104 msgid "<option>-r</option>" -msgstr "" +msgstr "<option>-r</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cdrom.8.xml:104 msgid "<option>--rename</option>" -msgstr "" +msgstr "<option>--rename</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:105 msgid "" @@ -1625,17 +2269,22 @@ msgid "" "This option will cause <command>apt-cdrom</command> to prompt for a new " "label. Configuration Item: <literal>APT::CDROM::Rename</literal>." msgstr "" +"Przemianuj dysk. Zmienia etykietę dysku lub unieważnia etykietę wcześniej " +"daną dyskowi. Podanie tej opcji spowoduje, że <command>apt-cdrom</command> " +"spyta się o nową etykietę. Pozycja w pliku konfiguracyjnym: <literal>APT::" +"CDROM::Rename</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cdrom.8.xml:113 apt-get.8.xml:347 msgid "<option>-m</option>" -msgstr "" +msgstr "<option>-m</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cdrom.8.xml:113 msgid "<option>--no-mount</option>" -msgstr "" +msgstr "<option>--no-mount</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:114 msgid "" @@ -1643,12 +2292,16 @@ msgid "" "unmounting the mount point. Configuration Item: <literal>APT::CDROM::" "NoMount</literal>." msgstr "" +"Nie montuj. Uniemożliwia programowi <command>apt-cdrom</command> montowanie " +"i odmontowywanie CDROM-u. Pozycja w pliku konfiguracyjnym: <literal>APT::" +"CDROM::NoMount</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cdrom.8.xml:121 msgid "<option>--fast</option>" -msgstr "" +msgstr "<option>--fast</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:122 msgid "" @@ -1657,12 +2310,18 @@ msgid "" "been run on this disc before and did not detect any errors. Configuration " "Item: <literal>APT::CDROM::Fast</literal>." msgstr "" +"Szybkie kopiowanie. Zakłada, że pliki z pakietami są poprawne i nie sprawdza " +"każdego pakietu. Ta opcja powinna być używana tylko wtedy, jeżeli " +"<command>apt-cdrom</command> był już uruchomiony na danym dysku i nie wykrył " +"na nim żadnych błędów. Pozycja w pliku konfiguracyjnym: <literal>APT::" +"CDROM::Fast</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cdrom.8.xml:131 msgid "<option>--thorough</option>" -msgstr "" +msgstr "<option>--thorough</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:132 msgid "" @@ -1670,22 +2329,27 @@ msgid "" "1.1/1.2 discs that have Package files in strange places. It takes much " "longer to scan the CD but will pick them all up." msgstr "" +"Gruntowne przeglądanie pakietów. Ta opcja może być potrzebna do indeksowania " +"starych dysków z Debianem 1.1/1.2, w których pliki Package były umieszczone " +"w dziwnych miejscach. Indeksowanie całego CD zabiera więcej czasu, ale " +"znajdzie wszystkie takie pliki." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cdrom.8.xml:140 apt-get.8.xml:378 msgid "<option>--just-print</option>" -msgstr "" +msgstr "<option>--just-print</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cdrom.8.xml:141 apt-get.8.xml:380 msgid "<option>--recon</option>" -msgstr "" +msgstr "<option>--recon</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cdrom.8.xml:142 apt-get.8.xml:381 msgid "<option>--no-act</option>" -msgstr "" +msgstr "<option>--no-act</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:143 msgid "" @@ -1693,29 +2357,35 @@ msgid "" "files. Everything is still checked however. Configuration Item: " "<literal>APT::CDROM::NoAct</literal>." msgstr "" +"Bez zmian. Nie zmienia pliku &sources-list; i nie zapisuje pików " +"indeksowych. Jednakże nadal wszystko jest sprawdzane. Pozycja w pliku " +"konfiguracyjnym: <literal>APT::CDROM::NoAct</literal>." +# #. type: Content of: <refentry><refsect1><para> #: apt-cdrom.8.xml:156 msgid "&apt-conf;, &apt-get;, &sources-list;" -msgstr "" +msgstr "&apt-conf;, &apt-get;, &sources-list;" +# #. type: Content of: <refentry><refsect1><para> #: apt-cdrom.8.xml:161 msgid "" "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 " "on error." msgstr "" +"<command>apt-cdrom</command> zwraca zero, gdy zakończyło się pomyślnie, 100 " +"- w przypadku błędu." #. type: Content of: <refentry><refnamediv><refname> #: apt-config.8.xml:22 apt-config.8.xml:29 msgid "apt-config" -msgstr "" +msgstr "apt-config" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-config.8.xml:30 -#, fuzzy msgid "APT Configuration Query program" -msgstr "Plik konfiguracyjny" +msgstr "Program odpytywania konfiguracji APT" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-config.8.xml:36 @@ -1725,6 +2395,10 @@ msgid "" "c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> " "<arg>shell</arg> <arg>dump</arg> </group>" msgstr "" +"<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-" +"o=<replaceable>opcja konfiguracji</replaceable></option></arg> <arg><option>-" +"c=<replaceable>plik</replaceable></option></arg> <group choice=\"req\"> " +"<arg>shell</arg> <arg>dump</arg> </group>" #. type: Content of: <refentry><refsect1><para> #: apt-config.8.xml:48 @@ -1734,18 +2408,25 @@ msgid "" "the main configuration file <filename>/etc/apt/apt.conf</filename> in a " "manner that is easy to use by scripted applications." msgstr "" +"<command>apt-config</command> jest wewnętrznym programem używanym przez " +"różne części pakietu APT w celu zapewnienia spójności konfiguracji. Uzyskuje " +"dostęp do głównego pliku konfiguracyjnego <filename>/etc/apt/apt.conf</" +"filename> w sposób łatwy do użycia w programach skryptowych." +# #. type: Content of: <refentry><refsect1><para> #: apt-config.8.xml:53 apt-ftparchive.1.xml:72 msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given " "one of the commands below must be present." msgstr "" +"Jedno z poniższych poleceń musi być użyte, chyba że została podana opcja " +"<option>-h</option> albo <option>--help</option>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-config.8.xml:58 msgid "shell" -msgstr "" +msgstr "shell" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-config.8.xml:60 @@ -1756,6 +2437,11 @@ msgid "" "shell assignments commands for each present value. In a shell script it " "should be used like:" msgstr "" +"shell pozwala skryptom powłoki na uzyskanie informacji o konfiguracji. " +"Wymaga podania pary argumentów: pierwszym z nich jest zmienna powłoki, a " +"drugim nazwa zmiennej konfiguracyjnej do odczytania. Wyjściem jest lista " +"przypisań zmiennych powłoki dla każdej odczytanej wartości konfiguracji. " +"Przykład użycia w skrypcie powłoki:" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> #: apt-config.8.xml:68 @@ -1765,6 +2451,9 @@ msgid "" "RES=`apt-config shell OPTS MyApp::options`\n" "eval $RES\n" msgstr "" +"OPTS=\"-f\"\n" +"RES=`apt-config shell OPTS MojaAplikacja::opcje`\n" +"eval $RES\n" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-config.8.xml:73 @@ -1772,6 +2461,8 @@ msgid "" "This will set the shell environment variable $OPTS to the value of MyApp::" "options with a default of <option>-f</option>." msgstr "" +"Powyższe ustawi wartość zmiennej środowiskowej powłoki $OPTS na wartość " +"zmiennej MojaAplikacja::opcje, z domyślną wartością <option>-f</option>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-config.8.xml:77 @@ -1780,39 +2471,47 @@ msgid "" "names, d returns directories, b returns true or false and i returns an " "integer. Each of the returns is normalized and verified internally." msgstr "" +"Do zmienna konfiguracji można dołączyć /[fbdi]. f zwraca nazwy plików, d - " +"katalogi, b - true lub false, a i - liczbę. Każda ze zwracanych wartości " +"jest ujednolicana i weryfikowana." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-config.8.xml:86 msgid "Just show the contents of the configuration space." -msgstr "" +msgstr "Wyświetla zawartość przestrzeni konfiguracji." #. type: Content of: <refentry><refsect1><para> #: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593 #: apt-sortpkgs.1.xml:70 msgid "&apt-conf;" -msgstr "" +msgstr "&apt-conf;" +# #. type: Content of: <refentry><refsect1><para> #: apt-config.8.xml:109 msgid "" "<command>apt-config</command> returns zero on normal operation, decimal 100 " "on error." msgstr "" +"<command>apt-config</command> zwraca zero, gdy zakończyło się pomyślnie, 100 " +"- w przypadku błędu." #. type: Content of: <refentry><refnamediv><refname> #: apt-extracttemplates.1.xml:22 apt-extracttemplates.1.xml:29 msgid "apt-extracttemplates" -msgstr "" +msgstr "apt-extracttemplates" #. type: Content of: <refentry><refmeta><manvolnum> #: apt-extracttemplates.1.xml:23 apt-ftparchive.1.xml:23 apt-sortpkgs.1.xml:23 msgid "1" -msgstr "" +msgstr "1" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-extracttemplates.1.xml:30 msgid "Utility to extract DebConf config and templates from Debian packages" msgstr "" +"Narzędzie wyciągające z pakietów Debiana skrypty konfiguracyjne i szablony " +"DebConf" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-extracttemplates.1.xml:36 @@ -1822,6 +2521,9 @@ msgid "" "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></" "arg>" msgstr "" +"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> " +"<arg><option>-t=<replaceable>katalog_tymczasowy</replaceable></option></arg> " +"<arg choice=\"plain\" rep=\"repeat\"><replaceable>plik</replaceable></arg>" #. type: Content of: <refentry><refsect1><para> #: apt-extracttemplates.1.xml:44 @@ -1832,11 +2534,15 @@ msgid "" "config scripts and templates, one line of output will be generated in the " "format:" msgstr "" +"<command>apt-extracttemplates</command> pobiera jeden lub więcej pakietów " +"Debiana i zapisuje (w katalogu tymczasowym) wszystkie skojarzone z nimi " +"skrypty konfiguracyjne i pliki szablonów. Dla każdego pakietu zawierającego " +"te skrypty i szablony, zostanie wypisana linia w następującym formacie:" #. type: Content of: <refentry><refsect1><para> #: apt-extracttemplates.1.xml:49 msgid "package version template-file config-script" -msgstr "" +msgstr "pakiet wersja plik-template skrypt-config" #. type: Content of: <refentry><refsect1><para> #: apt-extracttemplates.1.xml:50 @@ -1846,16 +2552,21 @@ msgid "" "literal>) directory, with filenames of the form <filename>package.template." "XXXX</filename> and <filename>package.config.XXXX</filename>" msgstr "" +"plik-template i skrypt-config są zapisywane w katalogu tymczasowym podanym " +"jako argument opcji <option>-t</option> lub <option>--tempdir</option> " +"(<literal>APT::ExtractTemplates::TempDir</literal>). Nazwy tych plików są w " +"postaci <filename>pakiet.template.XXXX</filename> oraz <filename>pakiet." +"config.XXXX</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-extracttemplates.1.xml:60 apt-get.8.xml:488 msgid "<option>-t</option>" -msgstr "" +msgstr "<option>-t</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-extracttemplates.1.xml:60 msgid "<option>--tempdir</option>" -msgstr "" +msgstr "<option>--tempdir</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-extracttemplates.1.xml:62 @@ -1864,13 +2575,19 @@ msgid "" "config scripts. Configuration Item: <literal>APT::ExtractTemplates::" "TempDir</literal>" msgstr "" +"Katalog tymczasowy, w którym zapisywane będą wyciągnięte szablony debconf i " +"pliki konfiguracyjne. Pozycja w pliku konfiguracyjnym: <literal>APT::" +"ExtractTemplates::TempDir</literal>." +# #. type: Content of: <refentry><refsect1><para> #: apt-extracttemplates.1.xml:79 msgid "" "<command>apt-extracttemplates</command> returns zero on normal operation, " "decimal 100 on error." msgstr "" +"<command>apt-extracttemplates</command> zwraca zero, gdy zakończyło się " +"pomyślnie, 100 - w przypadku błędu." #. The last update date #. type: Content of: <refentry><refentryinfo> @@ -1879,19 +2596,42 @@ msgid "" "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 " "August 2009</date>" msgstr "" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; " +"<date>17 sierpnia 2009</date>" #. type: Content of: <refentry><refnamediv><refname> #: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:29 msgid "apt-ftparchive" -msgstr "" +msgstr "apt-ftparchive" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-ftparchive.1.xml:30 msgid "Utility to generate index files" -msgstr "" +msgstr "Narzędzie użytkowe do generowania plików indeksu" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-ftparchive.1.xml:36 +#, fuzzy +#| msgid "" +#| "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " +#| "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " +#| "<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +#| "arg> <arg><option>-o <replaceable>config</" +#| "replaceable>=<replaceable>string</replaceable></option></arg> " +#| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group " +#| "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat" +#| "\"><replaceable>path</replaceable></arg><arg><replaceable>override</" +#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +#| "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</" +#| "replaceable></arg><arg><replaceable>override</" +#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +#| "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></" +#| "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</" +#| "replaceable></arg></arg> <arg>generate <arg choice=\"plain" +#| "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep=" +#| "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg " +#| "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </" +#| "group>" msgid "" "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " @@ -1912,6 +2652,25 @@ msgid "" "\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice=" "\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>" msgstr "" +"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " +"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " +"<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +"arg> <arg><option>-o <replaceable>opcja_konfiguracji</" +"replaceable>=<replaceable>łańcuch_znaków</replaceable></option></arg> " +"<arg><option>-c=<replaceable>plik</replaceable></option></arg> <group choice=" +"\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>ścieżka</replaceable></arg><arg><replaceable>plik_nadpisań</" +"replaceable><arg><replaceable>prefiks_ścieżki</replaceable></arg></arg></" +"arg> <arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>ścieżka</" +"replaceable></arg><arg><replaceable>plik_nadpisań</" +"replaceable><arg><replaceable>prefiks_ścieżki</replaceable></arg></arg></" +"arg> <arg>contents <arg choice=\"plain\"><replaceable>ścieżka</replaceable></" +"arg></arg> <arg>release <arg choice=\"plain\"><replaceable>ścieżka</" +"replaceable></arg></arg> <arg>generate <arg choice=\"plain" +"\"><replaceable>plik_konfiguracji</replaceable></arg> <arg choice=\"plain\" " +"rep=\"repeat\"><replaceable>sekcja</replaceable></arg></arg> <arg>clean <arg " +"choice=\"plain\"><replaceable>plik_konfiguracji</replaceable></arg></arg> </" +"group>" #. type: Content of: <refentry><refsect1><para> #: apt-ftparchive.1.xml:57 @@ -1965,7 +2724,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:86 msgid "sources" -msgstr "" +msgstr "sources" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:88 @@ -2045,7 +2804,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:138 apt-get.8.xml:292 msgid "clean" -msgstr "" +msgstr "clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:140 @@ -2080,7 +2839,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> #: apt-ftparchive.1.xml:158 msgid "Dir Section" -msgstr "" +msgstr "Dir Section" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt-ftparchive.1.xml:160 @@ -2106,9 +2865,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:172 -#, fuzzy msgid "OverrideDir" -msgstr "Wprowadzenie" +msgstr "OverrideDir" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:174 @@ -2118,7 +2876,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:177 msgid "CacheDir" -msgstr "" +msgstr "CacheDir" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:179 @@ -2128,7 +2886,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:182 msgid "FileListDir" -msgstr "" +msgstr "FileListDir" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:184 @@ -2153,7 +2911,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:196 msgid "Packages::Compress" -msgstr "" +msgstr "Packages::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:198 @@ -2228,7 +2986,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:235 msgid "FileMode" -msgstr "" +msgstr "FileMode" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:237 @@ -2318,7 +3076,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412 msgid "Sources" -msgstr "" +msgstr "Sources" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:289 @@ -2367,7 +3125,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443 msgid "BinCacheDB" -msgstr "" +msgstr "BinCacheDB" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:316 @@ -2379,7 +3137,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:320 msgid "FileList" -msgstr "" +msgstr "FileList" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:322 @@ -2392,7 +3150,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:327 msgid "SourceFileList" -msgstr "" +msgstr "SourceFileList" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:329 @@ -2444,6 +3202,10 @@ msgid "" " Generate for DIST=scope SECTION=i ARCH=j\n" " " msgstr "" +"for i in Sections do \n" +" for j in Architectures do\n" +" Generate for DIST=scope SECTION=i ARCH=j\n" +" " #. type: Content of: <refentry><refsect1><refsect2><para> #: apt-ftparchive.1.xml:352 @@ -2456,7 +3218,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:361 msgid "Sections" -msgstr "" +msgstr "Sections" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:363 @@ -2483,7 +3245,7 @@ msgstr "" #: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423 #, fuzzy msgid "BinOverride" -msgstr "Wprowadzenie" +msgstr "BinOverride" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:377 @@ -2494,9 +3256,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428 -#, fuzzy msgid "SrcOverride" -msgstr "Wprowadzenie" +msgstr "SrcOverride" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:383 @@ -2508,7 +3269,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433 msgid "ExtraOverride" -msgstr "" +msgstr "ExtraOverride" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435 @@ -2518,7 +3279,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438 msgid "SrcExtraOverride" -msgstr "" +msgstr "SrcExtraOverride" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440 @@ -2594,8 +3355,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-ftparchive.1.xml:462 +#, fuzzy msgid "The Binary Override File" -msgstr "" +msgstr "Wprowadzenie" #. type: Content of: <refentry><refsect1><para> #: apt-ftparchive.1.xml:463 @@ -2611,13 +3373,13 @@ msgstr "" #: apt-ftparchive.1.xml:469 #, no-wrap msgid "old [// oldn]* => new" -msgstr "" +msgstr "old [// oldn]* => new" #. type: Content of: <refentry><refsect1><para><literallayout> #: apt-ftparchive.1.xml:471 #, no-wrap msgid "new" -msgstr "" +msgstr "new" #. type: Content of: <refentry><refsect1><para> #: apt-ftparchive.1.xml:468 @@ -2632,8 +3394,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-ftparchive.1.xml:479 +#, fuzzy msgid "The Source Override File" -msgstr "" +msgstr "Wprowadzenie" #. type: Content of: <refentry><refsect1><para> #: apt-ftparchive.1.xml:481 @@ -2659,7 +3422,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:497 msgid "<option>--md5</option>" -msgstr "" +msgstr "<option>--md5</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:499 @@ -2672,15 +3435,20 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:504 msgid "<option>--db</option>" -msgstr "" +msgstr "<option>--db</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:506 +#, fuzzy msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." msgstr "" +"Przeszukaj tylko nazwy pakietów, pomijając szczegółowe opisy. Pozycja w " +"pliku konfiguracyjnym: <literal>APT::Cache::NamesOnly</literal>." +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:512 msgid "" @@ -2689,25 +3457,36 @@ msgid "" "<option>-q=#</option> to set the quiet level, overriding the configuration " "file. Configuration Item: <literal>quiet</literal>." msgstr "" +"Cichy; wypisuje tylko informacje potrzebne do logowania, opuszczając " +"wskaźniki postępu. Więcej znaków q spowoduje jeszcze bardziej ciche wyjście, " +"maksimum jest 2. Można także ustawić poziom cichości za pomocą <option>-q=#</" +"option>, nadpisując tym samym opcję z pliku konfiguracyjnego. Pozycja w " +"pliku konfiguracyjnym: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:518 msgid "<option>--delink</option>" -msgstr "" +msgstr "<option>--delink</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:520 +#, fuzzy msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " "and can be turned off with <option>--no-delink</option>. Configuration " "Item: <literal>APT::FTPArchive::DeLinkAct</literal>." msgstr "" +"Automatycznie odbudowuje bufor pakietów, zamiast używać istniejącego " +"bufora. Ta opcja jest domyślnie włączona, aby ją wyłączyć, należy użyć " +"<option>--no-generate</option>. Pozycja w pliku konfiguracyjnym: " +"<literal>APT::Cache::Generate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:526 msgid "<option>--contents</option>" -msgstr "" +msgstr "<option>--contents</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:528 @@ -2722,46 +3501,69 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:536 msgid "<option>--source-override</option>" -msgstr "" +msgstr "<option>--source-override</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:538 +#, fuzzy msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" "literal>." msgstr "" +"Ogranicza wyjście poleceń <literal>depends</literal> i <literal>rdepends</" +"literal> tylko do pakietów, które są obecnie zainstalowane. Pozycja w pliku " +"konfiguracyjnym: <literal>APT::Cache::Installed</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:542 msgid "<option>--readonly</option>" -msgstr "" +msgstr "<option>--readonly</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:544 +#, fuzzy msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." msgstr "" +"Przeszukaj tylko nazwy pakietów, pomijając szczegółowe opisy. Pozycja w " +"pliku konfiguracyjnym: <literal>APT::Cache::NamesOnly</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:548 +#, fuzzy +#| msgid "<option>-a</option>" msgid "<option>--arch</option>" -msgstr "" +msgstr "<option>-a</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 +#, fuzzy +#| msgid "" +#| "If the command is either <literal>install</literal> or <literal>remove</" +#| "literal>, then this option acts like running <literal>autoremove</" +#| "literal> command, removing the unused dependency packages. Configuration " +#| "Item: <literal>APT::Get::AutomaticRemove</literal>." msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " "<literal>*_all.deb</literal> instead of all package files in the given " "path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>." msgstr "" +"Jeżeli polecenie to albo <literal>install</literal>, albo <literal>remove</" +"literal>, to ta opcja działa tak, jak uruchomienie polecenia " +"<literal>autoremove</literal> i usuwa pakiety mające nieużywane już " +"zależności. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::" +"AutomaticRemove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:555 +#, fuzzy msgid "<option>APT::FTPArchive::AlwaysStat</option>" -msgstr "" +msgstr "<option>--version</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:557 @@ -2779,8 +3581,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:567 +#, fuzzy msgid "<option>APT::FTPArchive::LongDescription</option>" -msgstr "" +msgstr "<option>--version</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:569 @@ -2796,13 +3599,13 @@ msgstr "" #: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477 #: sources.list.5.xml:193 msgid "Examples" -msgstr "" +msgstr "Przykłady" #. type: Content of: <refentry><refsect1><para><programlisting> #: apt-ftparchive.1.xml:587 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" -msgstr "" +msgstr "<command>apt-ftparchive</command> packages <replaceable>katalog</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> #: apt-ftparchive.1.xml:583 @@ -2811,12 +3614,15 @@ msgid "" "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" +# #. type: Content of: <refentry><refsect1><para> #: apt-ftparchive.1.xml:597 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." msgstr "" +"<command>apt-ftparchive</command> zwraca zero, gdy zakończyło się pomyślnie, " +"100 - w przypadku błędu." #. The last update date #. type: Content of: <refentry><refentryinfo> @@ -2825,16 +3631,19 @@ msgid "" "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 " "November 2008</date>" msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; " +"<date>8 listopada 2008</date>" #. type: <heading></heading> #: apt-get.8.xml:22 apt-get.8.xml:29 guide.sgml:96 msgid "apt-get" -msgstr "" +msgstr "apt-get" +# #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-get.8.xml:30 msgid "APT package handling utility -- command-line interface" -msgstr "" +msgstr "Narzędzie zarządzania pakietami APT -- interfejs linii poleceń" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-get.8.xml:36 @@ -2871,7 +3680,39 @@ msgid "" "choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> " "</group> </arg> </group>" msgstr "" +"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " +"<option>-o= <replaceable>opcja_konfiguracji</replaceable> </option> </arg> " +"<arg> <option>-c= <replaceable>plik_konfiguracyjny</replaceable> </option> </" +"arg> <arg> <option>-t=</option> <group choice='req'> <arg choice='plain'> " +"<replaceable>nazwa_wydania</replaceable> </arg> <arg choice='plain'> " +"<replaceable>wyrażenie_numeru_wydania</replaceable> </arg> <arg " +"choice='plain'> <replaceable>kod_wydania</replaceable> </arg> </group> </" +"arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg " +"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg " +"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice=" +"\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable> <arg> <group " +"choice='req'> <arg choice='plain'> =<replaceable>numer_wersji_pakietu</" +"replaceable> </arg> <arg choice='plain'> /<replaceable>nazwa_wydania</" +"replaceable> </arg> <arg choice='plain'> /<replaceable>kod_wydania</" +"replaceable> </arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove " +"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable></" +"arg></arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>pakiet</replaceable></arg></arg> <arg choice='plain'>source " +"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable> <arg> " +"<group choice='req'> <arg choice='plain'> " +"=<replaceable>numer_wersji_pakietu</replaceable> </arg> <arg " +"choice='plain'> /<replaceable>nazwa_wydania</replaceable> </arg> <arg " +"choice='plain'> /<replaceable>kod_wydania</replaceable> </arg> </group> </" +"arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain\" rep=" +"\"repeat\"><replaceable>pakiet</replaceable></arg></arg> <arg " +"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg " +"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg " +"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg " +"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group " +"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> " +"</group> </arg> </group>" +# #. type: Content of: <refentry><refsect1><para> #: apt-get.8.xml:126 msgid "" @@ -2880,12 +3721,18 @@ msgid "" "library. Several \"front-end\" interfaces exist, such as &dselect;, " "&aptitude;, &synaptic;, &gnome-apt; and &wajig;." msgstr "" +"<command>apt-get</command> jest narzędziem do zarządzania pakietami " +"działającym z linii poleceń, które może być za wewnętrzne narzędzie innych " +"programów używających biblioteki APT. Istnieje wiele interfejsów " +"użytkownika, takich jak &dselect;, &aptitude;, &synaptic;, &gnome-apt; oraz " +"&wajig;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:135 apt-key.8.xml:124 msgid "update" -msgstr "" +msgstr "update" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:136 msgid "" @@ -2899,12 +3746,23 @@ msgid "" "literal>. Please be aware that the overall progress meter will be incorrect " "as the size of the package files cannot be known in advance." msgstr "" +"<literal>update</literal> jest używane do zsynchronizowania zawartości " +"plików indeksu pakietów z ich źródłami. Lista dostępnych pakietów jest " +"pobierana z lokalizacji określonych w pliku <filename>/etc/apt/sources.list</" +"filename>. Na przykład, gdy używane jest archiwum Debiana, to polecenie " +"pobiera i przegląda pliki <filename>Packages.gz</filename>, tak żeby " +"udostępnić informacje o nowych i uaktualnionych pakietach. Polecenie " +"<literal>update</literal> powinno być użyte zawsze przed <literal>upgrade</" +"literal> lub <literal>dist-upgrade</literal>. Należy zauważyć, że licznik " +"całkowitego postępu operacji jest błędny, ponieważ rozmiar plików " +"<filename>Packages.gz</filename> nie jest wcześniej znany." #. type: <tag></tag> #: apt-get.8.xml:147 guide.sgml:121 msgid "upgrade" -msgstr "" +msgstr "upgrade" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:148 msgid "" @@ -2919,12 +3777,23 @@ msgid "" "<literal>update</literal> must be performed first so that <command>apt-get</" "command> knows that new versions of packages are available." msgstr "" +"<literal>upgrade</literal> instaluje najnowsze wersje wszystkich pakietów, " +"obecnie zainstalowanych w systemie, na podstawie źródeł wymienionych w pliku " +"<filename>/etc/apt/sources.list</filename>. Zainstalowane pakiety, których " +"nowsza wersja jest dostępna, są ściągane i uaktualniane; w żadnym wypadku " +"podanie tej opcji nie spowoduje usunięcia zainstalowanego pakietu czy " +"zainstalowania nowego pakietu, wcześniej nie zainstalowanego. Pakiety, " +"których nowa wersja wymaga zmiany statusu (np. zainstalowania bądź " +"usunięcia) innego pakietu, będą pozostawione bez zmian. Aby <command>apt-" +"get</command> wiedział, że są dostępne nowe wersje pakietów, należy " +"wcześniej wykonać <literal>update</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:160 msgid "dselect-upgrade" -msgstr "" +msgstr "dselect-upgrade" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:161 msgid "" @@ -2935,12 +3804,20 @@ msgid "" "realize that state (for instance, the removal of old and the installation of " "new packages)." msgstr "" +"<literal>dselect-upgrade</literal> jest używane w połączeniu z programem " +"&dselect;, tradycyjnym narzędziem do zarządzania pakietami w systemie " +"Debian. <literal>dselect-upgrade</literal> uwzględnia zmiany zrobione " +"programem &dselect; w polu <literal>Status</literal> pliku zawierającego " +"informacje o dostępnych pakietach i wykonuje akcje potrzebne do " +"zrealizowania tych zmian (na przykład: usunięcie starych pakietów i dodanie " +"nowych)." #. type: <tag></tag> #: apt-get.8.xml:170 guide.sgml:140 msgid "dist-upgrade" -msgstr "" +msgstr "dist-upgrade" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:171 msgid "" @@ -2954,12 +3831,23 @@ msgid "" "from which to retrieve desired package files. See also &apt-preferences; " "for a mechanism for overriding the general settings for individual packages." msgstr "" +"<literal>dist-upgrade</literal> wykonuje to samo, co <literal>upgrade</" +"literal>, jednakże w inteligentny sposób wykrywa zmiany zależności w nowych " +"wersjach pakietów. <command>apt-get</command> ma wbudowany \"sprytny\" " +"system rozwiązywania konfliktów i jeśli będzie to potrzebne, podejmie próbę " +"zaktualizowania najważniejszych pakietów, kosztem tych mniej ważnych. Tak " +"więc <literal>dist-upgrade</literal> może usunąć niektóre pakiety.Plik " +"<filename>/etc/apt/sources.list</filename> zawiera listę adresów, z których " +"będą pobierane żądane pakiety. Zobacz również do &apt-preferences; - " +"znajduje się tam opis mechanizmu nadpisywania globalnych ustawień dla " +"poszczególnych pakietów." #. type: <tag></tag> #: apt-get.8.xml:183 guide.sgml:131 msgid "install" -msgstr "" +msgstr "install" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:185 msgid "" @@ -2975,7 +3863,21 @@ msgid "" "a package to install. These latter features may be used to override " "decisions made by apt-get's conflict resolution system." msgstr "" +"Po <literal>install</literal> musi występować nazwa jednego lub więcej " +"pakietów przeznaczonych do zainstalowania. Każdy argument jest nazwą " +"pakietu, a nie pełną nazwą pliku, w którym się znajduje (na przykład w " +"systemie Debian GNU/Linux, tym argumentem byłoby libc6, a nie " +"<literal>libc6_1.9.6-2.deb</literal>). Wszystkie pakiety, które są " +"potrzebne do zainstalowania żądanego(-ych) pakietu(-ów), będą także " +"ściągnięte i zainstalowane. Plik <filename>/etc/apt/sources.list</filename> " +"zawiera listę adresów, z których będą pobierane żądane pakiety. Jeżeli po " +"nazwie pakietu pojawi się minus (bez spacji pomiędzy minusem a nazwą " +"pakietu), to ten pakiet zostanie usunięty, o ile oczywiście jest " +"zainstalowany. Podobnie znak plusa może być użyty w celu zainstalowania " +"pakietu. Ta ostatnia właściwość może być użyta do nadpisania decyzji " +"podjętych przez system rozwiązywania konfliktów programu apt-get." +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:203 msgid "" @@ -2986,13 +3888,23 @@ msgid "" "package name with a slash and the version of the distribution or the Archive " "name (stable, testing, unstable)." msgstr "" +"Konkretna wersja pakietu może być wybrana do zainstalowania przez " +"umieszczenie po nazwie pakietu znaku równości, a za nim wybranej wersji " +"pakietu. Podana wersja zostanie wyszukana i wybrana do zainstalowania. " +"Również konkretna dystrybucja może być wybrana przez umieszczenie po nazwie " +"pakietu znaku ukośnika, po którym następuje wersja dystrybucji bądź nazwa " +"archiwum (stable, testing, unstable)." +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:210 msgid "" "Both of the version selection mechanisms can downgrade packages and must be " "used with care." msgstr "" +"Oba mechanizmy wyboru pakietów mogą zainstalować wcześniejsze wersje " +"pakietów niż są już zainstalowane w systemie, dlatego muszą być używane " +"ostrożnie." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:213 @@ -3005,14 +3917,26 @@ msgid "" "you wish to upgrade, and if a newer version is available, it (and its " "dependencies, as described above) will be downloaded and installed." msgstr "" +"Jest to także akcja, której należy użyć, aby zaktualizować jeden lub więcej " +"spośród pakietów już zainstalowanych, bez aktualizowania wszystkich " +"pozostałych pakietów. W przeciwieństwie do polecenia \"upgrade\", które " +"instaluje najnowsze wersje wszystkich obecnie zainstalowanych pakietów, " +"\"install\" zainstaluje najnowsze wersje pakietu (pakietów) podanego " +"(podanych) w linii poleceń. Wystarczy podać nazwę pakietu (pakietów) do " +"zaktualizowania i jeśli nowsze wersje są dostępna, to zostaną pobrane i " +"zainstalowane (łączne z zależnościami, tak jak to opisano powyżej)." +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:224 msgid "" "Finally, the &apt-preferences; mechanism allows you to create an alternative " "installation policy for individual packages." msgstr "" +"W końcu, mechanizm &apt-preferences; pozwala określić alternatywny sposób " +"instalacji poszczególnych pakietów." +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:228 msgid "" @@ -3024,12 +3948,22 @@ msgid "" "expression with a '^' or '$' character, or create a more specific regular " "expression." msgstr "" +"Jeżeli żaden pakiet nie pasuje do podanego wyrażenia, a to wyrażenie zawiera " +"jeden z następujących znaków: \".\", \"?\" albo \"*\", to zakłada się, że " +"jest to wyrażenie regularne zgodne z POSIX-em i jest ono stosowane do " +"wszystkich nazw pakietów w bazie. Pakiety, których nazwy pasują do tego " +"wyrażenia regularnego, są instalowane (bądź usuwane). Należy zwrócić uwagę " +"na to, że dopasowywany jest podciąg, tak więc \"lo*\" pasuje zarówno do " +"\"how-lo\", jak i do \"lowest\". Jeśli jest to niepożądane, można określić " +"początek lub koniec dopasowania wyrażenia regularnego, używając znaków \"^| " +"lub \"$\", można też stworzyć bardziej specyficzne wyrażenie regularne." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:237 msgid "remove" -msgstr "" +msgstr "remove" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:238 msgid "" @@ -3039,11 +3973,15 @@ msgid "" "package name (with no intervening space), the identified package will be " "installed instead of removed." msgstr "" +"<literal>remove</literal> odpowiada poleceniu <literal>install</literal> z " +"tą różnicą, że pakiety są usuwane, a nie instalowane. Jeżeli nazwa pakietu " +"zostanie poprzedzona znakiem plusa (bez rozdzielającej spacji), wskazany " +"pakiet zostanie zainstalowany zamiast zostać usunięty." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:245 msgid "purge" -msgstr "" +msgstr "purge" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:246 @@ -3052,12 +3990,16 @@ msgid "" "that packages are removed and purged (any configuration files are deleted " "too)." msgstr "" +"<literal>purge</literal> działa tak, jak <literal>remove</literal>, z tą " +"różnicą, że pakiety są po usunięciu czyszczone (czyli usuwane są również " +"wszystkie pliki konfiguracyjne)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:250 msgid "source" -msgstr "" +msgstr "source" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:251 msgid "" @@ -3069,6 +4011,14 @@ msgid "" "literal>, the <option>-t</option> option or per package with the " "<literal>pkg/release</literal> syntax, if possible." msgstr "" +"<literal>source</literal> powoduje, że <command>apt-get</command> ściąga " +"pakiety ze źródłami. APT na podstawie listy dostępnych pakietów decyduje, " +"który pakiet źródłowy ściągnąć. Następnie szuka najnowszej dostępnej wersji " +"pakietu źródłowego i pobiera ją do bieżącego katalogu. Jeśli jest to " +"możliwe, to APT bierze pod uwagę domyślne wydanie, ustawione w <literal>APT::" +"Default-Release</literal> w pliku konfiguracyjnym albo określone w opcji " +"<option>-t</option>, albo podane przy użyciu składni <literal>pakiet/" +"wydanie</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:259 @@ -3079,6 +4029,12 @@ msgid "" "from. If you don't do this you will properly get another (newer, older or " "none) source version than the one you have installed or could install." msgstr "" +"Pakiety źródłowe są znajdowane inaczej niż pakiety binarne: przez linie z " +"identyfikatorem <literal>deb-src</literal> w pliku &sources-list;. Oznacza " +"to, że w pliku tym należy umieścić taką linię dla każdego repozytorium, z " +"którego będą pobierane źródła. W przeciwnym wypadku może zostać pobrany " +"pakiet źródłowy w innej wersji (nowszej, starszej albo żadnej) niż ta, który " +"jest zainstalowana lub możliwa do zainstalowania." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:266 @@ -3088,7 +4044,12 @@ msgid "" "<option>--download-only</option> is specified then the source package will " "not be unpacked." msgstr "" +"Jeżeli podano opcję <option>--compile</option>, to pakiet źródłowy zostanie " +"skompilowany do pakietu binarnego .deb za pomocą programu <command>dpkg-" +"buildpackage</command>; podanie opcji <option>--download-only</option> " +"spowoduje natomiast, że pakiet źródłowy nie zostanie rozpakowany." +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:271 msgid "" @@ -3098,7 +4059,13 @@ msgid "" "name and version, implicitly enabling the <literal>APT::Get::Only-Source</" "literal> option." msgstr "" +"Konkretną wersję pakietu źródłowego można ściągnąć, umieszczając po nazwie " +"pakietu źródłowego znak równości, a za nim numer wersji do ściągnięcia. " +"Działa tu taki sam mechanizm jak w przypadku pakietów binarnych. Włączone " +"zostaje dokładne dopasowywanie nazw i wersji pakietów źródłowych i pośrednio " +"włączona zostaje opcja <literal>APT::Get::Only-Source</literal>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:277 msgid "" @@ -3106,31 +4073,42 @@ msgid "" "only in the current directory and are similar to downloading source tar " "balls." msgstr "" +"Uwaga. Pakiety źródłowe nie są traktowane tak samo, jak pakiety binarne - są " +"przechowywane tylko w bieżącym katalogu, mniej więcej tak, jakby zostały " +"ściągnięte oryginalne źródła programu ze strony jego autorów." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:282 msgid "build-dep" -msgstr "" +msgstr "build-dep" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:283 msgid "" "<literal>build-dep</literal> causes apt-get to install/remove packages in an " "attempt to satisfy the build dependencies for a source package." msgstr "" +"<literal>build-dep</literal> powoduje, że apt-get zainstaluje/usunie pakiety " +"tak, żeby spełnić zależności wymagane do zbudowania danego pakietu " +"źródłowego." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:287 msgid "check" -msgstr "" +msgstr "check" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:288 msgid "" "<literal>check</literal> is a diagnostic tool; it updates the package cache " "and checks for broken dependencies." msgstr "" +"<literal>check</literal> jest poleceniem diagnostycznym, które odświeża " +"bufor (cache) pakietów i szuka zepsutych pakietów." +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:293 msgid "" @@ -3142,12 +4120,20 @@ msgid "" "want to run <literal>apt-get clean</literal> from time to time to free up " "disk space." msgstr "" +"<literal>clean</literal> czyści lokalne repozytorium ściągniętych plików z " +"pakietami. Usuwa wszystko z wyjątkiem pliku blokady <filename>&cachedir;/" +"archives/</filename> oraz katalogu <filename>&cachedir;/archives/partial/</" +"filename>. Gdy APT jest używane jako metoda programu &dselect;, " +"<literal>clean</literal> jest uruchamiane automatycznie. Osoby nie używające " +"dselect, powinny od czasu do czasu uruchamiać <literal>apt-get clean</" +"literal>, aby zwolnić trochę miejsca na dysku." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:302 msgid "autoclean" -msgstr "" +msgstr "autoclean" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:303 msgid "" @@ -3159,11 +4145,19 @@ msgid "" "Installed</literal> will prevent installed packages from being erased if it " "is set to off." msgstr "" +"Podobnie jak <literal>clean</literal>, <literal>autoclean</literal> czyści " +"lokalne repozytorium pobranych plików z pakietami. Różnica jest taka, że " +"<literal>autoclean</literal> usuwa tylko te pliki pakietów, które już nie " +"mogą być ściągnięte i w większości są bezużyteczne. Pozwala to na " +"utrzymywanie bufora (cache'a) przed długi czas i na uniknięcie " +"niekontrolowanego jego wzrostu. Wyłączenie opcji konfiguracyjnej " +"<literal>APT::Clean-Installed</literal> zapobiegnie usuwaniu plików " +"zawierających zainstalowane pakiety." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:312 msgid "autoremove" -msgstr "" +msgstr "autoremove" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:313 @@ -3172,11 +4166,14 @@ msgid "" "automatically installed to satisfy dependencies for some package and that " "are no more needed." msgstr "" +"<literal>autoremove</literal> jest używane do usuwania pakietów, które " +"zostały zainstalowane automatycznie, żeby rozwiązać zależności, i nie są już " +"potrzebne." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:323 apt-get.8.xml:429 msgid "<option>--no-install-recommends</option>" -msgstr "" +msgstr "<option>--no-install-recommends</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:324 @@ -3184,24 +4181,31 @@ msgid "" "Do not consider recommended packages as a dependency for installing. " "Configuration Item: <literal>APT::Install-Recommends</literal>." msgstr "" +"Nie rozpatruje rekomendowanych pakietów jako zależności do instalacji. " +"Pozycja w pliku konfiguracyjnym: <literal>APT::Install-Recommends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:328 msgid "<option>--download-only</option>" -msgstr "" +msgstr "<option>--download-only</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:329 msgid "" "Download only; package files are only retrieved, not unpacked or installed. " "Configuration Item: <literal>APT::Get::Download-Only</literal>." msgstr "" +"Tylko pobieranie; pliki z pakietami są tylko ściągane, ale nie rozpakowywane " +"czy instalowane. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::" +"Download-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:333 msgid "<option>--fix-broken</option>" -msgstr "" +msgstr "<option>--fix-broken</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:334 msgid "" @@ -3217,17 +4221,29 @@ msgid "" "option> may produce an error in some situations. Configuration Item: " "<literal>APT::Get::Fix-Broken</literal>." msgstr "" +"Popraw; podejmuje próbę poprawienia zepsutych zależności. Używanie tej opcji " +"z install/remove może spowodować pominięcie któregokolwiek z pakietów " +"podanych w linii poleceń, co pozwoli programowi APT znaleźć właściwe " +"rozwiązanie problemu. Ta opcja jest czasami potrzebna przy pierwszym " +"uruchomieniu APT, który nie pozwala, aby w systemie istniały zepsute " +"zależności. Jest również prawdopodobne, że systemowa struktura zależności " +"może być tak zepsuta, że będzie wymagała ręcznej naprawy (co zazwyczaj " +"oznacza użycie &dselect; lub <command>dpkg --remove</command>w celu " +"usunięcia niektórych naruszonych pakietów). W pewnych sytuacjach użycie tej " +"opcji łącznie z <option>-m</option> może spowodować błąd. Pozycja w pliku " +"konfiguracyjnym: <literal>APT::Get::Fix-Broken</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:347 msgid "<option>--ignore-missing</option>" -msgstr "" +msgstr "<option>--ignore-missing</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:348 msgid "<option>--fix-missing</option>" -msgstr "" +msgstr "<option>--fix-missing</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:349 msgid "" @@ -3239,12 +4255,20 @@ msgid "" "it could not be downloaded then it will be silently held back. " "Configuration Item: <literal>APT::Get::Fix-Missing</literal>." msgstr "" +"Ignoruj brakujące pakiety. Pakiety, które nie mogą być pobrane lub nie " +"powiedzie się test spójności pakietu po jego pobraniu (plik z pakietem jest " +"uszkodzony), zostają wstrzymane. W pewnych sytuacjach użycie tej opcji " +"łącznie z <option>-f</option> może spowodować błąd. Pakiet, który jest " +"wybrany do instalacji (w szczególności jest on wymieniony w linii poleceń), " +"ale nie może zostać pobrany, zostanie pominięty. Pozycja w pliku " +"konfiguracyjnym: <literal>APT::Get::Fix-Missing</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:359 msgid "<option>--no-download</option>" -msgstr "" +msgstr "<option>--no-download</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:360 msgid "" @@ -3252,7 +4276,12 @@ msgid "" "missing</option> to force APT to use only the .debs it has already " "downloaded. Configuration Item: <literal>APT::Get::Download</literal>." msgstr "" +"Wyłącza pobierania pakietów. Najlepiej stosować z <option>--ignore-missing</" +"option>, aby wymusić na APT używanie tylko tych plików .deb, które zostały " +"wcześniej ściągnięte. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::" +"Download</literal>." +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:367 msgid "" @@ -3264,17 +4293,26 @@ msgid "" "may decided to do something you did not expect. Configuration Item: " "<literal>quiet</literal>." msgstr "" +"Cichy; wypisuje tylko informacje potrzebne do logowania, opuszczając " +"wskaźniki postępu. Więcej znaków q spowoduje jeszcze bardziej ciche wyjście, " +"maksimum jest 2. Można także ustawić poziom cichości za pomocą <option>-q=#</" +"option>, nadpisując tym samym opcję z pliku konfiguracyjnego. Należy " +"zauważyć, że poziom cichości równy 2 implikuje <option>-y</option>, dlatego -" +"qq nigdy nie powinno być używane bez opcji typu -d, --print-uris lub -s, " +"gdyż APT może zadecydować o zrobieniu czegoś, czego użytkownik się nie " +"spodziewa. Pozycja w pliku konfiguracyjnym: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:377 msgid "<option>--simulate</option>" -msgstr "" +msgstr "<option>--simulate</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:379 msgid "<option>--dry-run</option>" -msgstr "" +msgstr "<option>--dry-run</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:382 msgid "" @@ -3282,6 +4320,9 @@ msgid "" "actually change the system. Configuration Item: <literal>APT::Get::" "Simulate</literal>." msgstr "" +"Brak akcji; wykonuje symulację zdarzeń, które mogłyby się przytrafić, ale " +"nic nie zmienia w systemie. Pozycja w pliku konfiguracyjnym: <literal>APT::" +"Get::Simulate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:386 @@ -3293,7 +4334,16 @@ msgid "" "will be triggered if run as root (root should know what he is doing without " "further warnings by <literal>apt-get</literal>)." msgstr "" +"Symulacja uruchomiona przez zwykłego użytkownika automatycznie wyłączy " +"blokady (<literal>Debug::NoLocking</literal>) . Jeżeli jest ustawiona opcja " +"<literal>APT::Get::Show-User-Simulation-Note</literal> (a domyślnie jest ona " +"ustawiona), to zostanie wyświetlona informacja o tym, że to jest tylko " +"symulacja. W przypadku uruchomienia przez administratora systemu, blokada " +"nie zostanie wyłączona, ani informacja nie będzie pokazana (użytkownik root " +"powinien wiedzieć, co robi,bez dodatkowych ostrzeżeń ze strony <literal>apt-" +"get</literal>)." +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:392 msgid "" @@ -3302,22 +4352,28 @@ msgid "" "indicate broken packages and empty set of square brackets meaning breaks " "that are of no consequence (rare)." msgstr "" +"Symulacja powoduje wypisanie serii linii, z których każda reprezentuje " +"operację programu dpkg: konfigurowanie (Conf), usunięcie (Remv), " +"rozpakowanie (Inst). Nawiasy kwadratowe oznaczają zepsute pakiety, przy czym " +"puste nawiasy kwadratowe oznaczają, że przyczyna zepsucia pakietu nie jest " +"znana (rzadkość)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:399 msgid "<option>-y</option>" -msgstr "" +msgstr "<option>-y</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:399 msgid "<option>--yes</option>" -msgstr "" +msgstr "<option>--yes</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:400 msgid "<option>--assume-yes</option>" -msgstr "" +msgstr "<option>--assume-yes</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:401 msgid "" @@ -3327,83 +4383,100 @@ msgid "" "essential package occurs then <literal>apt-get</literal> will abort. " "Configuration Item: <literal>APT::Get::Assume-Yes</literal>." msgstr "" +"Automatycznie odpowiada \"tak\" na pytania. Zakładając odpowiedź \"tak\" na " +"wszelkie pytania, uruchamia się w trybie nieinteraktywnym. Jeśli wystąpi " +"jakaś niepożądana sytuacja, na przykład zmiana wstrzymanego pakietu lub " +"usunięcie pakietu mającego status Essential, <literal>apt-get</literal> " +"przerwie działanie. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::" +"Assume-Yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:408 msgid "<option>-u</option>" -msgstr "" +msgstr "<option>-u</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:408 msgid "<option>--show-upgraded</option>" -msgstr "" +msgstr "<option>--show-upgraded</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:409 msgid "" "Show upgraded packages; Print out a list of all packages that are to be " "upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>." msgstr "" +"Pokazuje uaktualnione pakiety. Wypisuje listę wszystkich pakietów, które " +"będą uaktualnione. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::Show-" +"Upgraded</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:414 msgid "<option>-V</option>" -msgstr "" +msgstr "<option>-V</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:414 msgid "<option>--verbose-versions</option>" -msgstr "" +msgstr "<option>--verbose-versions</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:415 msgid "" "Show full versions for upgraded and installed packages. Configuration Item: " "<literal>APT::Get::Show-Versions</literal>." msgstr "" +"Wyświetla pełne wersje aktualizowanych pakietów Pozycja w pliku " +"konfiguracyjnym: <literal>APT::Get::Show-Versions</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:419 msgid "<option>-b</option>" -msgstr "" +msgstr "<option>-b</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:419 msgid "<option>--compile</option>" -msgstr "" +msgstr "<option>--compile</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:420 msgid "<option>--build</option>" -msgstr "" +msgstr "<option>--build</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:421 msgid "" "Compile source packages after downloading them. Configuration Item: " "<literal>APT::Get::Compile</literal>." msgstr "" +"Skompiluj pakiety źródłowe po ich ściągnięciu. Pozycja w pliku " +"konfiguracyjnym: <literal>APT::Get::Compile</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:425 msgid "<option>--install-recommends</option>" -msgstr "" +msgstr "<option>--install-recommends</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:426 msgid "Also install recommended packages." -msgstr "" +msgstr "Instaluje również rekomendowane pakiety." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:430 msgid "Do not install recommended packages." -msgstr "" +msgstr "Nie instaluje rekomendowanych pakietów." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:433 msgid "<option>--ignore-hold</option>" -msgstr "" +msgstr "<option>--ignore-hold</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:434 msgid "" @@ -3412,12 +4485,18 @@ msgid "" "<literal>dist-upgrade</literal> to override a large number of undesired " "holds. Configuration Item: <literal>APT::Ignore-Hold</literal>." msgstr "" +"Ignoruje status hold (wstrzymany) pakietów. Ta opcja powoduje, że " +"<command>apt-get</command> zignoruje status hold pakietów. Może to być " +"użyteczne w połączeniu z <literal>dist-upgrade</literal> do unieważnienia " +"dużej liczby niepożądanych wstrzymań. Pozycja w pliku konfiguracyjnym: " +"<literal>APT::Ignore-Hold</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:440 msgid "<option>--no-upgrade</option>" -msgstr "" +msgstr "<option>--no-upgrade</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:441 msgid "" @@ -3426,12 +4505,17 @@ msgid "" "line from being upgraded if they are already installed. Configuration Item: " "<literal>APT::Get::Upgrade</literal>." msgstr "" +"Nie aktualizuje pakietów. Użyte w połączeniu z <literal>install</literal>, " +"<literal>no-upgrade</literal> spowoduje, że pakiety, które są już " +"zainstalowane, nie zostaną zaktualizowane. Pozycja w pliku konfiguracyjnym: " +"<literal>APT::Get::Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:447 msgid "<option>--force-yes</option>" -msgstr "" +msgstr "<option>--force-yes</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:448 msgid "" @@ -3441,12 +4525,19 @@ msgid "" "literal> can potentially destroy your system! Configuration Item: " "<literal>APT::Get::force-yes</literal>." msgstr "" +"Wymuszenie. Jest to niebezpieczna opcja, która powoduje, że apt-get " +"kontynuuje swoje działanie bez żadnej interakcji z użytkownikiem, nawet " +"jeśli robi coś, co może być szkodliwe. Nie powinna być używana, z wyjątkiem " +"bardzo szczególnych sytuacji. Używanie <literal>force-yes</literal> może " +"zniszczyć Twój system! Pozycja w pliku konfiguracyjnym: <literal>APT::Get::" +"force-yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:455 msgid "<option>--print-uris</option>" -msgstr "" +msgstr "<option>--print-uris</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:456 msgid "" @@ -3459,12 +4550,22 @@ msgid "" "to decompress any compressed files. Configuration Item: <literal>APT::Get::" "Print-URIs</literal>." msgstr "" +"Nie ściąga pakietów do zainstalowania, tylko wypisuje ich URI. Każdy URI " +"składa się z lokalizacji, nazwy pliku przeznaczenia, rozmiaru oraz " +"oczekiwanej sumy kontrolnej md5. Należy zauważyć, że nazwa pliku " +"przeznaczenia nie musi być taka sama jak nazwa zdalnego pliku! Działa to " +"także z poleceniami <literal>source</literal> i <literal>update</literal>. " +"Używane z poleceniem <literal>update</literal>, nie wypisuje sum MD5 i " +"rozmiaru, a także w gestii użytkownika leży wtedy rozpakowywanie spakowanych " +"plików. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::Print-URIs</" +"literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:466 msgid "<option>--purge</option>" -msgstr "" +msgstr "<option>--purge</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:467 msgid "" @@ -3473,24 +4574,33 @@ msgid "" "<option>remove --purge</option> is equivalent to the <option>purge</option> " "command. Configuration Item: <literal>APT::Get::Purge</literal>." msgstr "" +"Używa polecenia purge (wyczyść), zamiast remove (usuń) dla wszystkiego, co " +"miałoby zostać usunięte. Obok pakietów, które są przeznaczone do " +"wyczyszczenia, wyświetlana jest gwiazdka (\"*\"). <option>remove --purge</" +"option> jest odpowiednikiem polecenia <option>purge</option>. Pozycja w " +"pliku konfiguracyjnym: <literal>APT::Get::Purge</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:474 msgid "<option>--reinstall</option>" -msgstr "" +msgstr "<option>--reinstall</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:475 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." msgstr "" +"Ponownie instaluje pakiety, których najnowsza wersja już jest zainstalowana " +"Pozycja w pliku konfiguracyjnym: <literal>APT::Get::ReInstall</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:479 msgid "<option>--list-cleanup</option>" -msgstr "" +msgstr "<option>--list-cleanup</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:480 msgid "" @@ -3501,17 +4611,24 @@ msgid "" "change your source list. Configuration Item: <literal>APT::Get::List-" "Cleanup</literal>." msgstr "" +"Ta opcja jest domyślnie włączona, można ją wyłączyć używając <literal>--no-" +"list-cleanup</literal>. Jeżeli jest włączona, <command>apt-get</command> " +"będzie automatycznie zarządzał zawartością <filename>&statedir;/lists</" +"filename>,tak aby przestarzałe pliki były usuwane. Jedynym powodem dla jej " +"wyłączenia mogłyby być częste zmiany w sources.list. Pozycja w pliku " +"konfiguracyjnym: <literal>APT::Get::List-Cleanup</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:489 msgid "<option>--target-release</option>" -msgstr "" +msgstr "<option>--target-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:490 msgid "<option>--default-release</option>" -msgstr "" +msgstr "<option>--default-release</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:491 msgid "" @@ -3525,12 +4642,22 @@ msgid "" "option>. Configuration Item: <literal>APT::Default-Release</literal>; see " "also the &apt-preferences; manual page." msgstr "" +"Ta opcja tworzy domyślny pin o priorytecie 990, używając podanego łańcucha " +"znaków oznaczającego wersję dystrybucji. Nadpisuje to ogólne ustawienia z " +"pliku <filename>/etc/apt/preferences</filename>. Opcja nie zmienia pinu " +"pakietów, które mają własne (szczegółowe) ustawienia w powyższym pliku " +"preferencji. W skrócie - ta opcja pozwala pozwala na prostą kontrolę, z " +"których dystrybucji będą pobierane pakiety. Przykłady: <option>-t '2.1*'</" +"option>, <option>-t unstable</option> lub <option>-t sid</option> Pozycja w " +"pliku konfiguracyjnym: <literal>APT::Default-Release</literal>; zobacz także " +"stronę podręcznika &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:504 msgid "<option>--trivial-only</option>" -msgstr "" +msgstr "<option>--trivial-only</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:506 msgid "" @@ -3539,23 +4666,32 @@ msgid "" "option> will answer yes to any prompt, <option>--trivial-only</option> will " "answer no. Configuration Item: <literal>APT::Get::Trivial-Only</literal>." msgstr "" +"Wykonuje tylko \"banalne\" (ang. \"trivial\") operacje. Tę opcję można " +"porównać z <option>--assume-yes</option>, ale tam gdzie <option>--assume-" +"yes</option> odpowiedziałoby \"tak\" na pytanie, <option>--trivial-only</" +"option> odpowie \"nie\". Pozycja w pliku konfiguracyjnym: <literal>APT::" +"Get::Trivial-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:512 msgid "<option>--no-remove</option>" -msgstr "" +msgstr "<option>--no-remove</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:513 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." msgstr "" +"Jeżeli jakikolwiek pakiet miałby zostać usunięty, apt-get natychmiast kończy " +"działanie. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::Remove</" +"literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:518 msgid "<option>--auto-remove</option>" -msgstr "" +msgstr "<option>--auto-remove</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:519 @@ -3565,12 +4701,18 @@ msgid "" "command, removing the unused dependency packages. Configuration Item: " "<literal>APT::Get::AutomaticRemove</literal>." msgstr "" +"Jeżeli polecenie to albo <literal>install</literal>, albo <literal>remove</" +"literal>, to ta opcja działa tak, jak uruchomienie polecenia " +"<literal>autoremove</literal> i usuwa pakiety mające nieużywane już " +"zależności. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::" +"AutomaticRemove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:525 msgid "<option>--only-source</option>" -msgstr "" +msgstr "<option>--only-source</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:526 msgid "" @@ -3582,22 +4724,30 @@ msgid "" "corresponding source package. Configuration Item: <literal>APT::Get::Only-" "Source</literal>." msgstr "" +"Ma znaczenie tylko dla poleceń <literal>source</literal> i <literal>build-" +"dep</literal>. Wskazuje na to, że podane nazwy pakietów źródłowych nie " +"powinny być mapowane w tabeli pakietów binarnych. Oznacza to, że gdy podano " +"tę opcję, to powyższe polecenia zaakceptują tylko nazwy pakietów źródłowych." +"Nie będą akceptować nazw pakietów binarnych ani wyszukiwać odpowiadających " +"im pakietów źródłowych. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::" +"Only-Source</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:536 msgid "<option>--diff-only</option>" -msgstr "" +msgstr "<option>--diff-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:536 msgid "<option>--dsc-only</option>" -msgstr "" +msgstr "<option>--dsc-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:536 msgid "<option>--tar-only</option>" -msgstr "" +msgstr "<option>--tar-only</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:537 msgid "" @@ -3605,23 +4755,31 @@ msgid "" "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" "literal>, and <literal>APT::Get::Tar-Only</literal>." msgstr "" +"Ściągnij tylko plik diff, dsc albo tar pakietu źródłowego. Pozycje w pliku " +"konfiguracyjnym: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::" +"Dsc-Only</literal> oraz <literal>APT::Get::Tar-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:542 msgid "<option>--arch-only</option>" -msgstr "" +msgstr "<option>--arch-only</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:543 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." msgstr "" +"Przetwarza tylko te pakiety z zależnościami wymaganymi do zbudowania pakietu " +"ze źródeł (build-dependencies), które są zależnie od architektury " +"komputera. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::Arch-Only</" +"literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:547 msgid "<option>--allow-unauthenticated</option>" -msgstr "" +msgstr "<option>--allow-unauthenticated</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:548 @@ -3630,6 +4788,9 @@ msgid "" "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" "AllowUnauthenticated</literal>." msgstr "" +"Ignorowanie sytuacji, w których nie powiedzie się autentykacja pakietów i " +"nieostrzeganie o tym. Jest to użyteczne dla programów typu pbuilder. Pozycja " +"w pliku konfiguracyjnym: <literal>APT::Get::AllowUnauthenticated</literal>." #. type: Content of: <refentry><refsect1><variablelist> #: apt-get.8.xml:561 @@ -3637,7 +4798,10 @@ msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" msgstr "" +"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " +"&file-statelists;" +# #. type: Content of: <refentry><refsect1><para> #: apt-get.8.xml:570 msgid "" @@ -3645,43 +4809,50 @@ msgid "" "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" "preferences;, the APT Howto." msgstr "" +"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " +"&apt-config;, &apt-secure;, Przewodnik APT dla użytkowników w &guidesdir;, " +"&apt-preferences;, APT Howto." +# #. type: Content of: <refentry><refsect1><para> #: apt-get.8.xml:576 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." msgstr "" +"<command>apt-get</command> zwraca zero, gdy zakończyło się pomyślnie, 100 - " +"w przypadku błędu." #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:579 msgid "ORIGINAL AUTHORS" -msgstr "" +msgstr "AUTORZY ORYGINAŁU" #. type: Content of: <refentry><refsect1><para> #: apt-get.8.xml:580 msgid "&apt-author.jgunthorpe;" -msgstr "" +msgstr "&apt-author.jgunthorpe;" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:583 msgid "CURRENT AUTHORS" -msgstr "" +msgstr "OBECNI AUTORZY" #. type: Content of: <refentry><refsect1><para> #: apt-get.8.xml:585 msgid "&apt-author.team;" -msgstr "" +msgstr "&apt-author.team;" #. type: Content of: <refentry><refnamediv><refname> #: apt-key.8.xml:14 apt-key.8.xml:21 msgid "apt-key" -msgstr "" +msgstr "apt-key" +# #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-key.8.xml:22 msgid "APT key management utility" -msgstr "" +msgstr "Narzędzie zarządzanie kluczami APT" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-key.8.xml:28 @@ -3691,6 +4862,10 @@ msgid "" "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></" "arg>" msgstr "" +"<command>apt-key</command> <arg><option>--keyring <replaceable>nazwa_pliku</" +"replaceable></option></arg> <arg><replaceable>polecenie</replaceable></arg> " +"<arg rep=\"powtórzenia\"><option><replaceable>argumenty</replaceable></" +"option></arg>" #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml:37 @@ -3699,16 +4874,20 @@ msgid "" "authenticate packages. Packages which have been authenticated using these " "keys will be considered trusted." msgstr "" +"<command>apt-key</command> jest używane do zarządzania listami kluczy " +"używanych przez APT do sprawdzania autentyczności pakietów. Pakiety, których " +"autentyczność została sprawdzona przy użyciu tych kluczy, są uznawane za " +"zaufane." #. type: Content of: <refentry><refsect1><title> #: apt-key.8.xml:43 msgid "Commands" -msgstr "" +msgstr "Polecenia" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:45 msgid "add <replaceable>filename</replaceable>" -msgstr "" +msgstr "add <replaceable>nazwa_pliku</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:49 @@ -3717,61 +4896,66 @@ msgid "" "<replaceable>filename</replaceable>, or standard input if " "<replaceable>filename</replaceable> is <literal>-</literal>." msgstr "" +"Dodaje nowy klucz do listy zaufanych kluczy.Klucz jest czytany z podanej " +"<replaceable>nazwy_pliku</replaceable> lub ze standardowego wejścia, jeśli " +"zamiast <replaceable>nazwy_pliku</replaceable> podano <literal>-</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:57 msgid "del <replaceable>keyid</replaceable>" -msgstr "" +msgstr "del <replaceable>id_klucza</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:61 msgid "Remove a key from the list of trusted keys." -msgstr "" +msgstr "Usuwa klucz z listy zaufanych kluczy." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:68 msgid "export <replaceable>keyid</replaceable>" -msgstr "" +msgstr "export <replaceable>id_klucza</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:72 msgid "Output the key <replaceable>keyid</replaceable> to standard output." msgstr "" +"Wyświetla klucz o podanym <replaceable>id_klucza</replaceable> na " +"standardowe wyjście." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:79 msgid "exportall" -msgstr "" +msgstr "exportall" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:83 msgid "Output all trusted keys to standard output." -msgstr "" +msgstr "Wypisuje na standardowe wyjście wszystkie zaufane klucze." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:90 msgid "list" -msgstr "" +msgstr "list" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:94 msgid "List trusted keys." -msgstr "" +msgstr "Wyświetla listę zaufanych kluczy." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:101 msgid "finger" -msgstr "" +msgstr "finger" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:105 msgid "List fingerprints of trusted keys." -msgstr "" +msgstr "Wyświetla listę odcisków zaufanych kluczy." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:112 msgid "adv" -msgstr "" +msgstr "adv" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:116 @@ -3779,6 +4963,8 @@ msgid "" "Pass advanced options to gpg. With adv --recv-key you can download the " "public key." msgstr "" +"Przekazuje zaawansowane opcje do gpg. Na przykład adv --recv-key umożliwia " +"pobranie klucza publicznego." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:128 @@ -3786,6 +4972,8 @@ msgid "" "Update the local keyring with the keyring of Debian archive keys and removes " "from the keyring the archive keys which are no longer valid." msgstr "" +"Aktualizuje lokalną składnicę kluczy używając składnicy kluczy archiwum " +"Debiana i usuwa z lokalnej składnicy nieaktualne już klucze archiwów Debiana." #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml:140 @@ -3793,11 +4981,13 @@ msgid "" "Note that options need to be defined before the commands described in the " "previous section." msgstr "" +"Proszę zauważyć, że poniższe opcje muszą być podane przed poleceniami " +"opisanymi w poprzednim rozdziale." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:142 msgid "--keyring <replaceable>filename</replaceable>" -msgstr "" +msgstr "--keyring <replaceable>nazwa_pliku</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:143 @@ -3809,47 +4999,53 @@ msgid "" "filename> is the primary keyring which means that e.g. new keys are added to " "this one." msgstr "" +"Opcja pozwala na podanie pliku składnicy kluczy publicznych używanego w " +"programie. Domyślnie program używa pliku <filename>trusted.gpg</filename> " +"oraz wszystkich plików częściowych w katalogu <filename>trusted.gpg.d</" +"filename>. <filename>trusted.gpg</filename> jest podstawową składnicą " +"kluczy, co oznacza na przykład to, że nowe klucze będą dodawane właśnie tam." #. type: Content of: <refentry><refsect1><variablelist> #: apt-key.8.xml:156 msgid "&file-trustedgpg;" -msgstr "" +msgstr "&file-trustedgpg;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:158 msgid "<filename>/etc/apt/trustdb.gpg</filename>" -msgstr "" +msgstr "<filename>/etc/apt/trustdb.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:159 msgid "Local trust database of archive keys." -msgstr "" +msgstr "Lokalna składnica zaufanych kluczy archiwum." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:162 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" -msgstr "" +msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:163 msgid "Keyring of Debian archive trusted keys." -msgstr "" +msgstr "Składnica zaufanych kluczy archiwum Debiana." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:166 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" +"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:167 msgid "Keyring of Debian archive removed trusted keys." -msgstr "" +msgstr "Składnica usuniętych zaufanych kluczy archiwum Debiana." #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml:176 msgid "&apt-get;, &apt-secure;" -msgstr "" +msgstr "&apt-get;, &apt-secure;" #. The last update date #. type: Content of: <refentry><refentryinfo> @@ -3858,16 +5054,18 @@ msgid "" "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " "August 2009</date>" msgstr "" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; " +"<date>9 sierpnia 2009</date>" #. type: Content of: <refentry><refnamediv><refname> #: apt-mark.8.xml:22 apt-mark.8.xml:29 msgid "apt-mark" -msgstr "" +msgstr "apt-mark" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-mark.8.xml:30 msgid "mark/unmark a package as being automatically-installed" -msgstr "" +msgstr "Zaznaczanie/odznaczanie pakietu jako zainstalowanego automatycznie." #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-mark.8.xml:36 @@ -3879,6 +5077,12 @@ msgid "" "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </" "arg> <arg choice=\"plain\">showauto</arg> </group>" msgstr "" +" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" +"f=<replaceable>NAZWA_PLIKU</replaceable></option></arg> <group choice=\"plain" +"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain" +"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg " +"choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable></arg> </" +"arg> <arg choice=\"plain\">showauto</arg> </group>" #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml:53 @@ -3886,6 +5090,8 @@ msgid "" "<command>apt-mark</command> will change whether a package has been marked as " "being automatically installed." msgstr "" +"<command>apt-mark</command> zmienia flagę mówiącą o tym, czy pakiet był " +"zainstalowany automatycznie." #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml:57 @@ -3896,11 +5102,17 @@ msgid "" "are no longer depended on by any manually installed packages, they will be " "removed by e.g. <command>apt-get</command> or <command>aptitude</command>." msgstr "" +"Kiedy użytkownik zażąda zainstalowania pakietu, powoduje to zazwyczaj " +"zainstalowanie również innych pakietów, zależnych od żądanego pakietu. Te " +"zależne pakiety są oznaczane jako zainstalowane automatycznie. Kiedy takie " +"automatycznie zainstalowane pakiety nie są już potrzebne (czyli żaden inny " +"pakiet od nich nie zależy), zostaną usunięte przez na przykład <command>apt-" +"get</command> lub <command>aptitude</command>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:65 msgid "markauto" -msgstr "" +msgstr "markauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:66 @@ -3909,11 +5121,14 @@ msgid "" "installed, which will cause the package to be removed when no more manually " "installed packages depend on this package." msgstr "" +"<literal>markauto</literal> jest używane do zaznaczania pakietu jako " +"zainstalowanego automatycznie, co spowoduje jego usunięcie, w sytuacji gdy " +"żaden inny ręcznie zainstalowany pakiet nie będzie od niego zależał." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:73 msgid "unmarkauto" -msgstr "" +msgstr "unmarkauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:74 @@ -3922,11 +5137,14 @@ msgid "" "installed, which will prevent the package from being automatically removed " "if no other packages depend on it." msgstr "" +"<literal>unmarkauto</literal> jest używane do zaznaczania pakietu jako " +"zainstalowanego ręcznie, co go uchroni przed automatycznym usunięciem, w " +"sytuacji gdy żaden inny pakiet nie będzie od niego zależał." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:81 msgid "showauto" -msgstr "" +msgstr "showauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:82 @@ -3934,12 +5152,17 @@ msgid "" "<literal>showauto</literal> is used to print a list of automatically " "installed packages with each package on a new line." msgstr "" +"<literal>showauto</literal> jest używane do wypisania listy wszystkich " +"pakietów zainstalowanych automatycznie. Każdy pakiet jest wypisywany w " +"osobnej linii." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:93 msgid "" "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" msgstr "" +"<option>-f=<filename><replaceable>nazwa-pliku</replaceable></filename></" +"option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:94 @@ -3947,6 +5170,8 @@ msgid "" "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" "option>" msgstr "" +"<option>--file=<filename><replaceable>NAZWA_PLIKU</replaceable></filename></" +"option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:97 @@ -3956,41 +5181,47 @@ msgid "" "<filename>extended_status</filename> in the directory defined by the " "Configuration Item: <literal>Dir::State</literal>." msgstr "" +"Informacje o stanie pakietów są czytane z (lub zapisywane do) pliku o " +"podanej <replaceable>NAZWIE_PLIKU</replaceable>. Nie jest wtedy używana " +"domyślny plik <filename>extended_status</filename> znajdujący się w katalogu " +"określonym w pliku konfiguracyjnym w pozycji<literal>Dir::State</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:103 msgid "<option>-h</option>" -msgstr "" +msgstr "<option>-h</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:104 msgid "<option>--help</option>" -msgstr "" +msgstr "<option>--help</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:105 msgid "Show a short usage summary." -msgstr "" +msgstr "Wyświetla krótkie informacje na temat użytkowania." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:111 msgid "<option>-v</option>" -msgstr "" +msgstr "<option>-v</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:112 msgid "<option>--version</option>" -msgstr "" +msgstr "<option>--version</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:113 msgid "Show the program version." -msgstr "" +msgstr "Wyświetla wersję programu." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:124 msgid "<filename>/var/lib/apt/extended_states</filename>" -msgstr "" +msgstr "<filename>/var/lib/apt/extended_states</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:125 @@ -3999,23 +5230,29 @@ msgid "" "State</literal> sets the path to the <filename>extended_states</filename> " "file." msgstr "" +"Lista stanów pakietów zainstalowanych automatycznie. Pozycja w pliku " +"konfiguracyjnym: <literal>Dir::State</literal> ustawia ścieżkę do pliku o " +"nazwie <filename>extended_states</filename>." #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml:134 msgid "&apt-get;,&aptitude;,&apt-conf;" -msgstr "" +msgstr "&apt-get;,&aptitude;,&apt-conf;" +# #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml:138 msgid "" "<command>apt-mark</command> returns zero on normal operation, non-zero on " "error." msgstr "" +"<command>apt-mark</command> zwraca zero, gdy zakończyło się pomyślnie, " +"wartość niezerową - w przypadku błędu." #. type: Content of: <refentry><refnamediv><refname> #: apt-secure.8.xml:14 apt-secure.8.xml:36 msgid "apt-secure" -msgstr "" +msgstr "apt-secure" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-secure.8.xml:37 @@ -4215,6 +5452,8 @@ msgid "" "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " "&debsign; &debsig-verify;, &gpg;" msgstr "" +"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " +"&debsign; &debsig-verify;, &gpg;" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:187 @@ -4230,7 +5469,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-secure.8.xml:200 msgid "Manpage Authors" -msgstr "" +msgstr "Autorzy strony podręcznika" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:202 @@ -4242,12 +5481,13 @@ msgstr "" #. type: Content of: <refentry><refnamediv><refname> #: apt-sortpkgs.1.xml:22 apt-sortpkgs.1.xml:29 msgid "apt-sortpkgs" -msgstr "" +msgstr "apt-sortpkgs" +# #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-sortpkgs.1.xml:30 msgid "Utility to sort package index files" -msgstr "" +msgstr "Narzędzie użytkowe do sortowania plików indeksu" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-sortpkgs.1.xml:36 @@ -4257,6 +5497,10 @@ msgid "" "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg choice=" "\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>" msgstr "" +"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> " +"<arg><option>-o=<replaceable>opcja_konfiguracji</replaceable></option></arg> " +"<arg><option>-c=<replaceable>plik</replaceable></option></arg> <arg choice=" +"\"plain\" rep=\"repeat\"><replaceable>plik</replaceable></arg>" #. type: Content of: <refentry><refsect1><para> #: apt-sortpkgs.1.xml:45 @@ -4266,50 +5510,66 @@ msgid "" "name. It will also sort the internal fields of each record according to the " "internal sorting rules." msgstr "" +"<command>apt-sortpkgs</command> bierze plik indeksu (Source lub Packages) i " +"sortuje rekordy po nazwie pakietu. Posortuje także pola w każdym rekordzie, " +"zgodnie z wewnętrznymi zasadami sortowania." #. type: Content of: <refentry><refsect1><para> #: apt-sortpkgs.1.xml:51 msgid "All output is sent to stdout, the input must be a seekable file." msgstr "" +"Wyjście programu jest wypisywane na standardowe wyjście, wejście musi " +"pochodzić z pliku." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-sortpkgs.1.xml:58 msgid "<option>--source</option>" -msgstr "" +msgstr "<option>--source</option>" +# #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-sortpkgs.1.xml:60 msgid "" "Use Source index field ordering. Configuration Item: <literal>APT::" "SortPkgs::Source</literal>." msgstr "" +"Używa kolejności pól indeksu pliku Source. Pozycja w pliku konfiguracji: " +"<literal>APT::SortPkgs::Source</literal>." +# #. type: Content of: <refentry><refsect1><para> #: apt-sortpkgs.1.xml:74 msgid "" "<command>apt-sortpkgs</command> returns zero on normal operation, decimal " "100 on error." msgstr "" +"<command>apt-sortpkgs</command> zwraca zero, gdy zakończyło się pomyślnie, " +"100 - w przypadku błędu." #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt.conf.5.xml:13 +#, fuzzy msgid "" "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " "&apt-product; <date>16 January 2010</date>" msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" +"firstname> <surname>Burrows</surname> <contrib>Pierwsza dokumentacja Debug::" +"*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; &apt-" +"product; <date>18 września 2009</date>" #. type: Content of: <refentry><refnamediv><refname> #: apt.conf.5.xml:28 apt.conf.5.xml:35 msgid "apt.conf" -msgstr "" +msgstr "apt.conf" #. type: Content of: <refentry><refmeta><manvolnum> #: apt.conf.5.xml:29 apt_preferences.5.xml:22 sources.list.5.xml:23 msgid "5" -msgstr "" +msgstr "5" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt.conf.5.xml:36 @@ -4404,6 +5664,12 @@ msgid "" " };\n" "};\n" msgstr "" +"APT {\n" +" Get {\n" +" Assume-Yes \"true\";\n" +" Fix-Broken \"true\";\n" +" };\n" +"};\n" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:89 @@ -4417,7 +5683,7 @@ msgstr "" #: apt.conf.5.xml:94 #, no-wrap msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" -msgstr "" +msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:97 @@ -4521,7 +5787,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:152 msgid "Default-Release" -msgstr "" +msgstr "Default-Release" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:153 @@ -4535,7 +5801,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:157 msgid "Ignore-Hold" -msgstr "" +msgstr "Ignore-Hold" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:158 @@ -4546,8 +5812,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:162 +#, fuzzy msgid "Clean-Installed" -msgstr "" +msgstr "B<--installed>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:163 @@ -4614,8 +5881,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:201 +#, fuzzy msgid "Cache-Limit" -msgstr "" +msgstr "Cache" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:202 @@ -4637,7 +5905,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:210 msgid "Get" -msgstr "" +msgstr "Get" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:211 @@ -4649,7 +5917,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:215 msgid "Cache" -msgstr "" +msgstr "Cache" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:216 @@ -4661,7 +5929,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:220 msgid "CDROM" -msgstr "" +msgstr "CDROM" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:221 @@ -4727,8 +5995,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:258 +#, fuzzy msgid "Source-Symlinks" -msgstr "" +msgstr "Sources" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:259 @@ -4740,7 +6009,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:263 sources.list.5.xml:139 msgid "http" -msgstr "" +msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:264 @@ -4808,7 +6077,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:304 msgid "https" -msgstr "" +msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:305 @@ -4844,7 +6113,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:329 sources.list.5.xml:150 msgid "ftp" -msgstr "" +msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:330 @@ -4897,7 +6166,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:368 sources.list.5.xml:132 msgid "cdrom" -msgstr "" +msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> #: apt.conf.5.xml:374 @@ -4921,7 +6190,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:379 msgid "gpgv" -msgstr "" +msgstr "gpgv" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:380 @@ -4958,13 +6227,13 @@ msgstr "" #: apt.conf.5.xml:396 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" -msgstr "" +msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> #: apt.conf.5.xml:399 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" -msgstr "" +msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:392 @@ -4987,7 +6256,7 @@ msgstr "" #: apt.conf.5.xml:403 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" -msgstr "" +msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:401 @@ -5155,8 +6424,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:493 +#, fuzzy msgid "Clean" -msgstr "" +msgstr "B<clean>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:494 @@ -5178,8 +6448,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:507 +#, fuzzy msgid "Updateoptions" -msgstr "" +msgstr "opcje" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:508 @@ -5278,8 +6549,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:556 +#, fuzzy msgid "Build-options" -msgstr "" +msgstr "opcje" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:557 @@ -5317,6 +6589,10 @@ msgid "" "DPkg::ConfigurePending \"true\";\n" "DPkg::TriggersPending \"true\";" msgstr "" +"DPkg::NoTriggers \"true\";\n" +"PackageManager::Configure \"smart\";\n" +"DPkg::ConfigurePending \"true\";\n" +"DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt.conf.5.xml:572 @@ -5335,7 +6611,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt.conf.5.xml:584 msgid "DPkg::NoTriggers" -msgstr "" +msgstr "DPkg::NoTriggers" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:585 @@ -5352,7 +6628,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt.conf.5.xml:592 msgid "PackageManager::Configure" -msgstr "" +msgstr "PackageManager::Configure" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:593 @@ -5373,7 +6649,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt.conf.5.xml:603 msgid "DPkg::ConfigurePending" -msgstr "" +msgstr "DPkg::ConfigurePending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:604 @@ -5389,7 +6665,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt.conf.5.xml:610 msgid "DPkg::TriggersPending" -msgstr "" +msgstr "DPkg::TriggersPending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:611 @@ -5404,7 +6680,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt.conf.5.xml:616 msgid "PackageManager::UnpackAll" -msgstr "" +msgstr "PackageManager::UnpackAll" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:617 @@ -5421,7 +6697,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt.conf.5.xml:624 msgid "OrderList::Score::Immediate" -msgstr "" +msgstr "OrderList::Score::Immediate" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> #: apt.conf.5.xml:632 @@ -5434,6 +6710,12 @@ msgid "" "\tPreDepends 50;\n" "};" msgstr "" +"OrderList::Score {\n" +"\tDelete 500;\n" +"\tEssential 200;\n" +"\tImmediate 10;\n" +"\tPreDepends 50;\n" +"};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:625 @@ -5465,8 +6747,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt.conf.5.xml:654 +#, fuzzy msgid "Debug options" -msgstr "" +msgstr "opcje" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:656 @@ -5507,10 +6790,13 @@ msgstr "" #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: apt.conf.5.xml:692 +#, fuzzy msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" +"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " +"in CDROM IDs." #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:702 @@ -5520,7 +6806,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:707 msgid "<literal>Debug::Acquire::cdrom</literal>" -msgstr "" +msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:711 @@ -5531,7 +6817,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:718 msgid "<literal>Debug::Acquire::ftp</literal>" -msgstr "" +msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:722 @@ -5541,7 +6827,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:729 msgid "<literal>Debug::Acquire::http</literal>" -msgstr "" +msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:733 @@ -5551,7 +6837,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:740 msgid "<literal>Debug::Acquire::https</literal>" -msgstr "" +msgstr "<literal>Debug::Acquire::https</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:744 @@ -5561,7 +6847,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:751 msgid "<literal>Debug::Acquire::gpgv</literal>" -msgstr "" +msgstr "<literal>Debug::Acquire::gpgv</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:755 @@ -5573,7 +6859,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:762 msgid "<literal>Debug::aptcdrom</literal>" -msgstr "" +msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:766 @@ -5585,7 +6871,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:773 msgid "<literal>Debug::BuildDeps</literal>" -msgstr "" +msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:776 @@ -5595,7 +6881,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:783 msgid "<literal>Debug::Hashes</literal>" -msgstr "" +msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:786 @@ -5607,7 +6893,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:793 msgid "<literal>Debug::IdentCDROM</literal>" -msgstr "" +msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:796 @@ -5620,7 +6906,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:804 msgid "<literal>Debug::NoLocking</literal>" -msgstr "" +msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:807 @@ -5632,7 +6918,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:815 msgid "<literal>Debug::pkgAcquire</literal>" -msgstr "" +msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:819 @@ -5642,7 +6928,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:826 msgid "<literal>Debug::pkgAcquire::Auth</literal>" -msgstr "" +msgstr "<literal>Debug::pkgAcquire::Auth</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:829 @@ -5654,7 +6940,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:836 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" -msgstr "" +msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:839 @@ -5666,7 +6952,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:847 msgid "<literal>Debug::pkgAcquire::RRed</literal>" -msgstr "" +msgstr "<literal>Debug::pkgAcquire::RRed</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:851 @@ -5678,7 +6964,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:858 msgid "<literal>Debug::pkgAcquire::Worker</literal>" -msgstr "" +msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:862 @@ -5689,7 +6975,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:869 msgid "<literal>Debug::pkgAutoRemove</literal>" -msgstr "" +msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:873 @@ -5701,7 +6987,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:880 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" -msgstr "" +msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:883 @@ -5716,7 +7002,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:894 msgid "<literal>Debug::pkgDepCache::Marker</literal>" -msgstr "" +msgstr "<literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:897 @@ -5738,7 +7024,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:916 msgid "<literal>Debug::pkgInitConfig</literal>" -msgstr "" +msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:919 @@ -5748,7 +7034,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:926 msgid "<literal>Debug::pkgDPkgPM</literal>" -msgstr "" +msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:929 @@ -5760,7 +7046,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:937 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" -msgstr "" +msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:940 @@ -5772,7 +7058,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:947 msgid "<literal>Debug::pkgOrderList</literal>" -msgstr "" +msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:951 @@ -5784,7 +7070,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:959 msgid "<literal>Debug::pkgPackageManager</literal>" -msgstr "" +msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:963 @@ -5795,7 +7081,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:970 msgid "<literal>Debug::pkgPolicy</literal>" -msgstr "" +msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:974 @@ -5805,7 +7091,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:980 msgid "<literal>Debug::pkgProblemResolver</literal>" -msgstr "" +msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:984 @@ -5817,7 +7103,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:992 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" -msgstr "" +msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:995 @@ -5830,7 +7116,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:1003 msgid "<literal>Debug::sourceList</literal>" -msgstr "" +msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:1007 @@ -5849,25 +7135,27 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt.conf.5.xml:1037 msgid "&file-aptconf;" -msgstr "" +msgstr "&file-aptconf;" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:1042 msgid "&apt-cache;, &apt-config;, &apt-preferences;." -msgstr "" +msgstr "&apt-cache;, &apt-config;, &apt-preferences;." #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt_preferences.5.xml:13 +#, fuzzy +#| msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" msgid "" "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>" -msgstr "" +msgstr "&apt-author.team; &apt-email; &apt-product; <date>4 maja 2009</date>" #. type: Content of: <refentry><refnamediv><refname> #: apt_preferences.5.xml:21 apt_preferences.5.xml:28 msgid "apt_preferences" -msgstr "" +msgstr "apt_preferences" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt_preferences.5.xml:29 @@ -5937,13 +7225,13 @@ msgstr "" #: apt_preferences.5.xml:86 #, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" -msgstr "" +msgstr "<command>apt-get install -t testing <replaceable>jakiś-pakiet</replaceable></command>\n" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml:89 #, no-wrap msgid "APT::Default-Release \"stable\";\n" -msgstr "" +msgstr "APT::Default-Release \"stable\";\n" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:73 @@ -5964,7 +7252,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml:98 msgid "priority 100" -msgstr "" +msgstr "priorytet 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:99 @@ -5974,7 +7262,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml:103 msgid "priority 500" -msgstr "" +msgstr "priorytet 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:104 @@ -5986,7 +7274,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml:108 msgid "priority 990" -msgstr "" +msgstr "priorytet 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:109 @@ -6110,6 +7398,9 @@ msgid "" "Pin: version 5.8*\n" "Pin-Priority: 1001\n" msgstr "" +"Package: perl\n" +"Pin: version 5.8*\n" +"Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #: apt_preferences.5.xml:179 @@ -6137,6 +7428,9 @@ msgid "" "Pin: origin \"\"\n" "Pin-Priority: 999\n" msgstr "" +"Package: *\n" +"Pin: origin \"\"\n" +"Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #: apt_preferences.5.xml:195 @@ -6164,6 +7458,9 @@ msgid "" "Pin: release a=unstable\n" "Pin-Priority: 50\n" msgstr "" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #: apt_preferences.5.xml:210 @@ -6181,6 +7478,9 @@ msgid "" "Pin: release n=squeeze\n" "Pin-Priority: 900\n" msgstr "" +"Package: *\n" +"Pin: release n=squeeze\n" +"Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #: apt_preferences.5.xml:219 @@ -6198,6 +7498,9 @@ msgid "" "Pin: release a=stable, v=3.0\n" "Pin-Priority: 500\n" msgstr "" +"Package: *\n" +"Pin: release a=stable, v=3.0\n" +"Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><title> #: apt_preferences.5.xml:235 @@ -6207,55 +7510,67 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml:243 msgid "P > 1000" -msgstr "" +msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:244 +#, fuzzy msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" msgstr "" +"powoduje, że wersja zostanie zainstalowana tylko wtedy, jeżeli żadna wersja " +"pakietu nie jest jeszcze zainstalowana" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml:248 msgid "990 < P <=1000" -msgstr "" +msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:249 +#, fuzzy msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" msgstr "" +"powoduje, że wersja zostanie zainstalowana tylko wtedy, jeżeli żadna wersja " +"pakietu nie jest jeszcze zainstalowana" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml:254 msgid "500 < P <=990" -msgstr "" +msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:255 +#, fuzzy msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" msgstr "" +"powoduje, że wersja zostanie zainstalowana tylko wtedy, jeżeli żadna wersja " +"pakietu nie jest jeszcze zainstalowana" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml:260 msgid "100 < P <=500" -msgstr "" +msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:261 +#, fuzzy msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" msgstr "" +"powoduje, że wersja zostanie zainstalowana tylko wtedy, jeżeli żadna wersja " +"pakietu nie jest jeszcze zainstalowana" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml:266 msgid "0 < P <=100" -msgstr "" +msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:267 @@ -6263,11 +7578,13 @@ msgid "" "causes a version to be installed only if there is no installed version of " "the package" msgstr "" +"powoduje, że wersja zostanie zainstalowana tylko wtedy, jeżeli żadna wersja " +"pakietu nie jest jeszcze zainstalowana" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml:271 msgid "P < 0" -msgstr "" +msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:272 @@ -6314,11 +7631,22 @@ msgid "" "Pin: release unstable\n" "Pin-Priority: 50\n" msgstr "" +"Package: perl\n" +"Pin: version 5.8*\n" +"Pin-Priority: 1001\n" +"\n" +"Package: *\n" +"Pin: origin \"\"\n" +"Pin-Priority: 999\n" +"\n" +"Package: *\n" +"Pin: release unstable\n" +"Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:300 msgid "Then:" -msgstr "" +msgstr "Wtedy:" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #: apt_preferences.5.xml:302 @@ -6363,22 +7691,22 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml:335 msgid "the <literal>Package:</literal> line" -msgstr "" +msgstr "linia <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:336 msgid "gives the package name" -msgstr "" +msgstr "podaje nazwę pakietu" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml:339 apt_preferences.5.xml:389 msgid "the <literal>Version:</literal> line" -msgstr "" +msgstr "linia <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:340 msgid "gives the version number for the named package" -msgstr "" +msgstr "podaje numer wersji danego pakietu" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:327 @@ -6396,7 +7724,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml:356 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" -msgstr "" +msgstr "linia <literal>Archive:</literal> lub <literal>Suite:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:357 @@ -6413,12 +7741,12 @@ msgstr "" #: apt_preferences.5.xml:367 #, no-wrap msgid "Pin: release a=stable\n" -msgstr "" +msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml:373 msgid "the <literal>Codename:</literal> line" -msgstr "" +msgstr "linia <literal>Codename:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:374 @@ -6434,7 +7762,7 @@ msgstr "" #: apt_preferences.5.xml:383 #, no-wrap msgid "Pin: release n=squeeze\n" -msgstr "" +msgstr "Pin: release n=squeeze\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:390 @@ -6454,11 +7782,14 @@ msgid "" "Pin: release a=stable, v=3.0\n" "Pin: release 3.0\n" msgstr "" +"Pin: release v=3.0\n" +"Pin: release a=stable, v=3.0\n" +"Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml:408 msgid "the <literal>Component:</literal> line" -msgstr "" +msgstr "linia <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:409 @@ -6475,12 +7806,12 @@ msgstr "" #: apt_preferences.5.xml:418 #, no-wrap msgid "Pin: release c=main\n" -msgstr "" +msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml:424 msgid "the <literal>Origin:</literal> line" -msgstr "" +msgstr "linia <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:425 @@ -6495,12 +7826,12 @@ msgstr "" #: apt_preferences.5.xml:431 #, no-wrap msgid "Pin: release o=Debian\n" -msgstr "" +msgstr "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml:437 msgid "the <literal>Label:</literal> line" -msgstr "" +msgstr "linia <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:438 @@ -6515,7 +7846,7 @@ msgstr "" #: apt_preferences.5.xml:444 #, no-wrap msgid "Pin: release l=Debian\n" -msgstr "" +msgstr "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:345 @@ -6574,7 +7905,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml:487 -#, no-wrap +#, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" "Explanation: package versions other than those in the stable distro\n" @@ -6586,6 +7917,15 @@ msgid "" "Pin: release o=Debian\n" "Pin-Priority: -10\n" msgstr "" +"Explanation: Uninstall or do not install any Debian-originated\n" +"Explanation: package versions other than those in the stable distro\n" +"Package: *\n" +"Pin: release a=stable\n" +"Pin-Priority: 900\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:481 @@ -6606,6 +7946,9 @@ msgid "" "apt-get upgrade\n" "apt-get dist-upgrade\n" msgstr "" +"apt-get install <replaceable>nazwa-pakietu</replaceable>\n" +"apt-get upgrade\n" +"apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:499 @@ -6620,7 +7963,7 @@ msgstr "" #: apt_preferences.5.xml:516 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" -msgstr "" +msgstr "apt-get install <replaceable>pakiet</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:510 @@ -6652,6 +7995,17 @@ msgid "" "Pin: release o=Debian\n" "Pin-Priority: -10\n" msgstr "" +"Package: *\n" +"Pin: release a=testing\n" +"Pin-Priority: 900\n" +"\n" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 800\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:524 @@ -6677,7 +8031,7 @@ msgstr "" #: apt_preferences.5.xml:565 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" -msgstr "" +msgstr "apt-get install <replaceable>pakiet</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:556 @@ -6698,7 +8052,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml:586 -#, no-wrap +#, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" "Explanation: other than those in the distribution codenamed with squeeze or sid\n" @@ -6715,6 +8069,20 @@ msgid "" "Pin: release o=Debian\n" "Pin-Priority: -10\n" msgstr "" +"Explanation: Uninstall or do not install any Debian-originated package versions\n" +"Explanation: other than those in the distribution codenamed with squeeze or sid\n" +"Package: *\n" +"Pin: release n=squeeze\n" +"Pin-Priority: 900\n" +"\n" +"Explanation: Debian unstable is always codenamed with sid\n" +"Package: *\n" +"Pin: release a=sid\n" +"Pin-Priority: 800\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:574 @@ -6744,7 +8112,7 @@ msgstr "" #: apt_preferences.5.xml:623 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" -msgstr "" +msgstr "apt-get install <replaceable>pakiet</replaceable>/sid\n" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:614 @@ -6761,22 +8129,22 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt_preferences.5.xml:632 msgid "&file-preferences;" -msgstr "" +msgstr "&file-preferences;" #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:638 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" -msgstr "" +msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" #. type: Content of: <refentry><refnamediv><refname> #: sources.list.5.xml:22 sources.list.5.xml:29 msgid "sources.list" -msgstr "" +msgstr "sources.list" #. type: Content of: <refentry><refnamediv><refpurpose> #: sources.list.5.xml:30 msgid "Package resource list for APT" -msgstr "" +msgstr "Lista zasobów pakietów dla APT" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:34 @@ -6786,6 +8154,10 @@ msgid "" "documents only the packaging system used by the Debian GNU/Linux system. " "This control file is <filename>/etc/apt/sources.list</filename>." msgstr "" +"Lista zasobów pakietów jest używana do zlokalizowania archiwów pakietów " +"używanego systemu dystrybucji pakietów. Obecnie ta strona podręcznika " +"opisuje tylko system pakietów używany w systemie Debian GNU/Linux. Plikiem " +"kontrolnym jest <filename>/etc/apt/sources.list</filename>." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:39 @@ -6799,11 +8171,21 @@ msgid "" "Universal Resource Locator, or URL. The rest of the line can be marked as a " "comment by using a #." msgstr "" +"Listę źródeł zaprojektowano tak, aby obsługiwała dowolną liczbę aktywnych " +"źródeł i różnorodne lokalizacje źródeł. Każde źródło jest wymienione w " +"osobnej linii, zaczynając od źródeł najbardziej preferowanych. Format każdej " +"linii jest następujący: <literal>typ uri argumenty</literal>. Pierwsza " +"pozycja, <literal>typ</literal>, wyznacza format <literal>argumentów</" +"literal>. <literal>uri</literal> jest uniwersalnym identyfikatorem zasobu " +"(ang. Universal Resource Identifier - URI), który jest nadzbiorem dobrze " +"znanego uniwersalnego lokalizatora zasobu (ang. Universal Resource Locator - " +"URL). Pozostała część linii może być komentarzem, jeśli zaczyna się od znaku " +"\"#\"." #. type: Content of: <refentry><refsect1><title> #: sources.list.5.xml:50 msgid "sources.list.d" -msgstr "" +msgstr "sources.list.d" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:51 @@ -6815,11 +8197,17 @@ msgid "" "digits (0-9), underscore (_), hyphen (-) and period (.) characters. " "Otherwise they will be silently ignored." msgstr "" +"Katalog <filename>/etc/apt/sources.list.d</filename> umożliwia podzielenie " +"pliku źródeł na osobne pliki. Format jest dokładnie taki sam, jak w " +"przypadku zwykłego pliku <filename>sources.list</filename>. Nazwy plików w " +"tym katalogu muszą się kończyć rozszerzeniem <filename>.list</filename> i " +"mogą składać się tylko z liter (a-z i A-Z), cyfr (0-9), znaku podkreślenia " +"(_), pauzy (-) i kropki (.). Inne pliki zostaną zignorowane." #. type: Content of: <refentry><refsect1><title> #: sources.list.5.xml:60 msgid "The deb and deb-src types" -msgstr "" +msgstr "Typy deb i deb-src" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:61 @@ -6834,6 +8222,15 @@ msgid "" "form as the <literal>deb</literal> type. A <literal>deb-src</literal> line " "is required to fetch source indexes." msgstr "" +"Typ <literal>deb</literal> opisuje typowe dwupoziomowe archiwum Debiana: " +"<filename>dystrybucja/komponent</filename>. Zazwyczaj <literal>dystrybucja</" +"literal> jest jedną z: <literal>stable</literal>, <literal>unstable</" +"literal> lub <literal>testing</literal>, a <filename>komponent</filename> - " +"jednym z: <literal>main</literal>, <literal>contrib</literal>, <literal>non-" +"free</literal> lub <literal>non-us</literal>. Typ <literal>deb-src</literal> " +"opisuje lokalizacje kodów źródłowych dystrybucji Debiana i używa takiego " +"samego formatu jak typ <literal>deb</literal>. <literal>deb-src</literal> " +"jest wymagany do pobierania indeksów kodów źródłowych." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:73 @@ -6841,12 +8238,14 @@ msgid "" "The format for a <filename>sources.list</filename> entry using the " "<literal>deb</literal> and <literal>deb-src</literal> types is:" msgstr "" +"Formaty wpisów w <filename>sources.list</filename> używających typów " +"<literal>deb</literal> i <literal>deb-src</literal> to:" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:76 #, no-wrap msgid "deb uri distribution [component1] [component2] [...]" -msgstr "" +msgstr "deb URI dystrybucja [komponent1] [komponent2] [...]" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:78 @@ -6860,6 +8259,14 @@ msgid "" "literal> does not specify an exact path, at least one <literal>component</" "literal> must be present." msgstr "" +"URI typu <literal>deb</literal> musi podawać bazową lokalizację dystrybucji " +"Debiana, w której APT znajdzie potrzebne informacje. <literal>Dystrybucja</" +"literal> może być dokładną ścieżką - w takim przypadku komponenty trzeba " +"pominąć, a <literal>dystrybucja</literal> musi się kończyć znakiem ukośnika " +"(\"/\"). Jest to użyteczne, gdy interesuje nas szczególna pod-sekcja " +"archiwum, podana jako URI. Jeśli <literal>dystrybucja</literal> nie podaje " +"dokładnej ścieżki, to musi być obecny przynajmniej jeden <literal>komponent</" +"literal>." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:87 @@ -6871,7 +8278,15 @@ msgid "" "of interest when specifying an exact path, <literal>APT</literal> will " "automatically generate a URI with the current architecture otherwise." msgstr "" +"<literal>Dystrybucja</literal> może zawierać także zmienną <literal>$(ARCH)</" +"literal>, która zostanie rozwinięta do architektury Debiana (i386, m68k, " +"powerpc, ...) używanej w systemie. Pozwala to na używanie plików " +"<filename>sources.list</filename> niezależnych od architektury. W ogólności " +"jest to interesujące tylko wtedy, gdy podaje się dokładną ścieżkę, w innym " +"przypadku <literal>APT</literal> automatycznie wygeneruje URI zawierający " +"bieżącą architekturę." +# #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:95 msgid "" @@ -6886,6 +8301,18 @@ msgid "" "number of simultaneous anonymous users. APT also parallelizes connections to " "different hosts to more effectively deal with sites with low bandwidth." msgstr "" +"Ponieważ w pojedynczej linii można podać tylko jedną dystrybucję, może być " +"potrzebne wymienienie tego samego URI w wielu liniach, jeżeli pożądany jest " +"podzbiór wszystkich dostępnych dystrybucji lub komponentów w danej " +"lokalizacji. APT wewnętrznie posortuje listę URI po wygenerowaniu " +"kompletnego zbioru i użyje pojedynczego połączenia do pobrania wszystkich " +"odniesień do tego samego zdalnego komputera, tak żeby niepotrzebnie nie " +"nawiązywać połączenia FTP, zamykać go, robić cokolwiek innego, a potem " +"ponownie łączyć się do tego samego zasobu. Ta cecha jest użyteczna do " +"uzyskiwania dostępu do obciążonych serwerów FTP ograniczających liczbę " +"jednoczesnych anonimowych połączeń. APT tworzy równoległe połączenia do " +"różnych komputerów, tak żeby efektywnie radzić sobie z komputerami w " +"sieciach o niskiej przepustowości łączy." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:107 @@ -6895,11 +8322,16 @@ msgid "" "speed from fastest to slowest (CD-ROM followed by hosts on a local network, " "followed by distant Internet hosts, for example)." msgstr "" +"Ważne jest, aby źródła pakietów były wymienione w kolejności preferencji " +"użytkownika, zaczynając od tego najbardziej preferowanego. Zazwyczaj " +"wynikiem tego będzie sortowanie od najszybszego do najwolniejszego (na " +"przykład CD-ROM przed komputerami w lokalnej sieci przed odległymi " +"komputerami w Internecie)." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:112 msgid "Some examples:" -msgstr "" +msgstr "Kilka przykładów:" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:114 @@ -6909,16 +8341,19 @@ msgid "" "deb http://http.us.debian.org/debian dists/stable-updates/\n" " " msgstr "" +"deb http://http.us.debian.org/debian stable main contrib non-free\n" +"deb http://http.us.debian.org/debian dists/stable-updates/\n" +" " #. type: Content of: <refentry><refsect1><title> #: sources.list.5.xml:120 msgid "URI specification" -msgstr "" +msgstr "Określanie URI" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: sources.list.5.xml:125 msgid "file" -msgstr "" +msgstr "file" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: sources.list.5.xml:127 @@ -6927,6 +8362,9 @@ msgid "" "considered an archive. This is useful for NFS mounts and local mirrors or " "archives." msgstr "" +"Schemat file pozwala używać jako archiwum dowolnego katalogu w systemie " +"plików. Jest użyteczny dla katalogów montowanych przez NFS i lokalnych kopii " +"archiwów." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: sources.list.5.xml:134 @@ -6934,6 +8372,9 @@ msgid "" "The cdrom scheme allows APT to use a local CDROM drive with media swapping. " "Use the &apt-cdrom; program to create cdrom entries in the source list." msgstr "" +"Schemat cdrom pozwala APT na użycie lokalnego dysku CDROM ze zmianą dysków. " +"Prosimy używać programu &apt-cdrom; do dodawania takich wpisów w sources." +"list." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: sources.list.5.xml:141 @@ -6945,6 +8386,12 @@ msgid "" "http://user:pass@server:port/. Note that this is an insecure method of " "authentication." msgstr "" +"Schemat http opisuje serwer archiwum HTTP. Jeśli ustawiono zmienną " +"środowiskową <envar>http_proxy</envar> w formacie http://serwer:port/, to " +"APT użyje serwera proxy określonego w tej zmiennej. Użytkownicy serwerów " +"proxy wymagających autoryzacji mogą ustawić tę zmienną na http://użytkownik:" +"hasło@serwer:port/. Proszę zauważyć, że taki sposób autoryzacji nie jest " +"bezpieczny." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: sources.list.5.xml:152 @@ -6957,11 +8404,18 @@ msgid "" "method. ftp proxies using http specified in the configuration file will be " "ignored." msgstr "" +"Schemat ftp opisuje serwer FTP archiwum. Zachowanie modułu FTP można " +"dowolnie konfigurować, szczegóły można znaleźć na stronie podręcznika &apt-" +"conf;. Proszę zauważyć, że można podać serwer proxy ftp, używając zmiennej " +"środowiskowej <envar>ftp_proxy</envar>. Możliwe jest podanie serwera proxy " +"http (które to serwery często rozumieją lokalizacje zasobów ftp) używając " +"tej i TYLKO tej metody. Podane w pliku konfiguracyjnym serwery proxy ftp " +"używające http zostaną zignorowane." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: sources.list.5.xml:161 msgid "copy" -msgstr "" +msgstr "copy" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: sources.list.5.xml:163 @@ -6970,16 +8424,20 @@ msgid "" "copied into the cache directory instead of used directly at their location. " "This is useful for people using a zip disk to copy files around with APT." msgstr "" +"Schemat copy jest identyczny ze schematem file, z tym wyjątkiem, że pakiety " +"nie są używane bezpośrednio z podanej lokalizacji, tylko są kopiowane do " +"katalogu bufora. Jest to użyteczne w przypadku używania dysku przenośnego do " +"skopiowania plików przy użyciu APT." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: sources.list.5.xml:168 msgid "rsh" -msgstr "" +msgstr "rsh" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: sources.list.5.xml:168 msgid "ssh" -msgstr "" +msgstr "ssh" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: sources.list.5.xml:170 @@ -6990,11 +8448,17 @@ msgid "" "<command>find</command> and <command>dd</command> commands to perform the " "file transfers from the remote." msgstr "" +"Metoda rsh/ssh uruchamia rsh/ssh do połączenia się ze zdalnym komputerem " +"jako podany użytkownik i uzyskania dostępu do plików. Dobrym pomysłem jest " +"wcześniejsze przygotowanie kluczy RSA lub dostępu rhosts. APT, po uzyskaniu " +"dostępu do plików na zdalnym komputerze, używa standardowych poleceń " +"<command>find</command> i <command>dd</command> do przetransferowania plików " +"ze zdalnego komputera." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: sources.list.5.xml:178 msgid "more recognizable URI types" -msgstr "" +msgstr "więcej rozpoznawanych typów URI" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: sources.list.5.xml:180 @@ -7008,6 +8472,15 @@ msgid "" "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></" "refentrytitle> <manvolnum>1</manvolnum></citerefentry>." msgstr "" +"APT może być rozszerzone o więcej metod, pochodzących z innych opcjonalnych " +"pakietów, które powinny się nazywać <literal>apt-transport-" +"<replaceable>metoda</replaceable></literal>. Zespół APT opiekuje się na " +"przykład pakietem <literal>apt-transport-https</literal>, dostarczającym " +"metody dostępu dla URI typu https, działającej podobnie do metody http. " +"Dostępne są również inne metody pozwalające na przykład używać debtorrenta, " +"proszę zobaczyć <citerefentry> <refentrytitle><filename>apt-transport-" +"debtorrent</filename></refentrytitle> <manvolnum>1</manvolnum></" +"citerefentry>." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:122 @@ -7015,6 +8488,8 @@ msgid "" "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, " "rsh. <placeholder type=\"variablelist\" id=\"0\"/>" msgstr "" +"Obecnie rozpoznawane są następujące typy URI: cdrom, file, http, ftp, copy, " +"ssh, rsh. <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:194 @@ -7022,34 +8497,37 @@ msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." msgstr "" +"Użycie archiwum lokalnego (lub montowanego przez NFS) w katalogu /home/jason/" +"debian dla zasobów stable/main, stable/contrib i stable/non-free." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:196 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" -msgstr "" +msgstr "deb file:/home/jason/debian stable main contrib non-free" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:198 msgid "As above, except this uses the unstable (development) distribution." msgstr "" +"Jak wyżej, z tą różnicą że używa dystrybucji niestabilnej (deweloperskiej)." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:199 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" -msgstr "" +msgstr "deb file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:201 msgid "Source line for the above" -msgstr "" +msgstr "Linie źródeł dla powyższego przykładu" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:202 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" -msgstr "" +msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:204 @@ -7057,12 +8535,14 @@ msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." msgstr "" +"Użycie HTTP do uzyskania dostępu do archiwum na komputerze archive.debian." +"org i dystrybucji hamm/main." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:206 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" -msgstr "" +msgstr "deb http://archive.debian.org/debian-archive hamm main" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:208 @@ -7070,12 +8550,14 @@ msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the stable/contrib area." msgstr "" +"Użycie FTP do uzyskania dostępu do archiwum na komputerze ftp.debian.org i " +"dystrybucji stable/contrib." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:210 #, no-wrap msgid "deb ftp://ftp.debian.org/debian stable contrib" -msgstr "" +msgstr "deb ftp://ftp.debian.org/debian stable contrib" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:212 @@ -7085,12 +8567,16 @@ msgid "" "well as the one in the previous example in <filename>sources.list</filename> " "a single FTP session will be used for both resource lines." msgstr "" +"Użycie FTP do uzyskania dostępu do archiwum na komputerze ftp.debian.org, " +"dystrybucji unstable/contrib. Jeśli poniższa linia wystąpi razem z linią z " +"poprzedniego przykładu w tym samym pliku <filename>sources.list</filename>, " +"to pojedyncza sesja FTP będzie użyta w celu uzyskania dostępu do obu zasobów." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:216 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" -msgstr "" +msgstr "deb ftp://ftp.debian.org/debian unstable contrib" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:218 @@ -7098,18 +8584,20 @@ msgid "" "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US " "directory." msgstr "" +"Użycie HTTP do uzyskania dostępu do archiwum na komputerze nonus.debian." +"org, w katalogu debian-non-US." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:220 #, no-wrap msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" -msgstr "" +msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" #. type: Content of: <refentry><refsect1><para><literallayout> #: sources.list.5.xml:229 #, no-wrap msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" -msgstr "" +msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:222 @@ -7121,71 +8609,72 @@ msgid "" "only illustrates how to use the substitution variable; non-us is no longer " "structured like this] <placeholder type=\"literallayout\" id=\"0\"/>" msgstr "" +"Użycie HTTP do uzyskania dostępu do archiwum na komputerze nonus.debian." +"org, w katalogu debian-non-US. Dla komputerów i386 używa tylko plików " +"znalezionych w podkatalogu <filename>unstable/binary-i386</filename>, a dla " +"komputerów m68k <filename>unstable/binary-m68k</filename>; i tak dalej dla " +"innych architektur. (Uwaga: ten przykład jest tylko ilustracją, jak używać " +"zmiennych podstawienia non-us obecnie nie zawiera już takiej struktury). " +"<placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:234 msgid "&apt-cache; &apt-conf;" -msgstr "" +msgstr "&apt-cache;, &apt-conf;" #. type: <title> #: guide.sgml:4 msgid "APT User's Guide" -msgstr "" +msgstr "Podręcznik użytkownika APT" #. type: #: guide.sgml:6 offline.sgml:6 -#, fuzzy msgid "Jason Gunthorpe jgg@debian.org" msgstr "Jason Gunthorpe jgg@debian.org" #. type: #: guide.sgml:7 -#, fuzzy msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $" -msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $" +msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $" #. type: #: guide.sgml:11 msgid "" "This document provides an overview of how to use the the APT package manager." -msgstr "" +msgstr "Dokument zawiera opis używania menadżera pakietów APT." #. type: #: guide.sgml:15 -#, fuzzy msgid "Copyright © Jason Gunthorpe, 1998." -msgstr "Copyright © Jason Gunthorpe, 1999." +msgstr "Copyright © Jason Gunthorpe, 1998." #. type:

#: guide.sgml:21 offline.sgml:22 -#, fuzzy msgid "" "\"APT\" and this document are free software; you can redistribute them and/" "or modify them under the terms of the GNU General Public License as " "published by the Free Software Foundation; either version 2 of the License, " "or (at your option) any later version." msgstr "" -"\"APT\" i ten dokument s± oprogramowaniem wolnodostêpnym; mo¿esz " -"rozpowszechniaæ je i/lub zmieniaæ w zgodzie z postanowieniami \"Ogólnej " -"Licencji Publicznej GNU\" (GNU General Public License) takiej, jak zosta³a " -"opublikowana przez \"Fundacje Wolnego Oprogramowania (Free Software " -"Foundation); albo w wersji 2 tej¿e licencji, albo (twój wybór) w dowolnej " -"pó¼niejszej." +"\"APT\" i ten dokument są oprogramowaniem wolnodostępnym, które można " +"rozpowszechniać oraz zmieniać zgodnie z postanowieniami drugiej albo (wedle " +"uznania) dowolnej późniejszej wersji \"Ogólnej Licencji Publicznej GNU" +"\" (GNU General Public License) publikowanej przez \"Fundację Wolnego " +"Oprogramowania (Free Software Foundation)." #. type:

#: guide.sgml:24 offline.sgml:25 -#, fuzzy msgid "" "For more details, on Debian GNU/Linux systems, see the file /usr/share/" "common-licenses/GPL for the full license." msgstr "" -"Wiêcej szczegó³ów mo¿na uzyskaæ, przegl±daj±c plik zawieraj±cy pe³ny tekst " +"Więcej szczegółów można uzyskać, przeglądając plik zawierający pełen tekst " "licencji (w systemach Debian jest to plik /usr/share/common-licenses/GPL)." #. type: #: guide.sgml:32 msgid "General" -msgstr "" +msgstr "Ogólne" #. type:

#: guide.sgml:38 @@ -7195,11 +8684,15 @@ msgid "" "provide a way to install and remove packages as well as download new " "packages from the Internet." msgstr "" +"Pakiet APT składa się z dwóch części: z metody APT programu dselect oraz z programu apt-get będącego interfejsem linii " +"poleceń. Obie części pozwalają na instalowanie i usuwanie pakietów oraz na " +"pobieranie nowych pakietów z Internetu." #. type: #: guide.sgml:39 msgid "Anatomy of the Package System" -msgstr "" +msgstr "Budowa systemu pakietów" #. type:

#: guide.sgml:44 @@ -7208,6 +8701,9 @@ msgid "" "with each package to help assure that it integrates cleanly and easily into " "the system. The most prominent of its features is the dependency system." msgstr "" +"System pakietów Debiana zawiera sporą ilość informacji skojarzonych z każdym " +"pakietem, zapewniających integralność pakietów w systemie. Najbardziej " +"widoczną cechą systemu pakietów jest system zależności." #. type:

#: guide.sgml:52 @@ -7218,6 +8714,11 @@ msgid "" "things the average user is required to install. Also, it allows for choices " "in mail transport agents, X servers and so on." msgstr "" +"System zależności pozwala poszczególnym programom używać wspólnych elementów " +"systemu, takich jak biblioteki. Upraszcza także umieszczanie rzadko " +"używanych części programów w oddzielnych pakietach, tak aby zmniejszyć " +"liczbę pakietów instalowanych przez przeciętnego użytkownika. Pozwala także " +"wybierać programy odpowiedzialne za dostarczanie poczty, serwery X-ów itp." #. type:

#: guide.sgml:57 @@ -7227,6 +8728,9 @@ msgid "" "package requires another package to be installed at the same time to work " "properly." msgstr "" +"Pierwszym krokiem potrzebnym do zrozumienia systemu zależności jest " +"zrozumienie koncepcji prostej zależności. Prosta zależność oznacza, że dany " +"pakiet do poprawnego działania wymaga zainstalowania innego pakietu." #. type:

#: guide.sgml:63 @@ -7236,6 +8740,11 @@ msgid "" "simple dependency on GPG. Also, because it is an emacs extension it has a " "simple dependency on emacs, without emacs it is completely useless." msgstr "" +"Na przykład mailcrypt jest rozszerzeniem edytora emacs, umożliwiającym " +"szyfrowanie e-maili za pomocą programu GPG. Bez zainstalowanego pakietu GPG, " +"mailcrypt jest bezużyteczny, dlatego mailcrypt zawiera prostą zależność od " +"GPG. Ma także prostą zależność od pakietu emacs, ponieważ jest rozszerzeniem " +"emacsa, więc i bez emacsa jest równie bezużyteczny." #. type:

#: guide.sgml:73 @@ -7249,6 +8758,16 @@ msgid "" "system so all mail transport agents have a conflicting dependency with all " "other mail transport agents." msgstr "" +"Inną ważną zależnością, którą należy zrozumieć, jest konflikt. Oznacza to, " +"że dany pakiet może nie działać albo może być szkodliwy dla systemu, jeżeli " +"razem z nim jest zainstalowany inny pakiet. Jako przykład rozważmy program " +"odpowiedzialny za dostarczanie poczty (ang. \"mail transport agent\") taki " +"jak sendmail, exim lub qmail. Nie jest możliwe jednoczesne zainstalowanie " +"dwóch takich programów, ponieważ oba musiałyby nasłuchiwać na tym samym " +"porcie sieciowym, żeby odebrać e-maile. Próba zainstalowanie obu poważnie " +"uszkodzi system. Dlatego też wszystkie programy obsługi dostarczania poczty " +"są w konflikcie ze wszystkimi innymi programami obsługującymi dostarczanie " +"poczty." #. type:

#: guide.sgml:83 @@ -7262,6 +8781,15 @@ msgid "" "depend on mail-transport-agent. This can add a great deal of confusion when " "trying to manually fix packages." msgstr "" +"Dodatkową komplikacją jest możliwość, że dany pakiet może udawać inny " +"pakiet. Proszę rozważyć jako przykład, że exim i sendmail praktycznie rzecz " +"biorąc są identyczne - oba dostarczają pocztę, oba mają wspólny interfejs. " +"Dlatego też system pakietów daje im możliwość zadeklarowania, że oba są " +"programami obsługującymi dostarczanie poczty.Tak więc zarówno exim, jak i " +"sendmail deklarują, że dostarczają pakiet o nazwie mail-transport-agent, od " +"którego mogą zależeć pakiety, wymagające do swojego działania programu " +"obsługi poczty. Może to być bardzo mylące podczas próby ręcznego naprawiania " +"zależności pakietów." #. type:

#: guide.sgml:88 @@ -7271,6 +8799,9 @@ msgid "" "issues by providing a number of automatic algorithms that help in selecting " "packages for installation." msgstr "" +"W dowolnym czasie pojedyncza zależność może być lub nie być spełniona przez " +"obecnie zainstalowane pakiety. ATP próbuje rozwiązać zależności używając " +"pewnej liczby algorytmów pomagających w wyborze pakietów do zainstalowania." #. type:

#: guide.sgml:102 @@ -7280,6 +8811,10 @@ msgid "" "understand .deb files, it works with the package's proper name and can only " "install .deb archives from a Source." msgstr "" +"apt-get dostarcza prostego sposobu na zainstalowanie pakietów z " +"linii poleceń. W przeciwieństwie do dpkg, apt-get " +"nie posługuje się nazwami plików \".deb\", lecz używa nazw pakietów i może " +"zainstalować tylko archiwa \".deb\" ze skonfigurowanych źródeł." #. type:

#: guide.sgml:109 @@ -7291,6 +8826,12 @@ msgid "" "packages are available. This is done with apt-get update. For " "instance," msgstr "" +"Pierwszą rzeczą

Aby używać serwera proxy, należy najpierw " +"ustawić zmienną środowiskową http_proxy, proszę przeczytać sources.list(5), którą należy zrobić przed użyciem apt-get jest " +"pobranie listy pakietów (ze źródeł wymienionych w pliku sources.list" +"(5)), tak żeby APT wiedział, jakie pakiety są dostępne. Robi się to za " +"pomocą polecenia apt-get update. Na przykład:" #. type: #: guide.sgml:116 @@ -7302,11 +8843,16 @@ msgid "" "Reading Package Lists... Done\n" "Building Dependency Tree... Done" msgstr "" +"# apt-get update\n" +"Pob: http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n" +"Pob: http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n" +"Czytanie list pakietów... Gotowe\n" +"Budowanie drzewa zależności.. Gotowe" #. type:

#: guide.sgml:120 msgid "Once updated there are several commands that can be used:" -msgstr "" +msgstr "Po zaktualizowaniu można użyć następnych poleceń:" #. type:

#: guide.sgml:131 @@ -7319,6 +8865,14 @@ msgid "" "on new packages or conflict with some other package. dselect or " "apt-get install can be used to force these packages to install." msgstr "" +"Upgrade spróbuje delikatnie zaktualizować cały system. Upgrade nigdy nie " +"zainstaluje nowego pakietu ani nie usunie istniejącego pakiety, ani też nie " +"zaktualizuje pakietu do wersji powodującej, że inny pakiet przestanie " +"działać. Można używać tego polecenia codziennie do w miarę bezpiecznych " +"aktualizacji systemu. Upgrade wypisze listę pakietów, których nie potrafił " +"zaktualizować, co zazwyczaj oznacza, że zależą one od nowych pakietów lub są " +"w konflikcie z innymi pakietami. Można wymusić instalację takich pakietów, " +"używając do tego dselect lub apt-get install." #. type:

#: guide.sgml:140 @@ -7331,6 +8885,14 @@ msgid "" "listed packages and will print a summary and ask for confirmation if " "anything other than its arguments are changed." msgstr "" +"Install jest używane do instalowania pakietów przez podanie ich nazwy. " +"Pakiet jest automatycznie pobierany i instalowany. Może być to użyteczne, " +"gdy już zna się nazwę pakietu do zainstalowania i nie chce się uruchamiać " +"graficznego interfejsu wyboru pakietów. Można podać dowolną liczbę nazw " +"pakietów do zainstalowania - wszystkie będą pobrane. Install próbuje " +"automatycznie rozwiązać problemy z zależnościami w podanych pakietach, " +"wypisze podsumowanie i poprosi o potwierdzenie, jeśli zamierza zmienić " +"cokolwiek innego niż pakiety podane jako jego argumenty." #. type:

#: guide.sgml:149 @@ -7343,6 +8905,14 @@ msgid "" "dselect. Once dist-upgrade has completed then dselect can be used to install any packages that may have been left out." msgstr "" +"Dist-upgrade powoduje całkowitą aktualizację systemu i jest zaprojektowany " +"do uproszczenia aktualizacji z jednego wydania Debiana do kolejnego. Używa " +"wyrafinowanych algorytmów do określenia najlepszego zbioru pakietów do " +"zainstalowania, aktualizacji lub usunięcia, tak aby zaktualizować jak " +"najwięcej pakietów w systemie do nowszego wydania. W niektórych sytuacjach, " +"może być prościej użyć dist-upgrade niż ręcznie rozwiązywać zależności w " +"programie dselect. Kiedy dist-upgrade zakończy działanie, można " +"użyć programu dselect do zainstalowania pominiętych pakietów." #. type:

#: guide.sgml:152 @@ -7350,6 +8920,8 @@ msgid "" "It is important to closely look at what dist-upgrade is going to do, its " "decisions may sometimes be quite surprising." msgstr "" +"Jest ważne, aby dokładnie przyjrzeć się temu, co dist-upgrade zamierza " +"zrobić, gdyż jego decyzje mogą czasami zdumiewać." #. type:

#: guide.sgml:163 @@ -7362,11 +8934,19 @@ msgid "" "the downloaded archives can be installed by simply running the command that " "caused them to be downloaded again without -d." msgstr "" +"Zachowanie programu apt-get można kontrolować za pomocą opcji " +"linii poleceń szczegółowo opisanych w stronie podręcznika ekranowego . Najbardziej użyteczną z nich jest -d, która nie instaluje pobranych plików. Jeśli system musi pobrać dużą " +"liczbę pakietów, instalowanie ich może być niepożądane, jeśli coś pójdzie " +"nie tak. Jeśli użyto -d, to pobrane archiwa można zainstalować, " +"ponownie uruchamiając polecenie, które spowodowało ich pobranie, tym razem " +"bez opcji -d." #. type: #: guide.sgml:168 msgid "DSelect" -msgstr "" +msgstr "DSelect" #. type:

#: guide.sgml:173 @@ -7376,6 +8956,10 @@ msgid "" "to select the packages to be installed or removed and APT actually installs " "them." msgstr "" +"Metoda APT dselect dostarcza kompletnego systemu APT w " +"interfejsie użytkownika programu wyboru pakietów dselect. " +"dselect może być użyty do wybrania pakietów przeznaczonych do " +"zainstalowania lub usunięcia, a APT zainstaluje lub usunie te pakiety." #. type:

#: guide.sgml:184 @@ -7390,6 +8974,16 @@ msgid "" "have access to the latest bug fixes. APT will automatically use packages on " "your CDROM before downloading from the Internet." msgstr "" +"Aby włączyć metodę APT należy wybrać opcję \"[A] Dostęp\" w programie " +"dselect , a następnie wybrać metodę APT. Użytkownik zostanie " +"poproszony o skonfigurowanie listy źródeł, będących lokalizacjami, " +"z których będą pobierane pakiety. Mogą być to strony internetowe, lokalne " +"serwery lustrzane Debiana lub CDROM-y. Każde źródło może dostarczać tylko " +"fragmentu pełnego archiwum Debiana, a APT automatycznie połączy je w " +"kompletny zbiór pakietów. Jeśli używany jest CDROM, to dobrym pomysłem jest " +"podanie najpierw jego, a potem podanie mirrorów umożliwiających dostęp do " +"najnowszych wersji pakietów zawierających poprawki błędów. APT automatycznie " +"użyje pakietów z CDROM-u zanim zacznie pobierać pakiety z Internetu." #. type: #: guide.sgml:198 @@ -7408,6 +9002,18 @@ msgid "" " \n" " URL [http://llug.sep.bnl.gov/debian]:" msgstr "" +" Ustawianie listy źródłowych lokalizacji dystrybucji\n" +"\t \n" +" Proszę podać bazowy URL dystrybucji Debiana.\n" +" Obsługiwane schematy połączeń to: http ftp file\n" +"\t \n" +" Przykłady:\n" +" file:/mnt/debian,\n" +" ftp://ftp.debian.org/debian,\n" +" http://ftp.pl.debian.org/debian,\n" +" \n" +" \n" +" URL [http://llug.sep.bnl.gov/debian]:" #. type:

#: guide.sgml:205 @@ -7416,6 +9022,9 @@ msgid "" "archive, defaulting to a HTTP mirror. Next it asks for the distribution to " "get." msgstr "" +"Ustawianie źródeł zaczyna się od pytania o bazową lokalizację Debiana. " +"Domyślną wartością jest mirror HTTP. Następnie użytkownik jest pytany o " +"dystrybucję do pobrania." #. type: #: guide.sgml:212 @@ -7427,6 +9036,11 @@ msgid "" " \n" " Distribution [stable]:" msgstr "" +" Proszę podać znacznik dystrybucji do pobrania lub ścieżkę do pliku\n" +" pakietów kończącą się znakiem \"/\". Zazwyczaj znacznikiem dystrybucji\n" +" jest coś w rodzaju: stable unstable testing non-US\n" +" \n" +" Dystrybucja [stable]:" #. type:

#: guide.sgml:222 @@ -7438,6 +9052,13 @@ msgid "" "that cannot be exported from the United States. Importing these packages " "into the US is legal however." msgstr "" +"Dystrybucja odnosi się do wersji Debiana: stable(stabilna) to " +"najnowsza wydana wersja, a unstable (niestabilna) to wersja " +"rozwojowa. non-US jest dostępna tylko na wybranych serwerach " +"lustrzanych i zawiera pakiety, które wykorzystują technologie szyfrowania " +"danych lub inne rzeczy, które nie mogą być eksportowane z serwerów " +"umieszczonych w Stanach Zjednoczonych. Importowanie tych pakietów do Stanów " +"Zjednoczonych jest jednakże legalne." #. type: #: guide.sgml:228 @@ -7448,6 +9069,10 @@ msgid "" " \n" " Components [main contrib non-free]:" msgstr "" +" Proszę podać komponenty do pobrania\n" +" Zazwyczaj komponentem jest coś w rodzaju: main contrib non-free\n" +" \n" +" Komponenty [main contrib non-free]:" #. type:

#: guide.sgml:236 @@ -7457,6 +9082,11 @@ msgid "" "packages while contrib and non-free contain things that have various " "restrictions placed on their use and distribution." msgstr "" +"Lista komponentów jest listą pod-dystrybucji do pobrania. Dystrybucja jest " +"podzielona ze względu na licencje oprogramowania: main (główna) zawiera " +"pakiety zgodne z DFSG (\"Wytycznymi Debiana w sprawie Wolnego Oprogramowania" +"\"),contrib i non-free zawierają pakiety, które zawierają restrykcje " +"związane z ich używaniem lub rozpowszechnianiem." #. type:

#: guide.sgml:240 @@ -7464,6 +9094,9 @@ msgid "" "Any number of sources can be added, the setup script will continue to prompt " "until you have specified all that you want." msgstr "" +"Można dodać dowolną liczbę źródeł. Skrypt konfigurujący będzie kontynuował " +"odpytywanie użytkownika dopóty, dopóki nie poda wszystkich źródeł, które " +"chciał skonfigurować." #. type:

#: guide.sgml:247 @@ -7474,6 +9107,12 @@ msgid "" "dselect. [U]pdate must be performed even if apt-get update has been run before." msgstr "" +"Przed rozpoczęciem używania programu dselect należy w menu tego " +"programu wybrać \"[U] Aktualizacja\", abyzaktualizować listę dostępnych " +"pakietów. To polecenie jest nadzbiorem polecenia apt-get update, " +"zapewniającym programowi dselect dostęp do pobranych informacji " +"o pakietach. \"[U] Aktualizacja\" musi być wykonana, nawet jeśli wcześniej " +"uruchomiono apt-get update." #. type:

#: guide.sgml:253 @@ -7483,6 +9122,11 @@ msgid "" "[R]emove commands have no meaning, the [I]nstall command performs both of " "them together." msgstr "" +"Następnie można wybrać pakiety do zainstalowania, używając opcji \"[S] Wybór" +"\", a potem zainstalować te pakiety opcją \"[I] Instalacja\". Używanie " +"metody APT czyni opcje \"[C] Konfiguracja\" i \"[R] Usuwanie\" " +"bezużytecznymi, gdyż \"[I] Instalacja\" przeprowadza również te dwie " +"operacje." #. type:

#: guide.sgml:258 @@ -7491,11 +9135,14 @@ msgid "" "have been successfully installed. To change this behavior place Dselect::" "clean \"prompt\"; in /etc/apt/apt.conf." msgstr "" +"Domyślnie APT automatycznie usunie pliki pakietów (.deb), gdy tylko zostaną " +"zainstalowane. Aby zmienić to zachowanie, proszę umieścić Dselect::" +"clean \"prompt\"; w /etc/apt/apt.conf." #. type: #: guide.sgml:264 msgid "The Interface" -msgstr "" +msgstr "Interfejs" #. type:

#: guide.sgml:278 @@ -7509,11 +9156,20 @@ msgid "" "then will print out some informative status messages so that you can " "estimate how far along it is and how much is left to do." msgstr "" +"Metoda APT programu dselect i program apt-get " +"dzielą wspólny interfejs. Jest to prosty system, który najpierw informuje " +"użytkownika, co będzie zrobione, a następnie to robi

Metoda " +"programu dselect jest tak naprawdę zbiorem skryptów " +"wywołujących apt-get. Metoda ta ma jednakże większą " +"funkcjonalność niż sam program apt-get.

. Po " +"wyświetleniu podsumowania informującego o tym, co będzie zrobione, APT " +"wyświetla komunikaty dotyczące postępu przeprowadzanych operacji, tak żeby " +"można było oszacować czas pozostały do ich zakończenia." #. type: #: guide.sgml:280 msgid "Startup" -msgstr "" +msgstr "Uruchamianie" #. type:

#: guide.sgml:284 @@ -7523,6 +9179,10 @@ msgid "" "At any time these operations can be performed by running apt-get check." msgstr "" +"Przed każdą operacją, z wyjątkiem update, APT przeprowadza pewne akcje " +"przygotowujące wewnętrzny stan. Sprawdza również stan systemu. Te same " +"operacje można przeprowadzić w dowolnej chwili, uruchamiając apt-get " +"check." #. type: #: guide.sgml:289 @@ -7532,6 +9192,9 @@ msgid "" "Reading Package Lists... Done\n" "Building Dependency Tree... Done" msgstr "" +"# apt-get check\n" +"Czytanie list pakietów... Gotowe\n" +"Budowanie drzewa zależności... Gotowe" #. type:

#: guide.sgml:297 @@ -7541,6 +9204,10 @@ msgid "" "If some of the package files are not found then they will be ignored and a " "warning will be printed when apt-get exits." msgstr "" +"Pierwszą rzeczą, którą robi, jest wczytanie wszystkich plików pakietów do " +"pamięci. APT używa buforowania, tak żeby przyspieszyć tę operację przy " +"następnym uruchomieniu. Jeśli nie znajdzie niektórych plików pakietów, to " +"wypisze ostrzeżenie, a te pakiety zignoruje." #. type:

#: guide.sgml:303 @@ -7550,6 +9217,10 @@ msgid "" "package and considers if it is OK. Should this find a problem then a report " "will be printed out and apt-get will refuse to run." msgstr "" +"Końcową operacją jest szczegółowa analiza zależności w systemie. Sprawdzana " +"jest każda zależność każdego pakietu zainstalowanego lub rozpakowanego. W " +"razie wykrycia problemów z zależnościami apt-get wypisze " +"odpowiedni komunikat i odmówi dalszego działania." #. type: #: guide.sgml:320 @@ -7571,6 +9242,21 @@ msgid "" " Depends: xlib6g (>= 3.3-5) but it is not installed\n" " libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)" msgstr "" +"# apt-get check\n" +"Czytanie list pakietów... Gotowe\n" +"Budowanie drzewa zależności... Gotowe\n" +"Należy uruchomić \"apt-get -f install\", aby je naprawić.\n" +"Następujące pakiety mają niespełnione zależności:\n" +" 9fonts: Wymaga: xlib6g ale nie jest zainstalowany\n" +" uucp: Wymaga: mailx ale nie jest zainstalowany\n" +" blast: Wymaga: xlib6g (>= 3.3-5) ale nie jest zainstalowany\n" +" adduser: Wymaga: perl-base ale nie jest zainstalowany\n" +" aumix: Wymaga: libgpmg1 but ale nie jest zainstalowany\n" +" debiandoc-sgml: Wymaga: sgml-base ale nie jest zainstalowany\n" +" bash-builtins: Wymaga: bash (>= 2.01) but 2.0-3 is installed\n" +" cthugha: Wymaga: svgalibg1 but it is not installed\n" +" Wymaga: xlib6g (>= 3.3-5) ale nie jest zainstalowany\n" +" libreadlineg2: Jest w konflikcie z: libreadline2 (<< 2.1-2.1)" #. type:

#: guide.sgml:329 @@ -7581,6 +9267,10 @@ msgid "" "that are unmet. A short explanation of why the package has a dependency " "problem is also included." msgstr "" +"Powyższy przykład przedstawia system mający wiele problemów, włączając to " +"poważny problem z libreadlineg2. Każdy pakiet mający niespełnione zależności " +"jest wypisywany w osobnej linii razem z niespełnionymi zależnościami. Podane " +"jest również krótkie wyjaśnienie dotyczące przyczyny problemu." #. type:

#: guide.sgml:337 @@ -7593,6 +9283,13 @@ msgid "" "situation a package may have been unpacked without its dependents being " "installed." msgstr "" +"Są dwie przyczyny, z których powodu system może być zepsuty w powyższy " +"sposób. Pierwszą jest to, że dpkg podczas aktualizacji systemu " +"nie zauważył jakiejś subtelnej relacji między pakietami

APT " +"rozważa wszystkie znane zależności i próbuje nie dopuścić do zepsucia " +"pakietów.

. Drugą przyczyną jest wystąpienie błędu w czasie " +"instalowania pakietu. W takim przypadku pakiet może być rozpakowany, mimo że " +"pakiety od niego zależące nie są zainstalowane." #. type:

#: guide.sgml:345 @@ -7604,6 +9301,13 @@ msgid "" "dselect method always supplies the -f option to allow " "for easy continuation of failed maintainer scripts." msgstr "" +"Druga przyczyna jest o wiele mniej poważna niż pierwsza, ponieważ APT " +"wymusza pewne więzy integralności dotyczące kolejności instalowania " +"pakietów. W obu przypadkach przekazanie programowi apt-get " +"opcji -f wymusi na APT znalezienie rozwiązania umożliwiającego mu " +"kontynuowanie działania. Metoda APT programu dselect zawsze " +"przekazuje opcję -f, aby móc kontynuować po wystąpieniu błędu w " +"skryptach opiekunów pakietów." #. type:

#: guide.sgml:351 @@ -7614,11 +9318,17 @@ msgid "" "necessary to manually use dpkg (possibly with forcing options) to correct " "the situation enough to allow APT to proceed." msgstr "" +"Jednak gdy opcja -f jest używana do poprawienia zależności w " +"poważnie uszkodzonym systemie (pierwsza z opisanych wyżej przyczyn), możliwe " +"jest że albo od razu zwróci błąd, albo nie powiedzie się sekwencja " +"instalowania pakietów. W obu przypadkach należy poprawić zależności ręcznie, " +"używając do tego dpkg (być może przekazując mu opcje wymuszające \"--" +"force-...\"), w takim stopniu, aby umożliwić działanie systemowi APT." #. type: #: guide.sgml:356 msgid "The Status Report" -msgstr "" +msgstr "Raport stanu" #. type:

#: guide.sgml:363 @@ -7629,11 +9339,17 @@ msgid "" "final state of things, taking into account the -f option and any " "other relevant activities to the command being executed." msgstr "" +"Przed rozpoczęciem przetwarzania apt-get wyświetli raport " +"zawierający informacje o tym, co będzie zrobione. W ogólności raport ten " +"zależy od typu wykonywanej operacji, jednakże występuje w nim kilka " +"elementów wspólnych dla wszystkich typów. We wszystkich wypadkach " +"wyświetlane są informacje o końcowym stanie, brana jest pod uwagę opcja -" +"f, a także wszystkie istotne działania wykonywanego polecenia." #. type: #: guide.sgml:364 msgid "The Extra Package list" -msgstr "" +msgstr "Lista dodatkowych pakietów" #. type: #: guide.sgml:372 @@ -7646,6 +9362,12 @@ msgid "" " squake pgp-i python-base debmake ldso perl libreadlineg2\n" " ssh" msgstr "" +"Zostaną zainstalowane następujące dodatkowe pakiety:\n" +" libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n" +" mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n" +" bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n" +" squake pgp-i python-base debmake ldso perl libreadlineg2\n" +" ssh" #. type:

#: guide.sgml:379 @@ -7655,11 +9377,15 @@ msgid "" "generated for an install command. The listed packages are often the " "result of an Auto Install." msgstr "" +"Lista dodatkowych pakietów wyświetla wszystkie pakiety, które będą " +"zainstalowane lub zaktualizowane oprócz tych wymienionych w linii poleceń. " +"Jest generowana tylko dla polecenia install. Wymienione pakiety są " +"najczęściej wynikiem automatycznej instalacji." #. type: #: guide.sgml:382 msgid "The Packages to Remove" -msgstr "" +msgstr "Pakiety przeznaczone do usunięcia" #. type: #: guide.sgml:389 @@ -7671,6 +9397,11 @@ msgid "" " xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n" " nas xpilot xfig" msgstr "" +"Następujące pakiety zostaną USUNIĘTE:\n" +" xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n" +" xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n" +" xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n" +" nas xpilot xfig" #. type:

#: guide.sgml:399 @@ -7683,11 +9414,19 @@ msgid "" "that are going to be removed because they are only partially installed, " "possibly due to an aborted installation." msgstr "" +"Lista pakietów przeznaczonych do usunięcia wyświetla wszystkie pakiety, " +"które zostaną usunięte z systemu. Może być pokazana dla każdej operacji i " +"powinna być szczegółowo przeanalizowana, aby zapewnić, że żaden istotny " +"pakiet nie będzie usunięty. W szczególności opcja -f może " +"wygenerować sporo pakietów do usunięcia, także w przypadku jej użycia należy " +"szczególnie dokładnie przeanalizować wyświetlany raport. Lista może zawierać " +"pakiety usuwane z powodu ich tylko częściowego zainstalowania, wynikającego " +"być może z przerwania wcześniejszej instalacji." #. type: #: guide.sgml:402 msgid "The New Packages list" -msgstr "" +msgstr "Lista nowych pakietów" #. type: #: guide.sgml:406 @@ -7696,6 +9435,8 @@ msgid "" "The following NEW packages will installed:\n" " zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base" msgstr "" +"Zostaną zainstalowane następujące NOWE pakiety:\n" +" zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base" #. type:

#: guide.sgml:411 @@ -7704,11 +9445,14 @@ msgid "" "listed are not presently installed in the system but will be when APT is " "done." msgstr "" +"Lista nowych pakietów to proste przypomnienie o tym, co się stanie. Wypisane " +"pakiety nie są obecnie zainstalowane w systemie, ale będą, kiedy APT skończy " +"działanie." #. type: #: guide.sgml:414 msgid "The Kept Back list" -msgstr "" +msgstr "Lista zatrzymanych pakietów" #. type: #: guide.sgml:419 @@ -7718,6 +9462,9 @@ msgid "" " compface man-db tetex-base msql libpaper svgalib1\n" " gs snmp arena lynx xpat2 groff xscreensaver" msgstr "" +"Następujące pakiety zostały zatrzymane:\n" +" compface man-db tetex-base msql libpaper svgalib1\n" +" gs snmp arena lynx xpat2 groff xscreensaver" #. type:

#: guide.sgml:428 @@ -7729,11 +9476,18 @@ msgid "" "to install is with apt-get install or by using dselect " "to resolve their problems." msgstr "" +"Jeśli aktualizowany jest cały system, to jest możliwe, że nowe wersje " +"pakietów nie będą mogły być zainstalowane, ponieważ wymagają nowych pakietów " +"lub są w konflikcie z już zainstalowanymi pakietami. W takim wypadku pakiet " +"pojawi się na liście pakietów zatrzymanych. Najlepszym sposobem na " +"zainstalowanie takich pakietów jest użycie apt-get install lub " +"rozwiązanie problemów z zależnościami za pomocą programu dselect." #. type: #: guide.sgml:431 msgid "Held Packages warning" -msgstr "" +msgstr "Ostrzeżenie o zmianie zatrzymanych pakietów" #. type: #: guide.sgml:435 @@ -7742,6 +9496,8 @@ msgid "" "The following held packages will be changed:\n" " cvs" msgstr "" +"Zostaną zmienione następujące zatrzymane pakiety:\n" +" cvs" #. type:

#: guide.sgml:441 @@ -7750,17 +9506,21 @@ msgid "" "case it prints out a warning that the held package is going to be changed. " "This should only happen during dist-upgrade or install." msgstr "" +"Czasami można poprosić APT o zainstalowanie pakietu, który jest zatrzymany. " +"W takim przypadku wypisywane jest ostrzeżenie o zmianie zatrzymanego " +"pakietu. Może się to zdarzyć tylko podczas dist-upgrade lub install." #. type: #: guide.sgml:444 msgid "Final summary" -msgstr "" +msgstr "Podsumowanie" #. type:

#: guide.sgml:447 msgid "" "Finally, APT will print out a summary of all the changes that will occur." msgstr "" +"APT zakończy raport podsumowaniem wszystkich zmian, które przeprowadzi." #. type: #: guide.sgml:452 @@ -7770,6 +9530,9 @@ msgid "" "12 packages not fully installed or removed.\n" "Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used." msgstr "" +"206 aktualizowanych, 8 nowo instalowanych, 25 usuwanych i 51 nieaktualizowanych.\n" +"12 nie w pełni zainstalowanych lub usuniętych.\n" +"Konieczne pobranie 65.7M/66.7M archiwów. Po rozpakowaniu zostanie użyte 26.5M." #. type:

#: guide.sgml:470 @@ -7788,6 +9551,18 @@ msgid "" "If a large number of packages are being removed then the value may indicate " "the amount of space that will be freed." msgstr "" +"Pierwsza linia podsumowania jest uproszczoną wersją powyższych list i " +"zawiera liczbę aktualizacji - to jest pakietów już zainstalowanych, których " +"nowsze wersje są dostępne. W drugiej linii wyświetlono liczbę nie do końca " +"skonfigurowanych pakietów, prawdopodobnie w wyniku przerwania poprzedniej " +"instalacji. Ostatnia linia zawiera dane dotyczące miejsca na dysku. Pierwsza " +"para liczb odnosi się do rozmiaru plików archiwum: pierwsza liczba oznacza " +"liczbę bajtów, które muszą zostać pobrane ze zdalnych serwerów, a druga - " +"całkowity rozmiar wszystkich żądanych archiwów. Kolejna liczba oznacza " +"różnicę rozmiarów pomiędzy obecnie zainstalowanymi pakietami, a nowo " +"instalowanymi pakietami. W przybliżeniu odpowiada przestrzeni dysku, która " +"będzie zajęta w /usr po zakończeniu instalacji. Wartość ta może wskazywać na " +"zwolnienie miejsca na dysku, jeśli usuwana jest duża liczba pakietów." #. type:

#: guide.sgml:473 @@ -7795,11 +9570,13 @@ msgid "" "Some other reports can be generated by using the -u option to show packages " "to upgrade, they are similar to the previous examples." msgstr "" +"Używając opcji -u, można wygenerować raport pokazujący pakiety przeznaczone " +"do aktualizacji, podobny do tego pokazanego w poprzednim przykładzie." #. type: #: guide.sgml:477 msgid "The Status Display" -msgstr "" +msgstr "Wyświetlanie stanu przetwarzania" #. type:

#: guide.sgml:481 @@ -7807,6 +9584,8 @@ msgid "" "During the download of archives and package files APT prints out a series of " "status messages." msgstr "" +"Podczas pobierania archiwów i plików pakietów APT wyświetla serię " +"komunikatów o stanie." #. type: #: guide.sgml:490 @@ -7820,6 +9599,13 @@ msgid "" "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n" "11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s" msgstr "" +"# apt-get update\n" +"Pob:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n" +"Pob:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n" +"Traf http://llug.sep.bnl.gov/debian/ testing/main Packages\n" +"Pob:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n" +"Pob:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n" +"11% [5 testing/non-free `Oczekiwane na nagłówki' 0/32.1k 0%] 2203b/s 1m52s" #. type:

#: guide.sgml:500 @@ -7831,6 +9617,11 @@ msgid "" "apt-get update estimates the percent done which causes some " "inaccuracies." msgstr "" +"Linie zaczynające się od Pob: są wypisywane, kiedy APT zaczyna " +"pobierać plik, a ostatnia linia oznacza postęp pobierania. Pierwsza wartość " +"podana w procentach określa całkowity procent pobierania wszystkich plików. " +"Niestety rozmiar plików Package nie jest znany, tak więc apt-get update estymuje procent wykonanego pobierania, co powoduje pewne nieścisłości." #. type:

#: guide.sgml:509 @@ -7843,6 +9634,14 @@ msgid "" "The next word is the short form name of the object being downloaded. For " "archives it will contain the name of the package that is being fetched." msgstr "" +"Następna sekcja linii statusu powtarza się dla każdego wątku pobierania, " +"oznacza przeprowadzanie operacji i podaje kilka użytecznych informacji na " +"temat tego, co się dzieje. Czasem sekcja ta zawiera komunikat Tworzenie " +"procesu potomnego, co oznacza, że system operacyjny ładuje moduł " +"pobierania. Pierwszym słowem po znaku \"[\" jest liczba pobrań, dokładnie " +"taka jaka jest pokazana liczba linii historii pobrań. Następnie w skróconej " +"formie wyświetlana jest nazwa pobieranego obiektu. W przypadku archiwów " +"nazwa ta będzie zawierać nazwę pobieranego pakietu." #. type:

#: guide.sgml:524 @@ -7861,6 +9660,21 @@ msgid "" "regularly and reflects the time to complete everything at the shown transfer " "rate." msgstr "" +"W pojedynczych cudzysłowach podawany jest komunikat wskazujący na postęp " +"tworzenia połączenia pobierania danych. Zazwyczaj postęp ten jest sekwencją " +"zdarzeń od Podłączanie przez Oczekiwanie na nagłówki do " +"Pobieranie lub Wznawianie. Końcową wartością jest liczba " +"bajtów pobranych ze zdalnego serwera. Kiedy tylko pobieranie się rozpocznie, " +"wartość ta jest wyświetlana jw formacie typu 102/10.2k, co oznacza, " +"że pobrano 102 bajty, a oczekuje się jeszcze pobrania 10.2 kilobajtów. Aby " +"zaoszczędzić miejsce, całkowity rozmiar jest zawsze wyświetlany jako w " +"postaci 4-znakowej. Po rozmiarze następuje procentowy wskaźnik postępu " +"pobierania danego pliku. Przedostatnim elementem jest bieżąca średnia " +"prędkość pobierania, która jest aktualizowane co każde 5 sekund i " +"odzwierciedla tempo pobierania w tym okresie. W końcu wyświetlany jest " +"estymowany czas pobierania, regularnie aktualizowany i odzwierciedlający " +"czas pozostały do zakończenia pobierania przy założeniu utrzymania się " +"pokazanego tempa pobierania." #. type:

#: guide.sgml:530 @@ -7871,11 +9685,17 @@ msgid "" "for logging to a file, use the -q option to remove the status " "display." msgstr "" +"Linia stanu jest aktualizowana co każde pół sekundy, aby na bieżąco " +"informować użytkownika o postępie pobierania, podczas gdy linie \"Pob:\" są " +"przesuwane w dół, gdy tylko zacznie się pobieranie nowego pliku. Ponieważ " +"linia stanu jest ciągle zmieniana, wyjście programu nie jest odpowiednie do " +"przekierowania do pliku. Aby usunąć linie stanu, należy użyć opcji -q." #. type: #: guide.sgml:535 msgid "Dpkg" -msgstr "" +msgstr "Dpkg" #. type:

#: guide.sgml:542 @@ -7887,65 +9707,63 @@ msgid "" "each question there is usually a description of what it is asking and the " "questions are too varied to discuss completely here." msgstr "" +"APT używa programu dpkg do instalowania archiwów i przełączy " +"się do interfejsu dpkg, gdy tylko zakończy pobieranie plików. " +"dpkg może również zadawać pytania podczas przetwarzania " +"pakietów, a same pakiety także mogą zadawać pytania. Każde pytanie zazwyczaj " +"jest poprzedzone opisem, a same pytania są zbyt zróżnicowane, by je tutaj " +"opisać." #. type: #: offline.sgml:4 -#, fuzzy msgid "Using APT Offline" -msgstr "U¿ywanie APT w trybie offline" +msgstr "Używanie APT w trybie offline" #. type: #: offline.sgml:7 -#, fuzzy msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $" msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $" #. type: #: offline.sgml:12 -#, fuzzy msgid "" "This document describes how to use APT in a non-networked environment, " "specifically a 'sneaker-net' approach for performing upgrades." msgstr "" -"Dokument ten opisuje u¿ywanie programu APT w ¶rodowiskach pozbawionych " -"dostêpu, do sieci, a w szczególno¶ci metodê pozwalaj±c± na robienie " +"Dokument ten opisuje używanie programu APT w środowiskach pozbawionych " +"dostępu, do sieci, a w szczególności metodę pozwalającą na przeprowadzanie " "aktualizacji systemu." #. type: #: offline.sgml:16 -#, fuzzy msgid "Copyright © Jason Gunthorpe, 1999." msgstr "Copyright © Jason Gunthorpe, 1999." #. type: #: offline.sgml:32 -#, fuzzy msgid "Introduction" -msgstr "Wstêp" +msgstr "Wstęp" #. type: #: offline.sgml:34 offline.sgml:65 offline.sgml:180 -#, fuzzy msgid "Overview" msgstr "Wprowadzenie" #. type:

#: offline.sgml:40 -#, fuzzy msgid "" "Normally APT requires direct access to a Debian archive, either from a local " "media or through a network. Another common complaint is that a Debian " "machine is on a slow link, such as a modem and another machine has a very " "fast connection but they are physically distant." msgstr "" -"Normalnie APT wymaga bezpo¶redniego dostêpu do archiwów Debiana przez sieæ " -"lokaln± albo przez sieæ internetow±. Kolejn± niedogodno¶ci± mo¿e byæ fakt, " -"¿e nasz komputer, który pracuje na powolnym ³±czu takim jak modem, jest " -"znacznie oddalony od innego komputera z szybkim ³±czem." +"Zazwyczaj APT wymaga bezpośredniego dostępu do archiwów Debiana przez sieć " +"lokalną albo przez sieć internetową. Kolejną niedogodnością może być fakt, " +"że nasz komputer, który pracuje na powolnym łączu takim jak modem, jest " +"znacznie oddalony od innego komputera z szybkim łączem." #. type:

#: offline.sgml:51 -#, fuzzy msgid "" "The solution to this is to use large removable media such as a Zip disc or a " "SuperDisk disc. These discs are not large enough to store the entire Debian " @@ -7957,56 +9775,53 @@ msgid "" "the machine downloading the packages, and target host the one with " "bad or no connection." msgstr "" -"Rozwi±zaniem tego problemu jest u¿ycie pojemnych przeno¶nych no¶ników takich " -"jak dyskietka Zip lub dysk SuperDisk. No¶niki te nie s± wystarczaj±co " -"pojemne, by zgromadziæ kompletne archiwum Debiana, ale mo¿na ¶mia³o " -"dopasowaæ podzbiór du¿ego archiwum wystarczaj±cy dla wiêkszo¶ci " -"u¿ytkowników. Pomys³ polega na tym, by u¿yæ programu APT do wygenerowania " -"listy pakietów, które s± wymagane, a nastêpnie pobraniu ich na dysk, u¿ywaj" -"±c innego komputera z w³a¶ciw± zwarto¶ci±. Jest nawet mo¿liwe, by u¿yæ " -"innego komputera z Debianem z zainstalowanym programem APT lub zupe³nie " -"innym systemem operacyjnym i programem narzêdziowym do pobierania plików " +"Rozwiązaniem tego problemu jest użycie pojemnych przenośnych nośników takich " +"jak dyskietka Zip lub dysk SuperDisk. Nośniki te nie są wystarczająco " +"pojemne, by zgromadzić kompletne archiwum Debiana, ale można śmiało " +"dopasować podzbiór dużego archiwum wystarczający dla większości " +"użytkowników. Pomysł polega na tym, by użyć programu APT do wygenerowania " +"listy pakietów, które są wymagane, a następnie pobraniu ich na dysk, " +"używając innego komputera z właściwą zwartością. Jest nawet możliwe, by użyć " +"innego komputera z Debianem z zainstalowanym programem APT lub zupełnie " +"innym systemem operacyjnym i programem narzędziowym do pobierania plików " "takim jak wget." #. type:

#: offline.sgml:57 -#, fuzzy msgid "" "This is achieved by creatively manipulating the APT configuration file. The " "essential premise to tell APT to look on a disc for it's archive files. Note " "that the disc should be formated with a filesystem that can handle long file " "names such as ext2, fat32 or vfat." msgstr "" -"Osi±gane jest to przez twórcze manipulowanie plikiem konfiguracyjnym " -"programu APT. Rzecz± niezbêdn± jest poinformowanie programu APT, aby " -"wskazywa³ na dysk z plikami archiwum. Nale¿y zauwa¿yæ, ¿e dysk powinien byæ " -"sformatowany do obs³ugi systemu plików pozwalaj±cego pos³ugiwaæ siê d³ugimi " +"Osiągane jest to przez twórcze manipulowanie plikiem konfiguracyjnym " +"programu APT. Rzeczą niezbędną jest poinformowanie programu APT, aby " +"wskazywał na dysk z plikami archiwum. Należy zauważyć, że dysk powinien być " +"sformatowany do obsługi systemu plików pozwalającego posługiwać się długimi " "nazwami plików (np. ext2, fat32 albo vfat)." #. type: #: offline.sgml:63 -#, fuzzy msgid "Using APT on both machines" -msgstr "U¿ywanie programu APT na obu komputerach" +msgstr "Używanie programu APT na obu komputerach" #. type:

#: offline.sgml:71 -#, fuzzy msgid "" "APT being available on both machines gives the simplest configuration. The " "basic idea is to place a copy of the status file on the disc and use the " "remote machine to fetch the latest package files and decide which packages " "to download. The disk directory structure should look like:" msgstr "" -"APT bêd±cy do dyspozycji na obu komputerach daje najprostsz± kombinacjê. " -"Zasadniczym pomys³em tej metody jest umieszczenie kopii pliku status na " -"dysku i u¿ycie odleg³ego komputera, aby uzyskaæ najnowsze pliki pakietów i " -"zdecydowaæ, które pakiety trzeba pobraæ. Struktura katalogów na dysku " -"powinna wygl±daæ nastêpuj±co:" +"APT dostępny na obu komputerach daje najprostszą kombinację. Zasadniczym " +"pomysłem tej metody jest umieszczenie kopii pliku status na dysku i użycie " +"odległego komputera, aby uzyskać najnowsze pliki pakietów i zdecydować, " +"które pakiety trzeba pobrać. Struktura katalogów na dysku powinna wyglądać " +"następująco:" #. type: #: offline.sgml:80 -#, fuzzy, no-wrap +#, no-wrap msgid "" " /disc/\n" " archives/\n" @@ -8028,13 +9843,11 @@ msgstr "" #. type: #: offline.sgml:88 -#, fuzzy msgid "The configuration file" msgstr "Plik konfiguracyjny" #. type:

#: offline.sgml:96 -#, fuzzy msgid "" "The configuration file should tell APT to store its files on the disc and to " "use the configuration files on the disc as well. The sources.list should " @@ -8043,25 +9856,24 @@ msgid "" "target host. Please note, if you are using a local archive you must " "use copy URIs, the syntax is identical to file URIs." msgstr "" -"Plik konfiguracyjny powinien informowaæ program APT, aby przechowywa³ swoje " -"pliki na dysku, a tak¿e u¿ywa³ plików konfiguracyjnych z dysku. Plik sources." -"list powinien zawieraæ prawid³owe odno¶niki, których nale¿y u¿yæ na zdalnym " -"komputerze, a plik status powinien byæ kopi± /var/lib/dpkg/status. " -"Zauwa¿, ¿e je¶li u¿ywasz lokalnego archiwum musisz u¿yæ tych samych " -"odno¶ników o identycznej sk³adni." +"Plik konfiguracyjny powinien informować program APT, aby przechowywał swoje " +"pliki na dysku, a także używał plików konfiguracyjnych z dysku. Plik sources." +"list powinien zawierać prawidłowe odnośniki, których należy użyć na zdalnym " +"komputerze, a plik status powinien być kopią /var/lib/dpkg/status. " +"Należy zauważyć, że podczas używania lokalnego archiwum trzeba użyć tych " +"samych odnośników o identycznej składni." #. type:

#: offline.sgml:100 -#, fuzzy msgid "" "apt.conf must contain the necessary information to make APT use the " "disc:" msgstr "" -"apt.conf musi zawieraæ niezbêdne wpisy, by APT korzysta³ z dysku:" +"apt.conf musi zawierać niezbędne wpisy, by APT korzystał z dysku:" #. type: #: offline.sgml:124 -#, fuzzy, no-wrap +#, no-wrap msgid "" " APT\n" " {\n" @@ -8089,9 +9901,8 @@ msgid "" msgstr "" " APT\n" " {\n" -" /* Ten wpis nie jest wymagany, je¶li oba komputery maj± tê sam±\n" -" architekturê; mówi on programowi APT na komputerze pobieraj±cym \n" -" pakiety, jaka jest architektura naszego komputera */\n" +" /* Wpis nie jest wymagany, jeśli oba komputery mają tę samą architekturę;\n" +" podaje architekturę naszego komputera programowi APT na odległym komputerze */\n" " Architecture \"i386\";\n" " \n" " Get::Download-Only \"true\";\n" @@ -8099,34 +9910,31 @@ msgstr "" " \n" " Dir\n" " {\n" -" /* U¿yj katalogu disc na informacje stanu i przekieruj plik status\n" -" z domy¶lnego /var/lib/dpkg */\n" +" /* Używaj katalogu disc na informacje stanu i przekieruj plik status\n" +" z domyślnego /var/lib/dpkg */\n" " State \"/disc/\";\n" " State::status \"status\";\n" "\n" " // Katalog lokalnie przechowywanych pakietów binarnych\n" " Cache::archives \"/disc/archives/\";\n" -"\n" " Cache \"/tmp/\";\n" -"\n" +" \n" " // Lokalizacja pliku sources.list.\n" " Etc \"/disc\";\n" " };" #. type:

#: offline.sgml:129 -#, fuzzy msgid "" "More details can be seen by examining the apt.conf man page and the sample " "configuration file in /usr/share/doc/apt/examples/apt.conf." msgstr "" -"Wiêcej szczegó³ów mo¿na zobaczyæ w stronie podrêcznika apt.conf i w " -"przyk³adowym pliku konfiguracyjnym /usr/share/doc/apt/examples/apt.conf/usr/share/doc/apt/examples/apt.conf." #. type:

#: offline.sgml:136 -#, fuzzy msgid "" "On the target machine the first thing to do is mount the disc and copy /" "var/lib/dpkg/status to it. You will also need to create the directories " @@ -8134,16 +9942,16 @@ msgid "" "em>. Then take the disc to the remote machine and configure the sources." "list. On the remote machine execute the following:" msgstr "" -"Pierwsz± rzecz±, jak± nale¿y zrobiæ na oddalonym komputerze z Debianem to " -"zamontowaæ dysk i przekopiowaæ na niego plik /var/lib/dpkg/status. " -"Trzeba tak¿e utworzyæ stukturê katalogów przedstawion± we \"Wprowadzeniu\": " -"archives/partial/ i lists/partial/. Nastêpnie niesiemy " -"dysk do oddalonego komputera z szybkim ³±czem i konfigurujemy plik sources." -"list. Na oddalonym komputerze wykonujemy kolejno:" +"Pierwszą rzeczą, jaką należy zrobić na oddalonym komputerze z Debianem to " +"zamontować dysk i przekopiować na niego plik /var/lib/dpkg/status. " +"Trzeba także utworzyć strukturę katalogów przedstawioną we \"Wprowadzeniu\": " +"archives/partial/ i lists/partial/. Następnie należy " +"przenieść dysk do oddalonego komputera z szybkim łączem i skonfigurować plik " +"sources.list. Na oddalonym komputerze wykonujemy kolejno:" #. type: #: offline.sgml:142 -#, fuzzy, no-wrap +#, no-wrap msgid "" " # export APT_CONFIG=\"/disc/apt.conf\"\n" " # apt-get update\n" @@ -8159,32 +9967,30 @@ msgstr "" #. type:

#: offline.sgml:149 -#, fuzzy msgid "" "The dist-upgrade command can be replaced with any other standard APT " "commands, particularly dselect-upgrade. You can even use an APT front end " "such as dselect. However this presents a problem in communicating " "your selections back to the local computer." msgstr "" -"Polecenie dist-upgrade mo¿na zast±piæ ka¿dym innym podstawowym poleceniem " -"APT, w szczególno¶ci dselect-upgrade. Mo¿na nawet u¿yæ APT jako metody " -"dostêpu dla dselect. Jednak stworzy to problem w przeniesieniu " +"Polecenie dist-upgrade można zastąpić każdym innym podstawowym poleceniem " +"APT, w szczególności dselect-upgrade. Można nawet użyć APT jako metody " +"dostępu dla dselect. Jednak stworzy to problem w przeniesieniu " "Twoich operacji wyborów z powrotem na lokalny komputer." #. type:

#: offline.sgml:153 -#, fuzzy msgid "" "Now the disc contains all of the index files and archives needed to upgrade " "the target machine. Take the disc back and run:" msgstr "" "W tej chwili katalog disc zawiera wszystkie pliki indeksowe oraz archiwa " -"niezbêdne do aktualizacji maszyny z Debianem. Bierzemy dysk z powrotem do " +"niezbędne do aktualizacji maszyny z Debianem. Bierzemy dysk z powrotem do " "siebie i wpisujemy:" #. type: #: offline.sgml:159 -#, fuzzy, no-wrap +#, no-wrap msgid "" " # export APT_CONFIG=\"/disc/apt.conf\"\n" " # apt-get check\n" @@ -8194,23 +10000,21 @@ msgid "" msgstr "" " # export APT_CONFIG=\"/disc/apt.conf\"\n" " # apt-get check\n" -" [ APT tworzy lokaln± kopiê plików cache ]\n" +" [ APT tworzy lokalną kopię plików cache ]\n" " # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n" -" [ Mo¿e te¿ byæ inne polecenie programu APT ]" +" [ Może też być inne polecenie programu APT ]" #. type:

#: offline.sgml:165 -#, fuzzy msgid "" "It is necessary for proper function to re-specify the status file to be the " "local one. This is very important!" msgstr "" -"Do prawid³owego dzia³ania koniecznie nale¿y podaæ plik status z lokalnej " -"maszyny. To jest bardzo wa¿ne!" +"Do prawidłowego działania koniecznie należy podać plik status z lokalnej " +"maszyny. To jest bardzo ważne!" #. type:

#: offline.sgml:172 -#, fuzzy msgid "" "If you are using dselect you can do the very risky operation of copying disc/" "status to /var/lib/dpkg/status so that any selections you made on the remote " @@ -8218,66 +10022,61 @@ msgid "" "the local machine - but this may not always be possible. DO NOT copy the " "status file if dpkg or APT have been run in the mean time!!" msgstr "" -"Je¶li u¿ywasz dselect, mo¿esz wykonaæ bardzo ryzykown± operacjê skopiowania " -"disc/status do /var/lib/dpkg/status, tak ¿e wszystkie zmiany, których " -"dokona³e¶ na odleg³ym komputerze, bêd± przeniesione. Mocno zalecam, aby " -"dokonywaæ doboru pakietów tylko na lokalnym komputerze, ale nie zawsze jest " -"to mo¿liwe. NIE podmieniaj pliku status, je¶li dpkg lub APT by³y uruchamiane " -"w miêdzyczasie!!" +"Jeśli używasz dselect, możesz wykonać bardzo ryzykowną operację skopiowania " +"disc/status do /var/lib/dpkg/status, tak że wszystkie zmiany, których " +"dokonałeś na odległym komputerze, będą przeniesione. Mocno zalecam, aby " +"dokonywać doboru pakietów tylko na lokalnym komputerze, ale nie zawsze jest " +"to możliwe. NIE podmieniaj pliku status, jeśli dpkg lub APT były uruchamiane " +"w międzyczasie!" #. type: #: offline.sgml:178 -#, fuzzy msgid "Using APT and wget" -msgstr "U¿ywanie programów APT i wget" +msgstr "Używanie programów APT i wget" #. type:

#: offline.sgml:185 -#, fuzzy msgid "" "wget is a popular and portable download tool that can run on nearly " "any machine. Unlike the method above this requires that the Debian machine " "already has a list of available packages." msgstr "" -"wget jest popularnym i przeno¶nym programem narzêdziowym pobierania " -"plików, który dzia³a prawie na ka¿dym komputerze. W przeciwieñstwie do " -"metody opisanej powy¿ej ta wymaga, aby na lokalnym komputerze by³a aktualna " -"lista dostêpnych pakietów." +"wget jest popularnym i przenośnym programem narzędziowym pobierania " +"plików, który działa prawie na każdym komputerze. W przeciwieństwie do " +"metody opisanej powyżej ta wymaga, aby na lokalnym komputerze była aktualna " +"lista dostępnych pakietów." #. type:

#: offline.sgml:190 -#, fuzzy msgid "" "The basic idea is to create a disc that has only the archive files " "downloaded from the remote site. This is done by using the --print-uris " "option to apt-get and then preparing a wget script to actually fetch the " "packages." msgstr "" -"Nale¿y stworzyæ katalog disc tylko na pakiety do pobrania z innego " -"komputera. U¿yta zostanie do tego opcja --print-uris programu apt-get, a " -"nastêpnie przygotujemy skrypt dla programu wget, który pobierze w³a¶ciwe " +"Należy stworzyć katalog disc tylko na pakiety do pobrania z innego " +"komputera. Użyta zostanie do tego opcja --print-uris programu apt-get, a " +"następnie przygotujemy skrypt dla programu wget, który pobierze właściwe " "pakiety." #. type: #: offline.sgml:196 -#, fuzzy msgid "Operation" msgstr "Kolejne kroki" #. type:

#: offline.sgml:200 -#, fuzzy msgid "" "Unlike the previous technique no special configuration files are required. " "We merely use the standard APT commands to generate the file list." msgstr "" -"W odró¿nieniu od poprzedniej metody dzia³ania ta nie wymaga specjalnych " -"plików konfiguracyjnych. U¿ywamy jedynie podstawowych poleceñ APT, by " -"wygenerowaæ listê plików." +"W odróżnieniu od poprzedniej metody działania ta nie wymaga specjalnych " +"plików konfiguracyjnych. Używamy jedynie podstawowych poleceń APT, by " +"wygenerować listę plików." #. type: #: offline.sgml:205 -#, fuzzy, no-wrap +#, no-wrap msgid "" " # apt-get dist-upgrade \n" " [ Press no when prompted, make sure you are happy with the actions ]\n" @@ -8285,43 +10084,40 @@ msgid "" " # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script" msgstr "" " # apt-get dist-upgrade \n" -" [ Wybierz \"no\" po znaku zachêty, upewnij siê, czy to w³a¶ciwy wybór ]\n" +" [ Wybierz \"no\" po znaku zachęty, upewnij się, czy to właściwy wybór ]\n" " # apt-get -qq --print-uris dist-upgrade > uris\n" " # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script" #. type:

#: offline.sgml:210 -#, fuzzy msgid "" "Any command other than dist-upgrade could be used here, including dselect-" "upgrade." msgstr "" -"Tak¿e inne opcje ni¿ dist-upgrade mog± tu byæ u¿yte, w³±czaj±c dselect-" +"Można tu użyć także polecenia innego niż dist-upgrade, na przykład dselect-" "upgrade." #. type:

#: offline.sgml:216 -#, fuzzy msgid "" "The /disc/wget-script file will now contain a list of wget commands to " "execute in order to fetch the necessary archives. This script should be run " "with the current directory as the disc's mount point so as to save the " "output on the disc." msgstr "" -"Plik skryptu /disc/wget-script bêdzie teraz zawieraæ listê wywo³añ programu " -"wget, niezbêdnych do pobrania potrzebnych archiwów. Skrypt ten nale¿y " -"uruchomiæ w bie¿±cym katalogu o punkcie montowania disc, tak aby tu " -"zapisywa³ dane na dysku." +"Plik skryptu /disc/wget-script będzie teraz zawierać listę wywołań programu " +"wget, niezbędnych do pobrania potrzebnych archiwów. Skrypt ten należy " +"uruchomić w bieżącym katalogu o punkcie montowania disc, tak aby zapisywał " +"dane na tym dysku." #. type:

#: offline.sgml:219 -#, fuzzy msgid "The remote machine would do something like" -msgstr "Na oddalonym komputerze nale¿y wykonaæ co¶ takiego" +msgstr "Na oddalonym komputerze należy wykonać coś takiego" #. type: #: offline.sgml:223 -#, fuzzy, no-wrap +#, no-wrap msgid "" " # cd /disc\n" " # sh -x ./wget-script\n" @@ -8333,22 +10129,20 @@ msgstr "" #. type: #: offline.sgml:228 -#, fuzzy msgid "" "Once the archives are downloaded and the disc returned to the Debian machine " "installation can proceed using," msgstr "" -"Gdy archiwa zostan± pobrane i dysk wróci do komputera z Debianem, " -"instalowanie mo¿na prowadziæ dalej poleceniem:" +"Gdy archiwa zostaną pobrane i dysk wróci do komputera z Debianem, " +"instalowanie można prowadzić dalej poleceniem:" #. type: #: offline.sgml:230 -#, fuzzy, no-wrap +#, no-wrap msgid " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade" msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade" #. type:

#: offline.sgml:234 -#, fuzzy msgid "Which will use the already fetched archives on the disc." -msgstr "które u¿yje pobranych uprzednio archiwów z dysku." +msgstr "Które użyje pobranych uprzednio archiwów z dysku." diff --git a/po/nl.po b/po/nl.po index 5360f7fa3..98cb798b7 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,4 +1,4 @@ -# translation of apt_0.7.25.3_nl.po to Dutch +# translation of nl.po to Dutch # advanced package transfer - apt message translation catalog # # guus sliepen , 2002. @@ -7,10 +7,10 @@ # Frans Pop , 2010. msgid "" msgstr "" -"Project-Id-Version: apt_0.7.25.3_nl\n" +"Project-Id-Version: nl\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-01-11 15:17+0100\n" -"PO-Revision-Date: 2010-03-08 20:47+0100\n" +"PO-Revision-Date: 2010-03-16 06:52+0100\n" "Last-Translator: Frans Pop \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" @@ -2166,6 +2166,8 @@ msgid "" "The size of a MMap has already reached the defined limit of %lu bytes,abort " "the try to grow the MMap." msgstr "" +"De omvang van een MMap heeft de gedefinieerde limiet van %lu bytes al " +"bereikt; de MMap wordt niet verder vergroot." #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 @@ -3127,9 +3129,3 @@ msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Verbinding werd voortijdig afgebroken" - -#~ msgid "Failed to mount '%s' to '%s'" -#~ msgstr "Aankoppelen van '%s' op '%s' is mislukt" - -#~ msgid "Could not open file '%s'" -#~ msgstr "Kon bestand '%s' niet openen" -- cgit v1.2.3 From 9f240996cf1c5c10b5cdcca3b59a302d28e49608 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Fri, 19 Mar 2010 10:19:15 +0700 Subject: Add conflict with manpages-pl --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 96f29268c..24bea801d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ apt (0.7.26~exp3) UNRELEASED; urgency=low * Spanish manpages translation update. Closes: #573293 * Dutch translation update. Closes: #573946 * Polish manpages translation update. Closes: #574558 + * Add "manpages-pl (<< 20060617-3~)" to avoid file conflicts with + that package that was providing some manpages for APT utilities. [ Julian Andres Klode ] * cmdline/apt-mark: diff --git a/debian/control b/debian/control index c2b6c17a5..9cd3888b1 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Package: apt Architecture: any Depends: ${shlibs:Depends}, debian-archive-keyring, ${misc:Depends} -Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) +Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7), manpages-pl (<< 20060617-3~) Provides: ${libapt-pkg:provides} Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt -- cgit v1.2.3 From 6083d5ec97c605df51633cf6522df1323f69c29c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 19 Mar 2010 10:54:26 +0100 Subject: =?UTF-8?q?add=20translation=20of=20the=20manpages=20to=20PT=20(po?= =?UTF-8?q?rtuguese)=20Thanks=20to=20Am=C3=A9rico=20Monteiro!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 2 + doc/po/pt.po | 11089 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 11091 insertions(+) create mode 100644 doc/po/pt.po diff --git a/debian/changelog b/debian/changelog index 595285dbf..cd5f2ae1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ apt (0.7.26) UNRELEASED; urgency=low * Ignore :qualifiers after package name in build dependencies in the library by default, but try to honour them in apt-get as we have some sort of MultiArch support ready (Closes: #558103) + * add translation of the manpages to PT (portuguese) + Thanks to Américo Monteiro! * Switch to dpkg-source 3.0 (native) format * apt-pkg/depcache.cc: - remove Auto-Installed information from extended_states diff --git a/doc/po/pt.po b/doc/po/pt.po new file mode 100644 index 000000000..1e308afdc --- /dev/null +++ b/doc/po/pt.po @@ -0,0 +1,11089 @@ +# Translation of apt manpages to Portuguese +# Copyright (C) 2009 Free Software Foundation, Inc. +# This file is distributed under the same license as the apt-doc package. +# +# Américo Monteiro , 2009, 2010. +msgid "" +msgstr "" +"Project-Id-Version: apt-doc 0.7.26~exp3\n" +"POT-Creation-Date: 2010-03-14 16:41+0100\n" +"PO-Revision-Date: 2010-03-19 00:21+0000\n" +"Last-Translator: Américo Monteiro \n" +"Language-Team: Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. type: TH +#: apt.8:17 +#, no-wrap +msgid "apt" +msgstr "apt" + +#. type: TH +#: apt.8:17 +#, no-wrap +msgid "16 June 1998" +msgstr "16 Junho 1998" + +#. type: TH +#: apt.8:17 +#, no-wrap +msgid "Debian GNU/Linux" +msgstr "Debian GNU/Linux" + +#. type: SH +#: apt.8:18 +#, no-wrap +msgid "NAME" +msgstr "NOME" + +#. type: Plain text +#: apt.8:20 +msgid "apt - Advanced Package Tool" +msgstr "apt - Advanced Package Tool" + +#. type: SH +#: apt.8:20 +#, no-wrap +msgid "SYNOPSIS" +msgstr "SINOPSE" + +#. type: Plain text +#: apt.8:22 +msgid "B" +msgstr "B" + +#. type: SH +#: apt.8:22 +#, no-wrap +msgid "DESCRIPTION" +msgstr "DESCRIÇÃO" + +#. type: Plain text +#: apt.8:31 +msgid "" +"APT is a management system for software packages. For normal day to day " +"package management there are several frontends available, such as B" +"(8) for the command line or B(8) for the X Window System. Some " +"options are only implemented in B(8) though." +msgstr "" +"APT é um sistema de gestão para pacotes de software. Para a gestão de " +"pacotes normal do dia-a-dia existem vários frontends disponíveis, como o " +"B(8) para a linha de comandos ou o B(8) para o X Window " +"System. No entanto, algumas das opções estão apenas implementadas no B(8)." + +#. type: SH +#: apt.8:31 +#, no-wrap +msgid "OPTIONS" +msgstr "OPÇÕES" + +#. type: Plain text +#: apt.8:33 apt.8:35 +msgid "None." +msgstr "Nenhum." + +#. type: SH +#: apt.8:33 +#, no-wrap +msgid "FILES" +msgstr "FICHEIROS" + +#. type: SH +#: apt.8:35 +#, no-wrap +msgid "SEE ALSO" +msgstr "VEJA TAMBÉM" + +#. type: Plain text +#: apt.8:42 +msgid "" +"B(8), B(8), B(5), B(5), " +"B(5), B(8)" +msgstr "" +"B(8), B(8), B(5), B(5), " +"B(5), B(8)" + +#. type: SH +#: apt.8:42 +#, no-wrap +msgid "DIAGNOSTICS" +msgstr "DIAGNÓSTICOS" + +#. type: Plain text +#: apt.8:44 +msgid "apt returns zero on normal operation, decimal 100 on error." +msgstr "o apt devolve zero na operação normal, 100 decimal em erro." + +#. type: SH +#: apt.8:44 +#, no-wrap +msgid "BUGS" +msgstr "BUGS" + +#. type: Plain text +#: apt.8:46 +msgid "This manpage isn't even started." +msgstr "Este manual ainda nem começou." + +#. type: Plain text +#: apt.8:55 +msgid "" +"See Ehttp://bugs.debian.org/aptE. If you wish to report a bug in " +"B, please see I or the " +"B(1) command." +msgstr "" +"Veja Ehttp://bugs.debian.org/aptE. Se deseja reportar um bug em " +"B, por favor veja I ou o " +"comando B(1) ." + +#. type: SH +#: apt.8:55 +#, no-wrap +msgid "AUTHOR" +msgstr "AUTOR" + +#. type: Plain text +#: apt.8:56 +msgid "apt was written by the APT team Eapt@packages.debian.orgE." +msgstr "apt foi escrito pelo APT team Eapt@packages.debian.orgE." + +#. type: Plain text +#: apt.ent:2 +msgid "" +msgstr "" + +#. type: Plain text +#: apt.ent:10 +msgid "" +" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " +msgstr "" +" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " + +#. type: Plain text +#: apt.ent:17 +#, no-wrap +msgid "" +"\n" +"\n" +" apt.conf\n" +" 5\n" +" \"\n" +">\n" +msgstr "" +"\n" +"\n" +" apt.conf\n" +" 5\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:23 +#, no-wrap +msgid "" +"\n" +" apt-get\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-get\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:29 +#, no-wrap +msgid "" +"\n" +" apt-config\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-config\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:35 +#, no-wrap +msgid "" +"\n" +" apt-cdrom\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-cdrom\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:41 +#, no-wrap +msgid "" +"\n" +" apt-cache\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-cache\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:47 +#, no-wrap +msgid "" +"\n" +" apt_preferences\n" +" 5\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt_preferences\n" +" 5\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:53 +#, no-wrap +msgid "" +"\n" +" apt-key\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-key\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:59 +#, no-wrap +msgid "" +"\n" +" apt-secure\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-secure\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:65 +#, no-wrap +msgid "" +"\n" +" apt-ftparchive\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-ftparchive\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:72 +#, no-wrap +msgid "" +"\n" +" sources.list\n" +" 5\n" +" \"\n" +">\n" +msgstr "" +"\n" +" sources.list\n" +" 5\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:78 +#, no-wrap +msgid "" +"\n" +" reportbug\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" reportbug\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:84 +#, no-wrap +msgid "" +"\n" +" dpkg\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" dpkg\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:90 +#, no-wrap +msgid "" +"\n" +" dpkg-buildpackage\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" dpkg-buildpackage\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:96 +#, no-wrap +msgid "" +"\n" +" gzip\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" gzip\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:102 +#, no-wrap +msgid "" +"\n" +" dpkg-scanpackages\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" dpkg-scanpackages\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:108 +#, no-wrap +msgid "" +"\n" +" dpkg-scansources\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" dpkg-scansources\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:114 +#, no-wrap +msgid "" +"\n" +" dselect\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" dselect\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:120 +#, no-wrap +msgid "" +"\n" +" aptitude\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" aptitude\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:126 +#, no-wrap +msgid "" +"\n" +" synaptic\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" synaptic\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:132 +#, no-wrap +msgid "" +"\n" +" debsign\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" debsign\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:138 +#, no-wrap +msgid "" +"\n" +" debsig-verify\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" debsig-verify\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:144 +#, no-wrap +msgid "" +"\n" +" gpg\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" gpg\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:150 +#, no-wrap +msgid "" +"\n" +" gnome-apt\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" gnome-apt\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:156 +#, no-wrap +msgid "" +"\n" +" wajig\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" wajig\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:168 +#, no-wrap +msgid "" +"\n" +"\n" +"
apt@packages.debian.org
\n" +" \n" +" Jason Gunthorpe\n" +" \n" +" \n" +" 1998-2001 Jason Gunthorpe\n" +" 28 October 2008\n" +" Linux\n" +msgstr "" +"\n" +"\n" +"
apt@packages.debian.org
\n" +" \n" +" Jason Gunthorpe\n" +" \n" +" \n" +" 1998-2001 Jason Gunthorpe\n" +" 28 Outubro 2008\n" +" Linux\n" + +#. type: Plain text +#: apt.ent:171 +#, no-wrap +msgid "" +" \n" +"\"> \n" +msgstr "" +" \n" +"\"> \n" + +#. type: Plain text +#: apt.ent:177 +#, no-wrap +msgid "" +"\n" +" apt@packages.debian.org\n" +" \n" +"\">\n" +msgstr "" +"\n" +" apt@packages.debian.org\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:185 +#, no-wrap +msgid "" +"\n" +" Jason\n" +" Gunthorpe\n" +" \n" +" \n" +"\">\n" +msgstr "" +"\n" +" Jason\n" +" Gunthorpe\n" +" \n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:193 +#, no-wrap +msgid "" +"\n" +" Mike\n" +" O'Connor\n" +" \n" +" \n" +"\">\n" +msgstr "" +"\n" +" Mike\n" +" O'Connor\n" +" \n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:200 +#, no-wrap +msgid "" +"\n" +" APT team\n" +" \n" +" \n" +"\">\n" +msgstr "" +"\n" +" APT team\n" +" \n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:204 apt.ent:215 +#, no-wrap +msgid "" +"Linux\n" +"\">\n" +msgstr "" +"Linux\n" +"\">\n" + +#. type: Plain text +#: apt.ent:211 +#, no-wrap +msgid "" +"\n" +" Jason Gunthorpe\n" +" 1998-2001\n" +" \n" +"\">\n" +msgstr "" +"\n" +" Jason Gunthorpe\n" +" 1998-2001\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:221 +#, no-wrap +msgid "" +"\n" +"\t\tQA Page\n" +"\t\n" +"\">\n" +msgstr "" +"\n" +"\t\tQA Page\n" +"\t\n" +"\">\n" + +#. type: Plain text +#: apt.ent:232 +#, no-wrap +msgid "" +"\n" +"Bugs\n" +" APT bug page. \n" +" If you wish to report a bug in APT, please see\n" +" /usr/share/doc/debian/bug-reporting.txt or the\n" +" &reportbug; command.\n" +" \n" +" \n" +"\">\n" +msgstr "" +"\n" +"Bugs\n" +" página de bugs do APT. \n" +" Se deseja reportar um bug no APT, por favor veja\n" +" /usr/share/doc/debian/bug-reporting.txt ou o\n" +" comando &reportbug;.\n" +" \n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:240 +#, no-wrap +msgid "" +"\n" +"Author\n" +" APT was written by the APT team apt@packages.debian.org.\n" +" \n" +" \n" +"\">\n" +msgstr "" +"\n" +"Autor\n" +" APT foi escrito pela equipa do APT apt@packages.debian.org.\n" +" \n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:250 +#, no-wrap +msgid "" +"\n" +"\n" +" \n" +" Show a short usage summary.\n" +" \n" +" \n" +" \n" +msgstr "" +"\n" +"\n" +" \n" +" Mostra um sumário curto da utilização.\n" +" \n" +" \n" +" \n" + +#. type: Plain text +#: apt.ent:258 +#, no-wrap +msgid "" +" \n" +" \n" +" \n" +" Show the program version.\n" +" \n" +" \n" +" \n" +msgstr "" +" \n" +" \n" +" \n" +" Mostra a versão do programa.\n" +" \n" +" \n" +" \n" + +#. type: Plain text +#: apt.ent:268 +#, no-wrap +msgid "" +" \n" +" \n" +" \n" +" Configuration File; Specify a configuration file to use. \n" +" The program will read the default configuration file and then this \n" +" configuration file. See &apt-conf; for syntax information. \n" +" \n" +" \n" +" \n" +msgstr "" +" \n" +" \n" +" \n" +" Ficheiro de Configuração; Especifica um ficheiro de configuração a usar. \n" +" O programa irá ler o ficheiro de configuração predefinido e depois este \n" +" ficheiro de configuração. Veja &apt-conf; para informação de sintaxe. \n" +" \n" +" \n" +" \n" + +#. type: Plain text +#: apt.ent:280 +#, no-wrap +msgid "" +" \n" +" \n" +" \n" +" Set a Configuration Option; This will set an arbitrary\n" +" configuration option. The syntax is .\n" +" and can be used multiple\n" +" times to set different options.\n" +" \n" +" \n" +" \n" +"\">\n" +msgstr "" +" \n" +" \n" +" \n" +" Define uma Opção de Configuração; Isto irá definir uma opção\n" +" de configuração arbitrária. A sintaxe é .\n" +" e podem ser usadas várias\n" +" vezes para definir opções diferentes.\n" +" \n" +" \n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:291 +#, no-wrap +msgid "" +"\n" +"All command line options may be set using the configuration file, the\n" +" descriptions indicate the configuration option to set. For boolean\n" +" options you can override the config file by using something like \n" +" ,, \n" +" or several other variations.\n" +" \n" +"\">\n" +msgstr "" +"\n" +"Todas as opções de linha de comandos podem ser definidas usando o ficheiro de configuração, as\n" +" descrições indicam a opção de configuração a definir. Para opções\n" +" booleanas você pode sobre por o ficheiro de configuração usando algo como \n" +" ,, \n" +" ou várias outras variantes.\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:297 +#, no-wrap +msgid "" +"/etc/apt/apt.conf\n" +" APT configuration file.\n" +" Configuration Item: Dir::Etc::Main.\n" +" \n" +msgstr "" +"/etc/apt/apt.conf\n" +" Ficheiro de configuração do APT.\n" +" Item de Configuração: Dir::Etc::Main.\n" +" \n" + +#. type: Plain text +#: apt.ent:303 +#, no-wrap +msgid "" +" /etc/apt/apt.conf.d/\n" +" APT configuration file fragments.\n" +" Configuration Item: Dir::Etc::Parts.\n" +" \n" +"\">\n" +msgstr "" +" /etc/apt/apt.conf.d/\n" +" Ficheiros de configuração fragmentados do APT.\n" +" Item de Configuração: Dir::Etc::Parts.\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:309 +#, no-wrap +msgid "" +"&cachedir;/archives/\n" +" Storage area for retrieved package files.\n" +" Configuration Item: Dir::Cache::Archives.\n" +" \n" +msgstr "" +"&cachedir;/archives/\n" +" Área de armazenamento para ficheiros de pacotes obtidos.\n" +" Item de Configuração: Dir::Cache::Archives.\n" +" \n" + +#. type: Plain text +#: apt.ent:315 +#, no-wrap +msgid "" +" &cachedir;/archives/partial/\n" +" Storage area for package files in transit.\n" +" Configuration Item: Dir::Cache::Archives (implicit partial). \n" +" \n" +"\">\n" +msgstr "" +" &cachedir;/archives/partial/\n" +" Área de armazenamento para ficheiros de pacotes em curso.\n" +" Item de Configuração: Dir::Cache::Archives (implicit partial). \n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:325 +#, no-wrap +msgid "" +"/etc/apt/preferences\n" +" Version preferences file.\n" +" This is where you would specify "pinning",\n" +" i.e. a preference to get certain packages\n" +" from a separate source\n" +" or from a different version of a distribution.\n" +" Configuration Item: Dir::Etc::Preferences.\n" +" \n" +msgstr "" +"/etc/apt/preferences\n" +" Ficheiro de preferências de versão.\n" +" Isto é onde você deve especificar "pinning",\n" +" isto é, uma preferência para obter certos pacotes\n" +" A partir de uma fonte separada\n" +" ou a partir duma versão diferente de uma distribuição.\n" +" Item de Configuração: Dir::Etc::Preferences.\n" +" \n" + +#. type: Plain text +#: apt.ent:331 +#, no-wrap +msgid "" +" /etc/apt/preferences.d/\n" +" File fragments for the version preferences.\n" +" Configuration Item: Dir::Etc::PreferencesParts.\n" +" \n" +"\">\n" +msgstr "" +" /etc/apt/preferences.d/\n" +" Ficheiros fragmentados para as preferências de versão.\n" +" Item de Configuração: Dir::Etc::PreferencesParts.\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:337 +#, no-wrap +msgid "" +"/etc/apt/sources.list\n" +" Locations to fetch packages from.\n" +" Configuration Item: Dir::Etc::SourceList.\n" +" \n" +msgstr "" +"/etc/apt/sources.list\n" +" Localizações de onde obter pacotes.\n" +" Item de Configuração: Dir::Etc::SourceList.\n" +" \n" + +#. type: Plain text +#: apt.ent:343 +#, no-wrap +msgid "" +" /etc/apt/sources.list.d/\n" +" File fragments for locations to fetch packages from.\n" +" Configuration Item: Dir::Etc::SourceParts.\n" +" \n" +"\">\n" +msgstr "" +" /etc/apt/sources.list.d/\n" +" Ficheiros fragmentados para localizações de onde obter pacotes.\n" +" Item de Configuração: Dir::Etc::SourceParts.\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:350 +#, no-wrap +msgid "" +"&statedir;/lists/\n" +" Storage area for state information for each package resource specified in\n" +" &sources-list;\n" +" Configuration Item: Dir::State::Lists.\n" +" \n" +msgstr "" +"&statedir;/lists/\n" +" Área de armazenamento para informação de estado para cada recurso de pacote especificado em\n" +" &sources-list;\n" +" Tem de Configuração: Dir::State::Lists.\n" +" \n" + +#. type: Plain text +#: apt.ent:356 +#, no-wrap +msgid "" +" &statedir;/lists/partial/\n" +" Storage area for state information in transit.\n" +" Configuration Item: Dir::State::Lists (implicit partial).\n" +" \n" +"\">\n" +msgstr "" +" &statedir;/lists/partial/\n" +" Área de armazenamento para informação de estado em trânsito.\n" +" Item de Configuração: Dir::State::Lists (parcial implícito).\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:362 +#, no-wrap +msgid "" +"/etc/apt/trusted.gpg\n" +" Keyring of local trusted keys, new keys will be added here.\n" +" Configuration Item: Dir::Etc::Trusted.\n" +" \n" +msgstr "" +"/etc/apt/trusted.gpg\n" +" Chaveiro de chaves de confiança locais, as novas chaves serão adicionadas aqui.\n" +" Item de Configuração: Dir::Etc::Trusted.\n" +" \n" + +#. type: Plain text +#: apt.ent:369 +#, no-wrap +msgid "" +" /etc/apt/trusted.gpg.d/\n" +" File fragments for the trusted keys, additional keyrings can\n" +" be stored here (by other packages or the administrator).\n" +" Configuration Item Dir::Etc::TrustedParts.\n" +" \n" +"\">\n" +msgstr "" +" /etc/apt/trusted.gpg.d/\n" +" Fragmentos de ficheiro para as chaves de confiança, chaveiros adicionais podem\n" +" ser armazenados aqui (por outros pacotes ou pelo administrador).\n" +" Item de Configuração Dir::Etc::TrustedParts.\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:371 +msgid "" +msgstr "" + +#. type: Plain text +#: apt.ent:380 +#, no-wrap +msgid "" +"\n" +"john@doe.org in 2009,\n" +" 2010 and Daniela Acme daniela@acme.us in 2010 together with the\n" +" Debian Dummy l10n Team debian-l10n-dummy@lists.debian.org.\n" +"\">\n" +msgstr "" +"a_monteiro@netcabo.pt em 2009, 2010.\n" +" A tradução foi revista pela equipa de traduções portuguesas da Debian traduz@debianpt.org.\n" +"\">\n" + +#. type: Plain text +#: apt.ent:387 +#, no-wrap +msgid "" +"\n" +"\n" +msgstr "" +"\n" + +#. The last update date +#. type: Content of: +#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 +#: apt-sortpkgs.1.xml:13 sources.list.5.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; 29 " +"February 2004" +msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; 29 " +"Fevereiro 2004" + +#. type: Content of: +#: apt-cache.8.xml:22 apt-cache.8.xml:29 +msgid "apt-cache" +msgstr "apt-cache" + +#. type: Content of: +#: apt-cache.8.xml:23 apt-cdrom.8.xml:22 apt-config.8.xml:23 apt-get.8.xml:23 +#: apt-key.8.xml:15 apt-mark.8.xml:23 apt-secure.8.xml:15 +msgid "8" +msgstr "8" + +#. type: Content of: +#: apt-cache.8.xml:24 apt-cdrom.8.xml:23 apt-config.8.xml:24 +#: apt-extracttemplates.1.xml:24 apt-ftparchive.1.xml:24 apt-get.8.xml:24 +#: apt-key.8.xml:16 apt-mark.8.xml:24 apt-secure.8.xml:16 +#: apt-sortpkgs.1.xml:24 apt.conf.5.xml:30 apt_preferences.5.xml:23 +#: sources.list.5.xml:24 +msgid "APT" +msgstr "APT" + +#. type: Content of: +#: apt-cache.8.xml:30 +msgid "APT package handling utility -- cache manipulator" +msgstr "Utilitário de manuseamento de pacotes do APT -- manipulador de cache" + +#. type: Content of: +#: apt-cache.8.xml:36 +msgid "" +"apt-cache " +"add file gencaches showpkg pkg " +"showsrc pkg stats dump dumpavail unmet search regex show pkg depends pkg " +"rdepends pkg pkgnames prefix dotty pkg " +"xvcg pkg policy pkgs madison pkgs " +msgstr "" +"apt-cache " +" add ficheiro gencaches " +"showpkg pacote showsrc pacote stats dump dumpavail unmet search regex show pacote depends " +"pacote rdepends pacote pkgnames prefixo dotty pacote xvcg pacote policy pacotes madison pacotes " + +#. type: Content of: +#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 +#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125 +#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 +#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 +#: sources.list.5.xml:33 +msgid "Description" +msgstr "Descrição" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cache.8.xml:63 +msgid "" +"<command>apt-cache</command> performs a variety of operations on APT's " +"package cache. <command>apt-cache</command> does not manipulate the state of " +"the system but does provide operations to search and generate interesting " +"output from the package metadata." +msgstr "" +"<command>apt-cache</command> executa uma variedade de operações na cache de " +"pacotes do APT. <command>apt-cache</command> não manipula o estado do " +"sistema mas fornece operações para procurar e gerar resultados interessantes " +"a partir dos metadados do pacote." + +#. type: Content of: <refentry><refsect1><para> +#: apt-cache.8.xml:68 apt-get.8.xml:131 +msgid "" +"Unless the <option>-h</option>, or <option>--help</option> option is given, " +"one of the commands below must be present." +msgstr "" +"A menos que a opção <option>-h</option>, ou <option>--help</option> seja " +"fornecida, um dos comandos abaixo têm que estar presentes." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:72 +msgid "add <replaceable>file(s)</replaceable>" +msgstr "add <replaceable>ficheiro(s)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:73 +msgid "" +"<literal>add</literal> adds the named package index files to the package " +"cache. This is for debugging only." +msgstr "" +"<literal>add</literal> adiciona ficheiros índice do pacote nomeado à cache " +"pacotes. Isto é apenas para depuração." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:77 +msgid "gencaches" +msgstr "gencaches" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:78 +msgid "" +"<literal>gencaches</literal> performs the same operation as <command>apt-get " +"check</command>. It builds the source and package caches from the sources in " +"&sources-list; and from <filename>/var/lib/dpkg/status</filename>." +msgstr "" +"<literal>gencaches</literal> executa a mesma operação que o <command>apt-get " +"check</command>. Constrói as caches de fonte e pacote a partir das fontes em " +"&sources-list; e a partir de <filename>/var/lib/dpkg/status</filename>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:84 +msgid "showpkg <replaceable>pkg(s)</replaceable>" +msgstr "showpkg <replaceable>pacote(s)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:85 +msgid "" +"<literal>showpkg</literal> displays information about the packages listed on " +"the command line. Remaining arguments are package names. The available " +"versions and reverse dependencies of each package listed are listed, as well " +"as forward dependencies for each version. Forward (normal) dependencies are " +"those packages upon which the package in question depends; reverse " +"dependencies are those packages that depend upon the package in question. " +"Thus, forward dependencies must be satisfied for a package, but reverse " +"dependencies need not be. For instance, <command>apt-cache showpkg " +"libreadline2</command> would produce output similar to the following:" +msgstr "" +"<literal>showpkg</literal> mostra informação acerca dos pacotes listados na " +"linha de comandos. Os argumentos restantes são nomes de pacotes. São " +"listadas as versões disponíveis e dependências reversas de cada pacote " +"listado, assim como as dependências dianteiras de cada versão. Dependências " +"dianteiras (normais) são aqueles pacotes de que o pacote em questão depende; " +"dependências reversas são aqueles pacotes que dependem do pacote em questão. " +"Assim, as dependências dianteiras de um pacote têm de ser satisfeitas, mas " +"as dependências reversas não precisam de ser. Por exemplo, <command>apt-" +"cache showpkg libreadline2</command> deverá produzir resultados semelhantes " +"ao seguinte:" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> +#: apt-cache.8.xml:97 +#, no-wrap +msgid "" +"Package: libreadline2\n" +"Versions: 2.1-12(/var/state/apt/lists/foo_Packages),\n" +"Reverse Depends: \n" +" libreadlineg2,libreadline2\n" +" libreadline2-altdev,libreadline2\n" +"Dependencies:\n" +"2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null))\n" +"Provides:\n" +"2.1-12 - \n" +"Reverse Provides: \n" +msgstr "" +"Pacote: libreadline2\n" +"Versões: 2.1-12(/var/state/apt/lists/foo_Packages),\n" +"Dependências Reversas Depends: \n" +" libreadlineg2,libreadline2\n" +" libreadline2-altdev,libreadline2\n" +"Dependências:\n" +"2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null))\n" +"Fornecimentos:\n" +"2.1-12 - \n" +"Fornecimentos Reversos: \n" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:109 +msgid "" +"Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and " +"ncurses3.0 which must be installed for libreadline2 to work. In turn, " +"libreadlineg2 and libreadline2-altdev depend on libreadline2. If " +"libreadline2 is installed, libc5 and ncurses3.0 (and ldso) must also be " +"installed; libreadlineg2 and libreadline2-altdev do not have to be " +"installed. For the specific meaning of the remainder of the output it is " +"best to consult the apt source code." +msgstr "" +"Assim pode-se ver que libreadline2, versão 2.1-12, depende de libc5 e " +"ncurses3.0 que têm que ser instalados para que libreadline2 funcione. Por " +"sua vez, libreadlineg2 e libreadline2-altdev dependem de libreadline2. Se " +"libreadline2 for instalado, libc5 e ncurses3.0 (e ldso) também têm que ser " +"instalados; libreadlineg2 e libreadline2-altdev não precisam de ser " +"instalados. Para o significado específico do lembrete da saída é melhor " +"consultar o código fonte do apt." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:118 +msgid "stats" +msgstr "stats" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:118 +msgid "" +"<literal>stats</literal> displays some statistics about the cache. No " +"further arguments are expected. Statistics reported are:" +msgstr "" +"<literal>stats</literal> mostra algumas estatísticas acerca da cache. Não " +"são esperados mais argumentos. As estatísticas reportadas são:" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:121 +msgid "" +"<literal>Total package names</literal> is the number of package names found " +"in the cache." +msgstr "" +"<literal>Total package names</literal> é o número de nomes de pacotes " +"encontrados na cache." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:125 +msgid "" +"<literal>Normal packages</literal> is the number of regular, ordinary " +"package names; these are packages that bear a one-to-one correspondence " +"between their names and the names used by other packages for them in " +"dependencies. The majority of packages fall into this category." +msgstr "" +"<literal>Normal packages</literal> é o número de nomes de pacotes regulares " +"e ordinários; estes são pacotes que têm uma correspondência de um-para-um " +"entre os seus nomes e os nomes usados por outros pacotes para eles nas " +"dependências. A maioria dos pacotes caem nesta categoria." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:131 +msgid "" +"<literal>Pure virtual packages</literal> is the number of packages that " +"exist only as a virtual package name; that is, packages only \"provide\" the " +"virtual package name, and no package actually uses the name. For instance, " +"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual " +"package; several packages provide \"mail-transport-agent\", but there is no " +"package named \"mail-transport-agent\"." +msgstr "" +"<literal>Pure virtual packages</literal> é o número de pacotes que existem " +"apenas como nome de pacote virtual; isto é, os pacotes apenas " +"\"disponibilizam\" o nome do pacote virtual, e nenhum pacote usa realmente o " +"nome. Por exemplo, \"mail-transport-agent\" no sistema Debian GNU/Linux é um " +"pacote puramente virtual; vários pacotes disponibilizam \"mail-transport-" +"agent\", mas não existe um existe um pacote chamado \"mail-transport-agent\"." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:139 +msgid "" +"<literal>Single virtual packages</literal> is the number of packages with " +"only one package providing a particular virtual package. For example, in the " +"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only " +"one package, xless, provides \"X11-text-viewer\"." +msgstr "" +"<literal>Single virtual packages</literal> é o número de pacotes com apenas " +"um pacote a disponibilizar um pacote virtual particular. Por exemplo, no " +"sistema Debian GNU/Linux, \"X11-text-viewer\" é um pacote virtual, mas " +"apenas um pacote, xless, disponibiliza \"X11-text-viewer\"." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:145 +msgid "" +"<literal>Mixed virtual packages</literal> is the number of packages that " +"either provide a particular virtual package or have the virtual package name " +"as the package name. For instance, in the Debian GNU/Linux system, \"debconf" +"\" is both an actual package, and provided by the debconf-tiny package." +msgstr "" +"<literal>Mixed virtual packages</literal> é o número de pacotes que ou " +"disponibilizam um pacote virtual particular ou têm o nome de pacote virtual " +"como o nome de pacote. Por exemplo, no sistema Debian GNU/Linux, \"debconf\" " +"é tanto um pacote real, como também disponibilizado pelo pacote debconf-tiny." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:152 +msgid "" +"<literal>Missing</literal> is the number of package names that were " +"referenced in a dependency but were not provided by any package. Missing " +"packages may be an evidence if a full distribution is not accessed, or if a " +"package (real or virtual) has been dropped from the distribution. Usually " +"they are referenced from Conflicts or Breaks statements." +msgstr "" +"<literal>Missing</literal> é o número de nomes de pacotes que são " +"referenciados numa dependência mas não foram disponibilizados por nenhum " +"pacote. Os pacotes em falta podem ser uma evidência de que não se está a " +"aceder ao total de uma distribuição, ou que um pacote (real ou virtual) foi " +"removido da distribuição. Normalmente são referenciados a partir de " +"declarações de Conflitos ou Breaks." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:159 +msgid "" +"<literal>Total distinct</literal> versions is the number of package versions " +"found in the cache; this value is therefore at least equal to the number of " +"total package names. If more than one distribution (both \"stable\" and " +"\"unstable\", for instance), is being accessed, this value can be " +"considerably larger than the number of total package names." +msgstr "" +"<literal>Total distinct versions</literal> é o número de versões de pacotes " +"encontrados na cache; este valor é portanto pelo menos igual ao número do " +"total de nomes de pacotes. Se mais do que uma distribuição (ambas \"stable\" " +"e \"unstable\", por exemplo) está a ser acedida, este valor pode ser " +"consideravelmente maior que o número do total de nomes de pacotes." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:166 +msgid "" +"<literal>Total dependencies</literal> is the number of dependency " +"relationships claimed by all of the packages in the cache." +msgstr "" +"<literal>Total dependencies</literal> é o número de relacionamentos com " +"dependências reivindicadas por todos os pacotes na cache." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:173 +msgid "showsrc <replaceable>pkg(s)</replaceable>" +msgstr "showsrc <replaceable>pacote(s)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:174 +msgid "" +"<literal>showsrc</literal> displays all the source package records that " +"match the given package names. All versions are shown, as well as all " +"records that declare the name to be a Binary." +msgstr "" +"<literal>showsrc</literal> mostra todos os registos de pacotes fonte que " +"correspondem aos nomes de pacotes fornecidos. Todas as versões são " +"mostradas, assim como todos os registos que declaram o nome como sendo um " +"Binário." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:179 apt-config.8.xml:84 +msgid "dump" +msgstr "dump" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:180 +msgid "" +"<literal>dump</literal> shows a short listing of every package in the cache. " +"It is primarily for debugging." +msgstr "" +"<literal>dump</literal> mostra uma listagem curta de todos os pacotes na " +"cache. É principalmente para depuração." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:184 +msgid "dumpavail" +msgstr "dumpavail" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:185 +msgid "" +"<literal>dumpavail</literal> prints out an available list to stdout. This is " +"suitable for use with &dpkg; and is used by the &dselect; method." +msgstr "" +"<literal>dumpavail</literal> escreve uma lista de disponibilidades no " +"stdout. Isto é apropriado para usar com o &dpkg; e é usado pelo método " +"&dselect;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:189 +msgid "unmet" +msgstr "unmet" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:190 +msgid "" +"<literal>unmet</literal> displays a summary of all unmet dependencies in the " +"package cache." +msgstr "" +"<literal>unmet</literal> mostra um sumário de todas as dependências " +"insatisfeitas na cache do pacote." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:194 +msgid "show <replaceable>pkg(s)</replaceable>" +msgstr "show <replaceable>pacote(s)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:195 +msgid "" +"<literal>show</literal> performs a function similar to <command>dpkg --print-" +"avail</command>; it displays the package records for the named packages." +msgstr "" +"<literal>show</literal> executa uma função semelhante ao <command>dpkg --" +"print-avail</command>; mostra os registos do pacote para os pacotes nomeados." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:200 +msgid "search <replaceable>regex [ regex ... ]</replaceable>" +msgstr "search <replaceable>regex [ regex ... ]</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:201 +msgid "" +"<literal>search</literal> performs a full text search on all available " +"package lists for the POSIX regex pattern given, see " +"<citerefentry><refentrytitle><command>regex</command></refentrytitle> " +"<manvolnum>7</manvolnum></citerefentry>. It searches the package names and " +"the descriptions for an occurrence of the regular expression and prints out " +"the package name and the short description, including virtual package " +"names. If <option>--full</option> is given then output identical to " +"<literal>show</literal> is produced for each matched package, and if " +"<option>--names-only</option> is given then the long description is not " +"searched, only the package name is." +msgstr "" +"<literal>search</literal> executa uma busca de texto completo em todas as " +"listas de pacotes disponíveis para o padrão POSIX regex fornecido, veja " +"<citerefentry><refentrytitle><command>regex</command></refentrytitle> " +"<manvolnum>7</manvolnum></citerefentry>. Procura nos nomes de pacotes e nas " +"descrições por uma ocorrência da expressão regular e escreve o nome do " +"pacote e a descrição curta, incluindo nomes de pacotes virtuais. Se for " +"fornecido <option>--full</option> então são produzidos resultados idênticos " +"ao <literal>show</literal> para cada pacote correspondente, e se for " +"fornecido <option>--names-only</option> então não há procura na descrição " +"longa, apenas no nome do pacote." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:214 +msgid "" +"Separate arguments can be used to specify multiple search patterns that are " +"and'ed together." +msgstr "" +"Podem ser usados argumentos separados para especificar múltiplos padrões de " +"busca os quais são lidados em conjunto." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:218 +msgid "depends <replaceable>pkg(s)</replaceable>" +msgstr "depends <replaceable>pacote(s)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:219 +msgid "" +"<literal>depends</literal> shows a listing of each dependency a package has " +"and all the possible other packages that can fulfill that dependency." +msgstr "" +"<literal>depends</literal> mostra uma listagem de cada dependência que um " +"pacote tem e todos os outros pacotes possíveis que podem satisfazer essa " +"dependência." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:223 +msgid "rdepends <replaceable>pkg(s)</replaceable>" +msgstr "rdepends <replaceable>pacote(s)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:224 +msgid "" +"<literal>rdepends</literal> shows a listing of each reverse dependency a " +"package has." +msgstr "" +"<literal>rdepends</literal> mostra uma listagem de cada dependência reversa " +"que um pacote tem." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:228 +msgid "pkgnames <replaceable>[ prefix ]</replaceable>" +msgstr "pkgnames <replaceable>[ prefixo ]</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:229 +msgid "" +"This command prints the name of each package APT knows. The optional " +"argument is a prefix match to filter the name list. The output is suitable " +"for use in a shell tab complete function and the output is generated " +"extremely quickly. This command is best used with the <option>--generate</" +"option> option." +msgstr "" +"Este comando escreve o nome de cada pacote que o APT conhece. O argumento " +"opcional é um prefixo de correspondência para filtrar a lista de nomes. O " +"resultado é apropriado para usar numa função completa de consola e o " +"resultado é gerado com extrema rapidez. Este comando fica melhor usado com a " +"opção <option>--generate</option>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:234 +msgid "" +"Note that a package which APT knows of is not necessarily available to " +"download, installable or installed, e.g. virtual packages are also listed in " +"the generated list." +msgstr "" +"Note que um pacote que o APT conheça não está necessariamente disponível " +"para download, instalável ou instalado, por exemplo, os pacotes virtuais " +"também são listados na lista gerada." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:239 +msgid "dotty <replaceable>pkg(s)</replaceable>" +msgstr "dotty <replaceable>pacote(s)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:240 +msgid "" +"<literal>dotty</literal> takes a list of packages on the command line and " +"generates output suitable for use by dotty from the <ulink url=\"http://www." +"research.att.com/sw/tools/graphviz/\">GraphViz</ulink> package. The result " +"will be a set of nodes and edges representing the relationships between the " +"packages. By default the given packages will trace out all dependent " +"packages; this can produce a very large graph. To limit the output to only " +"the packages listed on the command line, set the <literal>APT::Cache::" +"GivenOnly</literal> option." +msgstr "" +"<literal>dotty</literal> recebe uma lista de pacotes na linha de comandos e " +"gera resultados apropriados para uso pelo dotty do pacote <ulink url=" +"\"http://www.research.att.com/sw/tools/graphviz/\">GraphViz</ulink>. O " +"resultado será um conjunto de nós e orlas que representam os relacionamentos " +"entre os pacotes. Por predefinição, os pacotes fornecidos irão seguir todos " +"os pacotes dependentes; isto pode produzir um gráfico muito grande. Para " +"limitar os resultados apenas aos pacotes listados na linha de comandos, " +"defina a opção <literal>APT::Cache::GivenOnly</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:249 +msgid "" +"The resulting nodes will have several shapes; normal packages are boxes, " +"pure provides are triangles, mixed provides are diamonds, missing packages " +"are hexagons. Orange boxes mean recursion was stopped [leaf packages], blue " +"lines are pre-depends, green lines are conflicts." +msgstr "" +"Os nós resultantes irão ter várias formas; pacotes normais são caixas, " +"fornecimentos puros são triângulos, fornecimentos mistos são diamantes, " +"pacotes desaparecidos são hexágonos. Caixas cor de laranja significa que a " +"recursão parou [pacotes leaf], linhas azuis são pré-dependências, linhas " +"verdes são conflitos." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:254 +msgid "Caution, dotty cannot graph larger sets of packages." +msgstr "" +"Atenção, o dotty não consegue fazer gráficos com grandes conjuntos de " +"pacotes." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:257 +msgid "xvcg <replaceable>pkg(s)</replaceable>" +msgstr "xvcg <replaceable>pacote(s)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:258 +msgid "" +"The same as <literal>dotty</literal>, only for xvcg from the <ulink url=" +"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>." +msgstr "" +"O mesmo que <literal>dotty</literal>, apenas para xvcg a partir de <ulink " +"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">Ferramenta " +"VCG</ulink>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:262 +msgid "policy <replaceable>[ pkg(s) ]</replaceable>" +msgstr "policy <replaceable>[ pacote(s) ]</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:263 +msgid "" +"<literal>policy</literal> is meant to help debug issues relating to the " +"preferences file. With no arguments it will print out the priorities of each " +"source. Otherwise it prints out detailed information about the priority " +"selection of the named package." +msgstr "" +"<literal>policy</literal> destina-se a ajudar a depurar problemas " +"relacionados com o ficheiro de preferências. Sem argumentos irá escrever as " +"propriedades de cada fonte. Caso contrário escreve informação detalhada " +"acerca da selecção de prioridade do pacote nomeado." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:269 +msgid "madison <replaceable>/[ pkg(s) ]</replaceable>" +msgstr "madison <replaceable>/[ pacote(s) ]</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:270 +msgid "" +"<literal>apt-cache</literal>'s <literal>madison</literal> command attempts " +"to mimic the output format and a subset of the functionality of the Debian " +"archive management tool, <literal>madison</literal>. It displays available " +"versions of a package in a tabular format. Unlike the original " +"<literal>madison</literal>, it can only display information for the " +"architecture for which APT has retrieved package lists (<literal>APT::" +"Architecture</literal>)." +msgstr "" +"O comando <literal>madison</literal> do <literal>apt-cache</literal> tenta " +"imitar o formato de saída e um subconjunto das funcionalidades da ferramenta " +"<literal>madison</literal> de gestão de pacotes da Debian. Mostra versões " +"disponíveis de um pacote num formato tabular. Ao contrário do " +"<literal>madison</literal> original, apenas pode mostrar informação para a " +"arquitectura que o APT recolheu listas de pacotes (<literal>APT::" +"Architecture</literal>)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 +#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 +msgid "options" +msgstr "opções" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:285 +msgid "<option>-p</option>" +msgstr "<option>-p</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:285 +msgid "<option>--pkg-cache</option>" +msgstr "<option>--pkg-cache</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:286 +msgid "" +"Select the file to store the package cache. The package cache is the primary " +"cache used by all operations. Configuration Item: <literal>Dir::Cache::" +"pkgcache</literal>." +msgstr "" +"Selecciona o ficheiro para armazenar a cache do pacote. A cache do pacote é " +"a cache principal usada por todas as operações. Item de Configuração: " +"<literal>Dir::Cache::pkgcache</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376 +#: apt-sortpkgs.1.xml:58 +msgid "<option>-s</option>" +msgstr "<option>-s</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:291 +msgid "<option>--src-cache</option>" +msgstr "<option>--src-cache</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:292 +msgid "" +"Select the file to store the source cache. The source is used only by " +"<literal>gencaches</literal> and it stores a parsed version of the package " +"information from remote sources. When building the package cache the source " +"cache is used to avoid reparsing all of the package files. Configuration " +"Item: <literal>Dir::Cache::srcpkgcache</literal>." +msgstr "" +"Selecciona o ficheiro para armazenar a cache de fonte. A fonte é usada " +"apenas pelo <literal>gencaches</literal> e armazena uma versão analisada da " +"informação do pacote a partir de fontes remotas. Ao construir a cache de " +"pacote é usada a cache fonte para evitar reanalisar todos os ficheiros do " +"pacote. Item de Configuração: <literal>Dir::Cache::srcpkgcache</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 +msgid "<option>-q</option>" +msgstr "<option>-q</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 +msgid "<option>--quiet</option>" +msgstr "<option>--quiet</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:300 +msgid "" +"Quiet; produces output suitable for logging, omitting progress indicators. " +"More q's will produce more quietness up to a maximum of 2. You can also use " +"<option>-q=#</option> to set the quietness level, overriding the " +"configuration file. Configuration Item: <literal>quiet</literal>." +msgstr "" +"Quiet; produz resultados apropriados para registar em logs, omitindo os " +"indicadores de progresso. Mais q's irão produzir mais serenidade até um " +"máximo de 2. Você também pode usar <option>-q=#</option> para definir o " +"nível de serenidade, sobrepondo o ficheiro de configuração. Item de " +"Configuração: <literal>quiet</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:306 +msgid "<option>-i</option>" +msgstr "<option>-i</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:306 +msgid "<option>--important</option>" +msgstr "<option>--important</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:307 +msgid "" +"Print only important dependencies; for use with unmet and depends. Causes " +"only Depends and Pre-Depends relations to be printed. Configuration Item: " +"<literal>APT::Cache::Important</literal>." +msgstr "" +"Escreve apenas dependências importantes; para usar com unmet e depends. " +"Separa apenas relações de Depends e Pre-Depends para serem escritas. Item de " +"Configuração: <literal>APT::Cache::Important</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:312 apt-cdrom.8.xml:121 apt-get.8.xml:333 +msgid "<option>-f</option>" +msgstr "<option>-f</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:312 +msgid "<option>--full</option>" +msgstr "<option>--full</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:313 +msgid "" +"Print full package records when searching. Configuration Item: " +"<literal>APT::Cache::ShowFull</literal>." +msgstr "" +"Escreve registos de pacote completos quando procura. Item de Configuração: " +"<literal>APT::Cache::ShowFull</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548 +msgid "<option>-a</option>" +msgstr "<option>-a</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:317 +msgid "<option>--all-versions</option>" +msgstr "<option>--all-versions</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:318 +msgid "" +"Print full records for all available versions. This is the default; to turn " +"it off, use <option>--no-all-versions</option>. If <option>--no-all-" +"versions</option> is specified, only the candidate version will displayed " +"(the one which would be selected for installation). This option is only " +"applicable to the <literal>show</literal> command. Configuration Item: " +"<literal>APT::Cache::AllVersions</literal>." +msgstr "" +"Escreve registos completos para todas as versões disponíveis. Isto é a " +"predefinição; para a desligar, use <option>--no-all-versions</option>. Se " +"<option>--no-all-versions</option> for especificada, apenas a versão " +"candidata será mostrada (aquela que seria seleccionada para instalação). " +"Esta opção é aplicável apenas ao comando <literal>show</literal>. Item de " +"Configuração: <literal>APT::Cache::AllVersions</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:326 +msgid "<option>-g</option>" +msgstr "<option>-g</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:326 +msgid "<option>--generate</option>" +msgstr "<option>--generate</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:327 +msgid "" +"Perform automatic package cache regeneration, rather than use the cache as " +"it is. This is the default; to turn it off, use <option>--no-generate</" +"option>. Configuration Item: <literal>APT::Cache::Generate</literal>." +msgstr "" +"Executa regeneração automática da cache de pacote, em vez de usar a cache " +"como está. Isto é a predefinição; para a desligar, use <option>--no-" +"generate</option>. Item de Configuração: <literal>APT::Cache::Generate</" +"literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:332 +msgid "<option>--names-only</option>" +msgstr "<option>--names-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:332 apt-cdrom.8.xml:139 +msgid "<option>-n</option>" +msgstr "<option>-n</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:333 +msgid "" +"Only search on the package names, not the long descriptions. Configuration " +"Item: <literal>APT::Cache::NamesOnly</literal>." +msgstr "" +"Apenas procura nos nomes dos pacotes, e não nas descrições longas. Item de " +"Configuração: <literal>APT::Cache::NamesOnly</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:337 +msgid "<option>--all-names</option>" +msgstr "<option>--all-names</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:338 +msgid "" +"Make <literal>pkgnames</literal> print all names, including virtual packages " +"and missing dependencies. Configuration Item: <literal>APT::Cache::" +"AllNames</literal>." +msgstr "" +"Faz com que o <literal>pkgnames</literal> escreva todos os nomes, incluindo " +"pacotes virtuais e dependências em falta. Item de configuração: " +"<literal>APT::Cache::AllNames</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:343 +msgid "<option>--recurse</option>" +msgstr "<option>--recurse</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:344 +msgid "" +"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so " +"that all packages mentioned are printed once. Configuration Item: " +"<literal>APT::Cache::RecurseDepends</literal>." +msgstr "" +"Torna <literal>depends</literal> e <literal>rdepends</literal> recursivo " +"para que todos os pacotes mencionados sejam escritos uma vez. Item de " +"Configuração <literal>APT::Cache::RecurseDepends</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:349 +msgid "<option>--installed</option>" +msgstr "<option>--installed</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:351 +msgid "" +"Limit the output of <literal>depends</literal> and <literal>rdepends</" +"literal> to packages which are currently installed. Configuration Item: " +"<literal>APT::Cache::Installed</literal>." +msgstr "" +"Limita a saída de <literal>depends</literal> e <literal>rdepends</literal> " +"aos pacotes que estão actualmente instalados. Item de Configuração: " +"<literal>APT::Cache::Installed</literal>." + +#. type: Content of: <refentry><refsect1><variablelist> +#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 +#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561 +#: apt-sortpkgs.1.xml:64 +msgid "&apt-commonoptions;" +msgstr "&apt-commonoptions;" + +#. type: Content of: <refentry><refsect1><title> +#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:633 +msgid "Files" +msgstr "Ficheiros" + +#. type: Content of: <refentry><refsect1><variablelist> +#: apt-cache.8.xml:363 +msgid "&file-sourceslist; &file-statelists;" +msgstr "&file-sourceslist; &file-statelists;" + +#. type: Content of: <refentry><refsect1><title> +#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 +#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576 +#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640 +#: sources.list.5.xml:233 +msgid "See Also" +msgstr "Veja também" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cache.8.xml:369 +msgid "&apt-conf;, &sources-list;, &apt-get;" +msgstr "&apt-conf;, &sources-list;, &apt-get;" + +#. type: Content of: <refentry><refsect1><title> +#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 +#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582 +#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 +msgid "Diagnostics" +msgstr "Diagnóstico" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cache.8.xml:374 +msgid "" +"<command>apt-cache</command> returns zero on normal operation, decimal 100 " +"on error." +msgstr "" +"<command>apt-cache</command> devolve zero em operação normal, 100 decimal em " +"erro." + +#. type: Content of: <refentry><refentryinfo> +#: apt-cdrom.8.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 " +"February 2004</date>" +msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 " +"Fevereiro 2004</date>" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-cdrom.8.xml:21 apt-cdrom.8.xml:28 +msgid "apt-cdrom" +msgstr "apt-cdrom" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-cdrom.8.xml:29 +msgid "APT CDROM management utility" +msgstr "Utilitário de gestão de CDROM do APT" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-cdrom.8.xml:35 +msgid "" +"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> " +"<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> " +"<arg><option>-o=<replaceable>config string</replaceable></option></arg> " +"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> " +"<arg>add</arg> <arg>ident</arg> </group>" +msgstr "" +"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> " +"<arg><option>-d=<replaceable>ponto de montagem do cdrom</replaceable></" +"option></arg> <arg><option>-o=<replaceable>string de configuração</" +"replaceable></option></arg> <arg><option>-c=<replaceable>ficheiro</" +"replaceable></option></arg> <group> <arg>add</arg> <arg>ident</arg> </group>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:48 +msgid "" +"<command>apt-cdrom</command> is used to add a new CDROM to APTs list of " +"available sources. <command>apt-cdrom</command> takes care of determining " +"the structure of the disc as well as correcting for several possible mis-" +"burns and verifying the index files." +msgstr "" +"O <command>apt-cdrom</command> é usado para adicionar um novo CDROM à lista " +"de fontes disponíveis do APT. O <command>apt-cdrom</command> encarrega-se de " +"determinar a estrutura do disco assim como corrigir várias falhas possíveis " +"e verificar os ficheiros de índice." + +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:55 +msgid "" +"It is necessary to use <command>apt-cdrom</command> to add CDs to the APT " +"system, it cannot be done by hand. Furthermore each disk in a multi-cd set " +"must be inserted and scanned separately to account for possible mis-burns." +msgstr "" +"É necessário usar o <command>apt-cdrom</command> para adicionar CDs ao " +"sistema APT, não pode ser feito manualmente. Mais, cada disco de um conjunto " +"de vários discos tem que ser inserido e sondado separadamente para ter em " +"conta possíveis falhas." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:65 +msgid "add" +msgstr "add" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:66 +msgid "" +"<literal>add</literal> is used to add a new disc to the source list. It will " +"unmount the CDROM device, prompt for a disk to be inserted and then proceed " +"to scan it and copy the index files. If the disc does not have a proper " +"<filename>disk</filename> directory you will be prompted for a descriptive " +"title." +msgstr "" +"<literal>add</literal> é usado para adicionar um novo disco à lista de " +"fontes. Irá desmontar o dispositivo CDROM, pedir que seja inserido um disco " +"e depois prosseguir com a sua sondagem e cópia dos ficheiros índice. Se o " +"disco não possuir um directório <filename>disk</filename> apropriado, ser-" +"lhe-à pedido um título descritivo." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:74 +msgid "" +"APT uses a CDROM ID to track which disc is currently in the drive and " +"maintains a database of these IDs in <filename>&statedir;/cdroms.list</" +"filename>" +msgstr "" +"O APT usa um ID de CDROM para acompanhar qual disco está actualmente na " +"drive e mantêm uma base de dados desses IDs em <filename>&statedir;/cdroms." +"list</filename>" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:81 +msgid "ident" +msgstr "ident" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:82 +msgid "" +"A debugging tool to report the identity of the current disc as well as the " +"stored file name" +msgstr "" +"Uma ferramenta de depuração para reportar a identificação do disco actual " +"assim como o nome de ficheiro armazenado" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:61 +msgid "" +"Unless the <option>-h</option>, or <option>--help</option> option is given " +"one of the commands below must be present. <placeholder type=\"variablelist" +"\" id=\"0\"/>" +msgstr "" +"A menos que a opção <option>-h</option>, ou <option>--help</option> seja " +"fornecida, um dos comandos abaixo têm que estar presentes. <placeholder type=" +"\"variablelist\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><title> +#: apt-cdrom.8.xml:91 apt-key.8.xml:139 +msgid "Options" +msgstr "Opções" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328 +msgid "<option>-d</option>" +msgstr "<option>-d</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:95 +msgid "<option>--cdrom</option>" +msgstr "<option>--cdrom</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:96 +msgid "" +"Mount point; specify the location to mount the cdrom. This mount point must " +"be listed in <filename>/etc/fstab</filename> and properly configured. " +"Configuration Item: <literal>Acquire::cdrom::mount</literal>." +msgstr "" +"Ponto de Montagem; especifica a localização para montar o cdrom. Este ponto " +"de montagem deve estar listado em <filename>/etc/fstab</filename> e " +"configurado apropriadamente. Item de configuração: <literal>Acquire::cdrom::" +"mount</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:104 +msgid "<option>-r</option>" +msgstr "<option>-r</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:104 +msgid "<option>--rename</option>" +msgstr "<option>--rename</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:105 +msgid "" +"Rename a disc; change the label of a disk or override the disks given label. " +"This option will cause <command>apt-cdrom</command> to prompt for a new " +"label. Configuration Item: <literal>APT::CDROM::Rename</literal>." +msgstr "" +"Renomear um disco; muda a etiqueta de um disco ou sobrepõe a etiqueta " +"fornecida do disco. Esta opção irá fazer com que o <command>apt-cdrom</" +"command> pergunte por uma nova etiqueta. Item de configuração: <literal>APT::" +"CDROM::Rename</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:113 apt-get.8.xml:347 +msgid "<option>-m</option>" +msgstr "<option>-m</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:113 +msgid "<option>--no-mount</option>" +msgstr "<option>--no-mount</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:114 +msgid "" +"No mounting; prevent <command>apt-cdrom</command> from mounting and " +"unmounting the mount point. Configuration Item: <literal>APT::CDROM::" +"NoMount</literal>." +msgstr "" +"Nenhuma montagem; impede o <command>apt-cdrom</command> de montar e " +"desmontar o ponto de montagem. Item de configuração: <literal>APT::CDROM::" +"NoMount</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:121 +msgid "<option>--fast</option>" +msgstr "<option>--fast</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:122 +msgid "" +"Fast Copy; Assume the package files are valid and do not check every " +"package. This option should be used only if <command>apt-cdrom</command> has " +"been run on this disc before and did not detect any errors. Configuration " +"Item: <literal>APT::CDROM::Fast</literal>." +msgstr "" +"Copia rápida; Assume que os ficheiros do pacote são válidos e não verifica " +"cada pacote. Este opção só deve ser usada se o <command>apt-cdrom</command> " +"já foi corrido com este disco e não detectou nenhum erro. Item de " +"configuração: <literal>APT::CDROM::Fast</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:131 +msgid "<option>--thorough</option>" +msgstr "<option>--thorough</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:132 +msgid "" +"Thorough Package Scan; This option may be needed with some old Debian " +"1.1/1.2 discs that have Package files in strange places. It takes much " +"longer to scan the CD but will pick them all up." +msgstr "" +"Sondagem de pacote exaustiva; Esta opção pode ser necessária com alguns " +"discos Debian antigos 1.1/1.2 que têm ficheiros de pacotes em lugares " +"estranhos. Demora muito mais tempo a sondar o CD mas irá apanhá-los a todos." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:140 apt-get.8.xml:378 +msgid "<option>--just-print</option>" +msgstr "<option>--just-print</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:141 apt-get.8.xml:380 +msgid "<option>--recon</option>" +msgstr "<option>--recon</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:142 apt-get.8.xml:381 +msgid "<option>--no-act</option>" +msgstr "<option>--no-act</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:143 +msgid "" +"No Changes; Do not change the &sources-list; file and do not write index " +"files. Everything is still checked however. Configuration Item: " +"<literal>APT::CDROM::NoAct</literal>." +msgstr "" +"Nenhuma alteração; Não altera o ficheiro &sources-list; e não escreve " +"ficheiros índice. No entanto, tudo continua a ser verificado. Item de " +"configuração: <literal>APT::CDROM::NoAct</literal>." + +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:156 +msgid "&apt-conf;, &apt-get;, &sources-list;" +msgstr "&apt-conf;, &apt-get;, &sources-list;" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:161 +msgid "" +"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 " +"on error." +msgstr "" +"<command>apt-cdrom</command> devolve zero em operação normal, 100 decimal em " +"erro." + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-config.8.xml:22 apt-config.8.xml:29 +msgid "apt-config" +msgstr "apt-config" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-config.8.xml:30 +msgid "APT Configuration Query program" +msgstr "Programa de Consulta de Configuração do APT" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-config.8.xml:36 +msgid "" +"<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-" +"o=<replaceable>config string</replaceable></option></arg> <arg><option>-" +"c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> " +"<arg>shell</arg> <arg>dump</arg> </group>" +msgstr "" +"<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-" +"o=<replaceable>string de configuração</replaceable></option></arg> " +"<arg><option>-c=<replaceable>ficheiro</replaceable></option></arg> <group " +"choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-config.8.xml:48 +msgid "" +"<command>apt-config</command> is an internal program used by various " +"portions of the APT suite to provide consistent configurability. It accesses " +"the main configuration file <filename>/etc/apt/apt.conf</filename> in a " +"manner that is easy to use by scripted applications." +msgstr "" +"<command>apt-config</command> é um programa interno usado por várias partes " +"da suite APT para fornecer uma configurabilidade consistente. Acede ao " +"ficheiro de configuração principal <filename>/etc/apt/apt.conf</filename> de " +"um modo que é fácil de usar para aplicações em script." + +#. type: Content of: <refentry><refsect1><para> +#: apt-config.8.xml:53 apt-ftparchive.1.xml:72 +msgid "" +"Unless the <option>-h</option>, or <option>--help</option> option is given " +"one of the commands below must be present." +msgstr "" +"A menos que a opção <option>-h</option>, ou <option>--help</option> seja " +"fornecida, um dos comandos abaixo têm que estar presentes." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-config.8.xml:58 +msgid "shell" +msgstr "shell" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:60 +msgid "" +"shell is used to access the configuration information from a shell script. " +"It is given pairs of arguments, the first being a shell variable and the " +"second the configuration value to query. As output it lists a series of " +"shell assignments commands for each present value. In a shell script it " +"should be used like:" +msgstr "" +"shell é usado para aceder à informação de configuração a partir de um script " +"shell. É fornecido pares de argumentos, sendo o primeiro uma variável de " +"shell e o segundo o valor de configuração a consultar. Como resultado cria " +"uma lista de comandos de atribuições de shell para cada valor presente. Num " +"script shell deverá ser usado como:" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> +#: apt-config.8.xml:68 +#, no-wrap +msgid "" +"OPTS=\"-f\"\n" +"RES=`apt-config shell OPTS MyApp::options`\n" +"eval $RES\n" +msgstr "" +"OPTS=\"-f\"\n" +"RES=`apt-config shell OPTS MyApp::options`\n" +"eval $RES\n" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:73 +msgid "" +"This will set the shell environment variable $OPTS to the value of MyApp::" +"options with a default of <option>-f</option>." +msgstr "" +"Isto irá definir a variável de ambiente shell $OPTS ao valor de MyApp::" +"options com uma predefinição de <option>-f</option>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:77 +msgid "" +"The configuration item may be postfixed with a /[fdbi]. f returns file " +"names, d returns directories, b returns true or false and i returns an " +"integer. Each of the returns is normalized and verified internally." +msgstr "" +"O item de configuração pode ser pós-fixado com um /[fdbi]. f devolve nomes " +"de ficheiros, d devolve directórios, b devolve verdadeiro ou falso e i " +"devolve um número inteiro. Cada um dos valores devolvidos é normalizado e " +"verificado internamente." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:86 +msgid "Just show the contents of the configuration space." +msgstr "Apenas mostra o conteúdo do espaço de configuração." + +#. type: Content of: <refentry><refsect1><para> +#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593 +#: apt-sortpkgs.1.xml:70 +msgid "&apt-conf;" +msgstr "&apt-conf;" + +#. type: Content of: <refentry><refsect1><para> +#: apt-config.8.xml:109 +msgid "" +"<command>apt-config</command> returns zero on normal operation, decimal 100 " +"on error." +msgstr "" +"<command>apt-config</command> devolve zero em operação normal, 100 decimal " +"em erro." + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-extracttemplates.1.xml:22 apt-extracttemplates.1.xml:29 +msgid "apt-extracttemplates" +msgstr "apt-extracttemplates" + +#. type: Content of: <refentry><refmeta><manvolnum> +#: apt-extracttemplates.1.xml:23 apt-ftparchive.1.xml:23 apt-sortpkgs.1.xml:23 +msgid "1" +msgstr "1" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-extracttemplates.1.xml:30 +msgid "Utility to extract DebConf config and templates from Debian packages" +msgstr "" +"Utilitário para extrair configurações e modelos DebConf a partir de pacotes " +"Debian" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-extracttemplates.1.xml:36 +msgid "" +"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> " +"<arg><option>-t=<replaceable>temporary directory</replaceable></option></" +"arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></" +"arg>" +msgstr "" +"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> " +"<arg><option>-t=<replaceable>directório temporário</replaceable></option></" +"arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>ficheiro</" +"replaceable></arg>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-extracttemplates.1.xml:44 +msgid "" +"<command>apt-extracttemplates</command> will take one or more Debian package " +"files as input and write out (to a temporary directory) all associated " +"config scripts and template files. For each passed in package that contains " +"config scripts and templates, one line of output will be generated in the " +"format:" +msgstr "" +"<command>apt-extracttemplates</command> irá receber um ou mais ficheiros de " +"pacotes Debian na sua entrada e escrever (para um directório temporário) " +"todos os scripts de configuração associados e ficheiros de modelo. Por cada " +"pacote passado por ele que contenha scripts de configuração e modelos, será " +"gerada uma linha no formato:" + +#. type: Content of: <refentry><refsect1><para> +#: apt-extracttemplates.1.xml:49 +msgid "package version template-file config-script" +msgstr "pacote versão ficheiro-modelo script-de-configuração" + +#. type: Content of: <refentry><refsect1><para> +#: apt-extracttemplates.1.xml:50 +msgid "" +"template-file and config-script are written to the temporary directory " +"specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</" +"literal>) directory, with filenames of the form <filename>package.template." +"XXXX</filename> and <filename>package.config.XXXX</filename>" +msgstr "" +"ficheiro-modelo e script-de-configuração são escritos num directório " +"temporário especificado por -t ou --tempdir (<literal>APT::" +"ExtractTemplates::TempDir</literal>) directório, com nomes de ficheiros no " +"formato <filename>pacote.modelo.XXXX</filename> e <filename>pacote." +"configuração.XXXX</filename>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495 +msgid "<option>-t</option>" +msgstr "<option>-t</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-extracttemplates.1.xml:60 +msgid "<option>--tempdir</option>" +msgstr "<option>--tempdir</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-extracttemplates.1.xml:62 +msgid "" +"Temporary directory in which to write extracted debconf template files and " +"config scripts. Configuration Item: <literal>APT::ExtractTemplates::" +"TempDir</literal>" +msgstr "" +"Directório temporário para onde escrever ficheiros debconf modelo extraídos " +"e scripts de configuração. Item de Configuração: <literal>APT::" +"ExtractTemplates::TempDir</literal>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-extracttemplates.1.xml:79 +msgid "" +"<command>apt-extracttemplates</command> returns zero on normal operation, " +"decimal 100 on error." +msgstr "" +"<command>apt-extracttemplates</command> devolve zero na operação normal, 100 " +"decimal em erro." + +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt-ftparchive.1.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 " +"August 2009</date>" +msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 " +"Agosto 2009</date>" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:29 +msgid "apt-ftparchive" +msgstr "apt-ftparchive" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-ftparchive.1.xml:30 +msgid "Utility to generate index files" +msgstr "Utilitário para gerar ficheiros de índice" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-ftparchive.1.xml:36 +msgid "" +"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " +"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " +"<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></" +"arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</" +"replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></" +"option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=" +"\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</" +"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +"<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</" +"replaceable></arg><arg><replaceable>override</" +"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +"<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></" +"arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></" +"arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</" +"replaceable></arg> <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice=" +"\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>" +msgstr "" +"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " +"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " +"<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +"arg> <arg><option>--arch <replaceable>arquitectura</replaceable></option></" +"arg> <arg><option>-o <replaceable>configuração</" +"replaceable>=<replaceable>string</replaceable></option></arg> <arg><option>-" +"c=<replaceable>ficheiro</replaceable></option></arg> <group choice=\"req\"> " +"<arg>packages<arg choice=\"plain\" rep=\"repeat\"><replaceable>caminho</" +"replaceable></arg><arg><replaceable>override</" +"replaceable><arg><replaceable>prefixo-de-caminho</replaceable></arg></arg></" +"arg> <arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>caminho</" +"replaceable></arg><arg><replaceable>sobrepor</" +"replaceable><arg><replaceable>prefixo-de-caminho</replaceable></arg></arg></" +"arg> <arg>contents <arg choice=\"plain\"><replaceable>caminho</replaceable></" +"arg></arg> <arg>release <arg choice=\"plain\"><replaceable>caminho</" +"replaceable></arg></arg> <arg>generate <arg choice=\"plain" +"\"><replaceable>ficheiro-de-configuração</replaceable></arg> <arg choice=" +"\"plain\" rep=\"repeat\"><replaceable>secção</replaceable></arg></arg> " +"<arg>clean <arg choice=\"plain\"><replaceable>ficheiro-de-configuração</" +"replaceable></arg></arg> </group>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:57 +msgid "" +"<command>apt-ftparchive</command> is the command line tool that generates " +"the index files that APT uses to access a distribution source. The index " +"files should be generated on the origin site based on the content of that " +"site." +msgstr "" +"<command>apt-ftparchive</command> é a ferramenta de linha de comandos que " +"cria os ficheiros índice que o APT usa para aceder a uma fonte de " +"distribuição. Os ficheiros índice devem ser gerados no site de origem " +"baseados no conteúdo desse site." + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:61 +msgid "" +"<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; " +"program, incorporating its entire functionality via the <literal>packages</" +"literal> command. It also contains a contents file generator, " +"<literal>contents</literal>, and an elaborate means to 'script' the " +"generation process for a complete archive." +msgstr "" +"<command>apt-ftparchive</command> é um super conjunto do programa &dpkg-" +"scanpackages;, incorporando todas as suas funcionalidades através do comando " +"<literal>packages</literal>. Também contém um gerador de ficheiro de " +"conteúdos, <literal>contents</literal>, e um meio elaborado de colocar em " +"script o processo de geração para um arquivo completo." + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:67 +msgid "" +"Internally <command>apt-ftparchive</command> can make use of binary " +"databases to cache the contents of a .deb file and it does not rely on any " +"external programs aside from &gzip;. When doing a full generate it " +"automatically performs file-change checks and builds the desired compressed " +"output files." +msgstr "" +"Internamente o <command>apt-ftparchive</command> pode fazer uso de bases de " +"dados binárias para por em cache os conteúdos de um ficheiro .deb e não " +"precisa de nenhum programa externo à excepção do &gzip;. Quando faz uma " +"geração completa, executa automaticamente verificações de alterações de " +"ficheiros e constrói os ficheiros comprimidos desejados." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:76 +msgid "packages" +msgstr "packages" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:78 +msgid "" +"The packages command generates a package file from a directory tree. It " +"takes the given directory and recursively searches it for .deb files, " +"emitting a package record to stdout for each. This command is approximately " +"equivalent to &dpkg-scanpackages;." +msgstr "" +"O comando packages gera um ficheiro pacote a partir duma árvore de " +"directórios. Recebe um dado directório e procura recursivamente por " +"ficheiros .deb, emitindo um registo de pacote para o stdout por cada um. " +"Este comando é aproximadamente equivalente ao &dpkg-scanpackages;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107 +msgid "" +"The option <option>--db</option> can be used to specify a binary caching DB." +msgstr "" +"A opção <option>--db</option> pode ser usada para especificar uma base de " +"dados de cache binária." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:86 +msgid "sources" +msgstr "sources" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:88 +msgid "" +"The <literal>sources</literal> command generates a source index file from a " +"directory tree. It takes the given directory and recursively searches it " +"for .dsc files, emitting a source record to stdout for each. This command is " +"approximately equivalent to &dpkg-scansources;." +msgstr "" +"O comando <literal>sources</literal> gera um índice de fonte a partir duma " +"árvore de directórios. Recebe um dado directório e procura recursivamente " +"por ficheiros .dsc, emitindo um registo de fonte para o stdout por cada um. " +"Este comando é aproximadamente equivalente ao &dpkg-scansources;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:93 +msgid "" +"If an override file is specified then a source override file will be looked " +"for with an extension of .src. The --source-override option can be used to " +"change the source override file that will be used." +msgstr "" +"Se for especificado um ficheiro de sobreposição então será procurado um " +"ficheiro de sobreposição de fonte com uma extensão de .src. A opção --" +"source-override pode ser usada para alterar o ficheiro de sobreposição de " +"fonte que irá ser usado." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:98 +msgid "contents" +msgstr "contents" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:100 +msgid "" +"The <literal>contents</literal> command generates a contents file from a " +"directory tree. It takes the given directory and recursively searches it " +"for .deb files, and reads the file list from each file. It then sorts and " +"writes to stdout the list of files matched to packages. Directories are not " +"written to the output. If multiple packages own the same file then each " +"package is separated by a comma in the output." +msgstr "" +"O comando<literal>contents</literal> gera um ficheiro de conteúdos a partir " +"duma árvore de directórios. Recebe um dado directório e procura " +"recursivamente por ficheiros .deb, e lê a lista de ficheiros de cada " +"ficheiro. Então organiza e escreve para o stdout a lista de ficheiros " +"correspondente a pacotes. Os directórios não são escritos no saída. Se " +"múltiplos pacotes possuírem o mesmo ficheiro então cada pacote é separado " +"por uma vírgula na saída." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:110 +msgid "release" +msgstr "release" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:112 +msgid "" +"The <literal>release</literal> command generates a Release file from a " +"directory tree. It recursively searches the given directory for Packages, " +"Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, Release and " +"md5sum.txt files. It then writes to stdout a Release file containing an MD5 " +"digest and SHA1 digest for each file." +msgstr "" +"O comando <literal>release</literal> gera um ficheiro Release a partir duma " +"árvore de directórios. Procura recursivamente o directório dado por " +"ficheiros Packages, Packages.gz, Packages.bz2, Sources, Sources.gz, Sources." +"bz2, Release e md5sum.txt. Depois escreve para o stdout um ficheiro Release " +"contendo um sumário MD5 e um sumário SHA1 por cada ficheiro." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:119 +msgid "" +"Values for the additional metadata fields in the Release file are taken from " +"the corresponding variables under <literal>APT::FTPArchive::Release</" +"literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The " +"supported fields are: <literal>Origin</literal>, <literal>Label</literal>, " +"<literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</" +"literal>, <literal>Date</literal>, <literal>Architectures</literal>, " +"<literal>Components</literal>, <literal>Description</literal>." +msgstr "" +"Valores para os campos de metadados adicionais no ficheiro Release são " +"tomados a partir das variáveis correspondentes sob <literal>APT::FTPArchive::" +"Release</literal>, ex. <literal>APT::FTPArchive::Release::Origin</literal>. " +"Os campos suportados são: <literal>Origin</literal>, <literal>Label</" +"literal>, <literal>Suite</literal>, <literal>Version</literal>, " +"<literal>Codename</literal>, <literal>Date</literal>, " +"<literal>Architectures</literal>, <literal>Components</literal>, " +"<literal>Description</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:129 +msgid "generate" +msgstr "generate" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:131 +msgid "" +"The <literal>generate</literal> command is designed to be runnable from a " +"cron script and builds indexes according to the given config file. The " +"config language provides a flexible means of specifying which index files " +"are built from which directories, as well as providing a simple means of " +"maintaining the required settings." +msgstr "" +"O comando <literal>generate</literal> é desenhado para ser executado a " +"partir dum script cron e constrói índices de acordo com o ficheiro de " +"configuração fornecido. A linguagem de configuração disponibiliza um meio " +"flexível de de especificar quais ficheiros índice são construídos a partir " +"de quais directórios, assim como disponibilizar um meio simples de manter as " +"definições requeridas." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:138 apt-get.8.xml:292 +msgid "clean" +msgstr "clean" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:140 +msgid "" +"The <literal>clean</literal> command tidies the databases used by the given " +"configuration file by removing any records that are no longer necessary." +msgstr "" +"O comando <literal>clean</literal> arruma as bases de dados usadas pelo " +"ficheiro de configuração fornecido ao remover quaisquer registos que já não " +"são necessários." + +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:146 +msgid "The Generate Configuration" +msgstr "A Configuração do Generate" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:148 +msgid "" +"The <literal>generate</literal> command uses a configuration file to " +"describe the archives that are going to be generated. It follows the typical " +"ISC configuration format as seen in ISC tools like bind 8 and dhcpd. &apt-" +"conf; contains a description of the syntax. Note that the generate " +"configuration is parsed in sectional manner, but &apt-conf; is parsed in a " +"tree manner. This only effects how the scope tag is handled." +msgstr "" +"O comando <literal>generate</literal> usa um ficheiro de configuração para " +"descrever os arquivos que vão ser gerados. Segue o formato típico de " +"configuração ISC como visto em ferramentas ISC como o bind 8 e dhcpd. &apt-" +"conf; contém uma descrição da sintaxe. Note que a configuração gerada é " +"analisada de maneira seccional, mas o &apt-conf; é analisado numa maneira de " +"árvore. Isto apenas afecta o modo de como a etiqueta scope é manuseada." + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:156 +msgid "" +"The generate configuration has 4 separate sections, each described below." +msgstr "" +"A configuração do generate tem 4 secções separadas, cada uma descrita mais " +"abaixo." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:158 +msgid "Dir Section" +msgstr "Secção Dir" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:160 +msgid "" +"The <literal>Dir</literal> section defines the standard directories needed " +"to locate the files required during the generation process. These " +"directories are prepended certain relative paths defined in later sections " +"to produce a complete an absolute path." +msgstr "" +"A secção <literal>Dir</literal> define os directórios standard necessários " +"para localizar os ficheiros requisitados durante o processo de geração. " +"Estes directórios precedem a certos caminhos relativos definidos em secções " +"posteriores para produzir um caminho completo e absoluto." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:165 +msgid "ArchiveDir" +msgstr "ArchiveDir" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:167 +msgid "" +"Specifies the root of the FTP archive, in a standard Debian configuration " +"this is the directory that contains the <filename>ls-LR</filename> and dist " +"nodes." +msgstr "" +"Especifica a raiz do arquivo FTP, numa configuração Debian standard este é o " +"directório que contém o <filename>ls-LR</filename> e nós da distribuição." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:172 +msgid "OverrideDir" +msgstr "OverrideDir" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:174 +msgid "Specifies the location of the override files." +msgstr "Especifica a localização dos ficheiros de sobrepor." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:177 +msgid "CacheDir" +msgstr "CacheDir" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:179 +msgid "Specifies the location of the cache files" +msgstr "Especifica a localização dos ficheiros de cache" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:182 +msgid "FileListDir" +msgstr "FileListDir" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:184 +msgid "" +"Specifies the location of the file list files, if the <literal>FileList</" +"literal> setting is used below." +msgstr "" +"Especifica a localização dos ficheiros de listas de ficheiros, se a " +"definição <literal>FileList</literal> for usada mais abaixo." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:190 +msgid "Default Section" +msgstr "Secção Default" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:192 +msgid "" +"The <literal>Default</literal> section specifies default values, and " +"settings that control the operation of the generator. Other sections may " +"override these defaults with a per-section setting." +msgstr "" +"A secção <literal>Default</literal> especifica valores predefinidos, e " +"definições que controlam a operação do gerador. Outras secções podem " +"sobrepor estas predefinições em uma definição por-secção." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:196 +msgid "Packages::Compress" +msgstr "Packages::Compress" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:198 +msgid "" +"Sets the default compression schemes to use for the Package index files. It " +"is a string that contains a space separated list of at least one of: '.' (no " +"compression), 'gzip' and 'bzip2'. The default for all compression schemes is " +"'. gzip'." +msgstr "" +"Define os esquemas de compressão predefinidos a usar para os ficheiros de " +"índice Package. É uma string que contém uma lista separada por espaços de " +"pelo menos um de: '.' (nenhuma compressão), 'gzip' and 'bzip2'. A " +"predefinição para todos os esquemas de compressão é '. gzip'." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:204 +msgid "Packages::Extensions" +msgstr "Packages::Extensions" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:206 +msgid "" +"Sets the default list of file extensions that are package files. This " +"defaults to '.deb'." +msgstr "" +"Define a lista predefinida das extensões de ficheiros que são ficheiros " +"pacote. A predefinição é '.deb'." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:210 +msgid "Sources::Compress" +msgstr "Sources::Compress" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:212 +msgid "" +"This is similar to <literal>Packages::Compress</literal> except that it " +"controls the compression for the Sources files." +msgstr "" +"Isto é semelhante a <literal>Packages::Compress</literal> excepto que " +"controla a compressão para os ficheiros das Fontes." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:216 +msgid "Sources::Extensions" +msgstr "Sources::Extensions" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:218 +msgid "" +"Sets the default list of file extensions that are source files. This " +"defaults to '.dsc'." +msgstr "" +"Define a lista predefinida das extensões de ficheiros que são ficheiros de " +"fontes. A predefinição é '.dsc'." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:222 +msgid "Contents::Compress" +msgstr "Contents::Compress" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:224 +msgid "" +"This is similar to <literal>Packages::Compress</literal> except that it " +"controls the compression for the Contents files." +msgstr "" +"Isto é semelhante a <literal>Packages::Compress</literal> excepto que " +"controla a compressão para os ficheiros de Conteúdos." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:228 +msgid "DeLinkLimit" +msgstr "DeLinkLimit" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:230 +msgid "" +"Specifies the number of kilobytes to delink (and replace with hard links) " +"per run. This is used in conjunction with the per-section <literal>External-" +"Links</literal> setting." +msgstr "" +"Especifica o número de kilobytes para delink (e substitui com hard links) " +"por execução. Isto é usado em conjunto com a definição <literal>External-" +"Links</literal> por secção." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:235 +msgid "FileMode" +msgstr "FileMode" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:237 +msgid "" +"Specifies the mode of all created index files. It defaults to 0644. All " +"index files are set to this mode with no regard to the umask." +msgstr "" +"Especifica o modo de todos os ficheiros índice criados. A predefinição é " +"0644. Todos os ficheiros índice são definidos para este modo " +"independentemente do umask." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:244 +msgid "TreeDefault Section" +msgstr "Secção TreeDefault" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:246 +msgid "" +"Sets defaults specific to <literal>Tree</literal> sections. All of these " +"variables are substitution variables and have the strings $(DIST), " +"$(SECTION) and $(ARCH) replaced with their respective values." +msgstr "" +"Define predefinições específicas para as secções <literal>Tree</literal>. " +"Todas estas variáveis são variáveis de substituição e têm as strings " +"$(DIST), $(SECTION) e $(ARCH) substituídas pelos seus respectivos valores." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:251 +msgid "MaxContentsChange" +msgstr "MaxContentsChange" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:253 +msgid "" +"Sets the number of kilobytes of contents files that are generated each day. " +"The contents files are round-robined so that over several days they will all " +"be rebuilt." +msgstr "" +"Define o número de kilobytes dos ficheiros de conteúdo que são gerados a " +"cada dia. Os ficheiros de conteúdo são re-circulados para que ao fim de " +"alguns dias todos sejam reconstruídos." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:258 +msgid "ContentsAge" +msgstr "ContentsAge" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:260 +msgid "" +"Controls the number of days a contents file is allowed to be checked without " +"changing. If this limit is passed the mtime of the contents file is updated. " +"This case can occur if the package file is changed in such a way that does " +"not result in a new contents file [override edit for instance]. A hold off " +"is allowed in hopes that new .debs will be installed, requiring a new file " +"anyhow. The default is 10, the units are in days." +msgstr "" +"Controla o número de dias que se permite a um ficheiro de conteúdo ser " +"verificado sem alteração. Se este limite for ultrapassado o mtime do " +"ficheiro de conteúdo é actualizado. Este caso pode ocorrer se o ficheiro de " +"pacote é alterado num modo que não resulta num novo ficheiro de conteúdo " +"[por exemplo uma edição de sobreposição]. É permitido um soltar na esperança " +"que novos .debs sejam instalados, requerendo um novo ficheiro de qualquer " +"modo. A predefinição é 10, as unidades são em dias." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:269 +msgid "Directory" +msgstr "Directory" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:271 +msgid "" +"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/" +"$(SECTION)/binary-$(ARCH)/</filename>" +msgstr "" +"Define o topo da árvore de directórios .deb. A predefinição é <filename>" +"$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:275 +msgid "SrcDirectory" +msgstr "SrcDirectory" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:277 +msgid "" +"Sets the top of the source package directory tree. Defaults to <filename>" +"$(DIST)/$(SECTION)/source/</filename>" +msgstr "" +"Define o topo da árvore de directórios de pacotes fonte. A predefinição é " +"<filename>$(DIST)/$(SECTION)/source/</filename>" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407 +msgid "Packages" +msgstr "Packages" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:283 +msgid "" +"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" +"binary-$(ARCH)/Packages</filename>" +msgstr "" +"Define o ficheiro Packages de saída. A predefinição é <filename>$(DIST)/" +"$(SECTION)/binary-$(ARCH)/Packages</filename>" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412 +msgid "Sources" +msgstr "Sources" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:289 +msgid "" +"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/" +"source/Sources</filename>" +msgstr "" +"Define o ficheiro Sources de saída. A predefinição é <filename>$(DIST)/" +"$(SECTION)/source/Sources</filename>" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:293 +msgid "InternalPrefix" +msgstr "InternalPrefix" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:295 +msgid "" +"Sets the path prefix that causes a symlink to be considered an internal link " +"instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</" +"filename>" +msgstr "" +"Define o prefixo de caminho que causa que um symlink seja considerado um " +"link interno em vez de um link externo. A predefinição é <filename>$(DIST)/" +"$(SECTION)/</filename>" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418 +msgid "Contents" +msgstr "Contents" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:302 +msgid "" +"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)" +"</filename>. If this setting causes multiple Packages files to map onto a " +"single Contents file (such as the default) then <command>apt-ftparchive</" +"command> will integrate those package files together automatically." +msgstr "" +"Define a saída do ficheiro Contents. A predefinição é <filename>$(DIST)/" +"Contents-$(ARCH)</filename>. Se esta definição causar múltiplos ficheiros " +"Packages para mapear em um único ficheiro Contents (tal como a predefinição) " +"então o <command>apt-ftparchive</command> irá automaticamente integrar esses " +"ficheiros pacotes todos juntos." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:309 +msgid "Contents::Header" +msgstr "Contents::Header" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:311 +msgid "Sets header file to prepend to the contents output." +msgstr "Define o ficheiro cabeçalho para prefixar a saída de conteúdos." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443 +msgid "BinCacheDB" +msgstr "BinCacheDB" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:316 +msgid "" +"Sets the binary cache database to use for this section. Multiple sections " +"can share the same database." +msgstr "" +"Define a base de dados de cache binária a usar para esta secção. Múltiplas " +"secções podem partilhar a mesma base de dados." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:320 +msgid "FileList" +msgstr "FileList" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:322 +msgid "" +"Specifies that instead of walking the directory tree, <command>apt-" +"ftparchive</command> should read the list of files from the given file. " +"Relative files names are prefixed with the archive directory." +msgstr "" +"Especifica que em vez de navegar na árvore de directórios, o <command>apt-" +"ftparchive</command> deverá ler a lista de ficheiros a partir do ficheiro " +"fornecido. Nomes de ficheiros relativos são prefixados com o directório de " +"arquivo." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:327 +msgid "SourceFileList" +msgstr "SourceFileList" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:329 +msgid "" +"Specifies that instead of walking the directory tree, <command>apt-" +"ftparchive</command> should read the list of files from the given file. " +"Relative files names are prefixed with the archive directory. This is used " +"when processing source indexes." +msgstr "" +"Especifica que em vez de navegar na árvore de directórios, o <command>apt-" +"ftparchive</command> deverá ler a lista de ficheiros a partir do ficheiro " +"fornecido. Nomes de ficheiros relativos são prefixados com o directório de " +"arquivo. Isto é usado quando se processa índices de fonte." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:337 +msgid "Tree Section" +msgstr "Secção Tree" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:339 +msgid "" +"The <literal>Tree</literal> section defines a standard Debian file tree " +"which consists of a base directory, then multiple sections in that base " +"directory and finally multiple Architectures in each section. The exact " +"pathing used is defined by the <literal>Directory</literal> substitution " +"variable." +msgstr "" +"A secção <literal>Tree</literal> define uma árvore de ficheiros Debian " +"standard que consiste de um directório base, depois múltiplas secções nesse " +"directório base e finalmente múltiplas Arquitecturas em cada secção. O " +"caminho exacto usado é definido pela variável de substituição " +"<literal>Directory</literal>." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:344 +msgid "" +"The <literal>Tree</literal> section takes a scope tag which sets the " +"<literal>$(DIST)</literal> variable and defines the root of the tree (the " +"path is prefixed by <literal>ArchiveDir</literal>). Typically this is a " +"setting such as <filename>dists/woody</filename>." +msgstr "" +"A secção <literal>Tree</literal> recebe uma etiqueta scope que define a " +"variável <literal>$(DIST)</literal> e define a raiz da árvore (o caminho é " +"prefixado por <literal>ArchiveDir</literal>). Tipicamente esta é uma " +"definição tal como <filename>dists/woody</filename>." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:349 +msgid "" +"All of the settings defined in the <literal>TreeDefault</literal> section " +"can be use in a <literal>Tree</literal> section as well as three new " +"variables." +msgstr "" +"Todas as definições definidas na secção <literal>TreeDefault</literal> podem " +"ser usadas na secção <literal>Tree</literal> assim como as novas três " +"variáveis." + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt-ftparchive.1.xml:355 +#, no-wrap +msgid "" +"for i in Sections do \n" +" for j in Architectures do\n" +" Generate for DIST=scope SECTION=i ARCH=j\n" +" " +msgstr "" +"for i in Sections do \n" +" for j in Architectures do\n" +" Generate for DIST=scope SECTION=i ARCH=j\n" +" " + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:352 +msgid "" +"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" +"command> performs an operation similar to: <placeholder type=\"programlisting" +"\" id=\"0\"/>" +msgstr "" +"Quando processa uma secção <literal>Tree</literal>, o <command>apt-" +"ftparchive</command> executa uma operação semelhante a: <placeholder type=" +"\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:361 +msgid "Sections" +msgstr "Sections" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:363 +msgid "" +"This is a space separated list of sections which appear under the " +"distribution, typically this is something like <literal>main contrib non-" +"free</literal>" +msgstr "" +"Isto é uma lista de secções separada por espaços que aparece sob a " +"distribuição, tipicamente isto é algo como <literal>main contrib non-free</" +"literal>" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:368 +msgid "Architectures" +msgstr "Architectures" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:370 +msgid "" +"This is a space separated list of all the architectures that appear under " +"search section. The special architecture 'source' is used to indicate that " +"this tree has a source archive." +msgstr "" +"Isto é uma lista separada por espaços de todas as arquitecturas que aparecem " +"sob a secção de buscas. A arquitectura especial 'source' é usada para " +"indicar que esta árvore tem um arquivo fonte." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423 +msgid "BinOverride" +msgstr "BinOverride" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:377 +msgid "" +"Sets the binary override file. The override file contains section, priority " +"and maintainer address information." +msgstr "" +"Define o ficheiro de sobreposição binário. O ficheiro de sobreposição " +"informação de secção, prioridade e endereço do responsável." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428 +msgid "SrcOverride" +msgstr "SrcOverride" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:383 +msgid "" +"Sets the source override file. The override file contains section " +"information." +msgstr "" +"Define o ficheiro de sobreposição fonte. O ficheiro de sobreposição " +"informação de secção." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433 +msgid "ExtraOverride" +msgstr "ExtraOverride" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435 +msgid "Sets the binary extra override file." +msgstr "Define o ficheiro de sobreposição extra binário." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438 +msgid "SrcExtraOverride" +msgstr "SrcExtraOverride" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440 +msgid "Sets the source extra override file." +msgstr "Define o ficheiro de sobreposição extra fonte." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:399 +msgid "BinDirectory Section" +msgstr "Secção BinDirectory" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:401 +msgid "" +"The <literal>bindirectory</literal> section defines a binary directory tree " +"with no special structure. The scope tag specifies the location of the " +"binary directory and the settings are similar to the <literal>Tree</literal> " +"section with no substitution variables or <literal>Section</" +"literal><literal>Architecture</literal> settings." +msgstr "" +"A secção <literal>bindirectory</literal> define uma árvore de directórios " +"binários sem nenhuma estrutura especial. A etiqueta scope especifica a " +"localização do directório binário e as definições são semelhantes às da " +"secção <literal>Tree</literal> sem nenhumas variáveis de substituição ou " +"definições <literal>Section</literal><literal>Architecture</literal>." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:409 +msgid "Sets the Packages file output." +msgstr "Define a saída do ficheiro Packages." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:414 +msgid "" +"Sets the Sources file output. At least one of <literal>Packages</literal> or " +"<literal>Sources</literal> is required." +msgstr "" +"Define a saída do ficheiro Sources. É necessário pelo menos um de " +"<literal>Packages</literal> ou <literal>Sources</literal>." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:420 +msgid "Sets the Contents file output. (optional)" +msgstr "Define a saída do ficheiro Contents (opcional)" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:425 +msgid "Sets the binary override file." +msgstr "Define o ficheiro de sobreposição binário." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:430 +msgid "Sets the source override file." +msgstr "Define o ficheiro de sobreposição fonte." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:445 +msgid "Sets the cache DB." +msgstr "Define a base de dados de cache." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:448 +msgid "PathPrefix" +msgstr "PathPrefix" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:450 +msgid "Appends a path to all the output paths." +msgstr "Acrescenta um caminho a todos os caminhos de saída." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:453 +msgid "FileList, SourceFileList" +msgstr "FileList, SourceFileList" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:455 +msgid "Specifies the file list file." +msgstr "Especifica o ficheiro de lista de ficheiros." + +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:462 +msgid "The Binary Override File" +msgstr "O Ficheiro Binary Override" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:463 +msgid "" +"The binary override file is fully compatible with &dpkg-scanpackages;. It " +"contains 4 fields separated by spaces. The first field is the package name, " +"the second is the priority to force that package to, the third is the the " +"section to force that package to and the final field is the maintainer " +"permutation field." +msgstr "" +"O ficheiro de sobreposição binário é totalmente compatível com &dpkg-" +"scanpackages;. Contém 4 campos separados por espaços. O primeiro campo é o " +"nome do pacote, o segundo é a prioridade a qual forçar esse pacote, o " +"terceiro é a secção onde forçar esse pacote e o último campo é o campo de " +"permutação do responsável." + +#. type: Content of: <refentry><refsect1><para><literallayout> +#: apt-ftparchive.1.xml:469 +#, no-wrap +msgid "old [// oldn]* => new" +msgstr "old [// oldn]* => new" + +#. type: Content of: <refentry><refsect1><para><literallayout> +#: apt-ftparchive.1.xml:471 +#, no-wrap +msgid "new" +msgstr "new" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:468 +msgid "" +"The general form of the maintainer field is: <placeholder type=" +"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" " +"id=\"1\"/> The first form allows a double-slash separated list of old email " +"addresses to be specified. If any of those are found then new is substituted " +"for the maintainer field. The second form unconditionally substitutes the " +"maintainer field." +msgstr "" +"O formato geral do campo do responsável é: <placeholder type=\"literallayout" +"\" id=\"0\"/> ou simplesmente, <placeholder type=\"literallayout\" id=\"1\"/" +">. O primeiro formato permite uma lista separada por um duplo slash (//) de " +"antigos endereços e email a serem especificados. Se nenhum destes for " +"encontrado então 'new' é substituído para o campo do responsável. O segundo " +"formato substitui incondicionalmente o campo do responsável." + +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:479 +msgid "The Source Override File" +msgstr "O Ficheiro Source Override" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:481 +msgid "" +"The source override file is fully compatible with &dpkg-scansources;. It " +"contains 2 fields separated by spaces. The first fields is the source " +"package name, the second is the section to assign it." +msgstr "" +"O ficheiro de sobreposição de fonte é totalmente compatível com &dpkg-" +"scansources;. Contém dois campos separados por espaços. O primeiro campo é o " +"nome de pacote fonte, o segundo é a secção onde o atribuir." + +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:486 +msgid "The Extra Override File" +msgstr "O Ficheiro Extra Override" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:488 +msgid "" +"The extra override file allows any arbitrary tag to be added or replaced in " +"the output. It has 3 columns, the first is the package, the second is the " +"tag and the remainder of the line is the new value." +msgstr "" +"O ficheiro de sobreposição extra permite que qualquer etiqueta arbitrária " +"seja adicionada ou substituída na saída. Tem 3 colunas, a primeira é o " +"pacote, a segunda é a etiqueta e restante da linha é o novo valor." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:497 +msgid "<option>--md5</option>" +msgstr "<option>--md5</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:499 +msgid "" +"Generate MD5 sums. This defaults to on, when turned off the generated index " +"files will not have MD5Sum fields where possible. Configuration Item: " +"<literal>APT::FTPArchive::MD5</literal>" +msgstr "" +"Gera sumários MD5. A predefinição é ligado, quando desligado os ficheiros " +"índice gerados não terão campos MD5Sum onde possíveis. Item de Configuração: " +"<literal>APT::FTPArchive::MD5</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:504 +msgid "<option>--db</option>" +msgstr "<option>--db</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:506 +msgid "" +"Use a binary caching DB. This has no effect on the generate command. " +"Configuration Item: <literal>APT::FTPArchive::DB</literal>." +msgstr "" +"Usa uma base de dados de cache binária. Isto não tem efeito no comando " +"generate. Item de configuração: <literal>APT::FTPArchive::DB</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:512 +msgid "" +"Quiet; produces output suitable for logging, omitting progress indicators. " +"More q's will produce more quiet up to a maximum of 2. You can also use " +"<option>-q=#</option> to set the quiet level, overriding the configuration " +"file. Configuration Item: <literal>quiet</literal>." +msgstr "" +"Silencioso; produz saída apropriada para registar em logs, omitindo " +"indicadores de progresso. Mais q's irão produzir mais silencio até um máximo " +"de 2. Você também pode usar <option>-q=#</option> para definir o nível de " +"silêncio, sobrepondo o ficheiro de configuração. Item de Configuração: " +"<literal>quiet</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:518 +msgid "<option>--delink</option>" +msgstr "<option>--delink</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:520 +msgid "" +"Perform Delinking. If the <literal>External-Links</literal> setting is used " +"then this option actually enables delinking of the files. It defaults to on " +"and can be turned off with <option>--no-delink</option>. Configuration " +"Item: <literal>APT::FTPArchive::DeLinkAct</literal>." +msgstr "" +"Executa Dissociação. Se é usada a definição <literal>External-Links</" +"literal> então esta opção activa a dissociação dos ficheiros. A sua " +"predefinição é ligada e e pode ser desligada com <option>--no-delink</" +"option>. Item de Configuração: <literal>APT::FTPArchive::DeLinkAct</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:526 +msgid "<option>--contents</option>" +msgstr "<option>--contents</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:528 +msgid "" +"Perform contents generation. When this option is set and package indexes are " +"being generated with a cache DB then the file listing will also be extracted " +"and stored in the DB for later use. When using the generate command this " +"option also allows the creation of any Contents files. The default is on. " +"Configuration Item: <literal>APT::FTPArchive::Contents</literal>." +msgstr "" +"Executa a geração de conteúdos. Quando esta opção está definida e os índices " +"de pacotes são gerados com um base de dados cache então a listagem de " +"ficheiros também será extraída e guardada na base de dados para utilização " +"posterior. Quando se usa o comando generate, esta opção também permite a " +"criação de quaisquer ficheiros de Conteúdos. A predefinição é ligado. Item " +"de Configuração: <literal>APT::FTPArchive::Contents</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:536 +msgid "<option>--source-override</option>" +msgstr "<option>--source-override</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:538 +msgid "" +"Select the source override file to use with the <literal>sources</literal> " +"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" +"literal>." +msgstr "" +"Selecciona o ficheiro de sobreposição de fonte a usar com o comando " +"<literal>sources</literal>. Item de Configuração: <literal>APT::FTPArchive::" +"SourceOverride</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:542 +msgid "<option>--readonly</option>" +msgstr "<option>--readonly</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:544 +msgid "" +"Make the caching databases read only. Configuration Item: <literal>APT::" +"FTPArchive::ReadOnlyDB</literal>." +msgstr "" +"Torna as bases de dados de cache apenas de leitura. Item de Configuração: " +"<literal>APT::FTPArchive::ReadOnlyDB</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:548 +msgid "<option>--arch</option>" +msgstr "<option>--arch</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:549 +msgid "" +"Accept in the <literal>packages</literal> and <literal>contents</literal> " +"commands only package files matching <literal>*_arch.deb</literal> or " +"<literal>*_all.deb</literal> instead of all package files in the given " +"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>." +msgstr "" +"Aceita nos comandos <literal>packages</literal> e <literal>contents</" +"literal> apenas ficheiros de pacotes que condizem com <literal>*_arch.deb</" +"literal> ou <literal>*_all.deb</literal> em vez de todos os ficheiros de " +"pacotes presentes no caminho fornecido. Item de Configuração: <literal>APT::" +"FTPArchive::Architecture</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:555 +msgid "<option>APT::FTPArchive::AlwaysStat</option>" +msgstr "<option>APT::FTPArchive::AlwaysStat</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:557 +msgid "" +"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " +"packages are recompiled and/or republished with the same version again, this " +"will lead to problems as the now outdated cached metadata like size and " +"checksums will be used. With this option enabled this will no longer happen " +"as it will be checked if the file was changed. Note that this option is set " +"to \"<literal>false</literal>\" by default as it is not recommend to upload " +"multiply versions/builds of a package with the same versionnumber, so in " +"theory nobody will have these problems and therefore all these extra checks " +"are useless." +msgstr "" +"&apt-ftparchive; põe em cache o máximo possível de metadados numa base de " +"dados de cache. Se os pacotes forem recompilados e/ou republicados de novo " +"com a mesma versão, irá originar problemas porque serão usados os metadados " +"desactualizados em cache como o tamanho e sumários de verificação. Com esta " +"opção activa isto não irá mais acontecer porque será verificado se o " +"ficheiro foi alterado. Note que esta opção vem regulada para " +"\"<literal>false</literal>\" por predefinição pois não é recomendado " +"disponibilizar múltiplas versões/compilações de um pacote com o mesmo número " +"de versão, portanto em teoria ninguém irá ter estes problemas e então todas " +"as verificações extras serão desnecessárias." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:567 +msgid "<option>APT::FTPArchive::LongDescription</option>" +msgstr "<option>APT::FTPArchive::LongDescription</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:569 +msgid "" +"This configuration option defaults to \"<literal>true</literal>\" and should " +"only be set to <literal>\"false\"</literal> if the Archive generated with " +"&apt-ftparchive; also provides <filename>Translation</filename> files. Note " +"that it is currently not possible to create these files with <command>apt-" +"ftparchive</command>." +msgstr "" +"Esta opção de configuração tem a predefinição de \"<literal>true</literal>\" " +"e deve apenas ser definida para <literal>\"false\"</literal> se o Arquivo " +"gerado com &apt-ftparchive; também disponibilizar ficheiros " +"<filename>Translation</filename>. Note que actualmente não é possível criar " +"esses ficheiros com <command>apt-ftparchive</command>." + +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480 +#: sources.list.5.xml:193 +msgid "Examples" +msgstr "Examples" + +#. type: Content of: <refentry><refsect1><para><programlisting> +#: apt-ftparchive.1.xml:587 +#, no-wrap +msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" +msgstr "<command>apt-ftparchive</command> pacotes <replaceable>directório</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:583 +msgid "" +"To create a compressed Packages file for a directory containing binary " +"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" +msgstr "" +"Para criar um ficheiro Packages comprimido para um directório que contém " +"pacotes binários (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:597 +msgid "" +"<command>apt-ftparchive</command> returns zero on normal operation, decimal " +"100 on error." +msgstr "" +"<command>apt-ftparchive</command> devolve zero na operação normal, 100 " +"decimal em erro." + +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt-get.8.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 " +"November 2008</date>" +msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 " +"Novembro 2008</date>" + +#. type: <heading></heading> +#: apt-get.8.xml:22 apt-get.8.xml:29 guide.sgml:96 +msgid "apt-get" +msgstr "apt-get" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-get.8.xml:30 +msgid "APT package handling utility -- command-line interface" +msgstr "" +"Utilitário de manuseamento de pacotes do APT -- interface de linha de " +"comandos" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-get.8.xml:36 +msgid "" +"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " +"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> " +"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> " +"<option>-t=</option> <group choice='req'> <arg choice='plain'> " +"<replaceable>target_release_name</replaceable> </arg> <arg choice='plain'> " +"<replaceable>target_release_number_expression</replaceable> </arg> <arg " +"choice='plain'> <replaceable>target_release_codename</replaceable> </arg> </" +"group> </arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg " +"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg " +"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice=" +"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group " +"choice='req'> <arg choice='plain'> =<replaceable>pkg_version_number</" +"replaceable> </arg> <arg choice='plain'> /<replaceable>target_release_name</" +"replaceable> </arg> <arg choice='plain'> /" +"<replaceable>target_release_codename</replaceable> </arg> </group> </arg> </" +"arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>purge <arg " +"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> " +"<arg choice='plain'>source <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg " +"choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg " +"choice='plain'> /<replaceable>target_release_name</replaceable> </arg> <arg " +"choice='plain'> /<replaceable>target_release_codename</replaceable> </arg> </" +"group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain" +"\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg " +"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg " +"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg " +"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg " +"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group " +"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> " +"</group> </arg> </group>" +msgstr "" +"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " +"<option>-o= <replaceable>string_de_configuração</replaceable> </option> </" +"arg> <arg> <option>-c= <replaceable>ficheiro_de_configuração</replaceable> </" +"option> </arg> <arg> <option>-t=</option> <group choice='req'> <arg " +"choice='plain'> <replaceable>nome_de_lançamento_de_destino</replaceable> </" +"arg> <arg choice='plain'> " +"<replaceable>expressão_de_número_de_lançamento_de_destino</replaceable> </" +"arg> <arg choice='plain'> " +"<replaceable>nome_de_código_do_lançamento_de_destino</replaceable> </arg> </" +"group> </arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg " +"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg " +"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice=" +"\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable> <arg> <group " +"choice='req'> <arg choice='plain'> =<replaceable>número_de_versão_do_pacote</" +"replaceable> </arg> <arg choice='plain'> /" +"<replaceable>nome_do_lançamento_de_destino</replaceable> </arg> <arg " +"choice='plain'> /<replaceable>nome_de_código_do_lançamento_de_destino</" +"replaceable> </arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove " +"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable></" +"arg></arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>pacote</replaceable></arg></arg> <arg choice='plain'>source " +"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable> <arg> " +"<group choice='req'> <arg choice='plain'> " +"=<replaceable>número_de_versão_do_pacote</replaceable> </arg> <arg " +"choice='plain'> /<replaceable>nome_de_lançamento_de_destino</replaceable> </" +"arg> <arg choice='plain'> /" +"<replaceable>nome_de_código_de_lançamento_de_destino</replaceable> </arg> </" +"group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain" +"\" rep=\"repeat\"><replaceable>pacote</replaceable></arg></arg> <arg " +"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg " +"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg " +"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg " +"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group " +"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> " +"</group> </arg> </group>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:126 +msgid "" +"<command>apt-get</command> is the command-line tool for handling packages, " +"and may be considered the user's \"back-end\" to other tools using the APT " +"library. Several \"front-end\" interfaces exist, such as &dselect;, " +"&aptitude;, &synaptic;, &gnome-apt; and &wajig;." +msgstr "" +"<command>apt-get</command> é a ferramenta de linha de comandos para lidar " +"com pacotes, e pode ser considerada o \"back-end\" dos utilizadores para " +"outras ferramentas que usam a biblioteca APT. Existem várias interfaces " +"\"front-end\" como o &dselect;, &aptitude;, &synaptic;, &gnome-apt; e " +"&wajig;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:135 apt-key.8.xml:124 +msgid "update" +msgstr "update" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:136 +msgid "" +"<literal>update</literal> is used to resynchronize the package index files " +"from their sources. The indexes of available packages are fetched from the " +"location(s) specified in <filename>/etc/apt/sources.list</filename>. For " +"example, when using a Debian archive, this command retrieves and scans the " +"<filename>Packages.gz</filename> files, so that information about new and " +"updated packages is available. An <literal>update</literal> should always be " +"performed before an <literal>upgrade</literal> or <literal>dist-upgrade</" +"literal>. Please be aware that the overall progress meter will be incorrect " +"as the size of the package files cannot be known in advance." +msgstr "" +"<literal>update</literal> é usado para re-sincronizar os ficheiros de " +"índices de pacotes a partir das suas fontes. Os índices dos pacotes " +"disponíveis são obtidos a partir das localizações em <filename>/etc/apt/" +"sources.list</filename>. Por exemplo, quando se usa um arquivo Debian, este " +"comando recolhe e analisa os ficheiros <filename>Packages.gz</filename> para " +"que a informação sobre pacotes novos e actualizados fique disponível. Um " +"<literal>update</literal> deve ser sempre executado antes de um " +"<literal>upgrade</literal> ou <literal>dist-upgrade</literal>. Por favor " +"note que a medição do processo total ira estar incorrecta pois o tamanho dos " +"ficheiros de pacotes não pode ser conhecido com antecedência." + +#. type: <tag></tag> +#: apt-get.8.xml:147 guide.sgml:121 +msgid "upgrade" +msgstr "upgrade" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:148 +msgid "" +"<literal>upgrade</literal> is used to install the newest versions of all " +"packages currently installed on the system from the sources enumerated in " +"<filename>/etc/apt/sources.list</filename>. Packages currently installed " +"with new versions available are retrieved and upgraded; under no " +"circumstances are currently installed packages removed, or packages not " +"already installed retrieved and installed. New versions of currently " +"installed packages that cannot be upgraded without changing the install " +"status of another package will be left at their current version. An " +"<literal>update</literal> must be performed first so that <command>apt-get</" +"command> knows that new versions of packages are available." +msgstr "" +"<literal>upgrade</literal> é usado para instalar as versões mais recentes de " +"todos os pacotes presentemente instalados no sistema a partir das fontes " +"enumeradas em <filename>/etc/apt/sources.list</filename>. Os pacotes " +"presentemente instalados com versões novas são obtidos e instalados; em " +"nenhumas circunstâncias os pacotes presentemente instalados serão removidos, " +"nem pacotes já instalados serão obtidos e instalados.Os pacotes " +"presentemente instalados com novas versões e que não possam ser actualizados " +"sem alterarem o estado da instalação de outro pacote serão deixados na " +"versão presente. Deve ser executado primeiro um <literal>update</literal> " +"para que o <command>apt-get</command> fique a saber que estão disponíveis " +"novas versões de pacotes." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:160 +msgid "dselect-upgrade" +msgstr "dselect-upgrade" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:161 +msgid "" +"<literal>dselect-upgrade</literal> is used in conjunction with the " +"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</" +"literal> follows the changes made by &dselect; to the <literal>Status</" +"literal> field of available packages, and performs the actions necessary to " +"realize that state (for instance, the removal of old and the installation of " +"new packages)." +msgstr "" +"<literal>dselect-upgrade</literal> é usado em conjunto com o front-end de " +"pacotes Debian tradicional, &dselect;. <literal>dselect-upgrade</literal> " +"segue as alterações feitas pelo &dselect; ao campo <literal>Status</literal> " +"dos pacotes disponíveis, e executa as acções necessárias para realizar esse " +"estado (por exemplo, a remoção de pacotes antigos e a instalação de novos)." + +#. type: <tag></tag> +#: apt-get.8.xml:170 guide.sgml:140 +msgid "dist-upgrade" +msgstr "dist-upgrade" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:171 +msgid "" +"<literal>dist-upgrade</literal> in addition to performing the function of " +"<literal>upgrade</literal>, also intelligently handles changing dependencies " +"with new versions of packages; <command>apt-get</command> has a \"smart\" " +"conflict resolution system, and it will attempt to upgrade the most " +"important packages at the expense of less important ones if necessary. So, " +"<literal>dist-upgrade</literal> command may remove some packages. The " +"<filename>/etc/apt/sources.list</filename> file contains a list of locations " +"from which to retrieve desired package files. See also &apt-preferences; " +"for a mechanism for overriding the general settings for individual packages." +msgstr "" +"<literal>dist-upgrade</literal> adicionalmente a executar a função do " +"<literal>upgrade</literal>, também lida inteligentemente com as alterações " +"de dependências com as novas versões de pacotes; o <command>apt-get</" +"command> tem um sistema de resolução de conflitos 'inteligente', que irá " +"tentar actualizar os pacotes mais importantes a custo dos pacotes menos " +"importantes, caso necessário. Portanto, o comando <literal>dist-upgrade</" +"literal> pode remover alguns pacotes. O ficheiro <filename>/etc/apt/sources." +"list</filename> contém uma lista de localizações de onde obter os ficheiros " +"de pacotes desejados. Veja também &apt-preferences; para um mecanismo para " +"sobrepor as definições gerais em pacotes individuais." + +#. type: <tag></tag> +#: apt-get.8.xml:183 guide.sgml:131 +msgid "install" +msgstr "install" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:185 +msgid "" +"<literal>install</literal> is followed by one or more packages desired for " +"installation or upgrading. Each package is a package name, not a fully " +"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would " +"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All " +"packages required by the package(s) specified for installation will also be " +"retrieved and installed. The <filename>/etc/apt/sources.list</filename> " +"file is used to locate the desired packages. If a hyphen is appended to the " +"package name (with no intervening space), the identified package will be " +"removed if it is installed. Similarly a plus sign can be used to designate " +"a package to install. These latter features may be used to override " +"decisions made by apt-get's conflict resolution system." +msgstr "" +"<literal>install</literal> é seguido por um ou mais pacotes desejados para " +"instalação ou actualização. Cada pacote é um nome de pacote, não um nome de " +"ficheiro completamente qualificado (por exemplo, num sistema Debian GNU/" +"Linux, libc6 seria o argumento fornecido e não <literal>libc6_1.9.6-2.deb</" +"literal>). Todos os pacotes necessários pelos pacotes especificados para " +"instalação irão também ser obtidos e instalados. O ficheiro <filename>/etc/" +"apt/sources.list</filename> é usado para localizar os pacotes desejados. Se " +"for acrescentado um sinal menos (-) ao nome do pacote (sem nenhum espaço a " +"separar), o pacote identificado irá ser removido se estiver instalado. À " +"semelhança, um sinal mais (+) pode ser usado para designar um pacote a " +"instalar. Estas últimas funcionalidades podem ser usadas para sobrepor " +"decisões feitas pelo sistema de resolução de conflitos do apt-get." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:203 +msgid "" +"A specific version of a package can be selected for installation by " +"following the package name with an equals and the version of the package to " +"select. This will cause that version to be located and selected for install. " +"Alternatively a specific distribution can be selected by following the " +"package name with a slash and the version of the distribution or the Archive " +"name (stable, testing, unstable)." +msgstr "" +"Pode ser seleccionada para instalação uma versão específica de um pacote ao " +"continuar o nome do pacote com um igual (=) e a versão do pacote a " +"seleccionar. Isto irá fazer com que essa versão seja localizada e " +"seleccionada para instalação. Alternativamente pode ser seleccionada uma " +"distribuição específica ao continuar o nome do pacote com uma slash (/) e a " +"versão da distribuição ou o nome de Arquivo (stable, testing, unstable)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:210 +msgid "" +"Both of the version selection mechanisms can downgrade packages and must be " +"used with care." +msgstr "" +"Ambos os mecanismos de selecção de versão podem regredir pacotes (downgrade) " +"e devem ser usados com cuidado." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:213 +msgid "" +"This is also the target to use if you want to upgrade one or more already-" +"installed packages without upgrading every package you have on your system. " +"Unlike the \"upgrade\" target, which installs the newest version of all " +"currently installed packages, \"install\" will install the newest version of " +"only the package(s) specified. Simply provide the name of the package(s) " +"you wish to upgrade, and if a newer version is available, it (and its " +"dependencies, as described above) will be downloaded and installed." +msgstr "" +"Este é também o objectivo a usar se deseja actualizar um ou mais pacotes já " +"instalados sem actualizar todos os pacotes que tem no seu sistema. Ao " +"contrário do objectivo \"upgrade\", o qual instala as versões mais recentes " +"de todos os pacotes presentemente instalados, o \"install\" irá instalar a " +"versão mais recente apenas dos pacotes especificados. Simplesmente forneça o " +"nome do(s) pacote(s) que deseja actualizar, e se estiver disponível uma nova " +"versão, ela ( e as suas dependências, como descrito em cima) serão " +"descarregadas e instaladas." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:224 +msgid "" +"Finally, the &apt-preferences; mechanism allows you to create an alternative " +"installation policy for individual packages." +msgstr "" +"Finalmente, o mecanismo &apt-preferences; permite-lhe criar uma política de " +"instalação alternativa para pacotes individuais." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:228 +msgid "" +"If no package matches the given expression and the expression contains one " +"of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and " +"it is applied to all package names in the database. Any matches are then " +"installed (or removed). Note that matching is done by substring so 'lo.*' " +"matches 'how-lo' and 'lowest'. If this is undesired, anchor the regular " +"expression with a '^' or '$' character, or create a more specific regular " +"expression." +msgstr "" +"Se nenhum pacote coincidir com a expressão fornecida e a expressão conter um " +"de '.', '?' ou '*' então é assumido ser uma expressão regular POSIX, e é " +"aplicada a todos os nomes de pacotes da base de dados. Quaisquer " +"correspondências são então instaladas (ou removidas). Note que a " +"correspondência é feita por substring, portanto 'lo.*' corresponde a 'how-" +"lo' e 'lowest'. Se isto for indesejável, ancore a expressão regular com a " +"caractere '^' ou '$', para criar uma expressão regular mais específica." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:237 +msgid "remove" +msgstr "remove" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:238 +msgid "" +"<literal>remove</literal> is identical to <literal>install</literal> except " +"that packages are removed instead of installed. Note the removing a package " +"leaves its configuration files in system. If a plus sign is appended to the " +"package name (with no intervening space), the identified package will be " +"installed instead of removed." +msgstr "" +"<literal>remove</literal> é idêntico a <literal>install</literal> à " +"excepção que os pacotes são removidos em vez de instalados. Note que remover " +"um pacote deixa os seus ficheiros de configuração no sistema. Se um sinal " +"mais (+) for acrescentado ao nome do pacote (sem nenhum espaço a separar), o " +"pacote identificado será instalado em vez de removido." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:245 +msgid "purge" +msgstr "purge" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:246 +msgid "" +"<literal>purge</literal> is identical to <literal>remove</literal> except " +"that packages are removed and purged (any configuration files are deleted " +"too)." +msgstr "" +"<literal>purge</literal> é idêntico ao <literal>remove</literal> com a " +"excepção que os pacotes são removidos e purgados (quaisquer ficheiros de " +"configuração são também apagados)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:250 +msgid "source" +msgstr "source" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:251 +msgid "" +"<literal>source</literal> causes <command>apt-get</command> to fetch source " +"packages. APT will examine the available packages to decide which source " +"package to fetch. It will then find and download into the current directory " +"the newest available version of that source package while respect the " +"default release, set with the option <literal>APT::Default-Release</" +"literal>, the <option>-t</option> option or per package with the " +"<literal>pkg/release</literal> syntax, if possible." +msgstr "" +"<literal>source</literal> faz com que o <command>apt-get</command> procure " +"pacotes fonte. O APT irá examinar os pacotes disponíveis para decidir qual " +"pacote fonte obter. Irá então encontrar e descarregar para o directório " +"actual a versão disponível mais recente desse pacote fonte enquanto respeita " +"o lançamento predefinido, definido com a opção <literal>APT::Default-" +"Release</literal>, a opção <option>-t</option> ou por pacote com a sintaxe " +"<literal>pkg/release</literal>, se possível." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:259 +msgid "" +"Source packages are tracked separately from binary packages via <literal>deb-" +"src</literal> type lines in the &sources-list; file. This means that you " +"will need to add such a line for each repository you want to get sources " +"from. If you don't do this you will properly get another (newer, older or " +"none) source version than the one you have installed or could install." +msgstr "" +"Os pacotes fonte são acompanhados em separado dos pacotes binários via linha " +"do tipo <literal>deb-src</literal> no ficheiro &sources-list;. Isto quer " +"dizer que você precisa de adicionar tal linha para cada repositório de onde " +"deseja obter fontes. Se você não fizer isto, irá provavelmente obter outra " +"versão de fonte (mais recente, antiga ou nenhuma) que aquela que tem " +"instalada ou pode instalar." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:266 +msgid "" +"If the <option>--compile</option> option is specified then the package will " +"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if " +"<option>--download-only</option> is specified then the source package will " +"not be unpacked." +msgstr "" +"Se for especificada a opção <option>--compile</option> então o pacote irá " +"ser compilado para um binário .deb usando <command>dpkg-buildpackage</" +"command>, Se for especificado <option>--download-only</option> então o " +"pacote fonte não será desempacotado." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:271 +msgid "" +"A specific source version can be retrieved by postfixing the source name " +"with an equals and then the version to fetch, similar to the mechanism used " +"for the package files. This enables exact matching of the source package " +"name and version, implicitly enabling the <literal>APT::Get::Only-Source</" +"literal> option." +msgstr "" +"Uma versão fonte específica pode ser obtida ao pós-fixar o nome da fonte com " +"um igual (=) e depois a versão a procurar, semelhante ao mecanismo usado " +"para os ficheiros de pacotes. Isto activa a correspondência exacta do pacote " +"fonte, nome e versão, activando implicitamente a opção <literal>APT::Get::" +"Only-Source</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:277 +msgid "" +"Note that source packages are not tracked like binary packages, they exist " +"only in the current directory and are similar to downloading source tar " +"balls." +msgstr "" +"Note que os pacotes fonte não são acompanhados como pacotes binários, eles " +"existem apenas no directório actual e são semelhantes à descarga de tar " +"balls fonte." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:282 +msgid "build-dep" +msgstr "build-dep" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:283 +msgid "" +"<literal>build-dep</literal> causes apt-get to install/remove packages in an " +"attempt to satisfy the build dependencies for a source package." +msgstr "" +"<literal>build-dep</literal> faz o apt-get instalar/remover pacotes numa " +"tentativa de satisfazer dependências de compilação para um pacote fonte." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:287 +msgid "check" +msgstr "check" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:288 +msgid "" +"<literal>check</literal> is a diagnostic tool; it updates the package cache " +"and checks for broken dependencies." +msgstr "" +"<literal>check</literal> é uma ferramenta de diagnóstico; actualiza a cache " +"de pacotes e verifica por dependências quebradas." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:293 +msgid "" +"<literal>clean</literal> clears out the local repository of retrieved " +"package files. It removes everything but the lock file from " +"<filename>&cachedir;/archives/</filename> and <filename>&cachedir;/archives/" +"partial/</filename>. When APT is used as a &dselect; method, <literal>clean</" +"literal> is run automatically. Those who do not use dselect will likely " +"want to run <literal>apt-get clean</literal> from time to time to free up " +"disk space." +msgstr "" +"<literal>clean</literal> limpa o repositório local dos ficheiros de pacotes " +"obtidos. Remove tudo excepto o ficheiro lock de <filename>&cachedir;/" +"archives/</filename> e <filename>&cachedir;/archives/partial/</filename>. " +"Quando o APT é usado com um método &dselect;, <literal>clean</literal> é " +"executado automaticamente. Aqueles que não usam o dselect irão provavelmente " +"querer executar <literal>apt-get clean</literal> de tempos a tempos para " +"libertar espaço do disco." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:302 +msgid "autoclean" +msgstr "autoclean" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:303 +msgid "" +"Like <literal>clean</literal>, <literal>autoclean</literal> clears out the " +"local repository of retrieved package files. The difference is that it only " +"removes package files that can no longer be downloaded, and are largely " +"useless. This allows a cache to be maintained over a long period without it " +"growing out of control. The configuration option <literal>APT::Clean-" +"Installed</literal> will prevent installed packages from being erased if it " +"is set to off." +msgstr "" +"Tal como o <literal>clean</literal>, <literal>autoclean</literal> limpa o " +"repositório local de ficheiros de pacotes obtidos. A diferença é que apenas " +"remove ficheiros de pacotes que já não podem ser mais descarregados, e são " +"na maioria dos casos inúteis. Isto permite a manutenção de uma cache durante " +"um longo período sem que ela cresça descontroladamente. A opção de " +"configuração <literal>APT::Clean-Installed</literal> irá prevenir que " +"pacotes instalados sejam apagados se estiver definida para 'off'." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:312 +msgid "autoremove" +msgstr "autoremove" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:313 +msgid "" +"<literal>autoremove</literal> is used to remove packages that were " +"automatically installed to satisfy dependencies for some package and that " +"are no more needed." +msgstr "" +"<literal>autoremove</literal> é usado para remover pacotes que foram " +"instalados automaticamente para satisfazer dependências de algum pacote e " +"que já não são necessários." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:323 apt-get.8.xml:429 +msgid "<option>--no-install-recommends</option>" +msgstr "<option>--no-install-recommends</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:324 +msgid "" +"Do not consider recommended packages as a dependency for installing. " +"Configuration Item: <literal>APT::Install-Recommends</literal>." +msgstr "" +"Não considera pacotes recomendados como dependências para instalação. Item " +"de Configuração: <literal>APT::Install-Recommends</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:328 +msgid "<option>--download-only</option>" +msgstr "<option>--download-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:329 +msgid "" +"Download only; package files are only retrieved, not unpacked or installed. " +"Configuration Item: <literal>APT::Get::Download-Only</literal>." +msgstr "" +"Apenas descarrega; os ficheiros pacotes são apenas obtidos, não são " +"desempacotados nem instalados. Item de Configuração: <literal>APT::Get::" +"Download-Only</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:333 +msgid "<option>--fix-broken</option>" +msgstr "<option>--fix-broken</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:334 +msgid "" +"Fix; attempt to correct a system with broken dependencies in place. This " +"option, when used with install/remove, can omit any packages to permit APT " +"to deduce a likely solution. If packages are specified, these have to " +"completely correct the problem. The option is sometimes necessary when " +"running APT for the first time; APT itself does not allow broken package " +"dependencies to exist on a system. It is possible that a system's dependency " +"structure can be so corrupt as to require manual intervention (which usually " +"means using &dselect; or <command>dpkg --remove</command> to eliminate some " +"of the offending packages). Use of this option together with <option>-m</" +"option> may produce an error in some situations. Configuration Item: " +"<literal>APT::Get::Fix-Broken</literal>." +msgstr "" +"Corrige; tenta corrigir um sistema com dependências quebradas no lugar. Esta " +"opção, quando usada com install/remove, pode omitir quaisquer pacotes para " +"permitir ao APT deduzir uma solução provável. Se forem especificados " +"pacotes, este têm de corrigir completamente o problema. A opção é por vezes " +"necessária quando se corre o APT pela primeira vez. O próprio APT não " +"permite que existam num sistema dependências de pacotes quebradas. É " +"possível que uma estrutura de dependências de um sistema esteja tão " +"corrompida ao ponto de requerer intervenção manual (o que normalmente " +"significa usar o &dselect; ou <command>dpkg --remove</command> para eliminar " +"alguns dos pacotes ofensivos). O uso desta opção juntamente com <option>-m</" +"option> pode produzir um erro em algumas situações. Item de Configuração: " +"<literal>APT::Get::Fix-Broken</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:347 +msgid "<option>--ignore-missing</option>" +msgstr "<option>--ignore-missing</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:348 +msgid "<option>--fix-missing</option>" +msgstr "<option>--fix-missing</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:349 +msgid "" +"Ignore missing packages; If packages cannot be retrieved or fail the " +"integrity check after retrieval (corrupted package files), hold back those " +"packages and handle the result. Use of this option together with <option>-f</" +"option> may produce an error in some situations. If a package is selected " +"for installation (particularly if it is mentioned on the command line) and " +"it could not be downloaded then it will be silently held back. " +"Configuration Item: <literal>APT::Get::Fix-Missing</literal>." +msgstr "" +"Ignora pacotes em falta; Se pacotes não podem ser obtidos ou falham a " +"verificação de integridade após obtenção (ficheiros de pacotes corrompidos), " +"retêm esses pacotes e manuseia o resultado. Usar esta opção em conjunto com " +"<option>-f</option> pode produzir erros em algumas situações. Se um pacote " +"for seleccionado para instalação (particularmente se for mencionado na linha " +"de comandos) e não pode ser descarregado estão será retido em silêncio. Item " +"de Configuração: <literal>APT::Get::Fix-Missing</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:359 +msgid "<option>--no-download</option>" +msgstr "<option>--no-download</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:360 +msgid "" +"Disables downloading of packages. This is best used with <option>--ignore-" +"missing</option> to force APT to use only the .debs it has already " +"downloaded. Configuration Item: <literal>APT::Get::Download</literal>." +msgstr "" +"Desactiva a descarga de pacotes. Isto é melhor ser usado com <option>--" +"ignore-missing</option> para forçar o APT a usar os .debs que já foram " +"descarregados. Item de Configuração: <literal>APT::Get::Download</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:367 +msgid "" +"Quiet; produces output suitable for logging, omitting progress indicators. " +"More q's will produce more quiet up to a maximum of 2. You can also use " +"<option>-q=#</option> to set the quiet level, overriding the configuration " +"file. Note that quiet level 2 implies <option>-y</option>, you should never " +"use -qq without a no-action modifier such as -d, --print-uris or -s as APT " +"may decided to do something you did not expect. Configuration Item: " +"<literal>quiet</literal>." +msgstr "" +"Silencioso; produz saída apropriada para registar em log, omitindo " +"indicadores de progresso. Mais q's irá resultar em mais silêncio até o " +"máximo de 2. Você também pode usar <option>-q=#</option> para definir o " +"nível de silêncio, sobrepondo o ficheiro de configuração. Note que o " +"silêncio nível 2 implica <option>-y</option>, você nunca deve usar -qq sem " +"um modificador de 'nenhuma acção' tal como -d, --print-uris ou -s pois o APT " +"pode decidir fazer algo que você não esperava. Item de Configuração: " +"<literal>quiet</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:377 +msgid "<option>--simulate</option>" +msgstr "<option>--simulate</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:379 +msgid "<option>--dry-run</option>" +msgstr "<option>--dry-run</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:382 +msgid "" +"No action; perform a simulation of events that would occur but do not " +"actually change the system. Configuration Item: <literal>APT::Get::" +"Simulate</literal>." +msgstr "" +"Nenhuma acção; executa uma simulação dos eventos que irão ocorrer mas na " +"realidade não altera o sistema. Item de Configuração: <literal>APT::Get::" +"Simulate</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:386 +msgid "" +"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</" +"literal>) automatic. Also a notice will be displayed indicating that this " +"is only a simulation, if the option <literal>APT::Get::Show-User-Simulation-" +"Note</literal> is set (Default: true). Neither NoLocking nor the notice " +"will be triggered if run as root (root should know what he is doing without " +"further warnings by <literal>apt-get</literal>)." +msgstr "" +"Uma simulação corrida como utilizador irá automaticamente desactivar o " +"bloqueio (<literal>Debug::NoLocking</literal>). Também será mostrado um " +"aviso indicando que é apenas uma simulação, se a opção <literal>APT::Get::" +"Show-User-Simulation-Note</literal> estiver definida (a predefinição é " +"verdadeira). Nem o NoLocking nem o aviso serão activados se corrido como " +"root (o root deve saber o que está a fazer sem mais avisos do <literal>apt-" +"get</literal>)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:392 +msgid "" +"Simulate prints out a series of lines each one representing a dpkg " +"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets " +"indicate broken packages and empty set of square brackets meaning breaks " +"that are of no consequence (rare)." +msgstr "" +"A simulação escreve uma série de linhas cada uma representando uma operação " +"do dpkg, Configurar (Conf), Remover (Remv), Desempacotar (Inst). Parênteses " +"rectos ([]) indicam pacotes quebrados e conjuntos de parênteses rectos " +"vazios significam quebras que não têm consequência (raro)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:399 +msgid "<option>-y</option>" +msgstr "<option>-y</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:399 +msgid "<option>--yes</option>" +msgstr "<option>--yes</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:400 +msgid "<option>--assume-yes</option>" +msgstr "<option>--assume-yes</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:401 +msgid "" +"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " +"non-interactively. If an undesirable situation, such as changing a held " +"package, trying to install a unauthenticated package or removing an " +"essential package occurs then <literal>apt-get</literal> will abort. " +"Configuration Item: <literal>APT::Get::Assume-Yes</literal>." +msgstr "" +"Responde sim automaticamente aos avisos; assume \"yes\" como resposta a " +"todos os avisos e corre não-interactivamente. Se uma situação indesejável " +"ocorrer, tal como alterar um pacote retido, tentar instalar um pacote não " +"autenticado ou remover um pacote essencial, então o <literal>apt-get</" +"literal> irá abortar. Item de Configuração: <literal>APT::Get::Assume-Yes</" +"literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:408 +msgid "<option>-u</option>" +msgstr "<option>-u</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:408 +msgid "<option>--show-upgraded</option>" +msgstr "<option>--show-upgraded</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:409 +msgid "" +"Show upgraded packages; Print out a list of all packages that are to be " +"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>." +msgstr "" +"Mostra pacotes actualizados; Escreve uma lista de todos os pacotes que estão " +"prestes a ser actualizados. Item de Configuração: <literal>APT::Get::Show-" +"Upgraded</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:414 +msgid "<option>-V</option>" +msgstr "<option>-V</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:414 +msgid "<option>--verbose-versions</option>" +msgstr "<option>--verbose-versions</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:415 +msgid "" +"Show full versions for upgraded and installed packages. Configuration Item: " +"<literal>APT::Get::Show-Versions</literal>." +msgstr "" +"Mostra as versões completas para pacotes actualizados e instalados. Item de " +"Configuração: <literal>APT::Get::Show-Versions</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:419 +msgid "<option>-b</option>" +msgstr "<option>-b</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:419 +msgid "<option>--compile</option>" +msgstr "<option>--compile</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:420 +msgid "<option>--build</option>" +msgstr "<option>--build</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:421 +msgid "" +"Compile source packages after downloading them. Configuration Item: " +"<literal>APT::Get::Compile</literal>." +msgstr "" +"Compila pacotes fonte após os descarregar. Item de Configuração: " +"<literal>APT::Get::Compile</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:425 +msgid "<option>--install-recommends</option>" +msgstr "<option>--install-recommends</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:426 +msgid "Also install recommended packages." +msgstr "Também instala pacotes recomendados." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:430 +msgid "Do not install recommended packages." +msgstr "Não instala pacotes recomendados." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:433 +msgid "<option>--ignore-hold</option>" +msgstr "<option>--ignore-hold</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:434 +msgid "" +"Ignore package Holds; This causes <command>apt-get</command> to ignore a " +"hold placed on a package. This may be useful in conjunction with " +"<literal>dist-upgrade</literal> to override a large number of undesired " +"holds. Configuration Item: <literal>APT::Ignore-Hold</literal>." +msgstr "" +"Ignora pacotes retidos; Isto faz com que o <command>apt-get</command> ignore " +"a retenção de um pacote. Isto pode ser útil em conjunto com <literal>dist-" +"upgrade</literal> para sobrepor um grande número de retenções não desejadas. " +"Item de Configuração: <literal>APT::Ignore-Hold</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:440 +msgid "<option>--no-upgrade</option>" +msgstr "<option>--no-upgrade</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:441 +msgid "" +"Do not upgrade packages; When used in conjunction with <literal>install</" +"literal>, <literal>no-upgrade</literal> will prevent packages on the command " +"line from being upgraded if they are already installed. Configuration Item: " +"<literal>APT::Get::Upgrade</literal>." +msgstr "" +"Não actualiza pacotes; Quando usado em conjunto com <literal>install</" +"literal>, o <literal>no-upgrade</literal> irá prevenir que pacotes sejam " +"actualizados na linha de comandos se estes já estiverem instalados. Item de " +"Configuração: <literal>APT::Get::Upgrade</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:447 +msgid "<option>--only-upgrade</option>" +msgstr "<option>--only-upgrade</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:448 +msgid "" +"Do not install new packages; When used in conjunction with <literal>install</" +"literal>, <literal>only-upgrade</literal> will prevent packages on the " +"command line from being upgraded if they are not already installed. " +"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>." +msgstr "" +"Não instala pacotes novos; Quando usado em conjunto com <literal>install</" +"literal>, o <literal>only-upgrade</literal> irá prevenir que pacotes sejam " +"actualizados na linha de comandos se estes não estiverem já instalados. Item " +"de Configuração: <literal>APT::Get::Only-Upgrade</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:454 +msgid "<option>--force-yes</option>" +msgstr "<option>--force-yes</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:455 +msgid "" +"Force yes; This is a dangerous option that will cause apt to continue " +"without prompting if it is doing something potentially harmful. It should " +"not be used except in very special situations. Using <literal>force-yes</" +"literal> can potentially destroy your system! Configuration Item: " +"<literal>APT::Get::force-yes</literal>." +msgstr "" +"Força o sim; Esta é uma opção perigosa que irá fazer com que o apt continue " +"sem avisar quando está a fazer algo potencialmente prejudicial. Não deve ser " +"usado excepto em situações muito especiais. Usar o <literal>force-yes</" +"literal> pode destruir potencialmente o seu sistema! Item de Configuração: " +"<literal>APT::Get::force-yes</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:462 +msgid "<option>--print-uris</option>" +msgstr "<option>--print-uris</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:463 +msgid "" +"Instead of fetching the files to install their URIs are printed. Each URI " +"will have the path, the destination file name, the size and the expected md5 " +"hash. Note that the file name to write to will not always match the file " +"name on the remote site! This also works with the <literal>source</literal> " +"and <literal>update</literal> commands. When used with the <literal>update</" +"literal> command the MD5 and size are not included, and it is up to the user " +"to decompress any compressed files. Configuration Item: <literal>APT::Get::" +"Print-URIs</literal>." +msgstr "" +"Ao invés de ir buscar os ficheiros para instalar, escreve os seus URIs. Cada " +"URI irá ter o caminho, o nome de ficheiro de destino, o tamanho e o hash md5 " +"esperado. Note que o nome de ficheiro a escrever nem sempre irá condizer com " +"o nome do ficheiro no site remoto! Isto também funciona com os comandos " +"<literal>source</literal> e <literal>update</literal>. Quando usado com o " +"comando <literal>update</literal> o MD5 e o tamanho não são incluídos, e " +"cabe ao utilizador descomprimir quaisquer ficheiros comprimidos. Item de " +"Configuração: <literal>APT::Get::Print-URIs</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:473 +msgid "<option>--purge</option>" +msgstr "<option>--purge</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:474 +msgid "" +"Use purge instead of remove for anything that would be removed. An asterisk " +"(\"*\") will be displayed next to packages which are scheduled to be purged. " +"<option>remove --purge</option> is equivalent to the <option>purge</option> " +"command. Configuration Item: <literal>APT::Get::Purge</literal>." +msgstr "" +"Usa purgar em vez de remoção para tudo o que seja removido. Um asterisco (\"*" +"\") será mostrado junto dos pacotes que estão agendados para serem purgados. " +"<option>remove --purge</option> é equivalente ao comando <option>purge</" +"option>. Item de Configuração: <literal>APT::Get::Purge</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:481 +msgid "<option>--reinstall</option>" +msgstr "<option>--reinstall</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:482 +msgid "" +"Re-Install packages that are already installed and at the newest version. " +"Configuration Item: <literal>APT::Get::ReInstall</literal>." +msgstr "" +"Re-instala pacotes que já estão instalados e na versão mais recente. Item de " +"Configuração: <literal>APT::Get::ReInstall</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:486 +msgid "<option>--list-cleanup</option>" +msgstr "<option>--list-cleanup</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:487 +msgid "" +"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " +"it off. When on <command>apt-get</command> will automatically manage the " +"contents of <filename>&statedir;/lists</filename> to ensure that obsolete " +"files are erased. The only reason to turn it off is if you frequently " +"change your source list. Configuration Item: <literal>APT::Get::List-" +"Cleanup</literal>." +msgstr "" +"A predefinição desta opção é ligada, use <literal>--no-list-cleanup</" +"literal> para a desligar. Quando ligada o <command>apt-get</command> irá " +"gerir automaticamente os conteúdos de <filename>&statedir;/lists</filename> " +"para assegurar que os ficheiros obsoletos são apagados. A única razão para " +"desligar isto é no caso de você alterar frequentemente a sua lista de " +"fontes. Item de Configuração: <literal>APT::Get::List-Cleanup</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:496 +msgid "<option>--target-release</option>" +msgstr "<option>--target-release</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:497 +msgid "<option>--default-release</option>" +msgstr "<option>--default-release</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:498 +msgid "" +"This option controls the default input to the policy engine, it creates a " +"default pin at priority 990 using the specified release string. This " +"overrides the general settings in <filename>/etc/apt/preferences</" +"filename>. Specifically pinned packages are not affected by the value of " +"this option. In short, this option lets you have simple control over which " +"distribution packages will be retrieved from. Some common examples might be " +"<option>-t '2.1*'</option>, <option>-t unstable</option> or <option>-t sid</" +"option>. Configuration Item: <literal>APT::Default-Release</literal>; see " +"also the &apt-preferences; manual page." +msgstr "" +"Esta opção controla a entrada predefinida para o motor de políticas, cria um " +"pin predefinido na prioridade 990 usando a string de lançamento " +"especificada. Isto sobrepõe as definições gerais em <filename>/etc/apt/" +"preferences</filename>. Os pacotes com pin específico não são afectados pelo " +"valor desta opção. Em resumo, esta opção permite-lhe ter controlo simples " +"sobre de qual distribuição os pacotes serão obtidos. Alguns exemplos comuns " +"podem ser <option>-t '2.1*'</option>, <option>-t unstable</option> ou " +"<option>-t sid</option>. Item de Configuração: <literal>APT::Default-" +"Release</literal>; veja também o manual &apt-preferences;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:511 +msgid "<option>--trivial-only</option>" +msgstr "<option>--trivial-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:513 +msgid "" +"Only perform operations that are 'trivial'. Logically this can be considered " +"related to <option>--assume-yes</option>, where <option>--assume-yes</" +"option> will answer yes to any prompt, <option>--trivial-only</option> will " +"answer no. Configuration Item: <literal>APT::Get::Trivial-Only</literal>." +msgstr "" +"Apenas executa operações 'triviais'. Na lógica isto pode ser considerado " +"relacionado ao <option>--assume-yes</option>, onde <option>--assume-yes</" +"option> irá responder 'sim' a todos os avisos, <option>--trivial-only</" +"option> irá responder 'não'. Item de Configuração: <literal>APT::Get::" +"Trivial-Only</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:519 +msgid "<option>--no-remove</option>" +msgstr "<option>--no-remove</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:520 +msgid "" +"If any packages are to be removed apt-get immediately aborts without " +"prompting. Configuration Item: <literal>APT::Get::Remove</literal>." +msgstr "" +"Se quaisquer pacotes estiverem para ser removidos, o apt-get aborta " +"imediatamente sem aviso. Item de Configuração: <literal>APT::Get::Remove</" +"literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:525 +msgid "<option>--auto-remove</option>" +msgstr "<option>--auto-remove</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:526 +msgid "" +"If the command is either <literal>install</literal> or <literal>remove</" +"literal>, then this option acts like running <literal>autoremove</literal> " +"command, removing the unused dependency packages. Configuration Item: " +"<literal>APT::Get::AutomaticRemove</literal>." +msgstr "" +"Se o comando for <literal>install</literal> ou <literal>remove</literal>, " +"então esta opção age como se corresse o comando <literal>autoremove</" +"literal>, removendo os pacotes de dependências não utilizados. Item de " +"Configuração: <literal>APT::Get::AutomaticRemove</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:532 +msgid "<option>--only-source</option>" +msgstr "<option>--only-source</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:533 +msgid "" +"Only has meaning for the <literal>source</literal> and <literal>build-dep</" +"literal> commands. Indicates that the given source names are not to be " +"mapped through the binary table. This means that if this option is " +"specified, these commands will only accept source package names as " +"arguments, rather than accepting binary package names and looking up the " +"corresponding source package. Configuration Item: <literal>APT::Get::Only-" +"Source</literal>." +msgstr "" +"Apenas tem significado para os comandos <literal>source</literal> e " +"<literal>build-dep</literal>. Indica que os nomes de fontes fornecidos não " +"são para serem mapeados através da tabela de binários. Isto quer dizer que " +"se esta opção for especificada, estes comandos apenas irão aceitar nomes de " +"pacotes fonte como argumentos, em vez de aceitarem nomes de pacotes binários " +"e procurar o pacote fonte correspondente. Item de Configuração: " +"<literal>APT::Get::Only-Source</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:543 +msgid "<option>--diff-only</option>" +msgstr "<option>--diff-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:543 +msgid "<option>--dsc-only</option>" +msgstr "<option>--dsc-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:543 +msgid "<option>--tar-only</option>" +msgstr "<option>--tar-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:544 +msgid "" +"Download only the diff, dsc, or tar file of a source archive. Configuration " +"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" +"literal>, and <literal>APT::Get::Tar-Only</literal>." +msgstr "" +"Descarrega apenas o ficheiro diff, dsc, ou tar de um pacote fonte. Item de " +"Configuração: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-" +"Only</literal>, e <literal>APT::Get::Tar-Only</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:549 +msgid "<option>--arch-only</option>" +msgstr "<option>--arch-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:550 +msgid "" +"Only process architecture-dependent build-dependencies. Configuration Item: " +"<literal>APT::Get::Arch-Only</literal>." +msgstr "" +"Apenas processa dependências de compilação dependentes da arquitectura. Item " +"de Configuração: <literal>APT::Get::Arch-Only</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:554 +msgid "<option>--allow-unauthenticated</option>" +msgstr "<option>--allow-unauthenticated</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:555 +msgid "" +"Ignore if packages can't be authenticated and don't prompt about it. This " +"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" +"AllowUnauthenticated</literal>." +msgstr "" +"Ignora se os pacotes não podem ser autenticados e não avisa sobre isso. Isto " +"é útil para ferramentas como o pbuilder. Item de Configuração: <literal>APT::" +"Get::AllowUnauthenticated</literal>." + +#. type: Content of: <refentry><refsect1><variablelist> +#: apt-get.8.xml:568 +msgid "" +"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " +"&file-statelists;" +msgstr "" +"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " +"&file-statelists;" + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:577 +msgid "" +"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " +"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" +"preferences;, the APT Howto." +msgstr "" +"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " +"&apt-config;, &apt-secure;, O guia de utilizadores do The APT em " +"&guidesdir;, &apt-preferences;, o Howto do APT." + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:583 +msgid "" +"<command>apt-get</command> returns zero on normal operation, decimal 100 on " +"error." +msgstr "" +"<command>apt-get</command> devolve zero na operação normal, 100 decimal em " +"erro." + +#. type: Content of: <refentry><refsect1><title> +#: apt-get.8.xml:586 +msgid "ORIGINAL AUTHORS" +msgstr "AUTORES ORIGINAIS" + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:587 +msgid "&apt-author.jgunthorpe;" +msgstr "&apt-author.jgunthorpe;" + +#. type: Content of: <refentry><refsect1><title> +#: apt-get.8.xml:590 +msgid "CURRENT AUTHORS" +msgstr "AUTORES ACTUAIS" + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:592 +msgid "&apt-author.team;" +msgstr "&apt-author.team;" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-key.8.xml:14 apt-key.8.xml:21 +msgid "apt-key" +msgstr "apt-key" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-key.8.xml:22 +msgid "APT key management utility" +msgstr "Utilitário de gestão de chaves do APT" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-key.8.xml:28 +msgid "" +"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</" +"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> " +"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></" +"arg>" +msgstr "" +"<command>apt-key</command> <arg><option>--keyring <replaceable>nome de " +"ficheiro</replaceable></option></arg> <arg><replaceable>comando</" +"replaceable></arg> <arg rep=\"repeat\"><option><replaceable>argumentos</" +"replaceable></option></arg>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-key.8.xml:37 +msgid "" +"<command>apt-key</command> is used to manage the list of keys used by apt to " +"authenticate packages. Packages which have been authenticated using these " +"keys will be considered trusted." +msgstr "" +"<command>apt-key</command> é usado para gerir uma lista de chaves usadas " +"pelo apt para autenticar pacotes. Os pacotes que foram autenticados com " +"estas chaves serão considerados de confiança." + +#. type: Content of: <refentry><refsect1><title> +#: apt-key.8.xml:43 +msgid "Commands" +msgstr "Comandos" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:45 +msgid "add <replaceable>filename</replaceable>" +msgstr "add <replaceable>nome-de-ficheiro</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:49 +msgid "" +"Add a new key to the list of trusted keys. The key is read from " +"<replaceable>filename</replaceable>, or standard input if " +"<replaceable>filename</replaceable> is <literal>-</literal>." +msgstr "" +"Adiciona uma chave nova à lista de chaves de confiança. A chave é lida de " +"<replaceable>nome de ficheiro</replaceable>, ou entrada standard se " +"<replaceable>nome de ficheiro</replaceable> for <literal>-</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:57 +msgid "del <replaceable>keyid</replaceable>" +msgstr "del <replaceable>id de chave</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:61 +msgid "Remove a key from the list of trusted keys." +msgstr "Remove uma chave da lista de chaves de confiança." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:68 +msgid "export <replaceable>keyid</replaceable>" +msgstr "export <replaceable>id de chave</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:72 +msgid "Output the key <replaceable>keyid</replaceable> to standard output." +msgstr "" +"Escreve o <replaceable>id de chave</replaceable> da chave na saída standard." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:79 +msgid "exportall" +msgstr "exportall" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:83 +msgid "Output all trusted keys to standard output." +msgstr "Escreve todas as chaves de confiança na saída standard." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:90 +msgid "list" +msgstr "list" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:94 +msgid "List trusted keys." +msgstr "Lista as chaves de confiança." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:101 +msgid "finger" +msgstr "finger" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:105 +msgid "List fingerprints of trusted keys." +msgstr "Lista as fingerprints das chaves de confiança." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:112 +msgid "adv" +msgstr "adv" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:116 +msgid "" +"Pass advanced options to gpg. With adv --recv-key you can download the " +"public key." +msgstr "" +"Passa opções avançadas ao gpg. Com adv --recv-key você pode descarregar a " +"chave pública." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:128 +msgid "" +"Update the local keyring with the keyring of Debian archive keys and removes " +"from the keyring the archive keys which are no longer valid." +msgstr "" +"Actualiza o chaveiro local com o chaveiro das chaves de arquivos Debian e " +"remove do chaveiro as chaves de arquivo que já não são válidas." + +#. type: Content of: <refentry><refsect1><para> +#: apt-key.8.xml:140 +msgid "" +"Note that options need to be defined before the commands described in the " +"previous section." +msgstr "" +"Note que as opções precisam ser definidas antes dos comandos descritos na " +"secção prévia." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:142 +msgid "--keyring <replaceable>filename</replaceable>" +msgstr "--keyring <replaceable>nome-de-ficheiro</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:143 +msgid "" +"With this option it is possible to specify a specific keyring file the " +"command should operate on. The default is that a command is executed on the " +"<filename>trusted.gpg</filename> file as well as on all parts in the " +"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</" +"filename> is the primary keyring which means that e.g. new keys are added to " +"this one." +msgstr "" +"Com esta opção é possível especificar um ficheiro de chaveiro específico com " +"o qual o comando deve operar. A predefinição é que um comando é executado no " +"ficheiro <filename>trusted.gpg</filename> assim como em todas as partes do " +"directório <filename>trusted.gpg.d</filename>, assim <filename>trusted.gpg</" +"filename> é o chaveiro principal o que significa que, por exemplo, as novas " +"chaves são adicionadas a este." + +#. type: Content of: <refentry><refsect1><variablelist> +#: apt-key.8.xml:156 +msgid "&file-trustedgpg;" +msgstr "&file-trustedgpg;" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:158 +msgid "<filename>/etc/apt/trustdb.gpg</filename>" +msgstr "<filename>/etc/apt/trustdb.gpg</filename>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:159 +msgid "Local trust database of archive keys." +msgstr "Base de dados local de confiança de chaves de arquivos." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:162 +msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:163 +msgid "Keyring of Debian archive trusted keys." +msgstr "Chaveiro das chaves de confiança dos arquivos Debian." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:166 +msgid "" +"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +msgstr "" +"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:167 +msgid "Keyring of Debian archive removed trusted keys." +msgstr "Chaveiro das chaves de confiança removidas dos arquivos Debian." + +#. type: Content of: <refentry><refsect1><para> +#: apt-key.8.xml:176 +msgid "&apt-get;, &apt-secure;" +msgstr "&apt-get;, &apt-secure;" + +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt-mark.8.xml:13 +msgid "" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " +"August 2009</date>" +msgstr "" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " +"Agosto 2009</date>" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-mark.8.xml:22 apt-mark.8.xml:29 +msgid "apt-mark" +msgstr "apt-mark" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-mark.8.xml:30 +msgid "mark/unmark a package as being automatically-installed" +msgstr "marca/desmarca um pacote como sendo instalado automaticamente" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-mark.8.xml:36 +msgid "" +" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" +"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain" +"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain" +"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg " +"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </" +"arg> <arg choice=\"plain\">showauto</arg> </group>" +msgstr "" +" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" +"f=<replaceable>NOME DE FICHEIRO</replaceable></option></arg> <group choice=" +"\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain" +"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg " +"choice=\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable></arg> </" +"arg> <arg choice=\"plain\">showauto</arg> </group>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-mark.8.xml:53 +msgid "" +"<command>apt-mark</command> will change whether a package has been marked as " +"being automatically installed." +msgstr "" +"<command>apt-mark</command> irá modificar se um pacote foi marcado como " +"sendo instalado automaticamente." + +#. type: Content of: <refentry><refsect1><para> +#: apt-mark.8.xml:57 +msgid "" +"When you request that a package is installed, and as a result other packages " +"are installed to satisfy its dependencies, the dependencies are marked as " +"being automatically installed. Once these automatically installed packages " +"are no longer depended on by any manually installed packages, they will be " +"removed by e.g. <command>apt-get</command> or <command>aptitude</command>." +msgstr "" +"Quando você pede que um pacote seja instalado, e como resultado outros " +"pacotes são instalados para satisfazer as suas dependências, as dependências " +"são marcadas como sendo instaladas automaticamente. Uma vez que estes " +"pacotes instalados automaticamente não sejam mais necessários por nenhum " +"pacote instalado manualmente, eles serão removidos pelo <command>apt-get</" +"command> ou <command>aptitude</command> (exemplos)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:65 +msgid "markauto" +msgstr "markauto" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:66 +msgid "" +"<literal>markauto</literal> is used to mark a package as being automatically " +"installed, which will cause the package to be removed when no more manually " +"installed packages depend on this package." +msgstr "" +"<literal>markauto</literal> é usado para marcar um pacote como sendo " +"instalado automaticamente, o que irá causar a remoção do pacote quando mais " +"nenhum pacote instalado manualmente depender deste pacote." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:73 +msgid "unmarkauto" +msgstr "unmarkauto" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:74 +msgid "" +"<literal>unmarkauto</literal> is used to mark a package as being manually " +"installed, which will prevent the package from being automatically removed " +"if no other packages depend on it." +msgstr "" +"<literal>unmarkauto</literal> é usado para marcar um pacote como sendo " +"instalado manualmente, o que irá prevenir que o pacote seja removido " +"automaticamente se nenhum outro pacote depender dele." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:81 +msgid "showauto" +msgstr "showauto" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:82 +msgid "" +"<literal>showauto</literal> is used to print a list of automatically " +"installed packages with each package on a new line." +msgstr "" +"<literal>showauto</literal> é usado para escrever uma lista dos pacotes " +"instalados automaticamente com cada pacote numa linha nova." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:93 +msgid "" +"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" +msgstr "" +"<option>-f=<filename><replaceable>NOME DE FICHEIRO</replaceable></filename></" +"option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:94 +msgid "" +"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" +"option>" +msgstr "" +"<option>--file=<filename><replaceable>NOME DE FICHEIRO</replaceable></" +"filename></option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:97 +msgid "" +"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></" +"filename> instead of the default location, which is " +"<filename>extended_status</filename> in the directory defined by the " +"Configuration Item: <literal>Dir::State</literal>." +msgstr "" +"Lê/Escreve o estado de pacote a partir de " +"<filename><replaceable>NOME_DE_FICHEIRO</replaceable></filename> em vez da " +"localização predefinida, a qual é <filename>extended_status</filename> no " +"directório definido pelo Item de Configuração: <literal>Dir::State</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:103 +msgid "<option>-h</option>" +msgstr "<option>-h</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:104 +msgid "<option>--help</option>" +msgstr "<option>--help</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:105 +msgid "Show a short usage summary." +msgstr "Mostra um curto sumário de utilização." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:111 +msgid "<option>-v</option>" +msgstr "<option>-v</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:112 +msgid "<option>--version</option>" +msgstr "<option>--version</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:113 +msgid "Show the program version." +msgstr "Mostra a versão do programa." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:124 +msgid "<filename>/var/lib/apt/extended_states</filename>" +msgstr "<filename>/var/lib/apt/extended_states</filename>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:125 +msgid "" +"Status list of auto-installed packages. Configuration Item: <literal>Dir::" +"State</literal> sets the path to the <filename>extended_states</filename> " +"file." +msgstr "" +"Lista de estado de pacotes auto-instalados. Item de Configuração: " +"<literal>Dir::State</literal> que define o caminho para o ficheiro " +"<filename>extended_states</filename>." + +#. type: Content of: <refentry><refsect1><para> +#: apt-mark.8.xml:134 +msgid "&apt-get;,&aptitude;,&apt-conf;" +msgstr "&apt-get;,&aptitude;,&apt-conf;" + +#. type: Content of: <refentry><refsect1><para> +#: apt-mark.8.xml:138 +msgid "" +"<command>apt-mark</command> returns zero on normal operation, non-zero on " +"error." +msgstr "" +"<command>apt-mark</command> devolve zero na operação normal, 100 decimal em " +"erro." + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-secure.8.xml:14 apt-secure.8.xml:36 +msgid "apt-secure" +msgstr "apt-secure" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-secure.8.xml:37 +msgid "Archive authentication support for APT" +msgstr "Suporte de autenticação de arquivos para o APT" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:42 +msgid "" +"Starting with version 0.6, <command>apt</command> contains code that does " +"signature checking of the Release file for all archives. This ensures that " +"packages in the archive can't be modified by people who have no access to " +"the Release file signing key." +msgstr "" +"A partir da versão 0.6, o <command>apt</command> contém código que faz " +"verificação de assinaturas do ficheiro Release para todos os arquivos. Isto " +"assegura que os pacotes no arquivo não podem ser modificados por pessoas que " +"não têm acesso à chave de assinatura do ficheiro Release." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:50 +msgid "" +"If a package comes from a archive without a signature or with a signature " +"that apt does not have a key for that package is considered untrusted and " +"installing it will result in a big warning. <command>apt-get</command> will " +"currently only warn for unsigned archives, future releases might force all " +"sources to be verified before downloading packages from them." +msgstr "" +"Se um pacote vem dum arquivo sem assinatura ou com uma assinatura para a " +"qual o apt não tem a chave, esse pacote é considerado 'não sendo de " +"confiança' e instalá-lo irá resultar num grande aviso. Actualmente o " +"<command>apt-get</command> irá avisar apenas de arquivos não assinados, " +"lançamentos futuros poderão vir a forçar que todas as fontes sejam " +"verificadas antes de descarregar pacotes delas." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:59 +msgid "" +"The package frontends &apt-get;, &aptitude; and &synaptic; support this new " +"authentication feature." +msgstr "" +"Os frontends de pacotes &apt-get;, &aptitude; e &synaptic; suportam esta " +"nova funcionalidade de autenticação." + +#. type: Content of: <refentry><refsect1><title> +#: apt-secure.8.xml:64 +msgid "Trusted archives" +msgstr "Arquivos de confiança" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:67 +msgid "" +"The chain of trust from an apt archive to the end user is made up of " +"different steps. <command>apt-secure</command> is the last step in this " +"chain, trusting an archive does not mean that the packages that you trust it " +"do not contain malicious code but means that you trust the archive " +"maintainer. It's the archive maintainer responsibility to ensure that the " +"archive integrity is correct." +msgstr "" +"A corrente de confiança desde um arquivo apt até ao utilizador final é feita " +"em diferentes passos. O <command>apt-secure</command> é o último passo nesta " +"corrente, confiar num arquivo não quer dizer que os pacotes em que confia " +"não possam conter código malicioso, mas que dizer que você confia no " +"responsável do arquivo. É da responsabilidade do responsável do arquivo " +"assegurar que a integridade do arquivo está correcta." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:75 +msgid "" +"apt-secure does not review signatures at a package level. If you require " +"tools to do this you should look at <command>debsig-verify</command> and " +"<command>debsign</command> (provided in the debsig-verify and devscripts " +"packages respectively)." +msgstr "" +"O apt-secure não revê as assinaturas ao nível do pacote. Se você necessita " +"de ferramentas que o façam deve procurar pelo <command>debsig-verify</" +"command> e <command>debsign</command> (disponibilizados nos pacotes debsig-" +"verify e devscripts respectivamente)." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:82 +msgid "" +"The chain of trust in Debian starts when a maintainer uploads a new package " +"or a new version of a package to the Debian archive. This upload in order to " +"become effective needs to be signed by a key of a maintainer within the " +"Debian maintainer's keyring (available in the debian-keyring package). " +"Maintainer's keys are signed by other maintainers following pre-established " +"procedures to ensure the identity of the key holder." +msgstr "" +"A corrente de confiança em Debian começa quando o responsável faz o upload " +"de um novo pacote ou de uma nova versão de um pacote para o arquivo Debian. " +"De modo a se tornar efectivo, este upload precisa de ser assinado por uma " +"chave de um responsável dentro do chaveiro de responsáveis da Debian " +"(disponível no pacote debian-keyring). As chaves dos responsáveis são " +"assinadas por outros responsáveis seguindo procedimentos pré-estabelecidos " +"para assegurar a identidade do dono da chave." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:92 +msgid "" +"Once the uploaded package is verified and included in the archive, the " +"maintainer signature is stripped off, an MD5 sum of the package is computed " +"and put in the Packages file. The MD5 sum of all of the packages files are " +"then computed and put into the Release file. The Release file is then signed " +"by the archive key (which is created once a year) and distributed through " +"the FTP server. This key is also on the Debian keyring." +msgstr "" +"Após o upload, o pacote é verificado e incluído no arquivo, a assinatura do " +"responsável é despojada, é computado um sumário MD5 do pacote e colocado no " +"ficheiro Packages. Os sumários MD5 de todos os ficheiros pacotes são então " +"computados e colocados no ficheiro Release. O ficheiro Release é então " +"assinado pela chave de arquivo (a qual é criada uma vez por ano) e " +"distribuído através do servidor FTP. Esta chave está também no chaveiro " +"Debian." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:102 +msgid "" +"Any end user can check the signature of the Release file, extract the MD5 " +"sum of a package from it and compare it with the MD5 sum of the package he " +"downloaded. Prior to version 0.6 only the MD5 sum of the downloaded Debian " +"package was checked. Now both the MD5 sum and the signature of the Release " +"file are checked." +msgstr "" +"Qualquer utilizador final pode verificar a assinatura do ficheiro Release, " +"extrair o sumário MD5 de um pacote a partir dele, e compará-lo com o sumário " +"MD5 do pacote que descarregou. Antes da versão 0.6 apenas o sumário MD5 do " +"pacote Debian descarregado era verificado. Agora são verificados ambos: o " +"sumário MD5 e a assinatura do ficheiro Release." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:109 +msgid "" +"Notice that this is distinct from checking signatures on a per package " +"basis. It is designed to prevent two possible attacks:" +msgstr "" +"Note que isto é diferente de verificar assinaturas por cada pacote. É " +"desenhado para prevenir dois ataques possíveis:" + +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:114 +msgid "" +"<literal>Network \"man in the middle\" attacks</literal>. Without signature " +"checking, a malicious agent can introduce himself in the package download " +"process and provide malicious software either by controlling a network " +"element (router, switch, etc.) or by redirecting traffic to a rogue server " +"(through arp or DNS spoofing attacks)." +msgstr "" +"<literal>Ataques de rede \"man in the middle\"</literal>. Sem verificação de " +"assinatura, um agente malicioso pode introduzir-se ele próprio no processo " +"de descarga de pacotes e disponibilizar software malicioso seja ao controlar " +"um elemento de rede (router, switch, etc.) ou ao redireccionar tráfego para " +"um servidor impostor (através de ataques de fraude de arp ou DNS)." + +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:122 +msgid "" +"<literal>Mirror network compromise</literal>. Without signature checking, a " +"malicious agent can compromise a mirror host and modify the files in it to " +"propagate malicious software to all users downloading packages from that " +"host." +msgstr "" +"<literal>Mirror network compromise</literal>. Sem verificação de assinatura, " +"um agente malicioso pode comprometer uma máquina mirror e modificar os " +"ficheiros dele para propagar software malicioso a todos os utilizadores que " +"descarregam pacotes a partir dessa máquina." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:129 +msgid "" +"However, it does not defend against a compromise of the Debian master server " +"itself (which signs the packages) or against a compromise of the key used to " +"sign the Release files. In any case, this mechanism can complement a per-" +"package signature." +msgstr "" +"No entanto, isto não defende contra um compromisso do próprio servidor " +"mestre da Debian (o qual assina os pacotes) ou contra um compromisso da " +"chave usada para assinar os ficheiros Release. Em qualquer caso, este " +"mecanismo pode complementar uma assinatura por-pacote." + +#. type: Content of: <refentry><refsect1><title> +#: apt-secure.8.xml:135 +msgid "User configuration" +msgstr "Configuração do utilizador" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:137 +msgid "" +"<command>apt-key</command> is the program that manages the list of keys used " +"by apt. It can be used to add or remove keys although an installation of " +"this release will automatically provide the default Debian archive signing " +"keys used in the Debian package repositories." +msgstr "" +"<command>apt-key</command> é o programa que gere a lista de chaves usada " +"pelo apt. Pode ser usado para adicionar ou remover chaves apesar de uma " +"instalação deste lançamento ir automaticamente disponibilizar as chaves de " +"assinaturas predefinidas de arquivo Debian usadas nos repositórios de " +"pacotes Debian." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:144 +msgid "" +"In order to add a new key you need to first download it (you should make " +"sure you are using a trusted communication channel when retrieving it), add " +"it with <command>apt-key</command> and then run <command>apt-get update</" +"command> so that apt can download and verify the <filename>Release.gpg</" +"filename> files from the archives you have configured." +msgstr "" +"De modo a adicionar uma chave nova você precisa primeiro de descarregá-la " +"(você deve certificar-se que está a usar um canal de comunicação de " +"confiança quando a obtém), adicioná-la com <command>apt-key</command> e " +"depois correr <command>apt-get update</command> para que o apt possa " +"descarregar e verificar os ficheiros <filename>Release.gpg</filename> dos " +"arquivos que você configurou." + +#. type: Content of: <refentry><refsect1><title> +#: apt-secure.8.xml:153 +msgid "Archive configuration" +msgstr "Configuração de arquivos" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:155 +msgid "" +"If you want to provide archive signatures in an archive under your " +"maintenance you have to:" +msgstr "" +"Se você deseja fornecer assinaturas de arquivo a um arquivo sob sua " +"manutenção, você tem que:" + +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:160 +msgid "" +"<emphasis>Create a toplevel Release file</emphasis>, if it does not exist " +"already. You can do this by running <command>apt-ftparchive release</" +"command> (provided in apt-utils)." +msgstr "" +"<emphasis>Criar um ficheiro Release de nível de topo</emphasis>, se este já " +"não existir. Você pode fazer isto ao correr <command>apt-ftparchive release</" +"command> (disponibilizado no apt-utils)." + +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:165 +msgid "" +"<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -abs -" +"o Release.gpg Release</command>." +msgstr "" +"<emphasis>Assiná-lo</emphasis>. Você pode fazer isso ao correr <command>gpg -" +"abs -o Release.gpg Release</command>." + +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:168 +msgid "" +"<emphasis>Publish the key fingerprint</emphasis>, that way your users will " +"know what key they need to import in order to authenticate the files in the " +"archive." +msgstr "" +"<emphasis>Publicar a impressão digital da chave</emphasis>, deste modo os " +"seus utilizadores irão saber que chave precisam de importar de modo a " +"autenticar os ficheiros no arquivo." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:175 +msgid "" +"Whenever the contents of the archive changes (new packages are added or " +"removed) the archive maintainer has to follow the first two steps previously " +"outlined." +msgstr "" +"Sempre que o conteúdo do arquivo mude (são adicionados novos pacotes ou " +"removidos), o responsável do arquivo tem que seguir os primeiros dois passos " +"previamente delineados." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:183 +msgid "" +"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " +"&debsign; &debsig-verify;, &gpg;" +msgstr "" +"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " +"&debsign; &debsig-verify;, &gpg;" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:187 +msgid "" +"For more background information you might want to review the <ulink url=" +"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html" +"\">Debian Security Infrastructure</ulink> chapter of the Securing Debian " +"Manual (available also in the harden-doc package) and the <ulink url=" +"\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong " +"Distribution HOWTO</ulink> by V. Alex Brennen." +msgstr "" +"Para mais informação de fundo você deve querer reler a <ulink url=\"http://" +"www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html" +"\">Infraestrutura de Segurança da Debian</ulink> no capítulo do Manual " +"Debian de Segurança (disponível também no pacote harden-doc) e o <ulink url=" +"\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong " +"Distribution HOWTO</ulink> de V. Alex Brennen." + +#. type: Content of: <refentry><refsect1><title> +#: apt-secure.8.xml:200 +msgid "Manpage Authors" +msgstr "Autores do manual" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:202 +msgid "" +"This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac " +"Jones, Colin Walters, Florian Weimer and Michael Vogt." +msgstr "" +"Este manual é baseado no trabalho de Javier Fernández-Sanguino Peña, Isaac " +"Jones, Colin Walters, Florian Weimer e Michael Vogt." + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-sortpkgs.1.xml:22 apt-sortpkgs.1.xml:29 +msgid "apt-sortpkgs" +msgstr "apt-sortpkgs" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-sortpkgs.1.xml:30 +msgid "Utility to sort package index files" +msgstr "Utilitário para organizar ficheiros índice de pacotes" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-sortpkgs.1.xml:36 +msgid "" +"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> " +"<arg><option>-o=<replaceable>config string</replaceable></option></arg> " +"<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg choice=" +"\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>" +msgstr "" +"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> " +"<arg><option>-o=<replaceable>string de configuração</replaceable></option></" +"arg> <arg><option>-c=<replaceable>ficheiro</replaceable></option></arg> <arg " +"choice=\"plain\" rep=\"repeat\"><replaceable>ficheiro</replaceable></arg>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-sortpkgs.1.xml:45 +msgid "" +"<command>apt-sortpkgs</command> will take an index file (Source index or " +"Package index) and sort the records so that they are ordered by the package " +"name. It will also sort the internal fields of each record according to the " +"internal sorting rules." +msgstr "" +"<command>apt-sortpkgs</command> irá pegar num ficheiro índice (índice de " +"fontes ou índice de pacotes) e organizar os registos para que fiquem " +"ordenados pelo nome do pacote. Também organiza os campos internos de cada " +"registo de acordo com as regras de organização internas." + +#. type: Content of: <refentry><refsect1><para> +#: apt-sortpkgs.1.xml:51 +msgid "All output is sent to stdout, the input must be a seekable file." +msgstr "" +"Todas as saídas são enviadas para o stdout, a entrada tem de ser um ficheiro " +"pesquisável." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-sortpkgs.1.xml:58 +msgid "<option>--source</option>" +msgstr "<option>--source</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-sortpkgs.1.xml:60 +msgid "" +"Use Source index field ordering. Configuration Item: <literal>APT::" +"SortPkgs::Source</literal>." +msgstr "" +"Usa ordenação de campo de índice Source. Item de Configuração: <literal>APT::" +"SortPkgs::Source</literal>." + +#. type: Content of: <refentry><refsect1><para> +#: apt-sortpkgs.1.xml:74 +msgid "" +"<command>apt-sortpkgs</command> returns zero on normal operation, decimal " +"100 on error." +msgstr "" +"<command>apt-sortpkgs</command> devolve zero na operação normal, 100 decimal " +"em erro." + +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt.conf.5.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" +"firstname> <surname>Burrows</surname> <contrib>Initial documentation of " +"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " +"&apt-product; <date>16 January 2010</date>" +msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" +"firstname> <surname>Burrows</surname> <contrib>Documentação inicial do " +"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " +"&apt-product; <date>16 Janeiro 2010</date>" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt.conf.5.xml:28 apt.conf.5.xml:35 +msgid "apt.conf" +msgstr "apt.conf" + +#. type: Content of: <refentry><refmeta><manvolnum> +#: apt.conf.5.xml:29 apt_preferences.5.xml:22 sources.list.5.xml:23 +msgid "5" +msgstr "5" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt.conf.5.xml:36 +msgid "Configuration file for APT" +msgstr "Ficheiro de configuração para o APT" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:40 +msgid "" +"<filename>apt.conf</filename> is the main configuration file for the APT " +"suite of tools, but by far not the only place changes to options can be " +"made. All tools therefore share the configuration files and also use a " +"common command line parser to provide a uniform environment." +msgstr "" +"<filename>apt.conf</filename> é o ficheiro de configuração principal para a " +"suite de ferramentas do APT, as não é o único lugar onde se podem fazer " +"alterações às opções. Então todas as ferramentas partilham os ficheiros de " +"configuração e também usam um analisador de linha de comandos comum para " +"disponibilizar um ambiente uniforme." + +#. type: Content of: <refentry><refsect1><orderedlist><para> +#: apt.conf.5.xml:45 +msgid "" +"When an APT tool starts up it will read the configuration files in the " +"following order:" +msgstr "" +"Quando a ferramenta APT arranca irá ler os ficheiros de configuração pela " +"seguinte ordem:" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:47 +msgid "" +"the file specified by the <envar>APT_CONFIG</envar> environment variable (if " +"any)" +msgstr "" +"o ficheiro especificado pela variável de ambiente <envar>APT_CONFIG</envar> " +"(se existir)" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:49 +msgid "" +"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " +"order which have no or \"<literal>conf</literal>\" as filename extension and " +"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " +"characters - otherwise they will be silently ignored." +msgstr "" +"todos os ficheiros em <literal>Dir::Etc::Parts</literal> em ordem ascendente " +"alfanumérica sem extensão ou com \"<literal>conf</literal>\" como extensão " +"do nome de ficheiro e que apenas contêm caracteres alfanuméricos, traço (-), " +"underscore (_) e ponto (.) - caso contrário serão ignorados em silêncio." + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:54 +msgid "" +"the main configuration file specified by <literal>Dir::Etc::main</literal>" +msgstr "" +"o ficheiro de configuração principal especificado por <literal>Dir::Etc::" +"main</literal>" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:56 +msgid "" +"the command line options are applied to override the configuration " +"directives or to load even more configuration files." +msgstr "" +"as opções de linha de comandos são aplicadas para sobrepor as directivas de " +"configuração ou para carregar mais ficheiros de configuração." + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:60 +msgid "Syntax" +msgstr "Sintaxe" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:61 +msgid "" +"The configuration file is organized in a tree with options organized into " +"functional groups. Option specification is given with a double colon " +"notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option " +"within the APT tool group, for the Get tool. Options do not inherit from " +"their parent groups." +msgstr "" +"O ficheiro de configuração é organizado numa árvore com as opções " +"organizadas em grupos de funcionamento. A especificação das opções é dada " +"com um sinal de dois pontos duplo , por exemplo <literal>APT::Get::Assume-" +"Yes</literal> é uma opção dentro do grupo de ferramentas do APT, para a " +"ferramenta Get. A opções não herdam dos seus grupos parentes." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:67 +msgid "" +"Syntactically the configuration language is modeled after what the ISC tools " +"such as bind and dhcp use. Lines starting with <literal>//</literal> are " +"treated as comments (ignored), as well as all text between <literal>/*</" +"literal> and <literal>*/</literal>, just like C/C++ comments. Each line is " +"of the form <literal>APT::Get::Assume-Yes \"true\";</literal>. The trailing " +"semicolon and the quotes are required. The value must be on one line, and " +"there is no kind of string concatenation. It must not include inside " +"quotes. The behavior of the backslash \"\\\" and escaped characters inside " +"a value is undefined and it should not be used. An option name may include " +"alphanumerical characters and the \"/-:._+\" characters. A new scope can be " +"opened with curly braces, like:" +msgstr "" +"Sintacticamente a linguagem de configuração é modelada após o que as " +"ferramentas ISC usam, como o bind e o dhcp. As linhas que começam com " +"<literal>//</literal> são tratadas como comentários (ignoradas), assim como " +"todo o texto entre <literal>/*</literal> e <literal>*/</literal>, tal como " +"os comentários de C/C++. Cada linha é do formato <literal>APT::Get::Assume-" +"Yes \"true\";</literal>. O ponto e vírgula à direita e as aspas são " +"necessárias. O valor deve estar numa linha, e não há nenhum tipo de " +"concatenação de string. Não pode incluir aspas interiores. O comportamento " +"da backslash \"\\\" e caracteres de escape dentro de um valor é indefinido e " +"não deve ser usado. Um nome de opção pode incluir caracteres alfanuméricos e " +"os caracteres \"/-:._+\". Um novo scope pode ser aberto com chavetas, como:" + +#. type: Content of: <refentry><refsect1><informalexample><programlisting> +#: apt.conf.5.xml:81 +#, no-wrap +msgid "" +"APT {\n" +" Get {\n" +" Assume-Yes \"true\";\n" +" Fix-Broken \"true\";\n" +" };\n" +"};\n" +msgstr "" +"APT {\n" +" Get {\n" +" Assume-Yes \"true\";\n" +" Fix-Broken \"true\";\n" +" };\n" +"};\n" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:89 +msgid "" +"with newlines placed to make it more readable. Lists can be created by " +"opening a scope and including a single string enclosed in quotes followed by " +"a semicolon. Multiple entries can be included, each separated by a semicolon." +msgstr "" +"com novas linhas colocadas para o tornar mais legível. As listas podem ser " +"criadas ao abrir um scope e incluindo uma string única entre aspas seguida " +"por um ponto e vírgula. Podem ser incluídas múltiplas entradas, cada uma " +"separada por um ponto e vírgula (;)." + +#. type: Content of: <refentry><refsect1><informalexample><programlisting> +#: apt.conf.5.xml:94 +#, no-wrap +msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" +msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:97 +msgid "" +"In general the sample configuration file in <filename>&docdir;examples/apt." +"conf</filename> &configureindex; is a good guide for how it should look." +msgstr "" +"Em geral o exemplo de ficheiro de configuração em <filename>&docdir;examples/" +"apt.conf</filename> &configureindex; é um bom guia de como deve ficar." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:101 +msgid "" +"The names of the configuration items are not case-sensitive. So in the " +"previous example you could use <literal>dpkg::pre-install-pkgs</literal>." +msgstr "" +"Os nomes dos items de configuração não são sensíveis a maiúsculas/" +"minúsculas. Portanto no exemplo prévio você poderia usar <literal>dpkg::pre-" +"install-pkgs</literal>." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:104 +msgid "" +"Names for the configuration items are optional if a list is defined as it " +"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. " +"If you don't specify a name a new entry will simply add a new option to the " +"list. If you specify a name you can override the option as every other " +"option by reassigning a new value to the option." +msgstr "" +"Os nomes dos items de configuração são opcionais se uma lista for definida " +"com pode ser vista no exemplo <literal>DPkg::Pre-Install-Pkgs</literal> " +"acima. Se você não especificar um nome, uma nova entrada irá simplesmente " +"adicionar uma nova opção à lista. Se você especificar um nome, você pode " +"sobrepor a opção como qualquer outra opção ao re-atribuir um novo valor à " +"opção." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:109 +msgid "" +"Two specials are allowed, <literal>#include</literal> (which is deprecated " +"and not supported by alternative implementations) and <literal>#clear</" +"literal>: <literal>#include</literal> will include the given file, unless " +"the filename ends in a slash, then the whole directory is included. " +"<literal>#clear</literal> is used to erase a part of the configuration tree. " +"The specified element and all its descendants are erased. (Note that these " +"lines also need to end with a semicolon.)" +msgstr "" +"São permitidas duas especiais, <literal>#include</literal> (a qual está " +"obsoleta e não é suportada por implementações alternativas) e " +"<literal>#clear</literal>: <literal>#include</literal> irá incluir o " +"ficheiro fornecido, a menos que o nome do ficheiro termine numa barra (/), " +"então todo o directório é incluído. <literal>#clear</literal> é usado para " +"apagar uma parte da árvore de configuração. O elemento especificado e os " +"seus descendentes são apagados. (Note que estas linhas também precisam de " +"acabar com um 'ponto e vírgula' (;) .)" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:117 +msgid "" +"The #clear command is the only way to delete a list or a complete scope. " +"Reopening a scope or the ::-style described below will <emphasis>not</" +"emphasis> override previously written entries. Only options can be " +"overridden by addressing a new value to it - lists and scopes can't be " +"overridden, only cleared." +msgstr "" +"O comando #clear é a única maneira de apagar uma lista ou um scope completo. " +"Reabrindo um scope ou o ::-style descrito abaixo <emphasis>não</emphasis> " +"irá sobrepor entradas escritas anteriormente. Apenas as opções podem ser " +"sobrepostas ao atribuir um novo valor a elas - listas e scopes não podem ser " +"sobrepostos, apenas limpos." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:122 +msgid "" +"All of the APT tools take a -o option which allows an arbitrary " +"configuration directive to be specified on the command line. The syntax is a " +"full option name (<literal>APT::Get::Assume-Yes</literal> for instance) " +"followed by an equals sign then the new value of the option. Lists can be " +"appended too by adding a trailing :: to the list name. (As you might " +"suspect: The scope syntax can't be used on the command line.)" +msgstr "" +"Todas as ferramentas do APT recebem uma opção -o que permite uma directiva " +"de configuração arbitrária para ser especificada na linha de comandos. A " +"sintaxe é um nome de opção completo (<literal>APT::Get::Assume-Yes</literal> " +"por exemplo) seguido por um igual (=) e depois o valor da opção. Também pode " +"ser acrescentadas listas ao adicionar um duplo dois-pontos (::) à direita " +"para o nome da lista. (Como deve suspeitar: A sintaxe de scope não pode ser " +"usada na linha de comandos.)" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:129 +msgid "" +"Note that you can use :: only for appending one item per line to a list and " +"that you should not use it in combination with the scope syntax. (The scope " +"syntax implicit insert ::) Using both syntaxes together will trigger a bug " +"which some users unfortunately relay on: An option with the unusual name " +"\"<literal>::</literal>\" which acts like every other option with a name. " +"These introduces many problems including that a user who writes multiple " +"lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a " +"list will gain the opposite as only the last assignment for this option " +"\"<literal>::</literal>\" will be used. Upcoming APT versions will raise " +"errors and will stop working if they encounter this misuse, so please " +"correct such statements now as long as APT doesn't complain explicit about " +"them." +msgstr "" +"Note que você apenas pode usar :: para acrescentar um item por linha a uma " +"lista e não o deve usar em combinação com a sintaxe scope. (A sintaxe scope " +"implicitamente insere ::). Usar ambas as sintaxes juntamente irá disparar um " +"bug que infelizmente alguns utilizadores nos transmitem: Uma opção com o " +"nome não usual \"<literal>::</literal>\" a qual actua como qualquer outra " +"opção com um nome. Isto introduz muitos problemas incluindo que, um " +"utilizador que escreve múltiplas linhas nesta sintaxe <emphasis>errada</" +"emphasis> na esperança de acrescentar a uma lista, irá ganhar o oposto " +"porque apenas a última atribuição para esta opção \"<literal>::</literal>\" " +"será a usada. Futuras versões do APT irá levantar erros e parar de funcionar " +"se encontrarem esta má utilização, portanto por favor corrija tais " +"declarações agora enquanto o APT não se queixa explicitamente acerca delas." + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:141 +msgid "The APT Group" +msgstr "O Grupo APT" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:142 +msgid "" +"This group of options controls general APT behavior as well as holding the " +"options for all of the tools." +msgstr "" +"Este grupo de opções controla o comportamento geral do APT assim como mantém " +"as opções para todas as ferramentas." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:146 +msgid "Architecture" +msgstr "Architecture" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:147 +msgid "" +"System Architecture; sets the architecture to use when fetching files and " +"parsing package lists. The internal default is the architecture apt was " +"compiled for." +msgstr "" +"System Architecture; define a arquitectura a usar quando procura ficheiros e " +"analisa listas de pacotes. A predefinição interna é a arquitectura para a " +"qual o APT foi compilado." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:152 +msgid "Default-Release" +msgstr "Default-Release" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:153 +msgid "" +"Default release to install packages from if more than one version available. " +"Contains release name, codename or release version. Examples: 'stable', " +"'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See also &apt-" +"preferences;." +msgstr "" +"Lançamento predefinido de onde instalar pacotes se existir mais de uma " +"versão disponível. Contém o nome do lançamento, nome de código ou versão de " +"lançamento. Exemplos: 'stable', 'testing', 'unstable', 'lenny', 'squeeze', " +"'4.0', '5.0*'. Veja também &apt-preferences;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:157 +msgid "Ignore-Hold" +msgstr "Ignore-Hold" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:158 +msgid "" +"Ignore Held packages; This global option causes the problem resolver to " +"ignore held packages in its decision making." +msgstr "" +"Ignore Held packages; Esta opção global faz com que ao resolver problemas, " +"os pacotes segurados sejam ignorados na sua decisão de marcação." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:162 +msgid "Clean-Installed" +msgstr "Clean-Installed" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:163 +msgid "" +"Defaults to on. When turned on the autoclean feature will remove any " +"packages which can no longer be downloaded from the cache. If turned off " +"then packages that are locally installed are also excluded from cleaning - " +"but note that APT provides no direct means to reinstall them." +msgstr "" +"A predefinição é ligada. Quando ligada, a funcionalidade autoclean irá " +"remover quaisquer pacotes que já não possam ser descarregados a partir da " +"cache. Se desligada, então os pacotes que estão instalados localmente são " +"também excluídos da limpeza - mas note que o APT não disponibiliza um meio " +"directo de os reinstalar." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:169 +msgid "Immediate-Configure" +msgstr "Immediate-Configure" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:170 +msgid "" +"Defaults to on which will cause APT to install essential and important " +"packages as fast as possible in the install/upgrade operation. This is done " +"to limit the effect of a failing &dpkg; call: If this option is disabled APT " +"does treat an important package in the same way as an extra package: Between " +"the unpacking of the important package A and his configuration can then be " +"many other unpack or configuration calls, e.g. for package B which has no " +"relation to A, but causes the dpkg call to fail (e.g. because maintainer " +"script of package B generates an error) which results in a system state in " +"which package A is unpacked but unconfigured - each package depending on A " +"is now no longer guaranteed to work as their dependency on A is not longer " +"satisfied. The immediate configuration marker is also applied to all " +"dependencies which can generate a problem if the dependencies e.g. form a " +"circle as a dependency with the immediate flag is comparable with a Pre-" +"Dependency. So in theory it is possible that APT encounters a situation in " +"which it is unable to perform immediate configuration, errors out and refers " +"to this option so the user can deactivate the immediate configuration " +"temporarily to be able to perform an install/upgrade again. Note the use of " +"the word \"theory\" here as this problem was only encountered by now in real " +"world a few times in non-stable distribution versions and was caused by " +"wrong dependencies of the package in question or by a system in an already " +"broken state, so you should not blindly disable this option as the mentioned " +"scenario above is not the only problem immediate configuration can help to " +"prevent in the first place. Before a big operation like <literal>dist-" +"upgrade</literal> is run with this option disabled it should be tried to " +"explicitly <literal>install</literal> the package APT is unable to configure " +"immediately, but please make sure to report your problem also to your " +"distribution and to the APT team with the buglink below so they can work on " +"improving or correcting the upgrade process." +msgstr "" +"A predefinição é ligado o que irá fazer com que o APT instale pacotes " +"essenciais e importantes o mais rápido possível na operação de instalar/" +"actualizar. Isto é feito para limitar o efeito de uma chamada falhada do " +"&dpkg;. Se esta opção for desactivada, o APT trata um pacote importante do " +"mesmo modo que um pacote extra: Entre o desempacotamento do pacote " +"importante A e a sua configuração podem acontecer muitas outras chamadas de " +"desempacotamento e configuração, exemplo, para o pacote B que não tem " +"nenhuma relação com A, mas causa uma falha na chamada ao dpkg (ex, porque o " +"script do responsável do pacote B gera um erro) o qual resulta num estado do " +"sistema em que o pacote A está desempacotado mas ainda não configurado - já " +"não se garante o funcionamento de cada pacote que depende de A porque a sua " +"dependência já não está satisfeita. O marcador de configuração imediata é " +"também aplicado a todas as dependências que possam gerar um problema se as " +"dependências, ex, formam um círculo como uma dependência com a marca de " +"imediato a ser comparável com uma Pré-Dependência. Portanto, em teoria, é " +"possível que o APT encontre uma situação na qual é incapaz de executar " +"configuração imediata, entre em erro e refira esta opção para que o " +"utilizador possa desactivar temporariamente a configuração imediata para ser " +"capaz de executar uma instalação/actualização outra vez. Note o uso da " +"palavra \"teoria\" aqui pois este problema foi poucas vezes encontrado até " +"agora no mundo real em versões de distribuição não-estáveis e causados por " +"dependências erradas do pacote em questão ou por um sistema já num estado " +"corrompido, portanto você não deve desactivar esta opção às cegas porque, em " +"primeiro lugar, o cenário mencionado acima não é o único problema que a " +"configuração imediata pode ajudar a prevenir. Antes de uma grande operação " +"como <literal>dist-upgrade</literal> ser corrida com esta opção desactivada, " +"deve ser tentado primeiro fazer um <literal>install</literal> explicito ao " +"pacote que o APT é incapaz de configurar imediatamente, mas por favor " +"certifique-se de também relatar o seu problema à sua distribuição e à equipa " +"do APT com o link de bug abaixo para que possam trabalhar na melhoria ou " +"correcção do processo de actualização." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:192 +msgid "Force-LoopBreak" +msgstr "Force-LoopBreak" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:193 +msgid "" +"Never Enable this option unless you -really- know what you are doing. It " +"permits APT to temporarily remove an essential package to break a Conflicts/" +"Conflicts or Conflicts/Pre-Depend loop between two essential packages. SUCH " +"A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option will work if the " +"essential packages are not tar, gzip, libc, dpkg, bash or anything that " +"those packages depend on." +msgstr "" +"Nunca Active esta opção a menos que saiba -realmente- o que está a fazer. " +"Permite ao APT remover temporariamente um pacote essencial para interromper " +"um ciclo vicioso de Conflitos/Conflitos ou Conflitos/Pré-Dependência entre " +"dois pacotes essenciais. TAL CICLO VICIOSO NÃO DEVERÁ NUNCA EXISTIR E É UM " +"GRAVE BUG. Esta opção deverá funcionar se os pacotes essenciais não forem " +"tar, gzip, libc, dpkg, bash ou qualquer coisa de que estes dependem." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:201 +msgid "Cache-Limit" +msgstr "Cache-Limit" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:202 +msgid "" +"APT uses a fixed size memory mapped cache file to store the 'available' " +"information. This sets the size of that cache (in bytes)." +msgstr "" +"O APT usa um ficheiro de cache de memória mapeada de tamanho fixo para " +"armazenar a informação 'disponível'. Isto define o tamanho dessa cache (em " +"bytes)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:206 +msgid "Build-Essential" +msgstr "Build-Essential" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:207 +msgid "Defines which package(s) are considered essential build dependencies." +msgstr "" +"Define quais pacote(s) são considerados dependências essenciais de " +"compilação." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:210 +msgid "Get" +msgstr "Get" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:211 +msgid "" +"The Get subsection controls the &apt-get; tool, please see its documentation " +"for more information about the options here." +msgstr "" +"A subsecção Get controla a ferramenta &apt-get;, por favor veja a sua " +"documentação para mais informação acerca das opções daqui." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:215 +msgid "Cache" +msgstr "Cache" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:216 +msgid "" +"The Cache subsection controls the &apt-cache; tool, please see its " +"documentation for more information about the options here." +msgstr "" +"A subsecção Cache controla a ferramenta &apt-cache;, por favor veja a sua " +"documentação para mais informação acerca das opções daqui." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:220 +msgid "CDROM" +msgstr "CDROM" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:221 +msgid "" +"The CDROM subsection controls the &apt-cdrom; tool, please see its " +"documentation for more information about the options here." +msgstr "" +"A subsecção CDROM controla a ferramenta &apt-cdrom;, por favor veja a sua " +"documentação para mais informação acerca das opções de aqui." + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:227 +msgid "The Acquire Group" +msgstr "O Grupo Acquire" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:232 +msgid "PDiffs" +msgstr "PDiffs" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:233 +msgid "" +"Try to download deltas called <literal>PDiffs</literal> for Packages or " +"Sources files instead of downloading whole ones. True by default." +msgstr "" +"Tenta descarregar deltas chamados <literal>PDiffs</literal> para Pacotes ou " +"ficheiros Fonte em vez de os descarregar por inteiro. Verdadeiro por " +"predefinição." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:236 +msgid "" +"Two sub-options to limit the use of PDiffs are also available: With " +"<literal>FileLimit</literal> can be specified how many PDiff files are " +"downloaded at most to patch a file. <literal>SizeLimit</literal> on the " +"other hand is the maximum precentage of the size of all patches compared to " +"the size of the targeted file. If one of these limits is exceeded the " +"complete file is downloaded instead of the patches." +msgstr "" +"Estão também disponíveis duas sub-opções para limitar o uso de PDiffs: Com " +"<literal>FileLimit</literal> pode ser especificado quantos ficheiros PDiff " +"são descarregados no máximo para aplicar um patch a um ficheiro. Por outro " +"lado <literal>SizeLimit</literal> é a percentagem máxima do tamanho de todas " +"as patches comparadas com o tamanho do ficheiro de destino. Se um destes " +"limites for excedido, é descarregado o ficheiro completo em vez das patches." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:245 +msgid "Queue-Mode" +msgstr "Queue-Mode" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:246 +msgid "" +"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" +"literal> or <literal>access</literal> which determines how APT parallelizes " +"outgoing connections. <literal>host</literal> means that one connection per " +"target host will be opened, <literal>access</literal> means that one " +"connection per URI type will be opened." +msgstr "" +"Modo de fila; <literal>Queue-Mode</literal> pode ser um de <literal>host</" +"literal> ou <literal>access</literal> que determina como o APT paraleliza " +"ligações de saída. <literal>host</literal> significa que será aberta uma " +"ligação por máquina destino, <literal>access</literal> significa que será " +"aberta uma ligação por tipo de URI." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:253 +msgid "Retries" +msgstr "Retries" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:254 +msgid "" +"Number of retries to perform. If this is non-zero APT will retry failed " +"files the given number of times." +msgstr "" +"Número de tentativas a executar. Se isto for diferente de zero o APT irá " +"tentar, no número fornecido de vezes, obter ficheiros falhados." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:258 +msgid "Source-Symlinks" +msgstr "Source-Symlinks" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:259 +msgid "" +"Use symlinks for source archives. If set to true then source archives will " +"be symlinked when possible instead of copying. True is the default." +msgstr "" +"Usa links simbólicos para arquivos fonte. Se definido para verdadeiro, então " +"os arquivos fonte serão links simbólicos, quando possível, em vez de cópias. " +"A predefinição é verdadeiro." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:263 sources.list.5.xml:139 +msgid "http" +msgstr "http" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:264 +msgid "" +"HTTP URIs; http::Proxy is the default http proxy to use. It is in the " +"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " +"host proxies can also be specified by using the form <literal>http::Proxy::" +"<host></literal> with the special keyword <literal>DIRECT</literal> " +"meaning to use no proxies. If no one of the above settings is specified, " +"<envar>http_proxy</envar> environment variable will be used." +msgstr "" +"HTTP URIs; http::Proxy é o proxy http predefinido a usar. Está no formato " +"standard de <literal>http://[[user][:pass]@]host[:port]/</literal>. Também " +"pode ser especificados proxies por máquina ao usar o formato <literal>http::" +"Proxy::<host></literal> com a palavra chave especial <literal>DIRECT</" +"literal> que significa não usar proxies. Se nenhuma das definições acima for " +"especificada, será usada a variável de ambiente <envar>http_proxy</envar>." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:272 +msgid "" +"Three settings are provided for cache control with HTTP/1.1 compliant proxy " +"caches. <literal>No-Cache</literal> tells the proxy to not use its cached " +"response under any circumstances, <literal>Max-Age</literal> is sent only " +"for index files and tells the cache to refresh its object if it is older " +"than the given number of seconds. Debian updates its index files daily so " +"the default is 1 day. <literal>No-Store</literal> specifies that the cache " +"should never store this request, it is only set for archive files. This may " +"be useful to prevent polluting a proxy cache with very large .deb files. " +"Note: Squid 2.0.2 does not support any of these options." +msgstr "" +"São disponibilizadas três definições para controle de cache como caches de " +"proxy compatíveis com HTTP/1.1. <literal>No-Cache</literal> diz ao proxy " +"para não usar a sua resposta em cache sob nenhumas circunstâncias, " +"<literal>Max-Age</literal> é enviado apenas para ficheiros de índice e diz à " +"cache para refrescar o seu objecto se for mais antigo que o número de " +"segundos fornecido. Debian actualiza os seus ficheiros índice diariamente, " +"portanto a predefinição é 1 dia. <literal>No-Store</literal> especifica que " +"a cache nunca deverá armazenar este requisito, é apenas definido para " +"ficheiros de arquivo. Isto pode ser útil para prevenir a poluição de uma " +"cache proxy com ficheiros .deb muito grandes. Nota: o Squid 2.0.2 não " +"suporta nenhuma destas opções." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:282 apt.conf.5.xml:346 +msgid "" +"The option <literal>timeout</literal> sets the timeout timer used by the " +"method, this applies to all things including connection timeout and data " +"timeout." +msgstr "" +"A opção <literal>timeout</literal> define o tempo limite usado por este " +"método, isto aplica-se a todas as coisas incluindo tempos limite de ligação " +"e tempos limite de dados." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:285 +msgid "" +"One setting is provided to control the pipeline depth in cases where the " +"remote server is not RFC conforming or buggy (such as Squid 2.0.2). " +"<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 " +"indicating how many outstanding requests APT should send. A value of zero " +"MUST be specified if the remote host does not properly linger on TCP " +"connections - otherwise data corruption will occur. Hosts which require this " +"are in violation of RFC 2068." +msgstr "" +"É disponibilizada uma definição para controlar a profundidade do pipeline em " +"casos onde o servidor remoto não é compatível com RFC ou é buggy (como o " +"Squid 2.0.2). <literal>Acquire::http::Pipeline-Depth</literal> pode ser um " +"valor de 0 a 5 que indica quantos requerimentos pendentes o APT deve enviar. " +"TEM de ser especificado um valor de 0 se a máquina remota não hesitar " +"propriamente em ligações TCP - de outro modo irá ocorrer corrupção de dados. " +"As máquinas que requerem isto estão em violação de RFC 2068." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:293 +msgid "" +"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" +"literal> which accepts integer values in kilobyte. The default value is 0 " +"which deactivates the limit and tries uses as much as possible of the " +"bandwidth (Note that this option implicit deactivates the download from " +"multiple servers at the same time.)" +msgstr "" +"A largura de banda usada pode ser limitada com <literal>Acquire::http::Dl-" +"Limit</literal> que aceita valores inteiros em kilobytes. O valor " +"predefinido é 0 que desactiva o limite e tenta usar o máximo possível da " +"largura de banda (Note que esta opção implícita desactiva a descarga de " +"múltiplos servidores ao mesmo tempo.)" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:298 +msgid "" +"<literal>Acquire::http::User-Agent</literal> can be used to set a different " +"User-Agent for the http download method as some proxies allow access for " +"clients only if the client uses a known identifier." +msgstr "" +"<literal>Acquire::http::User-Agent</literal> pode ser usado para definir um " +"Utilizador-Agente diferente para o método de download por http, porque " +"alguns proxies apenas permitem acesso a clientes se o cliente usar um " +"identificador conhecido." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:304 +msgid "https" +msgstr "https" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:305 +msgid "" +"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " +"options are the same as for <literal>http</literal> method and will also " +"default to the options from the <literal>http</literal> method if they are " +"not explicitly set for https. <literal>Pipeline-Depth</literal> option is " +"not supported yet." +msgstr "" +"HTTPS URIs. as opções Cache-control, Timeout, AllowRedirect, Dl-Limit e " +"proxy são as mesmas para o método <literal>http</literal> e irá também usar " +"as opções predefinidas do método <literal>http</literal> se não forem " +"explicitamente definidas para https. A opção <literal>Pipeline-Depth</" +"literal> ainda não é suportada." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:311 +msgid "" +"<literal>CaInfo</literal> suboption specifies place of file that holds info " +"about trusted certificates. <literal><host>::CaInfo</literal> is " +"corresponding per-host option. <literal>Verify-Peer</literal> boolean " +"suboption determines whether verify server's host certificate against " +"trusted certificates or not. <literal><host>::Verify-Peer</literal> " +"is corresponding per-host option. <literal>Verify-Host</literal> boolean " +"suboption determines whether verify server's hostname or not. <literal><" +"host>::Verify-Host</literal> is corresponding per-host option. " +"<literal>SslCert</literal> determines what certificate to use for client " +"authentication. <literal><host>::SslCert</literal> is corresponding " +"per-host option. <literal>SslKey</literal> determines what private key to " +"use for client authentication. <literal><host>::SslKey</literal> is " +"corresponding per-host option. <literal>SslForceVersion</literal> overrides " +"default SSL version to use. Can contain 'TLSv1' or 'SSLv3' string. " +"<literal><host>::SslForceVersion</literal> is corresponding per-host " +"option." +msgstr "" +"A sub-opção <literal>CaInfo</literal> especifica o lugar do ficheiro que " +"contém informação acerca de certificados de confiança. <literal><" +"host>::CaInfo</literal> é a opção por máquina correspondente. A sub-opção " +"booleana <literal>Verify-Peer</literal> determina se o certificado da " +"máquina servidora é um certificado de confiança ou não. <literal><" +"host>::Verify-Peer</literal> é a opção por máquina correspondente. A sub-" +"opção <literal>Verify-Host</literal> determina se o nome da máquina " +"servidora é verificado ou não. <literal><host>::Verify-Host</literal> " +"é a opção por máquina correspondente. <literal>SslCert</literal> determina " +"qual certificado a usar para autenticação de clientes <literal><host>::" +"SslCert</literal> é a opção por máquina correspondente. <literal>SslKey</" +"literal> determina qual chave privada a usar para autenticação de clientes. " +"<literal><host>::SslKey</literal> é a opção por máquina " +"correspondente. <literal>SslForceVersion</literal> sobrepõe a versão SSL " +"predefinida a usar. Pode conter strings 'TLSv1' ou 'SSLv3'. <literal><" +"host>::SslForceVersion</literal> é a opção po máquina correspondente." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:329 sources.list.5.xml:150 +msgid "ftp" +msgstr "ftp" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:330 +msgid "" +"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " +"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " +"proxies can also be specified by using the form <literal>ftp::Proxy::<" +"host></literal> with the special keyword <literal>DIRECT</literal> " +"meaning to use no proxies. If no one of the above settings is specified, " +"<envar>ftp_proxy</envar> environment variable will be used. To use a ftp " +"proxy you will have to set the <literal>ftp::ProxyLogin</literal> script in " +"the configuration file. This entry specifies the commands to send to tell " +"the proxy server what to connect to. Please see &configureindex; for an " +"example of how to do this. The substitution variables available are <literal>" +"$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> <literal>" +"$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> <literal>$(SITE)</" +"literal> and <literal>$(SITE_PORT)</literal> Each is taken from it's " +"respective URI component." +msgstr "" +"URIs FTP; ftp::Proxy é o proxy ftp predefinido a usar. Está no formato " +"standard de <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Os " +"proxies por máquina podem também ser especificados ao usar o formato " +"<literal>ftp::Proxy::<host></literal> com a palavra chave especial " +"<literal>DIRECT</literal> que significa não usar nenhum proxy. Se nenhuma " +"das definições acima for especificada, será usada a variável de ambiente " +"<envar>ftp_proxy</envar>. Para usar um proxy ftp você tem que definir o " +"script <literal>ftp::ProxyLogin</literal> no ficheiro de configuração. Esta " +"entrada especifica os comandos a enviar para dizer ao servidor proxy ao que " +"se ligar. Por favor veja &configureindex; para um exemplo de como fazer " +"isto. As variáveis de substituição disponíveis são <literal>$(PROXY_USER)</" +"literal> <literal>$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> " +"<literal>$(SITE_PASS)</literal> <literal>$(SITE)</literal> e <literal>" +"$(SITE_PORT)</literal>. Cada uma é tirada do seu componente URI respectivo." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:349 +msgid "" +"Several settings are provided to control passive mode. Generally it is safe " +"to leave passive mode on, it works in nearly every environment. However " +"some situations require that passive mode be disabled and port mode ftp used " +"instead. This can be done globally, for connections that go through a proxy " +"or for a specific host (See the sample config file for examples)." +msgstr "" +"São disponibilizadas várias definições para controlar o modo passivo. " +"Geralmente é seguro deixar o modo passivo ligado, funciona em quase todos " +"ambientes. No entanto algumas situações requerem que o modo passivo seja " +"desactivado e em vez disso usar o modo port ftp. Isto pode ser feito " +"globalmente, para ligações que passam por um proxy ou para uma máquina " +"específica (Veja a amostra de ficheiro de configuração para exemplos)." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:356 +msgid "" +"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" +"envar> environment variable to a http url - see the discussion of the http " +"method above for syntax. You cannot set this in the configuration file and " +"it is not recommended to use FTP over HTTP due to its low efficiency." +msgstr "" +"É possível usar proxy FTP sobre HTTP ao definir a variável de ambiente " +"<envar>ftp_proxy</envar> para um url http - veja a discussão do método http " +"em cima para a sintaxe. Você não pode definir isto no ficheiro de " +"configuração e não é recomendado usar FTP sobre HTTP devido à sua baixa " +"eficiência." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:361 +msgid "" +"The setting <literal>ForceExtended</literal> controls the use of RFC2428 " +"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " +"false, which means these commands are only used if the control connection is " +"IPv6. Setting this to true forces their use even on IPv4 connections. Note " +"that most FTP servers do not support RFC2428." +msgstr "" +"A definição <literal>ForceExtended</literal> controla o uso de comandos " +"RFC2428 <literal>EPSV</literal> e <literal>EPRT</literal>. A predefinição é " +"falso, o que significa que estes comandos apenas são usados se a ligação de " +"controle for IPv6. Definir isto para verdadeiro força o seu uso mesmo em " +"ligações IPv4. Note que a maioria dos servidores FTP não suporta RFC2428." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:368 sources.list.5.xml:132 +msgid "cdrom" +msgstr "cdrom" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> +#: apt.conf.5.xml:374 +#, no-wrap +msgid "/cdrom/::Mount \"foo\";" +msgstr "/cdrom/::Mount \"foo\";" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:369 +msgid "" +"CDROM URIs; the only setting for CDROM URIs is the mount point, " +"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " +"drive as specified in <filename>/etc/fstab</filename>. It is possible to " +"provide alternate mount and unmount commands if your mount point cannot be " +"listed in the fstab (such as an SMB mount and old mount packages). The " +"syntax is to put <placeholder type=\"literallayout\" id=\"0\"/> within the " +"cdrom block. It is important to have the trailing slash. Unmount commands " +"can be specified using UMount." +msgstr "" +"CDROM URIs; a única definição para URIs de CDROM é o ponto de montagem, " +"<literal>cdrom::Mount</literal> que deve ser o ponto de montagem para a " +"drive de CDROM como especificado em <filename>/etc/fstab</filename>. É " +"possível fornecer comandos de montar e desmontar alternativos se o seu ponto " +"de montagem não puder ser listado na fstab (como uma montagem SMB e pacotes " +"de montagem antiga). A sintaxe é colocar <placeholder type=\"literallayout" +"\" id=\"0\"/> dentro do bloco cdrom. É importante ter a barra final. " +"Comandos para desmontar podem ser especificados usando UMount." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:379 +msgid "gpgv" +msgstr "gpgv" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:380 +msgid "" +"GPGV URIs; the only option for GPGV URIs is the option to pass additional " +"parameters to gpgv. <literal>gpgv::Options</literal> Additional options " +"passed to gpgv." +msgstr "" +"GPGV URIs;a única opção para GPGV URIs é a opção para passar parâmetros " +"adicionais ao gpgv. <literal>gpgv::Options</literal> Opções adicionais " +"passadas ao gpgv." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:385 +msgid "CompressionTypes" +msgstr "CompressionTypes" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> +#: apt.conf.5.xml:391 +#, no-wrap +msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" +msgstr "Acquire::CompressionTypes::<replaceable>Extensão de Ficheiro</replaceable> \"<replaceable>Nome de método</replaceable>\";" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:386 +msgid "" +"List of compression types which are understood by the acquire methods. " +"Files like <filename>Packages</filename> can be available in various " +"compression formats. Per default the acquire methods can decompress " +"<command>bzip2</command>, <command>lzma</command> and <command>gzip</" +"command> compressed files, with this setting more formats can be added on " +"the fly or the used method can be changed. The syntax for this is: " +"<placeholder type=\"synopsis\" id=\"0\"/>" +msgstr "" +"Lista dos tipos de compressão que são compreendidos pelos métodos de " +"aquisição. Ficheiros como <filename>Packages</filename> podem estar " +"disponíveis em vários formatos de compressão. Por predefinição os métodos de " +"aquisição podem descomprimir ficheiros comprimidos em <command>bzip2</" +"command>, <command>lzma</command> e <command>gzip</command>, mais formatos " +"podem ser adicionados na hora com esta definição ou o método usado pode ser " +"alterado. A sintaxe para isto é: <placeholder type=\"synopsis\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> +#: apt.conf.5.xml:396 +#, no-wrap +msgid "Acquire::CompressionTypes::Order:: \"gz\";" +msgstr "Acquire::CompressionTypes::Order:: \"gz\";" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> +#: apt.conf.5.xml:399 +#, no-wrap +msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" +msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:392 +msgid "" +"Also the <literal>Order</literal> subgroup can be used to define in which " +"order the acquire system will try to download the compressed files. The " +"acquire system will try the first and proceed with the next compression type " +"in this list on error, so to prefer one over the other type simple add the " +"preferred type at first - not already added default types will be added at " +"run time to the end of the list, so e.g. <placeholder type=\"synopsis\" id=" +"\"0\"/> can be used to prefer <command>gzip</command> compressed files over " +"<command>bzip2</command> and <command>lzma</command>. If <command>lzma</" +"command> should be preferred over <command>gzip</command> and " +"<command>bzip2</command> the configure setting should look like this " +"<placeholder type=\"synopsis\" id=\"1\"/> It is not needed to add " +"<literal>bz2</literal> explicit to the list as it will be added automatic." +msgstr "" +"Também o subgrupo <literal>Order</literal> pode ser usado para definir em " +"que ordem o sistema de aquisição irá tentar descarregar os ficheiros " +"comprimidos. O sistema de aquisição irá tentar com o primeiro e prosseguir " +"com o próximo tipo de compressão na lista em caso de erro, portanto para " +"preferir um sobre outro tipo, simplesmente adicione o tipo preferido em " +"primeiro lugar - tipos predefinidos não já adicionados serão adicionados em " +"tempo de execução ao fim da lista, então, ex. <placeholder type=\"synopsis\" " +"id=\"0\"/> pode ser usado para preferir ficheiros comprimidos em " +"<command>gzip</command> sobre <command>bzip2</command> e <command>lzma</" +"command>. Se o <command>lzma</command> deve ser preferido sobre " +"<command>gzip</command> e <command>bzip2</command> a definição de " +"configuração deverá parecer-se com isto: <placeholder type=\"synopsis\" id=" +"\"1\"/>. Não é necessário adicionar explicitamente <literal>bz2</literal> à " +"lista pois será adicionado automaticamente." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> +#: apt.conf.5.xml:403 +#, no-wrap +msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" +msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:401 +msgid "" +"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" +"replaceable></literal> will be checked: If this setting exists the method " +"will only be used if this file exists, e.g. for the bzip2 method (the " +"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also " +"that list entries specified on the command line will be added at the end of " +"the list specified in the configuration files, but before the default " +"entries. To prefer a type in this case over the ones specified in in the " +"configuration files you can set the option direct - not in list style. This " +"will not override the defined list, it will only prefix the list with this " +"type." +msgstr "" +"Note que em tempo de execução será verificado o <literal>Dir::Bin::" +"<replaceable>nome de método</replaceable></literal>: se esta definição " +"existir, o método apenas será usado se este ficheiro existir, ex. para o " +"método bzip2 (o embutido) a definição é <placeholder type=\"literallayout\" " +"id=\"0\"/>. Note também que as entradas na lista especificadas na linha de " +"comandos serão adicionadas no fim da lista especificada nos ficheiros de " +"configuração, mas antes das entradas predefinidas. Para preferir um tipo " +"neste caso sobre aqueles especificados nos ficheiros de configuração você " +"pode definir a opção directamente - não em estilo de lista. Isto não irá " +"sobrepor a lista definida, irá apenas prefixar a lista com este tipo." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:408 +msgid "" +"While it is possible to add an empty compression type to the order list, but " +"APT in its current version doesn't understand it correctly and will display " +"many warnings about not downloaded files - these warnings are most of the " +"time false negatives. Future versions will maybe include a way to really " +"prefer uncompressed files to support the usage of local mirrors." +msgstr "" +"Apesar de ser possível de adicionar um tipo de compressão vazio à lista de " +"ordem, o APT na sua versão actual não o compreende correctamente e irá " +"mostrar muitos avisos acerca de ficheiros não descarregados - estes avisos " +"são na maioria vezes falsos positivos. Futuras versões irão talvez incluir " +"um modo de realmente preferir ficheiros não-comprimidos para suportar a " +"utilização de mirrors locais." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:414 +msgid "Languages" +msgstr "Languages" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:415 +msgid "" +"The Languages subsection controls which <filename>Translation</filename> " +"files are downloaded and in which order APT tries to display the Description-" +"Translations. APT will try to display the first available Description in the " +"Language which is listed at first. Languages can be defined with their short " +"or long Languagecodes. Note that not all archives provide " +"<filename>Translation</filename> files for every Language - especially the " +"long Languagecodes are rare, so please inform you which ones are available " +"before you set here impossible values." +msgstr "" +"A subsecção Languages controla quais ficheiros <filename>Translation</" +"filename> são descarregados e em que ordem o APT tenta mostrar as Traduções " +"das Descrições. O APT irá tentar mostra a primeira Descrição disponível para " +"a Linguagem que está listada em primeiro. As linguagens podem ser definidas " +"com os seus códigos de linguagem curtos ou longos. Note que nem todos os " +"arquivos disponibilizam ficheiros <filename>Translation</filename> para " +"todas as Linguagens - especialmente os códigos de linguagem longos são " +"raros, portanto por favor informe-se sobre os quais estão disponíveis antes " +"de definir aqui valores impossíveis." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> +#: apt.conf.5.xml:431 +#, no-wrap +msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" +msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:421 +msgid "" +"The default list includes \"environment\" and \"en\". " +"\"<literal>environment</literal>\" has a special meaning here: It will be " +"replaced at runtime with the languagecodes extracted from the " +"<literal>LC_MESSAGES</literal> environment variable. It will also ensure " +"that these codes are not included twice in the list. If " +"<literal>LC_MESSAGES</literal> is set to \"C\" only the " +"<filename>Translation-en</filename> file (if available) will be used. To " +"force apt to use no Translation file use the setting <literal>Acquire::" +"Languages=none</literal>. \"<literal>none</literal>\" is another special " +"meaning code which will stop the search for a fitting <filename>Translation</" +"filename> file. This can be used by the system administrator to let APT " +"know that it should download also this files without actually use them if " +"the environment doesn't specify this languages. So the following example " +"configuration will result in the order \"en, de\" in an english and in \"de, " +"en\" in a german localization. Note that \"fr\" is downloaded, but not used " +"if APT is not used in a french localization, in such an environment the " +"order would be \"fr, de, en\". <placeholder type=\"programlisting\" id=\"0" +"\"/>" +msgstr "" +"A lista predefinida inclui \"environment\" e \"en\". \"<literal>environment</" +"literal>\" tem um significado especial aqui: será substituída em tempo de " +"execução por códigos de linguagem extraídos a partir da variável de ambiente " +"<literal>LC_MESSAGES</literal>. Também irá assegurar que estes códigos não " +"são incluídos duas vezes na lista. Se <literal>LC_MESSAGES</literal> estiver " +"definida para \"C\" apenas o ficheiro <filename>Translation-en</filename> " +"será usado (se disponível). Para forçar o apt a não usar nenhum ficheiro de " +"tradução use a definição <literal>Acquire::Languages=none</literal>. " +"\"<literal>none</literal>\" é outro código de significado especial que irá " +"parar a procura por um ficheiro <filename>Translation</filename> apropriado. " +"Isto pode ser usado pelo administrador do sistema para dizer ao APT que deve " +"também descarregar estes ficheiros sem realmente os usar, se o ambiente não " +"especificar estas linguagens. Portanto o seguinte exemplo de configuração " +"irá resultar na ordem \"en, de\" num ambiente em inglês e \"de, en\" num " +"ambiente em alemão. Note que o \"fr\" é descarregado, mas não é usado se o " +"APT não for usado num ambiente em francês, em tal ambiente a ordem deveria " +"ser \"fr, de, en\". <placeholder type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:228 +msgid "" +"The <literal>Acquire</literal> group of options controls the download of " +"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" +"O grupo de opções <literal>Acquire</literal> controla a descarga de pacotes " +"e os manipuladores de URI. <placeholder type=\"variablelist\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:438 +msgid "Directories" +msgstr "Directories" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:440 +msgid "" +"The <literal>Dir::State</literal> section has directories that pertain to " +"local state information. <literal>lists</literal> is the directory to place " +"downloaded package lists in and <literal>status</literal> is the name of the " +"dpkg status file. <literal>preferences</literal> is the name of the APT " +"preferences file. <literal>Dir::State</literal> contains the default " +"directory to prefix on all sub items if they do not start with <filename>/</" +"filename> or <filename>./</filename>." +msgstr "" +"A secção <literal>Dir::State</literal> tem directórios que pertencem à " +"informação de estado local. <literal>lists</literal> é o directório para " +"colocar listas de pacotes descarregadas e <literal>status</literal> é o nome " +"do ficheiro de estado do dpkg. <literal>preferences</literal> é o nome do " +"ficheiro de preferências do APT. <literal>Dir::State</literal> contém o " +"directório predefinido para pré-fixar em todos os sub items que não começam " +"com <filename>/</filename> ou <filename>./</filename>." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:447 +msgid "" +"<literal>Dir::Cache</literal> contains locations pertaining to local cache " +"information, such as the two package caches <literal>srcpkgcache</literal> " +"and <literal>pkgcache</literal> as well as the location to place downloaded " +"archives, <literal>Dir::Cache::archives</literal>. Generation of caches can " +"be turned off by setting their names to be blank. This will slow down " +"startup but save disk space. It is probably preferred to turn off the " +"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the " +"default directory is contained in <literal>Dir::Cache</literal>" +msgstr "" +"<literal>Dir::Cache</literal> contém localizações pertencentes a informação " +"da cache local, como as caches de dois pacotes <literal>srcpkgcache</" +"literal> e <literal>pkgcache</literal> assim como a localização onde colocar " +"arquivos descarregados, <literal>Dir::Cache::archives</literal>. A geração " +"de caches pode ser desligada ao definir os seus nomes para vazio. Isto irá " +"abrandar o arranque mas poupar espaço em disco. Provavelmente é preferível " +"desligar o pkgcache em vez do srcpkgcache. Tal como <literal>Dir::State</" +"literal> o directório predefinido é contido em <literal>Dir::Cache</literal>" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:456 +msgid "" +"<literal>Dir::Etc</literal> contains the location of configuration files, " +"<literal>sourcelist</literal> gives the location of the sourcelist and " +"<literal>main</literal> is the default configuration file (setting has no " +"effect, unless it is done from the config file specified by " +"<envar>APT_CONFIG</envar>)." +msgstr "" +"<literal>Dir::Etc</literal> contém a localização dos ficheiros de " +"configuração, <literal>sourcelist</literal> fornece a localização da " +"sourcelist e <literal>main</literal> é o ficheiro da configuração " +"predefinida (definição não tem efeito, a menos que seja feita a partir do " +"ficheiro de configuração especificado por <envar>APT_CONFIG</envar>)." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:462 +msgid "" +"The <literal>Dir::Parts</literal> setting reads in all the config fragments " +"in lexical order from the directory specified. After this is done then the " +"main config file is loaded." +msgstr "" +"A definição <literal>Dir::Parts</literal> lê todos os fragmentos de " +"configuração em ordem léxica a partir do directório especificado. Após isto " +"estar feito então é carregado o ficheiro de configuração principal." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:466 +msgid "" +"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" +"Bin::Methods</literal> specifies the location of the method handlers and " +"<literal>gzip</literal>, <literal>bzip2</literal>, <literal>lzma</literal>, " +"<literal>dpkg</literal>, <literal>apt-get</literal> <literal>dpkg-source</" +"literal> <literal>dpkg-buildpackage</literal> and <literal>apt-cache</" +"literal> specify the location of the respective programs." +msgstr "" +"Programas binários são apontados por <literal>Dir::Bin</literal>. " +"<literal>Dir::Bin::Methods</literal> especifica a localização dos " +"manipuladores do método e de <literal>gzip</literal>, <literal>bzip2</" +"literal>, <literal>lzma</literal>, <literal>dpkg</literal>, <literal>apt-" +"get</literal> <literal>dpkg-source</literal> <literal>dpkg-buildpackage</" +"literal> e <literal>apt-cache</literal> especifica a localização dos " +"respectivos programas." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:474 +msgid "" +"The configuration item <literal>RootDir</literal> has a special meaning. If " +"set, all paths in <literal>Dir::</literal> will be relative to " +"<literal>RootDir</literal>, <emphasis>even paths that are specified " +"absolutely</emphasis>. So, for instance, if <literal>RootDir</literal> is " +"set to <filename>/tmp/staging</filename> and <literal>Dir::State::status</" +"literal> is set to <filename>/var/lib/dpkg/status</filename>, then the " +"status file will be looked up in <filename>/tmp/staging/var/lib/dpkg/status</" +"filename>." +msgstr "" +"O item de configuração <literal>RootDir</literal> tem um significado " +"especial. Se definido, todos os caminhos em <literal>Dir::</literal> serão " +"relativos a <literal>RootDir</literal>, <emphasis>mesmo caminhos que estão " +"absolutamente especificados</emphasis>. Então, por exemplo, se " +"<literal>RootDir</literal> estiver definido para <filename>/tmp/staging</" +"filename> e <literal>Dir::State::status</literal> estiver definido para " +"<filename>/var/lib/dpkg/status</filename>, então o ficheiro status será " +"procurado em <filename>/tmp/staging/var/lib/dpkg/status</filename>." + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:487 +msgid "APT in DSelect" +msgstr "APT em DSelect" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:489 +msgid "" +"When APT is used as a &dselect; method several configuration directives " +"control the default behaviour. These are in the <literal>DSelect</literal> " +"section." +msgstr "" +"Quando o APT é usado com um método &dselect;, várias directivas de " +"configuração controlam o comportamento predefinido. Estas estão na secção " +"<literal>DSelect</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:493 +msgid "Clean" +msgstr "Clean" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:494 +msgid "" +"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " +"and never. always and prompt will remove all packages from the cache after " +"upgrading, prompt (the default) does so conditionally. auto removes only " +"those packages which are no longer downloadable (replaced with a new version " +"for instance). pre-auto performs this action before downloading new " +"packages." +msgstr "" +"Modo Cache Clean: este valor deve ser um de always, prompt, auto, pre-auto e " +"never. always e prompt irão remover todos os pacotes da cache após a " +"actualização, prompt (a predefinição) fá-lo condicionalmente. auto remove " +"apenas aqueles pacotes que já não podem ser descarregados (por exemplo, " +"substituídos por uma nova versão). pre-auto executa esta acção antes de " +"descarregar novos pacotes." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:503 +msgid "" +"The contents of this variable is passed to &apt-get; as command line options " +"when it is run for the install phase." +msgstr "" +"O conteúdo desta variável é passado ao &apt-get; como opções de linha de " +"comandos quando é corrido para a fase de instalação." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:507 +msgid "Updateoptions" +msgstr "Updateoptions" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:508 +msgid "" +"The contents of this variable is passed to &apt-get; as command line options " +"when it is run for the update phase." +msgstr "" +"O conteúdo desta variável é passado ao &apt-get; como opções de linha de " +"comandos quando é executado para a fase de actualização." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:512 +msgid "PromptAfterUpdate" +msgstr "PromptAfterUpdate" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:513 +msgid "" +"If true the [U]pdate operation in &dselect; will always prompt to continue. " +"The default is to prompt only on error." +msgstr "" +"Se for verdadeira a operação [U]pdate no &dselect; irá sempre avisar para " +"continuar. A predefinição é avisar apenas em caso de erro." + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:519 +msgid "How APT calls dpkg" +msgstr "Como o APT chama o dpkg" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:520 +msgid "" +"Several configuration directives control how APT invokes &dpkg;. These are " +"in the <literal>DPkg</literal> section." +msgstr "" +"Várias directivas de configuração controlam como o APT invoca o invokes " +"&dpkg;. Estas estão na secção <literal>DPkg</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:525 +msgid "" +"This is a list of options to pass to dpkg. The options must be specified " +"using the list notation and each list item is passed as a single argument to " +"&dpkg;." +msgstr "" +"Isto é uma lista de opções para passar ao dpkg. As opções têm de ser " +"especificadas usando a notação de lista e cada item da lista é passado como " +"um argumento único ao &dpkg;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:530 +msgid "Pre-Invoke" +msgstr "Pre-Invoke" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:530 +msgid "Post-Invoke" +msgstr "Post-Invoke" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:531 +msgid "" +"This is a list of shell commands to run before/after invoking &dpkg;. Like " +"<literal>options</literal> this must be specified in list notation. The " +"commands are invoked in order using <filename>/bin/sh</filename>, should any " +"fail APT will abort." +msgstr "" +"Isto é uma lista de comandos shell para executar antes/após invocar o " +"&dpkg;. Tal como as <literal>opções</literal> isto tem que ser especificado " +"em notação listada. Os comandos são invocados em ordem usando <filename>/" +"bin/sh</filename>, caso algum deles falhe, o APT irá abortar." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:537 +msgid "Pre-Install-Pkgs" +msgstr "Pre-Install-Pkgs" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:538 +msgid "" +"This is a list of shell commands to run before invoking dpkg. Like " +"<literal>options</literal> this must be specified in list notation. The " +"commands are invoked in order using <filename>/bin/sh</filename>, should any " +"fail APT will abort. APT will pass to the commands on standard input the " +"filenames of all .deb files it is going to install, one per line." +msgstr "" +"Isto é uma lista de comandos shell para executar antes de invocar o &dpkg;. " +"Tal como as <literal>opções</literal> isto tem que ser especificado em " +"notação listada. Os comandos são invocados em ordem usando <filename>/bin/" +"sh</filename>, caso algum deles falhe, o APT irá abortar. O APT passa para " +"os comandos na entrada standard os nomes de ficheiros de todos os ficheiros ." +"deb que vai instalar, um por cada linha." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:544 +msgid "" +"Version 2 of this protocol dumps more information, including the protocol " +"version, the APT configuration space and the packages, files and versions " +"being changed. Version 2 is enabled by setting <literal>DPkg::Tools::" +"options::cmd::Version</literal> to 2. <literal>cmd</literal> is a command " +"given to <literal>Pre-Install-Pkgs</literal>." +msgstr "" +"A versão 2 deste protocolo despeja mais informação, incluindo a versão de " +"protocolo, o espaço de configuração do APT e os pacotes, ficheiros e versões " +"que foram alteradas. A versão 2 é activada ao definir <literal>DPkg::Tools::" +"options::cmd::Version</literal> a 2. <literal>cmd</literal> é um comando " +"dado ao <literal>Pre-Install-Pkgs</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:551 +msgid "Run-Directory" +msgstr "Run-Directory" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:552 +msgid "" +"APT chdirs to this directory before invoking dpkg, the default is <filename>/" +"</filename>." +msgstr "" +"O APT muda para este directório (chdir) antes de invocar o dpkg, a " +"predefinição é <filename>/</filename>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:556 +msgid "Build-options" +msgstr "Build-options" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:557 +msgid "" +"These options are passed to &dpkg-buildpackage; when compiling packages, the " +"default is to disable signing and produce all binaries." +msgstr "" +"Estas opções são passadas ao &dpkg-buildpackage; quando compila pacotes, a " +"predefinição é desactivar a assinatura e produzir todos os binários." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt.conf.5.xml:562 +msgid "dpkg trigger usage (and related options)" +msgstr "Utilização trigger do dpkg (e opções relacionadas)" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt.conf.5.xml:563 +msgid "" +"APT can call dpkg in a way so it can make aggressive use of triggers over " +"multiply calls of dpkg. Without further options dpkg will use triggers only " +"in between his own run. Activating these options can therefore decrease the " +"time needed to perform the install / upgrade. Note that it is intended to " +"activate these options per default in the future, but as it changes the way " +"APT calling dpkg drastically it needs a lot more testing. <emphasis>These " +"options are therefore currently experimental and should not be used in " +"productive environments.</emphasis> Also it breaks the progress reporting so " +"all frontends will currently stay around half (or more) of the time in the " +"100% state while it actually configures all packages." +msgstr "" +"APT pode chamar o dpkg num modo que faz uso agressivo dos triggers sobre " +"múltiplas chamadas do dpkg. Sem mais opções o dpkg irá usar triggers apenas " +"entre a sua própria execução. Activando estas opções pode portanto diminuir " +"o tempo necessário para executar a instalação / actualização. Note que é " +"intenção futura activar estas opções por predefinição, mas como muda " +"drasticamente a maneira como o APT chama o dpkg, precisa de muitos mais " +"testes. <emphasis>Estas opções são portanto experimentais e não deve ser " +"usadas em ambientes produtivos.</emphasis> Também interrompe o relatório de " +"progresso, então todos os frontends irão permanecer a cerca de metade (ou " +"mais) do tempo no estado de 100% enquanto na realidade está a configurar " +"todos os pacotes." + +#. type: Content of: <refentry><refsect1><refsect2><para><literallayout> +#: apt.conf.5.xml:578 +#, no-wrap +msgid "" +"DPkg::NoTriggers \"true\";\n" +"PackageManager::Configure \"smart\";\n" +"DPkg::ConfigurePending \"true\";\n" +"DPkg::TriggersPending \"true\";" +msgstr "" +"DPkg::NoTriggers \"true\";\n" +"PackageManager::Configure \"smart\";\n" +"DPkg::ConfigurePending \"true\";\n" +"DPkg::TriggersPending \"true\";" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt.conf.5.xml:572 +msgid "" +"Note that it is not guaranteed that APT will support these options or that " +"these options will not cause (big) trouble in the future. If you have " +"understand the current risks and problems with these options, but are brave " +"enough to help testing them create a new configuration file and test a " +"combination of options. Please report any bugs, problems and improvements " +"you encounter and make sure to note which options you have used in your " +"reports. Asking dpkg for help could also be useful for debugging proposes, " +"see e.g. <command>dpkg --audit</command>. A defensive option combination " +"would be <placeholder type=\"literallayout\" id=\"0\"/>" +msgstr "" +"Note que não é garantido que o APT irá suportar estas opções ou que estas " +"opções não irão causar (grandes) problemas no futuro. Se você compreendeu os " +"riscos e problemas actuais com estas opções, mas tem coragem suficiente para " +"ajudar a testá-la, crie um novo ficheiro de configuração e teste uma " +"combinação de opções. Por favor reporte quaisquer bugs, problemas e " +"melhoramentos que encontre e certifique-se de anotar nos seus relatórios " +"quais as opções que usou. Pedir ajuda ao dpkg também pode ser útil para " +"propósitos de depuração, veja ex. <command>dpkg --audit</command>. Uma " +"combinação de opções defensiva seria <placeholder type=\"literallayout\" id=" +"\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:584 +msgid "DPkg::NoTriggers" +msgstr "DPkg::NoTriggers" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:585 +msgid "" +"Add the no triggers flag to all dpkg calls (except the ConfigurePending " +"call). See &dpkg; if you are interested in what this actually means. In " +"short: dpkg will not run the triggers when this flag is present unless it is " +"explicitly called to do so in an extra call. Note that this option exists " +"(undocumented) also in older apt versions with a slightly different meaning: " +"Previously these option only append --no-triggers to the configure calls to " +"dpkg - now apt will add these flag also to the unpack and remove calls." +msgstr "" +"Adiciona a bandeira 'no triggers' a todas as chamadas do dpkg (excepto a " +"chamada ConfigurePending). Veja &dpkg; se está interessado no que isto " +"realmente representa. Em resumo: o dpkg não irá correr os triggers quando " +"esta bandeira está presente a menos que seja explicitamente chamado a fazê-" +"lo numa chamada extra. Note que esta opção existe (não documentada) também " +"em versões mais antigas do apt com um significado ligeiramente diferente: " +"Anteriormente esta opção apenas acrescentava --no-triggers às chamadas " +"configure para o dpkg - agora o apt irá adicionar esta bandeira também às " +"chamadas unpack e remove." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:592 +msgid "PackageManager::Configure" +msgstr "PackageManager::Configure" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:593 +msgid "" +"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " +"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " +"value and causes APT to configure all packages explicit. The " +"\"<literal>smart</literal>\" way is it to configure only packages which need " +"to be configured before another package can be unpacked (Pre-Depends) and " +"let the rest configure by dpkg with a call generated by the next option. " +"\"<literal>no</literal>\" on the other hand will not configure anything and " +"totally rely on dpkg for configuration (which will at the moment fail if a " +"Pre-Depends is encountered). Setting this option to another than the all " +"value will implicitly activate also the next option per default as otherwise " +"the system could end in an unconfigured status which could be unbootable!" +msgstr "" +"Valores válidos são \"<literal>all</literal>\", \"<literal>smart</literal>\" " +"e \"<literal>no</literal>\". \"<literal>all</literal>\" é o valor " +"predefinido e faz com que o APT configure todos os pacotes explícitos. O " +"modo \"<literal>smart</literal>\" serve para configurar apenas pacotes que " +"precisam de ser configurados antes que outro pacote possa ser desempacotado " +"(pré-dependências) e o resto configurado pelo dpkg com uma chamada gerada " +"pela próxima opção. \"<literal>no</literal>\" por outro lado não irá " +"configurar nada e confiar no dpkg para configurações (o qual irá falhar se " +"encontrar uma pré-dependência). Definir esta opção para outra que não seja o " +"valor all irá implicitamente activar também a próxima opção predefinida, " +"caso contrário o sistema poderia acabar num estado não configurado o qual " +"poderia não arrancar!" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:603 +msgid "DPkg::ConfigurePending" +msgstr "DPkg::ConfigurePending" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:604 +msgid "" +"If this option is set apt will call <command>dpkg --configure --pending</" +"command> to let dpkg handle all required configurations and triggers. This " +"option is activated automatic per default if the previous option is not set " +"to <literal>all</literal>, but deactivating could be useful if you want to " +"run APT multiple times in a row - e.g. in an installer. In these sceneries " +"you could deactivate this option in all but the last run." +msgstr "" +"Se esta opção for definida, o apt irá chamar <command>dpkg --configure --" +"pending</command> para permitir ao dpkg lidar como todas as configurações e " +"triggers requisitados. Esta opção é activada automaticamente por " +"predefinição se a opção anterior não for definida para <literal>all</" +"literal>, mas desactivá-la pode ser útil se deseja correr o APT múltiplas " +"vezes numa fila - ex. numa instalação. Nestes cenários você pode desactivar " +"esta opção em todas excepto na última execução." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:610 +msgid "DPkg::TriggersPending" +msgstr "DPkg::TriggersPending" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:611 +msgid "" +"Useful for <literal>smart</literal> configuration as a package which has " +"pending triggers is not considered as <literal>installed</literal> and dpkg " +"treats them as <literal>unpacked</literal> currently which is a dealbreaker " +"for Pre-Dependencies (see debbugs #526774). Note that this will process all " +"triggers, not only the triggers needed to configure this package." +msgstr "" +"Útil para configuração <literal>smart</literal>, pois um pacote que tenha " +"triggers pendentes não é considerado como <literal>installed</literal> e o " +"dpkg trata-o como actualmente <literal>unpacked</literal> o que é um modo de " +"lidar com pré-dependências (veja debbugs #526774). Note que isto irá " +"processar todos os triggers, e não apenas os triggers necessários para " +"configurar este pacote." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:616 +msgid "PackageManager::UnpackAll" +msgstr "PackageManager::UnpackAll" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:617 +msgid "" +"As the configuration can be deferred to be done at the end by dpkg it can be " +"tried to order the unpack series only by critical needs, e.g. by Pre-" +"Depends. Default is true and therefore the \"old\" method of ordering in " +"various steps by everything. While both method were present in earlier APT " +"versions the <literal>OrderCritical</literal> method was unused, so this " +"method is very experimental and needs further improvements before becoming " +"really useful." +msgstr "" +"Como a configuração pode ser diferida a ser feita no final pelo dpkg, pode " +"ser tentada a ordenar a série de desempacotamento apenas por necessidades " +"críticas, ex. por pré-dependências. A predefinição é verdadeiro e então o " +"método \"antigo\" de ordenar em vários passos por tudo. Enquanto ambos os " +"métodos estão presentes em versões jovens do APT, o método " +"<literal>OrderCritical</literal> não foi usado, portanto este método é muito " +"experimental e necessita de mais melhorias antes de se tornar realmente útil." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:624 +msgid "OrderList::Score::Immediate" +msgstr "OrderList::Score::Immediate" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> +#: apt.conf.5.xml:632 +#, no-wrap +msgid "" +"OrderList::Score {\n" +"\tDelete 500;\n" +"\tEssential 200;\n" +"\tImmediate 10;\n" +"\tPreDepends 50;\n" +"};" +msgstr "" +"OrderList::Score {\n" +"\tDelete 500;\n" +"\tEssential 200;\n" +"\tImmediate 10;\n" +"\tPreDepends 50;\n" +"};" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:625 +msgid "" +"Essential packages (and there dependencies) should be configured immediately " +"after unpacking. It will be a good idea to do this quite early in the " +"upgrade process as these these configure calls require currently also " +"<literal>DPkg::TriggersPending</literal> which will run quite a few triggers " +"(which maybe not needed). Essentials get per default a high score but the " +"immediate flag is relatively low (a package which has a Pre-Depends is " +"higher rated). These option and the others in the same group can be used to " +"change the scoring. The following example shows the settings with there " +"default values. <placeholder type=\"literallayout\" id=\"0\"/>" +msgstr "" +"Os pacotes essenciais ( e as suas dependências) deve ser configurados " +"imediatamente após a descompactação. Será uma boa ideia fazer isto bem cedo " +"no processo de actualização pois estas chamadas de configuração também " +"requerem actualmente <literal>DPkg::TriggersPending</literal> o que irá " +"correr alguns triggers (que talvez não sejam necessários). Os essenciais " +"obtêm por predefinição uma pontuação alta mas a bandeira 'imediato' é " +"relativamente baixa (um pacote que tenha uma pré-dependência tem pontuação " +"mais alta). Esta opção e as outras no mesmo grupo podem ser usadas para " +"alterar a pontuação. O exemplo seguinte mostra as definições que são valores " +"predefinidos. <placeholder type=\"literallayout\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:645 +msgid "Periodic and Archives options" +msgstr "Opções Periodic e Archives" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:646 +msgid "" +"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " +"of options configure behavior of apt periodic updates, which is done by " +"<literal>/etc/cron.daily/apt</literal> script. See header of this script for " +"the brief documentation of these options." +msgstr "" +"Os grupos de opções <literal>APT::Periodic</literal> e <literal>APT::" +"Archives</literal> configuram o comportamento das actualizações periódicas " +"do APT, o que é feito pelo script <literal>/etc/cron.daily/apt</literal>. " +"Veja o cabeçalho deste script para uma breve documentação das suas opções." + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:654 +msgid "Debug options" +msgstr "Opções de depuração" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:656 +msgid "" +"Enabling options in the <literal>Debug::</literal> section will cause " +"debugging information to be sent to the standard error stream of the program " +"utilizing the <literal>apt</literal> libraries, or enable special program " +"modes that are primarily useful for debugging the behavior of <literal>apt</" +"literal>. Most of these options are not interesting to a normal user, but a " +"few may be:" +msgstr "" +"Activar opções na secção <literal>Debug::</literal> irá causar o envio de " +"informação de depuração para o fluxo de erros standard do programa " +"utilizando as bibliotecas do <literal>apt</literal>, ou activar modos " +"especiais do programa que são principalmente úteis para depurar o " +"comportamento do <literal>apt</literal>. A maioria destas opções não têm " +"interesse para o utilizador normal, mas algumas podem ter:" + +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: apt.conf.5.xml:667 +msgid "" +"<literal>Debug::pkgProblemResolver</literal> enables output about the " +"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" +"literal>." +msgstr "" +"<literal>Debug::pkgProblemResolver</literal> activa mensagens na saída " +"acerca das decisões tomadas por <literal>dist-upgrade, upgrade, install, " +"remove, purge</literal>." + +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: apt.conf.5.xml:675 +msgid "" +"<literal>Debug::NoLocking</literal> disables all file locking. This can be " +"used to run some operations (for instance, <literal>apt-get -s install</" +"literal>) as a non-root user." +msgstr "" +"<literal>Debug::NoLocking</literal> desactiva o bloqueio de todos os " +"ficheiros. Isto pode ser usado para executar algumas operações (por exemplo, " +"<literal>apt-get -s install</literal>) como um utilizador não root." + +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: apt.conf.5.xml:684 +msgid "" +"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " +"time that <literal>apt</literal> invokes &dpkg;." +msgstr "" +"<literal>Debug::pkgDPkgPM</literal> escreve a linha de comandos actual de " +"cada vez que o <literal>apt</literal> invoca o &dpkg;." + +#. TODO: provide a +#. motivating example, except I haven't a clue why you'd want +#. to do this. +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: apt.conf.5.xml:692 +msgid "" +"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " +"in CDROM IDs." +msgstr "" +"<literal>Debug::IdentCdrom</literal> desactiva a inclusão de dados statfs em " +"IDs de CDROM." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:702 +msgid "A full list of debugging options to apt follows." +msgstr "Segue-se uma lista completa de opções de depuração para o apt." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:707 +msgid "<literal>Debug::Acquire::cdrom</literal>" +msgstr "<literal>Debug::Acquire::cdrom</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:711 +msgid "" +"Print information related to accessing <literal>cdrom://</literal> sources." +msgstr "" +"Escreve informação relacionada com o acesso a fontes de <literal>cdrom://</" +"literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:718 +msgid "<literal>Debug::Acquire::ftp</literal>" +msgstr "<literal>Debug::Acquire::ftp</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:722 +msgid "Print information related to downloading packages using FTP." +msgstr "" +"Escreve informação relacionada com o descarregamento de pacotes usando FTP." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:729 +msgid "<literal>Debug::Acquire::http</literal>" +msgstr "<literal>Debug::Acquire::http</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:733 +msgid "Print information related to downloading packages using HTTP." +msgstr "" +"Escreve informação relacionada com o descarregamento de pacotes usando HTTP." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:740 +msgid "<literal>Debug::Acquire::https</literal>" +msgstr "<literal>Debug::Acquire::https</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:744 +msgid "Print information related to downloading packages using HTTPS." +msgstr "" +"Escreve informação relacionada com o descarregamento de pacotes usando HTTPS." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:751 +msgid "<literal>Debug::Acquire::gpgv</literal>" +msgstr "<literal>Debug::Acquire::gpgv</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:755 +msgid "" +"Print information related to verifying cryptographic signatures using " +"<literal>gpg</literal>." +msgstr "" +"Escreve informação relacionada com a verificação de assinaturas " +"criptográficas usando <literal>gpg</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:762 +msgid "<literal>Debug::aptcdrom</literal>" +msgstr "<literal>Debug::aptcdrom</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:766 +msgid "" +"Output information about the process of accessing collections of packages " +"stored on CD-ROMs." +msgstr "" +"Escreve informação acerca do processo de aceder a colecções de pacotes " +"armazenados em CD-ROMs." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:773 +msgid "<literal>Debug::BuildDeps</literal>" +msgstr "<literal>Debug::BuildDeps</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:776 +msgid "Describes the process of resolving build-dependencies in &apt-get;." +msgstr "" +"Descreve os processos de resolver dependências de compilação no &apt-get;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:783 +msgid "<literal>Debug::Hashes</literal>" +msgstr "<literal>Debug::Hashes</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:786 +msgid "" +"Output each cryptographic hash that is generated by the <literal>apt</" +"literal> libraries." +msgstr "" +"Escreve cada hash criptográfico que é gerado pelas bibliotecas do " +"<literal>apt</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:793 +msgid "<literal>Debug::IdentCDROM</literal>" +msgstr "<literal>Debug::IdentCDROM</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:796 +msgid "" +"Do not include information from <literal>statfs</literal>, namely the number " +"of used and free blocks on the CD-ROM filesystem, when generating an ID for " +"a CD-ROM." +msgstr "" +"Não inclui informação de <literal>statfs</literal>, nomeadamente o número de " +"blocos usados e livres no sistema de ficheiros do CD-ROM, quando gera um ID " +"para um CD-ROM." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:804 +msgid "<literal>Debug::NoLocking</literal>" +msgstr "<literal>Debug::NoLocking</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:807 +msgid "" +"Disable all file locking. For instance, this will allow two instances of " +"<quote><literal>apt-get update</literal></quote> to run at the same time." +msgstr "" +"Desactiva o bloqueio de todos os ficheiros. Por exemplo, isto irá permitir o " +"funcionamento de duas instâncias do <quote><literal>apt-get update</" +"literal></quote> ao mesmo tempo." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:815 +msgid "<literal>Debug::pkgAcquire</literal>" +msgstr "<literal>Debug::pkgAcquire</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:819 +msgid "Log when items are added to or removed from the global download queue." +msgstr "" +"Regista no log quando os items são adicionados ou removidos da fila de " +"download global." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:826 +msgid "<literal>Debug::pkgAcquire::Auth</literal>" +msgstr "<literal>Debug::pkgAcquire::Auth</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:829 +msgid "" +"Output status messages and errors related to verifying checksums and " +"cryptographic signatures of downloaded files." +msgstr "" +"Escreve mensagens de estado e erros relacionados com a verificação de " +"checksums e assinaturas criptográficas dos ficheiros descarregados." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:836 +msgid "<literal>Debug::pkgAcquire::Diffs</literal>" +msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:839 +msgid "" +"Output information about downloading and applying package index list diffs, " +"and errors relating to package index list diffs." +msgstr "" +"Escreve informação acerca do download e aplicação de diffs de lista de " +"índice do pacote, e erros relacionados com as diffs de lista de índice do " +"pacote." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:847 +msgid "<literal>Debug::pkgAcquire::RRed</literal>" +msgstr "<literal>Debug::pkgAcquire::RRed</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:851 +msgid "" +"Output information related to patching apt package lists when downloading " +"index diffs instead of full indices." +msgstr "" +"Escreve informação relacionada com a aplicação de patch na lista de pacotes " +"do apt quando se descarrega diffs de índice em vez de índices completos." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:858 +msgid "<literal>Debug::pkgAcquire::Worker</literal>" +msgstr "<literal>Debug::pkgAcquire::Worker</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:862 +msgid "" +"Log all interactions with the sub-processes that actually perform downloads." +msgstr "" +"Regista todas as interacções com os sub-processos que realmente executam os " +"downloads." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:869 +msgid "<literal>Debug::pkgAutoRemove</literal>" +msgstr "<literal>Debug::pkgAutoRemove</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:873 +msgid "" +"Log events related to the automatically-installed status of packages and to " +"the removal of unused packages." +msgstr "" +"Regista no log eventos relacionados com o estado instalado-automaticamente " +"de pacotes e com a remoção de pacotes não utilizados." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:880 +msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" +msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:883 +msgid "" +"Generate debug messages describing which packages are being automatically " +"installed to resolve dependencies. This corresponds to the initial auto-" +"install pass performed in, e.g., <literal>apt-get install</literal>, and not " +"to the full <literal>apt</literal> dependency resolver; see <literal>Debug::" +"pkgProblemResolver</literal> for that." +msgstr "" +"Gera mensagens de depuração descrevendo quais pacotes estão a ser instalados " +"automaticamente para resolver dependências. Isto corresponde ao passo de " +"instalação-automática inicial executado em, ex, <literal>apt-get install</" +"literal>, e não ao resolvedor de dependências total do <literal>apt</" +"literal>; veja <literal>Debug::pkgProblemResolver</literal> para isso." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:894 +msgid "<literal>Debug::pkgDepCache::Marker</literal>" +msgstr "<literal>Debug::pkgDepCache::Marker</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:897 +msgid "" +"Generate debug messages describing which package is marked as keep/install/" +"remove while the ProblemResolver does his work. Each addition or deletion " +"may trigger additional actions; they are shown indented two additional space " +"under the original entry. The format for each line is <literal>MarkKeep</" +"literal>, <literal>MarkDelete</literal> or <literal>MarkInstall</literal> " +"followed by <literal>package-name <a.b.c -> d.e.f | x.y.z> (section)" +"</literal> where <literal>a.b.c</literal> is the current version of the " +"package, <literal>d.e.f</literal> is the version considered for installation " +"and <literal>x.y.z</literal> is a newer version, but not considered for " +"installation (because of a low pin score). The later two can be omitted if " +"there is none or if it is the same version as the installed. " +"<literal>section</literal> is the name of the section the package appears in." +msgstr "" +"Gera mensagens de depuração descrevendo qual pacote está marcado como manter/" +"instalar/remover enquanto o \"solucionador-de-problemas\" faz o seu " +"trabalho. Cada adição ou remoção pode activar acções adicionais; elas são " +"mostradas indentadas dois espaços adicionais sob da entrada original. O " +"formato de cada linha é <literal>MarkKeep</literal>, <literal>MarkDelete</" +"literal> ou <literal>MarkInstall</literal> seguido por <literal>package-name " +"<a.b.c -> d.e.f | x.y.z> (secção)</literal> onde <literal>a.b.c</" +"literal> é a versão actual do pacote, <literal>d.e.f</literal> é a versão " +"considerada para instalação e <literal>x.y.z</literal> é a versão mais " +"recente, mas não considerada para instalação (devido a baixa pontuação). Os " +"dois últimos podem ser omitidos se não existir nenhum ou for a mesma versão " +"que aquela instalada. <literal>section</literal> é o nome da secção onde o " +"pacote aparece." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:916 +msgid "<literal>Debug::pkgInitConfig</literal>" +msgstr "<literal>Debug::pkgInitConfig</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:919 +msgid "Dump the default configuration to standard error on startup." +msgstr "Despeja a configuração predefinida para o erro standard no arranque." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:926 +msgid "<literal>Debug::pkgDPkgPM</literal>" +msgstr "<literal>Debug::pkgDPkgPM</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:929 +msgid "" +"When invoking &dpkg;, output the precise command line with which it is being " +"invoked, with arguments separated by a single space character." +msgstr "" +"Ao invocar o &dpkg;, escreve com precisão a linha de comandos com a qual " +"está a ser invocado, com argumentos separados por um caractere de espaço " +"único." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:937 +msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" +msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:940 +msgid "" +"Output all the data received from &dpkg; on the status file descriptor and " +"any errors encountered while parsing it." +msgstr "" +"Escreve todos os dados recebidos do &dpkg; no descritor de ficheiro de " +"estado e quaisquer erros encontrados enquanto os analisa." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:947 +msgid "<literal>Debug::pkgOrderList</literal>" +msgstr "<literal>Debug::pkgOrderList</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:951 +msgid "" +"Generate a trace of the algorithm that decides the order in which " +"<literal>apt</literal> should pass packages to &dpkg;." +msgstr "" +"Gera um rastro do algoritmo que decide a ordem na qual o <literal>apt</" +"literal> deve passar os pacotes ao &dpkg;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:959 +msgid "<literal>Debug::pkgPackageManager</literal>" +msgstr "<literal>Debug::pkgPackageManager</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:963 +msgid "" +"Output status messages tracing the steps performed when invoking &dpkg;." +msgstr "" +"Escreve mensagens de estado seguindo os passos executados quando invoca o " +"&dpkg;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:970 +msgid "<literal>Debug::pkgPolicy</literal>" +msgstr "<literal>Debug::pkgPolicy</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:974 +msgid "Output the priority of each package list on startup." +msgstr "Escreve a prioridade da cada lista de pacote no arranque." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:980 +msgid "<literal>Debug::pkgProblemResolver</literal>" +msgstr "<literal>Debug::pkgProblemResolver</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:984 +msgid "" +"Trace the execution of the dependency resolver (this applies only to what " +"happens when a complex dependency problem is encountered)." +msgstr "" +"Rastreia a execução do resolvedor de dependências (isto só se aplica ao que " +"acontece quando é encontrado um problema de dependências complexo)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:992 +msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" +msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:995 +msgid "" +"Display a list of all installed packages with their calculated score used by " +"the pkgProblemResolver. The description of the package is the same as " +"described in <literal>Debug::pkgDepCache::Marker</literal>" +msgstr "" +"Mostra uma lista de todos os pacotes instalados com as suas pontuações " +"calculadas usadas pelo pkgProblemResolver. A descrição do do pacote é a " +"mesma que é descrita em <literal>Debug::pkgDepCache::Marker</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:1003 +msgid "<literal>Debug::sourceList</literal>" +msgstr "<literal>Debug::sourceList</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:1007 +msgid "" +"Print information about the vendors read from <filename>/etc/apt/vendors." +"list</filename>." +msgstr "" +"Escreve informação acerca dos fornecedores lida de <filename>/etc/apt/" +"vendors.list</filename>." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:1030 +msgid "" +"&configureindex; is a configuration file showing example values for all " +"possible options." +msgstr "" +"&configureindex; é um ficheiro de configuração que mostra valores exemplo " +"para todas as opções possíveis." + +#. type: Content of: <refentry><refsect1><variablelist> +#: apt.conf.5.xml:1037 +msgid "&file-aptconf;" +msgstr "&file-aptconf;" + +#. ? reading apt.conf +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:1042 +msgid "&apt-cache;, &apt-config;, &apt-preferences;." +msgstr "&apt-cache;, &apt-config;, &apt-preferences;." + +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt_preferences.5.xml:13 +msgid "" +"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>" +msgstr "" +"&apt-author.team; &apt-email; &apt-product; <date>16 Fevereiro 2010</date>" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt_preferences.5.xml:21 apt_preferences.5.xml:28 +msgid "apt_preferences" +msgstr "apt_preferences" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt_preferences.5.xml:29 +msgid "Preference control file for APT" +msgstr "Ficheiro de controle de preferências para o APT" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:34 +msgid "" +"The APT preferences file <filename>/etc/apt/preferences</filename> and the " +"fragment files in the <filename>/etc/apt/preferences.d/</filename> folder " +"can be used to control which versions of packages will be selected for " +"installation." +msgstr "" +"O ficheiro de preferências do APT <filename>/etc/apt/preferences</filename> " +"e os ficheiros fragmentados no directório <filename>/etc/apt/preferences.d/</" +"filename> podem ser usados para controlar quais as versões de pacotes irão " +"ser seleccionadas para instalação." + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:39 +msgid "" +"Several versions of a package may be available for installation when the " +"&sources-list; file contains references to more than one distribution (for " +"example, <literal>stable</literal> and <literal>testing</literal>). APT " +"assigns a priority to each version that is available. Subject to dependency " +"constraints, <command>apt-get</command> selects the version with the highest " +"priority for installation. The APT preferences file overrides the " +"priorities that APT assigns to package versions by default, thus giving the " +"user control over which one is selected for installation." +msgstr "" +"Várias versões de um pacote podem estar disponíveis para instalação quando o " +"ficheiro &sources-list; contém referências a mais do que uma distribuição " +"(por exemplo, <literal>stable</literal> e <literal>testing</literal>). O APT " +"atribui uma prioridade a cada versão que está disponível. Sujeito a " +"constrangimentos de dependências, o <command>apt-get</command> selecciona a " +"versão com a prioridade mais alta para instalação. O ficheiro de " +"preferências do APT sobrepõe as prioridades que o APT atribui às versões de " +"pacotes por predefinição, assim dando controle ao utilizador sobre qual é " +"seleccionado para instalação." + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:49 +msgid "" +"Several instances of the same version of a package may be available when the " +"&sources-list; file contains references to more than one source. In this " +"case <command>apt-get</command> downloads the instance listed earliest in " +"the &sources-list; file. The APT preferences file does not affect the " +"choice of instance, only the choice of version." +msgstr "" +"Podem estar disponíveis várias instâncias da mesma versão de um pacote " +"quando o ficheiro &sources-list; contém referências a mais do que uma fonte. " +"Neste caso o <command>apt-get</command> descarrega a instância listada mais " +"cedo no ficheiro &sources-list;. O ficheiro de preferências do APT não " +"afecta a escolha da instância, apenas a escolha da versão." + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:56 +msgid "" +"Preferences are a strong power in the hands of a system administrator but " +"they can become also their biggest nightmare if used without care! APT will " +"not questioning the preferences so wrong settings will therefore lead to " +"uninstallable packages or wrong decisions while upgrading packages. Even " +"more problems will arise if multiply distribution releases are mixed without " +"a good understanding of the following paragraphs. Packages included in a " +"specific release aren't tested in and therefore doesn't always work as " +"expected in older or newer releases or together with other packages from " +"different releases. You have been warned." +msgstr "" +"As preferências são um poder forte nas mãos de um administrador de sistemas " +"mas também se podem tornar no seu maior pesadelo se forem usadas sem " +"cuidado! O APT não irá questionar as preferências, portanto as definições " +"erradas irão acabar em pacotes não instaláveis ou decisões erradas ao " +"actualizar pacotes. Irão surgir ainda mais problemas se forem misturadas " +"múltiplas distribuições sem o perfeito entendimento dos parágrafos " +"seguintes. Os pacotes incluídos num lançamento específico não são testados e " +"por isso nem sempre funcionam como esperado nos lançamentos mais antigos ou " +"recentes ou em conjunto com outros pacotes de lançamentos diferentes. Você " +"foi avisado." + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:67 +msgid "" +"Note that the files in the <filename>/etc/apt/preferences.d</filename> " +"directory are parsed in alphanumeric ascending order and need to obey the " +"following naming convention: The files have no or \"<literal>pref</literal>" +"\" as filename extension and which only contain alphanumeric, hyphen (-), " +"underscore (_) and period (.) characters - otherwise they will be silently " +"ignored." +msgstr "" +"Note que os ficheiros no directório <filename>/etc/apt/preferences.d</" +"filename> são analisados em ordem alfanumérica ascendente e precisam " +"obedecer à convenção de nomes seguinte: Os ficheiros não têm extensão ou têm " +"\"<literal>pref</literal>\" na extensão do nome de ficheiro e os quais " +"apenas contêm caracteres alfanuméricos, traço (-), underscore (_) e ponto " +"(.) - caso contrário serão ignorados em silêncio." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:74 +msgid "APT's Default Priority Assignments" +msgstr "Atribuições de Prioridade Predefinidas do APT" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:89 +#, no-wrap +msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" +msgstr "<command>apt-get install -t testing <replaceable>algum-pacote</replaceable></command>\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:92 +#, no-wrap +msgid "APT::Default-Release \"stable\";\n" +msgstr "APT::Default-Release \"stable\";\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:76 +msgid "" +"If there is no preferences file or if there is no entry in the file that " +"applies to a particular version then the priority assigned to that version " +"is the priority of the distribution to which that version belongs. It is " +"possible to single out a distribution, \"the target release\", which " +"receives a higher priority than other distributions do by default. The " +"target release can be set on the <command>apt-get</command> command line or " +"in the APT configuration file <filename>/etc/apt/apt.conf</filename>. Note " +"that this has precedence over any general priority you set in the <filename>/" +"etc/apt/preferences</filename> file described later, but not over " +"specifically pinned packages. For example, <placeholder type=" +"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>" +msgstr "" +"Senão existir um ficheiro de preferências ou se não existe uma entrada no " +"ficheiro que se aplique a uma versão particular então a prioridade atribuída " +"a essa versão é a prioridade da distribuição à qual essa versão pertence. É " +"possível definir uma distribuição singular, \"o lançamento de destino\", a " +"qual recebe uma prioridade mais alta que as outras distribuições por " +"predefinição. O lançamento de destino pode ser definido na linha de comandos " +"do <command>apt-get</command> ou no ficheiro de configuração do APT " +"<filename>/etc/apt/apt.conf</filename>. Note que isto tem precedências sobre " +"qualquer prioridade geral que possa definir no ficheiro <filename>/etc/apt/" +"preferences</filename> descrito mais tarde, mas não sobre pacotes " +"especificamente imobilizados. Por exemplo, <placeholder type=\"programlisting" +"\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:101 +msgid "priority 100" +msgstr "priority 100" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:102 +msgid "to the version that is already installed (if any)." +msgstr "para a versão que já está instalada (se alguma)." + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:106 +msgid "priority 500" +msgstr "priority 500" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:107 +msgid "" +"to the versions that are not installed and do not belong to the target " +"release." +msgstr "" +"para as versões que não estão instaladas e não pertencem ao lançamento " +"destinado." + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:111 +msgid "priority 990" +msgstr "priority 990" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:112 +msgid "" +"to the versions that are not installed and belong to the target release." +msgstr "" +"para as versões que não estão instaladas e pertencem ao lançamento destinado." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:96 +msgid "" +"If the target release has been specified then APT uses the following " +"algorithm to set the priorities of the versions of a package. Assign: " +"<placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" +"Se o lançamento destinado foi especificado, então o APT usa o seguinte " +"algoritmo para definir as prioridades das versões de um pacote. Atribuir: " +"<placeholder type=\"variablelist\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:117 +msgid "" +"If the target release has not been specified then APT simply assigns " +"priority 100 to all installed package versions and priority 500 to all " +"uninstalled package versions." +msgstr "" +"Se o lançamento destinado não foi especificado, então o APT simplesmente " +"atribui prioridade 100 a todas as versões de pacotes instalados e prioridade " +"500 e todas as versões de pacotes não instalados." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:121 +msgid "" +"APT then applies the following rules, listed in order of precedence, to " +"determine which version of a package to install." +msgstr "" +"O APT então aplica as seguintes regras, listadas em ordem de precedência, " +"para determinar qual versão de um pacote deve instalar." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:124 +msgid "" +"Never downgrade unless the priority of an available version exceeds 1000. " +"(\"Downgrading\" is installing a less recent version of a package in place " +"of a more recent version. Note that none of APT's default priorities " +"exceeds 1000; such high priorities can only be set in the preferences file. " +"Note also that downgrading a package can be risky.)" +msgstr "" +"Nunca faz downgrade a menos que uma versão disponível exceda 1000. " +"(\"Downgrading\" é instalar uma versão menos recente de um pacote no lugar " +"de uma versão mais recente. Note que nenhuma das prioridades predefinidas do " +"APT excede 1000; tais altas prioridades só podem ser definidas no ficheiro " +"de preferências. Note também que fazer o downgrade a um pacote pode ser " +"arriscado.)" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:130 +msgid "Install the highest priority version." +msgstr "Instala a versão de prioridade mais alta." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:131 +msgid "" +"If two or more versions have the same priority, install the most recent one " +"(that is, the one with the higher version number)." +msgstr "" +"Se duas ou mais versões tiverem a mesma prioridade, instala a mais recente " +"(isto é, aquela com o número de versão mais alto)." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:134 +msgid "" +"If two or more versions have the same priority and version number but either " +"the packages differ in some of their metadata or the <literal>--reinstall</" +"literal> option is given, install the uninstalled one." +msgstr "" +"Se duas ou mais versões têm a mesma prioridade e o mesmo número de versão " +"mas ou os pacotes diferem em alguns dos seus metadados ou a opção <literal>--" +"reinstall</literal> é fornecida, instala a que foi desinstalada." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:140 +msgid "" +"In a typical situation, the installed version of a package (priority 100) " +"is not as recent as one of the versions available from the sources listed in " +"the &sources-list; file (priority 500 or 990). Then the package will be " +"upgraded when <command>apt-get install <replaceable>some-package</" +"replaceable></command> or <command>apt-get upgrade</command> is executed." +msgstr "" +"Numa situação típica, a versão instalada de um pacote (prioridade 100) não é " +"tão recente como uma das versões disponíveis nas fontes listadas no ficheiro " +"&sources-list; (prioridade 500 ou 990). Então o pacote será actualizado " +"quando for executado <command>apt-get install <replaceable>algum-pacote</" +"replaceable></command> ou <command>apt-get upgrade</command>." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:147 +msgid "" +"More rarely, the installed version of a package is <emphasis>more</emphasis> " +"recent than any of the other available versions. The package will not be " +"downgraded when <command>apt-get install <replaceable>some-package</" +"replaceable></command> or <command>apt-get upgrade</command> is executed." +msgstr "" +"Mais raramente, a versão instalada de um pacote é <emphasis>mais</emphasis> " +"recente que qualquer das outras versões disponíveis. O pacote não será " +"regredido para uma versão inferior quando for executado <command>apt-get " +"install <replaceable>algum-pacote</replaceable></command> ou <command>apt-" +"get upgrade</command>." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:152 +msgid "" +"Sometimes the installed version of a package is more recent than the version " +"belonging to the target release, but not as recent as a version belonging to " +"some other distribution. Such a package will indeed be upgraded when " +"<command>apt-get install <replaceable>some-package</replaceable></command> " +"or <command>apt-get upgrade</command> is executed, because at least " +"<emphasis>one</emphasis> of the available versions has a higher priority " +"than the installed version." +msgstr "" +"Por vezes a versão instalada de um pacote é mais recente que a versão " +"pertencente ao lançamento de destino, mas não tão recente que uma versão " +"pertencente a alguma outra distribuição. Tal pacote será de facto " +"actualizado quando for executado <command>apt-get install <replaceable>algum-" +"pacote</replaceable></command> ou <command>apt-get upgrade</command>, porque " +"pelo menos <emphasis>uma</emphasis> das versões disponíveis tem uma " +"prioridade mais alta que a versão instalada." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:161 +msgid "The Effect of APT Preferences" +msgstr "O Efeito das Preferências do APT" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:163 +msgid "" +"The APT preferences file allows the system administrator to control the " +"assignment of priorities. The file consists of one or more multi-line " +"records separated by blank lines. Records can have one of two forms, a " +"specific form and a general form." +msgstr "" +"O ficheiro de preferências do APT permite ao administrador do sistema " +"controlar a atribuição de prioridades. O ficheiro consiste em um ou mais " +"registos de multi-linhas separados por linhas vazias. Os registos podem ter " +"um ou dois formatos, um formato específico e um formato geral." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:169 +msgid "" +"The specific form assigns a priority (a \"Pin-Priority\") to one or more " +"specified packages and specified version or version range. For example, the " +"following record assigns a high priority to all versions of the " +"<filename>perl</filename> package whose version number begins with " +"\"<literal>5.8</literal>\". Multiple packages can be separated by spaces." +msgstr "" +"O formato específico atribui um prioridade (um \"Pin-Priority\") a um ou " +"mais pacotes específicos e versão específica ou série de versões. Por " +"exemplo, o seguinte registo atribui uma alta prioridade a todas as versões " +"do pacote <filename>perl</filename> cujo número de versão começa com " +"\"<literal>5.8</literal>\". Múltiplos pacotes podem ser separados por " +"espaços." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:176 +#, no-wrap +msgid "" +"Package: perl\n" +"Pin: version 5.8*\n" +"Pin-Priority: 1001\n" +msgstr "" +"Package: perl\n" +"Pin: version 5.8*\n" +"Pin-Priority: 1001\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:182 +msgid "" +"The general form assigns a priority to all of the package versions in a " +"given distribution (that is, to all the versions of packages that are listed " +"in a certain <filename>Release</filename> file) or to all of the package " +"versions coming from a particular Internet site, as identified by the site's " +"fully qualified domain name." +msgstr "" +"O formato geral atribui uma prioridade a todas as versões de pacotes numa " +"dada distribuição (isto é, a todas as versões de pacotes que estão listados " +"num certo ficheiro <filename>Release</filename>) ou a todas as versões de " +"pacotes vindos de um site de Internet particular, como identificado pelo " +"nome de domínio totalmente qualificado do site." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:188 +msgid "" +"This general-form entry in the APT preferences file applies only to groups " +"of packages. For example, the following record assigns a high priority to " +"all package versions available from the local site." +msgstr "" +"Esta entrada general-form no ficheiro de preferências do APT aplica-se " +"apenas a grupos de pacotes. Por exemplo, o seguinte registo atribui uma alta " +"prioridade a todas as versões de pacotes disponíveis a partir de um site " +"local." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:193 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: origin \"\"\n" +"Pin-Priority: 999\n" +msgstr "" +"Package: *\n" +"Pin: origin \"\"\n" +"Pin-Priority: 999\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:198 +msgid "" +"A note of caution: the keyword used here is \"<literal>origin</literal>\". " +"This should not be confused with the Origin of a distribution as specified " +"in a <filename>Release</filename> file. What follows the \"Origin:\" tag in " +"a <filename>Release</filename> file is not an Internet address but an author " +"or vendor name, such as \"Debian\" or \"Ximian\"." +msgstr "" +"Uma nota de atenção: a palavra chave usada aqui é \"<literal>origin</literal>" +"\". Isto não deve ser confundido com a Origem de uma distribuição como " +"especificada num ficheiro <filename>Release</filename>. O que representa a " +"etiqueta \"Origin:\" num ficheiro <filename>Release</filename> não é um " +"endereço de Internet mas um nome de autor ou marca, tal como \"Debian\" ou " +"\"Ximian\"." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:204 +msgid "" +"The following record assigns a low priority to all package versions " +"belonging to any distribution whose Archive name is \"<literal>unstable</" +"literal>\"." +msgstr "" +"O seguinte registo atribui uma baixa prioridade a todas as versões de " +"pacotes pertencentes a qualquer distribuição cujo nome de Arquivo é " +"\"<literal>unstable</literal>\"." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:208 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 50\n" +msgstr "" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 50\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:213 +msgid "" +"The following record assigns a high priority to all package versions " +"belonging to any distribution whose Codename is \"<literal>squeeze</literal>" +"\"." +msgstr "" +"O seguinte registo atribui uma alta prioridade a todas as versões de pacotes " +"pertencentes a qualquer distribuição cujo nome de código é " +"\"<literal>squeeze</literal>\"." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:217 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: release n=squeeze\n" +"Pin-Priority: 900\n" +msgstr "" +"Package: *\n" +"Pin: release n=squeeze\n" +"Pin-Priority: 900\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:222 +msgid "" +"The following record assigns a high priority to all package versions " +"belonging to any release whose Archive name is \"<literal>stable</literal>\" " +"and whose release Version number is \"<literal>3.0</literal>\"." +msgstr "" +"O seguinte registo atribui alta prioridade a todas as versões de pacotes " +"pertencentes a qualquer lançamento cujo nome de Arquivo é \"<literal>stable</" +"literal>\" e cujo número de Versão de lançamento é \"<literal>3.0</literal>" +"\"." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:227 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: release a=stable, v=3.0\n" +"Pin-Priority: 500\n" +msgstr "" +"Package: *\n" +"Pin: release a=stable, v=3.0\n" +"Pin-Priority: 500\n" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:238 +msgid "How APT Interprets Priorities" +msgstr "Como o APT Interpreta as Prioridades" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:246 +msgid "P > 1000" +msgstr "P > 1000" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:247 +msgid "" +"causes a version to be installed even if this constitutes a downgrade of the " +"package" +msgstr "" +"provoca que uma versão seja instalada mesmo que isso constitua uma redução " +"na versão do pacote (downgrade)" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:251 +msgid "990 < P <=1000" +msgstr "990 < P <=1000" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:252 +msgid "" +"causes a version to be installed even if it does not come from the target " +"release, unless the installed version is more recent" +msgstr "" +"provoca que uma versão seja instalada mesmo que não venha do lançamento de " +"destino, a menos que a versão instalada seja mais recente" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:257 +msgid "500 < P <=990" +msgstr "500 < P <=990" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:258 +msgid "" +"causes a version to be installed unless there is a version available " +"belonging to the target release or the installed version is more recent" +msgstr "" +"provoca que uma versão seja instalada a menos que exista uma versão " +"disponível pertencente ao lançamento de destino ou se a versão instalada é " +"mais recente" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:263 +msgid "100 < P <=500" +msgstr "100 < P <=500" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:264 +msgid "" +"causes a version to be installed unless there is a version available " +"belonging to some other distribution or the installed version is more recent" +msgstr "" +"provoca que uma versão seja instalada a menos que exista uma versão " +"disponível pertencente a outra distribuição ou se a versão instalada é mais " +"recente" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:269 +msgid "0 < P <=100" +msgstr "0 < P <=100" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:270 +msgid "" +"causes a version to be installed only if there is no installed version of " +"the package" +msgstr "" +"provoca que uma versão seja instalada apenas se não existir nenhuma versão " +"instalada do pacote" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:274 +msgid "P < 0" +msgstr "P < 0" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:275 +msgid "prevents the version from being installed" +msgstr "previne a instalação da versão" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:241 +msgid "" +"Priorities (P) assigned in the APT preferences file must be positive or " +"negative integers. They are interpreted as follows (roughly speaking): " +"<placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" +"As prioridades (P) atribuídas no ficheiro de preferências do APT têm de ser " +"inteiros positivos ou negativos. Elas são interpretadas como o seguinte " +"(falando grosso): <placeholder type=\"variablelist\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:280 +msgid "" +"If any specific-form records match an available package version then the " +"first such record determines the priority of the package version. Failing " +"that, if any general-form records match an available package version then " +"the first such record determines the priority of the package version." +msgstr "" +"Se quaisquer registos de formato específico corresponder a uma versão de " +"pacote disponível então o primeiro tal registo determina a prioridade da " +"versão do pacote. Falhando isso, se quaisquer registos em formato geral " +"corresponder a uma versão de pacote disponível então o primeiro tal registo " +"determina a prioridade da versão de pacote." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:286 +msgid "" +"For example, suppose the APT preferences file contains the three records " +"presented earlier:" +msgstr "" +"Por exemplo, suponha que o ficheiro de preferências do APT contém os três " +"registos apresentados atrás:" + +#. type: Content of: <refentry><refsect1><refsect2><programlisting> +#: apt_preferences.5.xml:290 +#, no-wrap +msgid "" +"Package: perl\n" +"Pin: version 5.8*\n" +"Pin-Priority: 1001\n" +"\n" +"Package: *\n" +"Pin: origin \"\"\n" +"Pin-Priority: 999\n" +"\n" +"Package: *\n" +"Pin: release unstable\n" +"Pin-Priority: 50\n" +msgstr "" +"Package: perl\n" +"Pin: version 5.8*\n" +"Pin-Priority: 1001\n" +"\n" +"Package: *\n" +"Pin: origin \"\"\n" +"Pin-Priority: 999\n" +"\n" +"Package: *\n" +"Pin: release unstable\n" +"Pin-Priority: 50\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:303 +msgid "Then:" +msgstr "Então:" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:305 +msgid "" +"The most recent available version of the <literal>perl</literal> package " +"will be installed, so long as that version's version number begins with " +"\"<literal>5.8</literal>\". If <emphasis>any</emphasis> 5.8* version of " +"<literal>perl</literal> is available and the installed version is 5.9*, then " +"<literal>perl</literal> will be downgraded." +msgstr "" +"Será instalada a versão mais recente disponível do pacote <literal>perl</" +"literal>, desde que o número da versão comece com \"<literal>5.8</literal>" +"\". Se <emphasis>qualquer</emphasis> versão 5.8* do <literal>perl</literal> " +"estiver disponível e a versão instalada for 5.9*, então será feito um " +"downgrade ao <literal>perl</literal>." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:310 +msgid "" +"A version of any package other than <literal>perl</literal> that is " +"available from the local system has priority over other versions, even " +"versions belonging to the target release." +msgstr "" +"Uma versão de qualquer pacote que não seja o <literal>perl</literal> e que " +"esteja disponível a partir do sistema local tem prioridade sobre outras " +"versões, mesmo versões que pertencem ao lançamento de destino." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:314 +msgid "" +"A version of a package whose origin is not the local system but some other " +"site listed in &sources-list; and which belongs to an <literal>unstable</" +"literal> distribution is only installed if it is selected for installation " +"and no version of the package is already installed." +msgstr "" +"Uma versão de um pacote cuja origem não é o sistema local mas qualquer outro " +"site listado em &sources-list; e o qual pertence a uma distribuição " +"<literal>unstable</literal> apenas é instalado se for seleccionado para " +"instalação e se nenhuma versão do pacote já estiver instalada." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:324 +msgid "Determination of Package Version and Distribution Properties" +msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:326 +msgid "" +"The locations listed in the &sources-list; file should provide " +"<filename>Packages</filename> and <filename>Release</filename> files to " +"describe the packages available at that location." +msgstr "" +"As localizações listadas no ficheiro &sources-list; devem fornecer os " +"ficheiros <filename>Packages</filename> e <filename>Release</filename> para " +"descrever os pacotes disponíveis nessa localização." + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:338 +msgid "the <literal>Package:</literal> line" +msgstr "a linha <literal>Package:</literal>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:339 +msgid "gives the package name" +msgstr "fornece o nome do pacote" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:342 apt_preferences.5.xml:392 +msgid "the <literal>Version:</literal> line" +msgstr "a linha <literal>Version:</literal>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:343 +msgid "gives the version number for the named package" +msgstr "fornece o número de versão do pacote nomeado" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:330 +msgid "" +"The <filename>Packages</filename> file is normally found in the directory " +"<filename>.../dists/<replaceable>dist-name</replaceable>/" +"<replaceable>component</replaceable>/<replaceable>arch</replaceable></" +"filename>: for example, <filename>.../dists/stable/main/binary-i386/" +"Packages</filename>. It consists of a series of multi-line records, one for " +"each package available in that directory. Only two lines in each record are " +"relevant for setting APT priorities: <placeholder type=\"variablelist\" id=" +"\"0\"/>" +msgstr "" +"O ficheiro <filename>Packages</filename> é normalmente encontrado no " +"directório <filename>.../dists/<replaceable>nome-da-distribuição</" +"replaceable>/<replaceable>componente</replaceable>/" +"<replaceable>arquitectura</replaceable></filename>: por exemplo, " +"<filename>.../dists/stable/main/binary-i386/Packages</filename>. Consiste " +"numa série de registos de várias linhas, um para cada pacote disponível " +"nesse directório. Apenas duas linhas em cada registo são relevantes para " +"definir prioridades do APT: <placeholder type=\"variablelist\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:359 +msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" +msgstr "a linha <literal>Archive:</literal> ou <literal>Suite:</literal>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:360 +msgid "" +"names the archive to which all the packages in the directory tree belong. " +"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " +"that all of the packages in the directory tree below the parent of the " +"<filename>Release</filename> file are in a <literal>stable</literal> " +"archive. Specifying this value in the APT preferences file would require " +"the line:" +msgstr "" +"nomeia o arquivo ao qual pertencem todos os pacotes na árvore de " +"directórios. Por exemplo, a linha \"Archive: stable\" ou \"Suite: stable\" " +"especifica que todos os pacotes na árvore de directórios abaixo do pai do " +"ficheiro <filename>Release</filename> estão num arquivo <literal>stable</" +"literal>. Especificar este valor no ficheiro de preferências do APT irá " +"requerer a linha:" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:370 +#, no-wrap +msgid "Pin: release a=stable\n" +msgstr "Pin: release a=stable\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:376 +msgid "the <literal>Codename:</literal> line" +msgstr "a linha <literal>Codename:</literal>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:377 +msgid "" +"names the codename to which all the packages in the directory tree belong. " +"For example, the line \"Codename: squeeze\" specifies that all of the " +"packages in the directory tree below the parent of the <filename>Release</" +"filename> file belong to a version named <literal>squeeze</literal>. " +"Specifying this value in the APT preferences file would require the line:" +msgstr "" +"nomeia o nome de código a qual todos os pacotes na árvore de directórios " +"pertencem. Por exemplo, a linha \"Codename: squeeze\" especifica que todos " +"os pacotes na árvore de directórios abaixo do pai do ficheiro " +"<filename>Release</filename> pertencem a uma versão chamada " +"<literal>squeeze</literal>. Especificar este valor no ficheiro de " +"preferências do APT requer a linha:" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:386 +#, no-wrap +msgid "Pin: release n=squeeze\n" +msgstr "Pin: release n=squeeze\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:393 +msgid "" +"names the release version. For example, the packages in the tree might " +"belong to Debian GNU/Linux release version 3.0. Note that there is normally " +"no version number for the <literal>testing</literal> and <literal>unstable</" +"literal> distributions because they have not been released yet. Specifying " +"this in the APT preferences file would require one of the following lines." +msgstr "" +"nomeia a versão de lançamento. Por exemplo, os pacotes na árvore podem " +"pertencer ao lançamento de Debian GNU/Linux versão 3.0. Note que não há " +"normalmente um número de versão para as distribuições <literal>testing</" +"literal> e <literal>unstable</literal>. porque ainda não foram lançadas. " +"Especificar isto no ficheiro de preferências do APT irá requerer uma das " +"seguintes linhas:" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:402 +#, no-wrap +msgid "" +"Pin: release v=3.0\n" +"Pin: release a=stable, v=3.0\n" +"Pin: release 3.0\n" +msgstr "" +"Pin: release v=3.0\n" +"Pin: release a=stable, v=3.0\n" +"Pin: release 3.0\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:411 +msgid "the <literal>Component:</literal> line" +msgstr "a linha <literal>Component:</literal>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:412 +msgid "" +"names the licensing component associated with the packages in the directory " +"tree of the <filename>Release</filename> file. For example, the line " +"\"Component: main\" specifies that all the packages in the directory tree " +"are from the <literal>main</literal> component, which entails that they are " +"licensed under terms listed in the Debian Free Software Guidelines. " +"Specifying this component in the APT preferences file would require the line:" +msgstr "" +"nomeia o componente de licenciamento associado com os pacotes na árvore de " +"directórios do ficheiro <filename>Release</filename>. Por exemplo, a linha " +"\"Component: main\" especifica que todos os pacotes na árvore de directórios " +"são do componente <literal>main</literal>, o que implica que estão " +"licenciados sob os termos listados em Debian Free Software Guidelines. " +"Especificar este componente no ficheiro de preferências do APT irá requerer " +"a linha:" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:421 +#, no-wrap +msgid "Pin: release c=main\n" +msgstr "Pin: release c=main\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:427 +msgid "the <literal>Origin:</literal> line" +msgstr "a linha <literal>Origin:</literal>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:428 +msgid "" +"names the originator of the packages in the directory tree of the " +"<filename>Release</filename> file. Most commonly, this is <literal>Debian</" +"literal>. Specifying this origin in the APT preferences file would require " +"the line:" +msgstr "" +"nomeia a originador dos pacotes na árvore de directórios do ficheiro " +"<filename>Release</filename>. Geralmente, isto é <literal>Debian</literal>. " +"Especificar esta etiqueta no ficheiro de preferências do APT irá requerer a " +"linha:" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:434 +#, no-wrap +msgid "Pin: release o=Debian\n" +msgstr "Pin: release o=Debian\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:440 +msgid "the <literal>Label:</literal> line" +msgstr "a linha <literal>Label:</literal>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:441 +msgid "" +"names the label of the packages in the directory tree of the " +"<filename>Release</filename> file. Most commonly, this is <literal>Debian</" +"literal>. Specifying this label in the APT preferences file would require " +"the line:" +msgstr "" +"nomeia a etiqueta dos pacotes na árvore de directórios do ficheiro " +"<filename>Release</filename>. Geralmente, isto é <literal>Debian</literal>. " +"Especificar esta etiqueta no ficheiro de preferências do APT irá requerer a " +"linha:" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:447 +#, no-wrap +msgid "Pin: release l=Debian\n" +msgstr "Pin: release l=Debian\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:348 +msgid "" +"The <filename>Release</filename> file is normally found in the directory " +"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " +"example, <filename>.../dists/stable/Release</filename>, or <filename>.../" +"dists/woody/Release</filename>. It consists of a single multi-line record " +"which applies to <emphasis>all</emphasis> of the packages in the directory " +"tree below its parent. Unlike the <filename>Packages</filename> file, " +"nearly all of the lines in a <filename>Release</filename> file are relevant " +"for setting APT priorities: <placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" +"O ficheiro <filename>Release</filename> fica normalmente no directório " +"<filename>.../dists/<replaceable>nome da distribuição</replaceable></" +"filename>: por exemplo, <filename>.../dists/stable/Release</filename>, ou " +"<filename>.../dists/woody/Release</filename>. Consiste num único registo de " +"várias linhas que se aplica a <emphasis>todos</emphasis> os pacotes na " +"árvore de directórios sob o seu pai. Ao contrário do ficheiro " +"<filename>Packages</filename>, quase todas as linhas num ficheiro " +"<filename>Release</filename> são relevantes para definir as prioridades do " +"APT: <placeholder type=\"variablelist\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:454 +msgid "" +"All of the <filename>Packages</filename> and <filename>Release</filename> " +"files retrieved from locations listed in the &sources-list; file are stored " +"in the directory <filename>/var/lib/apt/lists</filename>, or in the file " +"named by the variable <literal>Dir::State::Lists</literal> in the " +"<filename>apt.conf</filename> file. For example, the file <filename>debian." +"lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename> " +"contains the <filename>Release</filename> file retrieved from the site " +"<literal>debian.lcs.mit.edu</literal> for <literal>binary-i386</literal> " +"architecture files from the <literal>contrib</literal> component of the " +"<literal>unstable</literal> distribution." +msgstr "" +"Todos os ficheiros <filename>Packages</filename> e <filename>Release</" +"filename> obtidos das localizações listadas no ficheiro &sources-list; são " +"armazenados no directório <filename>/var/lib/apt/lists</filename>, ou no " +"ficheiro nomeado pela variável <literal>Dir::State::Lists</literal> no " +"ficheiro <filename>apt.conf</filename>. Por exemplo, o ficheiro " +"<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-" +"i386_Release</filename> contém o ficheiro <filename>Release</filename> " +"obtido do site <literal>debian.lcs.mit.edu</literal> para ficheiros da " +"arquitectura <literal>binary-i386</literal> do componente <literal>contrib</" +"literal> da distribuição <literal>unstable</literal>." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:467 +msgid "Optional Lines in an APT Preferences Record" +msgstr "Linhas Opcionais num Registo de Preferências do APT" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:469 +msgid "" +"Each record in the APT preferences file can optionally begin with one or " +"more lines beginning with the word <literal>Explanation:</literal>. This " +"provides a place for comments." +msgstr "" +"Cada registo no ficheiro de preferências do APT por começar opcionalmente " +"com uma ou mais linhas começadas com a palavra <literal>Explanation:</" +"literal>. Isto disponibiliza um espaço para comentários." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:473 +msgid "" +"The <literal>Pin-Priority:</literal> line in each APT preferences record is " +"optional. If omitted, APT assigns a priority of 1 less than the last value " +"specified on a line beginning with <literal>Pin-Priority: release ...</" +"literal>." +msgstr "" +"A linha <literal>Pin-Priority:</literal> em cada registo de preferências do " +"APT é opcional. Se omitida, o APT atribui uma prioridade de 1 a menos do " +"último valor especificado numa linha que começa com <literal>Pin-Priority: " +"release ...</literal>." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:482 +msgid "Tracking Stable" +msgstr "Acompanhando Stable" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:490 +#, no-wrap +msgid "" +"Explanation: Uninstall or do not install any Debian-originated\n" +"Explanation: package versions other than those in the stable distro\n" +"Package: *\n" +"Pin: release a=stable\n" +"Pin-Priority: 900\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" +msgstr "" +"Explicação: Desinstala ou não instala quaisquer versões de pacotes originais\n" +"Explicação: Debian para além daquelas da distribuição stable\n" +"Package: *\n" +"Pin: release a=stable\n" +"Pin-Priority: 900\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:484 +msgid "" +"The following APT preferences file will cause APT to assign a priority " +"higher than the default (500) to all package versions belonging to a " +"<literal>stable</literal> distribution and a prohibitively low priority to " +"package versions belonging to other <literal>Debian</literal> " +"distributions. <placeholder type=\"programlisting\" id=\"0\"/>" +msgstr "" +"O seguinte ficheiro de preferências do APT irá fazer com que o APT atribua " +"uma prioridade mais alta que o predefinido (500) a todos as versões de " +"pacotes que pertencem a uma distribuição <literal>stable</literal> e uma " +"prioridade proibitivamente baixa a versões de pacotes pertencentes a outras " +"distribuições <literal>Debian</literal>. <placeholder type=\"programlisting" +"\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:507 apt_preferences.5.xml:553 +#: apt_preferences.5.xml:611 +#, no-wrap +msgid "" +"apt-get install <replaceable>package-name</replaceable>\n" +"apt-get upgrade\n" +"apt-get dist-upgrade\n" +msgstr "" +"apt-get install <replaceable>nome-do-pacote</replaceable>\n" +"apt-get upgrade\n" +"apt-get dist-upgrade\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:502 +msgid "" +"With a suitable &sources-list; file and the above preferences file, any of " +"the following commands will cause APT to upgrade to the latest " +"<literal>stable</literal> version(s). <placeholder type=\"programlisting\" " +"id=\"0\"/>" +msgstr "" +"Com um ficheiro &sources-list; apropriado e o ficheiro de preferências " +"acima, qualquer dos seguintes comandos irá fazer com que o APT actualize " +"para as versões <literal>stable</literal> mais recentes. <placeholder type=" +"\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:519 +#, no-wrap +msgid "apt-get install <replaceable>package</replaceable>/testing\n" +msgstr "apt-get install <replaceable>pacote</replaceable>/testing\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:513 +msgid "" +"The following command will cause APT to upgrade the specified package to the " +"latest version from the <literal>testing</literal> distribution; the package " +"will not be upgraded again unless this command is given again. <placeholder " +"type=\"programlisting\" id=\"0\"/>" +msgstr "" +"O seguinte comandos irá fazer com que o APT actualize o pacote especificado " +"para a versão mais recente da distribuição <literal>testing</literal>; o " +"pacote não será actualizado de novo a menos que seja executado este comando " +"outra vez. <placeholder type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:525 +msgid "Tracking Testing or Unstable" +msgstr "Acompanhando Testing ou Unstable" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:534 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: release a=testing\n" +"Pin-Priority: 900\n" +"\n" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 800\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" +msgstr "" +"Package: *\n" +"Pin: release a=testing\n" +"Pin-Priority: 900\n" +"\n" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 800\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:527 +msgid "" +"The following APT preferences file will cause APT to assign a high priority " +"to package versions from the <literal>testing</literal> distribution, a " +"lower priority to package versions from the <literal>unstable</literal> " +"distribution, and a prohibitively low priority to package versions from " +"other <literal>Debian</literal> distributions. <placeholder type=" +"\"programlisting\" id=\"0\"/>" +msgstr "" +"O seguinte ficheiro de preferências do APT irá fazer com que o APT atribua " +"uma prioridade alta a versões de pacotes da distribuição <literal>testing</" +"literal>, uma prioridade mais baixa a versões de pacotes da distribuição " +"<literal>unstable</literal>, e uma prioridade proibitivamente baixa a " +"versões de pacotes de outras distribuições <literal>Debian</literal>. " +"<placeholder type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:548 +msgid "" +"With a suitable &sources-list; file and the above preferences file, any of " +"the following commands will cause APT to upgrade to the latest " +"<literal>testing</literal> version(s). <placeholder type=\"programlisting\" " +"id=\"0\"/>" +msgstr "" +"Com um ficheiro &sources-list; apropriado e o ficheiro de preferências " +"acima, qualquer dos seguintes comandos irá fazer com que o APT actualize " +"para as versões <literal>testing</literal> mais recentes. <placeholder type=" +"\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:568 +#, no-wrap +msgid "apt-get install <replaceable>package</replaceable>/unstable\n" +msgstr "apt-get install <replaceable>pacote</replaceable>/unstable\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:559 +msgid "" +"The following command will cause APT to upgrade the specified package to the " +"latest version from the <literal>unstable</literal> distribution. " +"Thereafter, <command>apt-get upgrade</command> will upgrade the package to " +"the most recent <literal>testing</literal> version if that is more recent " +"than the installed version, otherwise, to the most recent <literal>unstable</" +"literal> version if that is more recent than the installed version. " +"<placeholder type=\"programlisting\" id=\"0\"/>" +msgstr "" +"O comando seguinte irá fazer com que o APT actualize o pacote especificado " +"para a versão mais recente da distribuição <literal>unstable</literal>. " +"Posteriormente, o <command>apt-get upgrade</command> irá actualizar o pacote " +"para a versão <literal>testing</literal> mais recente se essa for mais " +"recente que a versão instalada, caso contrário, para a versão " +"<literal>unstable</literal> mais recente se essa for mais recente que a " +"versão instalada. <placeholder type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:575 +msgid "Tracking the evolution of a codename release" +msgstr "Acompanhando a evolução de um nome de código de lançamento" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:589 +#, no-wrap +msgid "" +"Explanation: Uninstall or do not install any Debian-originated package versions\n" +"Explanation: other than those in the distribution codenamed with squeeze or sid\n" +"Package: *\n" +"Pin: release n=squeeze\n" +"Pin-Priority: 900\n" +"\n" +"Explanation: Debian unstable is always codenamed with sid\n" +"Package: *\n" +"Pin: release a=sid\n" +"Pin-Priority: 800\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" +msgstr "" +"Explicação: Desinstala ou não instala nenhumas versões de pacotes originais Debian\n" +"Explicação: para além daquelas da distribuição com nome de código squeeze ou sid\n" +"Package: *\n" +"Pin: release n=squeeze\n" +"Pin-Priority: 900\n" +"\n" +"Explicação: Debian unstable tem sempre o nome de código sid\n" +"Package: *\n" +"Pin: release a=sid\n" +"Pin-Priority: 800\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:577 +msgid "" +"The following APT preferences file will cause APT to assign a priority " +"higher than the default (500) to all package versions belonging to a " +"specified codename of a distribution and a prohibitively low priority to " +"package versions belonging to other <literal>Debian</literal> distributions, " +"codenames and archives. Note that with this APT preference APT will follow " +"the migration of a release from the archive <literal>testing</literal> to " +"<literal>stable</literal> and later <literal>oldstable</literal>. If you " +"want to follow for example the progress in <literal>testing</literal> " +"notwithstanding the codename changes you should use the example " +"configurations above. <placeholder type=\"programlisting\" id=\"0\"/>" +msgstr "" +"O seguinte ficheiro de preferências do APT irá fazer com que o APT atribua " +"uma prioridade mais alta que a predefinida (500) a todas as versões de " +"pacotes pertencentes a um nome de código especificado de uma distribuição " +"com uma prioridade proibitivamente baixa a versões de pacotes pertencentes a " +"outras distribuições, nomes de código ou arquivos <literal>Debian</literal>. " +"Note que com estas preferências o APT irá seguir a migração de um lançamento " +"a partir do arquivo <literal>testing</literal> para <literal>stable</" +"literal> e mais tarde <literal>oldstable</literal>. Se você que seguir por " +"exemplo o progresso em <literal>testing</literal> não obstante as alterações " +"do nome de código, você deve usar as configurações exemplo acima. " +"<placeholder type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:606 +msgid "" +"With a suitable &sources-list; file and the above preferences file, any of " +"the following commands will cause APT to upgrade to the latest version(s) in " +"the release codenamed with <literal>squeeze</literal>. <placeholder type=" +"\"programlisting\" id=\"0\"/>" +msgstr "" +"Com um ficheiro &sources-list; apropriado e o ficheiro de preferências " +"acima, qualquer dos seguintes comandos fará com que o APT actualize para a " +"versão mais recente no lançamento com nome de código <literal>squeeze</" +"literal>. <placeholder type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:626 +#, no-wrap +msgid "apt-get install <replaceable>package</replaceable>/sid\n" +msgstr "apt-get install <replaceable>pacote</replaceable>/sid\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:617 +msgid "" +"The following command will cause APT to upgrade the specified package to the " +"latest version from the <literal>sid</literal> distribution. Thereafter, " +"<command>apt-get upgrade</command> will upgrade the package to the most " +"recent <literal>squeeze</literal> version if that is more recent than the " +"installed version, otherwise, to the most recent <literal>sid</literal> " +"version if that is more recent than the installed version. <placeholder " +"type=\"programlisting\" id=\"0\"/>" +msgstr "" +"O seguinte comando irá fazer com que o APT actualize o pacote especificado " +"para a versão mais recente da distribuição <literal>sid</literal> " +"distribution. Posteriormente, <command>apt-get upgrade</command> irá " +"actualizar o pacote para a versão <literal>squeeze</literal> mais recente se " +"essa for mais recente que a versão instalada, caso contrário, para a versão " +"<literal>sid</literal> mais recente se essa for mais recente que a versão " +"instalada. <placeholder type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><variablelist> +#: apt_preferences.5.xml:635 +msgid "&file-preferences;" +msgstr "&file-preferences;" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:641 +msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" +msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" + +#. type: Content of: <refentry><refnamediv><refname> +#: sources.list.5.xml:22 sources.list.5.xml:29 +msgid "sources.list" +msgstr "sources.list" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: sources.list.5.xml:30 +msgid "Package resource list for APT" +msgstr "Lista de recursos de pacote para APT" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:34 +msgid "" +"The package resource list is used to locate archives of the package " +"distribution system in use on the system. At this time, this manual page " +"documents only the packaging system used by the Debian GNU/Linux system. " +"This control file is <filename>/etc/apt/sources.list</filename>." +msgstr "" +"A lista de recursos de pacote é usada para localizar arquivos do sistema de " +"distribuição de pacotes usado no sistema. Neste momento, este manual " +"documenta apenas o sistema de pacotes usado pelo sistema Debian GNU/Linux. " +"Este ficheiro de controle é <filename>/etc/apt/sources.list</filename>." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:39 +msgid "" +"The source list is designed to support any number of active sources and a " +"variety of source media. The file lists one source per line, with the most " +"preferred source listed first. The format of each line is: <literal>type uri " +"args</literal> The first item, <literal>type</literal> determines the format " +"for <literal>args</literal>. <literal>uri</literal> is a Universal Resource " +"Identifier (URI), which is a superset of the more specific and well-known " +"Universal Resource Locator, or URL. The rest of the line can be marked as a " +"comment by using a #." +msgstr "" +"A lista de fontes é desenhada para suportar qualquer número de fontes " +"activas e uma variedade de médias fonte. O ficheiro lista uma fonte por " +"linha, com a fonte mais preferida listada em primeiro lugar. O formato para " +"cada linha é: <literal>tipo uri argumentos</literal>. O primeiro item, " +"<literal>tipo</literal> determina o formato para <literal>argumentos</" +"literal>. <literal>uri</literal> é um Universal Resource Identifier (URI), o " +"que é um super-conjunto para o mais específico e conhecido Universal " +"Resource Locator, ou URL. O resto da linha pode ser marcado como um " +"comentário usando um #." + +#. type: Content of: <refentry><refsect1><title> +#: sources.list.5.xml:50 +msgid "sources.list.d" +msgstr "sources.list.d" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:51 +msgid "" +"The <filename>/etc/apt/sources.list.d</filename> directory provides a way to " +"add sources.list entries in separate files. The format is the same as for " +"the regular <filename>sources.list</filename> file. File names need to end " +"with <filename>.list</filename> and may only contain letters (a-z and A-Z), " +"digits (0-9), underscore (_), hyphen (-) and period (.) characters. " +"Otherwise they will be silently ignored." +msgstr "" +"O directório <filename>/etc/apt/sources.list.d</filename> disponibiliza um " +"modo de adicionar entradas na sources.list em ficheiros separados. O formato " +"é o mesmo que para o ficheiro <filename>sources.list</filename> regular. Os " +"nomes de ficheiros precisam acabar com <filename>.list</filename> e apenas " +"podem conter letras (a-z e A-Z), dígitos (0-9), e os caracteres underscore " +"(_), menos (-) e ponto (.). De outro modo serão ignorados em silêncio." + +#. type: Content of: <refentry><refsect1><title> +#: sources.list.5.xml:60 +msgid "The deb and deb-src types" +msgstr "Os tipos deb e deb-src" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:61 +msgid "" +"The <literal>deb</literal> type describes a typical two-level Debian " +"archive, <filename>distribution/component</filename>. Typically, " +"<literal>distribution</literal> is generally one of <literal>stable</" +"literal> <literal>unstable</literal> or <literal>testing</literal> while " +"component is one of <literal>main</literal> <literal>contrib</literal> " +"<literal>non-free</literal> or <literal>non-us</literal>. The <literal>deb-" +"src</literal> type describes a debian distribution's source code in the same " +"form as the <literal>deb</literal> type. A <literal>deb-src</literal> line " +"is required to fetch source indexes." +msgstr "" +"O tipo <literal>deb</literal> descreve um arquivo Debian típico de dois " +"níveis, <filename>distribution/component</filename>. Tipicamente " +"<literal>distribution</literal> é geralmente um de <literal>stable</literal> " +"<literal>unstable</literal> ou <literal>testing</literal> enquanto component " +"é um de <literal>main</literal> <literal>contrib</literal> <literal>non-" +"free</literal> ou <literal>non-us</literal>. O tipo <literal>deb-src</" +"literal> descreve um código fonte de distribuição debian no mesmo formato " +"que o tipo <literal>deb</literal>. Uma linha <literal>deb-src</literal> é " +"necessária para obter índices fonte." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:73 +msgid "" +"The format for a <filename>sources.list</filename> entry using the " +"<literal>deb</literal> and <literal>deb-src</literal> types is:" +msgstr "" +"O formato para uma entrada na <filename>sources.list</filename> usando os " +"tipos <literal>deb</literal> e <literal>deb-src</literal> é:" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:76 +#, no-wrap +msgid "deb uri distribution [component1] [component2] [...]" +msgstr "deb uri distribuição [componente1] [componente2] [...]" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:78 +msgid "" +"The URI for the <literal>deb</literal> type must specify the base of the " +"Debian distribution, from which APT will find the information it needs. " +"<literal>distribution</literal> can specify an exact path, in which case the " +"components must be omitted and <literal>distribution</literal> must end with " +"a slash (/). This is useful for when the case only a particular sub-section " +"of the archive denoted by the URI is of interest. If <literal>distribution</" +"literal> does not specify an exact path, at least one <literal>component</" +"literal> must be present." +msgstr "" +"O URI para o tipo <literal>deb</literal> tem de especificar a base da " +"distribuição Debian, a partir do qual o APT irá encontrar a informação que " +"precisa. <literal>distribution</literal> pode especificar um caminho exacto, " +"que no caso os componente têm de ser omitidos e <literal>distribution</" +"literal> deve terminar com uma barra (/). Isto é útil para o caso de apenas " +"ser de interesse uma sub-secção particular do arquivo denotado pelo URI. Se " +"<literal>distribution</literal> não especificar um caminho exacto, pelo " +"menos um <literal>component</literal> tem de estar presente." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:87 +msgid "" +"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" +"</literal> which expands to the Debian architecture (i386, m68k, " +"powerpc, ...) used on the system. This permits architecture-independent " +"<filename>sources.list</filename> files to be used. In general this is only " +"of interest when specifying an exact path, <literal>APT</literal> will " +"automatically generate a URI with the current architecture otherwise." +msgstr "" +"<literal>distribution</literal> também pode conter uma variável. <literal>" +"$(ARCH)</literal> a qual se expande à arquitectura Debian (i386, m68k, " +"powerpc, ...) usada no sistema. Isto permite que seja usados ficheiros " +"<filename>sources.list</filename> independentes da arquitectura. Em geral, " +"isto é apenas de interesse quando se especifica um caminho exacto. De outro " +"modo o <literal>APT</literal> irá gerar automaticamente um URI com a " +"arquitectura actual." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:95 +msgid "" +"Since only one distribution can be specified per line it may be necessary to " +"have multiple lines for the same URI, if a subset of all available " +"distributions or components at that location is desired. APT will sort the " +"URI list after it has generated a complete set internally, and will collapse " +"multiple references to the same Internet host, for instance, into a single " +"connection, so that it does not inefficiently establish an FTP connection, " +"close it, do something else, and then re-establish a connection to that same " +"host. This feature is useful for accessing busy FTP sites with limits on the " +"number of simultaneous anonymous users. APT also parallelizes connections to " +"different hosts to more effectively deal with sites with low bandwidth." +msgstr "" +"Como apenas pode ser especificada por linha uma distribuição, pode ser " +"necessário ter várias linhas para o mesmo URI, se só for desejado um sub-" +"conjunto de todas as distribuições e componentes dessa localização. O APT " +"irá ordenar a lista de URI após ter gerado internamente um conjunto " +"completo, e irá desabar as várias referências à mesma máquina na Internet, " +"por exemplo, numa única ligação, para que não estabeleça uma ligação FTP " +"ineficiente, a feche, faça outra coisa, e depois volte a estabelecer ligação " +"à mesma máquina. Esta funcionalidade é útil para aceder a sites FTP ocupados " +"que limitam o número de utilizadores anónimos em simultâneo. O APT também " +"paraleliza ligações a máquinas diferentes para lidar mais eficientemente com " +"sites com baixa largura de banda." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:107 +msgid "" +"It is important to list sources in order of preference, with the most " +"preferred source listed first. Typically this will result in sorting by " +"speed from fastest to slowest (CD-ROM followed by hosts on a local network, " +"followed by distant Internet hosts, for example)." +msgstr "" +"É importante listar as fontes por ordem de preferência, com a fonte mais " +"preferida listada em primeiro lugar. Tipicamente isto irá resultar numa " +"ordenação por velocidades desde o mais rápido até ao mais lento (CD-ROM " +"seguido por máquinas numa rede local, seguido por máquinas distantes na " +"Internet, por exemplo)." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:112 +msgid "Some examples:" +msgstr "Alguns exemplos:" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:114 +#, no-wrap +msgid "" +"deb http://http.us.debian.org/debian stable main contrib non-free\n" +"deb http://http.us.debian.org/debian dists/stable-updates/\n" +" " +msgstr "" +"deb http://http.us.debian.org/debian stable main contrib non-free\n" +"deb http://http.us.debian.org/debian dists/stable-updates/\n" +" " + +#. type: Content of: <refentry><refsect1><title> +#: sources.list.5.xml:120 +msgid "URI specification" +msgstr "Especificação da URI" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: sources.list.5.xml:125 +msgid "file" +msgstr "file" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:127 +msgid "" +"The file scheme allows an arbitrary directory in the file system to be " +"considered an archive. This is useful for NFS mounts and local mirrors or " +"archives." +msgstr "" +"O esquema file permite que um directório arbitrário do sistema de ficheiros " +"seja considerado um arquivo. Isto é útil para montagens NFS e mirrors ou " +"arquivos locais." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:134 +msgid "" +"The cdrom scheme allows APT to use a local CDROM drive with media swapping. " +"Use the &apt-cdrom; program to create cdrom entries in the source list." +msgstr "" +"O esquema cdrom permite ao APT usar uma drive de CDROM local com mudança de " +"media. Use o programa &apt-cdrom; para criar entradas cdrom na lista de " +"fontes." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:141 +msgid "" +"The http scheme specifies an HTTP server for the archive. If an environment " +"variable <envar>http_proxy</envar> is set with the format http://server:" +"port/, the proxy server specified in <envar>http_proxy</envar> will be used. " +"Users of authenticated HTTP/1.1 proxies may use a string of the format " +"http://user:pass@server:port/. Note that this is an insecure method of " +"authentication." +msgstr "" +"O esquema http especifica um servidor HTTP para o arquivo. Se uma variável " +"de ambiente <envar>http_proxy</envar> estiver definida com o formato http://" +"server:port/, será usado o servidor proxy especificado em <envar>http_proxy</" +"envar>. Os utilizadores de proxies HTTP/1.1 autenticados pode usar uma " +"string do formato http://user:pass@server:port/. Note que este não é um " +"método de autenticação seguro." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:152 +msgid "" +"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " +"is highly configurable; for more information see the &apt-conf; manual page. " +"Please note that a ftp proxy can be specified by using the <envar>ftp_proxy</" +"envar> environment variable. It is possible to specify a http proxy (http " +"proxy servers often understand ftp urls) using this method and ONLY this " +"method. ftp proxies using http specified in the configuration file will be " +"ignored." +msgstr "" +"O esquema ftp especifica um servidor FTP para o arquivo. o comportamento FTP " +"do APT é altamente configurável; para mais informação veja o manual &apt-" +"conf;. Por favor note que um proxy ftp pode ser especificado ao usar a " +"variável de ambiente <envar>ftp_proxy</envar>. É possível especificar um " +"proxy http (os servidores de proxy http geralmente compreendem urls de ftp) " +"usando este método e APENAS este método. Os proxies ftp que usam http e seja " +"especificados no ficheiro de configuração serão ignorados." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: sources.list.5.xml:161 +msgid "copy" +msgstr "copy" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:163 +msgid "" +"The copy scheme is identical to the file scheme except that packages are " +"copied into the cache directory instead of used directly at their location. " +"This is useful for people using a zip disk to copy files around with APT." +msgstr "" +"O esquema copy é idêntico ao esquema file com a excepção que os pacotes são " +"copiados para o directório cache em vez serem usados directamente da sua " +"localização. Isto é útil para quem use um disco zip para copiar ficheiros " +"com o APT." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: sources.list.5.xml:168 +msgid "rsh" +msgstr "rsh" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: sources.list.5.xml:168 +msgid "ssh" +msgstr "ssh" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:170 +msgid "" +"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given " +"user and access the files. It is a good idea to do prior arrangements with " +"RSA keys or rhosts. Access to files on the remote uses standard " +"<command>find</command> and <command>dd</command> commands to perform the " +"file transfers from the remote." +msgstr "" +"O método rsh/ssh invoca rsh/ssh a ligar a uma máquina remota como um " +"utilizador fornecido e acede aos ficheiros. É uma boa ideia fazer " +"preparações prévias com chaves RSA ou rhosts. O acesso a ficheiros remotos " +"usa os comandos standard <command>find</command> e <command>dd</command> " +"para executar as transferências de ficheiros remotos." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: sources.list.5.xml:178 +msgid "more recognizable URI types" +msgstr "tipos de URI mais reconhecíveis" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:180 +msgid "" +"APT can be extended with more methods shipped in other optional packages " +"which should follow the nameing scheme <literal>apt-transport-" +"<replaceable>method</replaceable></literal>. The APT team e.g. maintains " +"also the <literal>apt-transport-https</literal> package which provides " +"access methods for https-URIs with features similar to the http method, but " +"other methods for using e.g. debtorrent are also available, see " +"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></" +"refentrytitle> <manvolnum>1</manvolnum></citerefentry>." +msgstr "" +"O APT pode ser estendido com mais métodos lançados em outros pacotes " +"opcionais que devem seguir o esquema de nomeação <literal>apt-transport-" +"<replaceable>método</replaceable></literal>. A equipa do APT, por exemplo, " +"mantém também o pacote <literal>apt-transport-https</literal> que " +"disponibiliza métodos de acesso para URIs https com funcionalidades " +"semelhantes ao método http, mas estão também disponíveis outros métodos para " +"usar por exemplo o debtorrent, veja <citerefentry> " +"<refentrytitle><filename>apt-transport-debtorrent</filename></refentrytitle> " +"<manvolnum>1</manvolnum></citerefentry>." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:122 +msgid "" +"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, " +"rsh. <placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" +"Os tipos de URI actualmente reconhecidos são cdrom, file, http, ftp, copy, " +"ssh, rsh. <placeholder type=\"variablelist\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:194 +msgid "" +"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " +"stable/main, stable/contrib, and stable/non-free." +msgstr "" +"Usa o arquivo armazenado localmente (ou montagem NFS) em /home/jason/debian " +"para stable/main, stable/contrib, e stable/non-free." + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:196 +#, no-wrap +msgid "deb file:/home/jason/debian stable main contrib non-free" +msgstr "deb file:/home/jason/debian stable main contrib non-free" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:198 +msgid "As above, except this uses the unstable (development) distribution." +msgstr "" +"Como em cima, excepto que usa a distribuição unstable (de desenvolvimento)." + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:199 +#, no-wrap +msgid "deb file:/home/jason/debian unstable main contrib non-free" +msgstr "deb file:/home/jason/debian unstable main contrib non-free" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:201 +msgid "Source line for the above" +msgstr "Linha de fonte para o referido acima" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:202 +#, no-wrap +msgid "deb-src file:/home/jason/debian unstable main contrib non-free" +msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:204 +msgid "" +"Uses HTTP to access the archive at archive.debian.org, and uses only the " +"hamm/main area." +msgstr "" +"Usa HTTP para aceder ao arquivo em archive.debian.org, e usa apenas a área " +"hamm/main." + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:206 +#, no-wrap +msgid "deb http://archive.debian.org/debian-archive hamm main" +msgstr "deb http://archive.debian.org/debian-archive hamm main" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:208 +msgid "" +"Uses FTP to access the archive at ftp.debian.org, under the debian " +"directory, and uses only the stable/contrib area." +msgstr "" +"Usa FTP para aceder ao arquivo em ftp.debian.org, sob o directório Debian, e " +"usa apenas a área stable/contrib." + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:210 +#, no-wrap +msgid "deb ftp://ftp.debian.org/debian stable contrib" +msgstr "deb ftp://ftp.debian.org/debian stable contrib" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:212 +msgid "" +"Uses FTP to access the archive at ftp.debian.org, under the debian " +"directory, and uses only the unstable/contrib area. If this line appears as " +"well as the one in the previous example in <filename>sources.list</filename> " +"a single FTP session will be used for both resource lines." +msgstr "" +"Usa FTP para aceder ao arquivo em ftp.debian.org, sob o directório debian, e " +"usa apenas a área unstable/contrib. Se esta linha aparecer também como " +"aquela no exemplo anterior em <filename>sources.list</filename> será usada " +"uma única sessão FTP para ambas linhas de recurso." + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:216 +#, no-wrap +msgid "deb ftp://ftp.debian.org/debian unstable contrib" +msgstr "deb ftp://ftp.debian.org/debian unstable contrib" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:218 +msgid "" +"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US " +"directory." +msgstr "" +"Usa HTTP para aceder ao arquivo em nonus.debian.org, sob o directório debian-" +"non-US." + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:220 +#, no-wrap +msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" +msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" + +#. type: Content of: <refentry><refsect1><para><literallayout> +#: sources.list.5.xml:229 +#, no-wrap +msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" +msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:222 +msgid "" +"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US " +"directory, and uses only files found under <filename>unstable/binary-i386</" +"filename> on i386 machines, <filename>unstable/binary-m68k</filename> on " +"m68k, and so forth for other supported architectures. [Note this example " +"only illustrates how to use the substitution variable; non-us is no longer " +"structured like this] <placeholder type=\"literallayout\" id=\"0\"/>" +msgstr "" +"Usa HTTP para aceder ao arquivo em nonus.debian.org, sob o directório debian-" +"non-US, e usa apenas os ficheiros encontrados sob <filename>unstable/binary-" +"i386</filename> em máquinas i386, <filename>unstable/binary-m68k</filename> " +"em m68k, e assim por diante para outras arquitecturas suportadas. [Note que " +"este exemplo apenas mostra como usar a variável de substituição; non-us já " +"não é mais estruturado desta maneira] <placeholder type=\"literallayout\" id=" +"\"0\"/>" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:234 +msgid "&apt-cache; &apt-conf;" +msgstr "&apt-cache; &apt-conf;" + +#. type: <title> +#: guide.sgml:4 +msgid "APT User's Guide" +msgstr "Guia de Utilizador do APT" + +#. type: +#: guide.sgml:6 offline.sgml:6 +msgid "Jason Gunthorpe jgg@debian.org" +msgstr "Jason Gunthorpe jgg@debian.org" + +#. type: +#: guide.sgml:7 +msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $" +msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $" + +#. type: +#: guide.sgml:11 +msgid "" +"This document provides an overview of how to use the the APT package manager." +msgstr "" +"Este documento disponibiliza uma visão geral de como usar o gestor de " +"pacotes APT." + +#. type: +#: guide.sgml:15 +msgid "Copyright © Jason Gunthorpe, 1998." +msgstr "Copyright © Jason Gunthorpe, 1998." + +#. type:

+#: guide.sgml:21 offline.sgml:22 +msgid "" +"\"APT\" and this document are free software; you can redistribute them and/" +"or modify them under the terms of the GNU General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "" +"\"APT\" and this document are free software; you can redistribute them and/" +"or modify them under the terms of the GNU General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." + +#. type:

+#: guide.sgml:24 offline.sgml:25 +msgid "" +"For more details, on Debian GNU/Linux systems, see the file /usr/share/" +"common-licenses/GPL for the full license." +msgstr "" +"Para mais detalhes em sistemas Debian GNU/Linux, veja o ficheiro /usr/share/" +"common-licenses/GPL para a licença completa." + +#. type: +#: guide.sgml:32 +msgid "General" +msgstr "Geral" + +#. type:

+#: guide.sgml:38 +msgid "" +"The APT package currently contains two sections, the APT dselect method and the apt-get command line user interface. Both " +"provide a way to install and remove packages as well as download new " +"packages from the Internet." +msgstr "" +"O pacote APT contém actualmente duas secções, o método dselect " +"do APT e a interface de utilizador de linha de comandos apt-get. Ambos disponibilizam uma maneira de instalar e remover pacotes assim " +"como descarregar novos pacotes da Internet." + +#. type: +#: guide.sgml:39 +msgid "Anatomy of the Package System" +msgstr "Anatomia do Sistema de Pacotes" + +#. type:

+#: guide.sgml:44 +msgid "" +"The Debian packaging system has a large amount of information associated " +"with each package to help assure that it integrates cleanly and easily into " +"the system. The most prominent of its features is the dependency system." +msgstr "" +"O sistema de pacotes Debian tem uma grande quantidade de informação " +"associada a cada pacote para ajudar a assegurar que este se integra de modo " +"limpo e fácil no sistema. A mais proeminente das suas funcionalidades é o " +"sistema de dependências." + +#. type:

+#: guide.sgml:52 +msgid "" +"The dependency system allows individual programs to make use of shared " +"elements in the system such as libraries. It simplifies placing infrequently " +"used portions of a program in separate packages to reduce the number of " +"things the average user is required to install. Also, it allows for choices " +"in mail transport agents, X servers and so on." +msgstr "" +"O sistema de dependências permite a programas individuais fazerem uso de " +"elementos partilhados no sistema tais como as bibliotecas. Facilita a " +"colocação de porções de um programa usadas raramente em pacotes separados " +"para reduzir o número de coisas que é necessário instalar ao utilizador " +"médio. Também permite opções em agentes de transporte de mail, servidores X " +"e mais." + +#. type:

+#: guide.sgml:57 +msgid "" +"The first step to understanding the dependency system is to grasp the " +"concept of a simple dependency. The meaning of a simple dependency is that a " +"package requires another package to be installed at the same time to work " +"properly." +msgstr "" +"O primeiro passo para compreender o sistema de dependências é pegar no " +"conceito de uma dependência simples. O significado de uma dependência " +"simples é que um pacote requer outro pacote seja instalado ao mesmo tempo " +"para funcionar correctamente." + +#. type:

+#: guide.sgml:63 +msgid "" +"For instance, mailcrypt is an emacs extension that aids in encrypting email " +"with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a " +"simple dependency on GPG. Also, because it is an emacs extension it has a " +"simple dependency on emacs, without emacs it is completely useless." +msgstr "" +"Por exemplo, mailcrypt é uma extensão do emacs que ajuda a encriptar mail " +"com GPG. Sem o GPGP instalado o mailcrypt é inútil, então o mailcrypt tem " +"uma dependência simples do GPG. Também, porque é uma extensão do emacs, tem " +"uma dependência simples do emacs, e sem o emacs é completamente inútil." + +#. type:

+#: guide.sgml:73 +msgid "" +"The other important dependency to understand is a conflicting dependency. It " +"means that a package, when installed with another package, will not work and " +"may possibly be extremely harmful to the system. As an example consider a " +"mail transport agent such as sendmail, exim or qmail. It is not possible to " +"have two mail transport agents installed because both need to listen to the " +"network to receive mail. Attempting to install two will seriously damage the " +"system so all mail transport agents have a conflicting dependency with all " +"other mail transport agents." +msgstr "" +"A outra dependência importante a compreender é a dependência de conflito. " +"Significa que um pacote, quando instalado com outro pacote, não irá " +"funcionar e pode ser extremamente prejudicial para o sistema. Como exemplo " +"considere um agente de transporte de mail como o sendmail, exim ou qmail. " +"Não é possível ter dois agentes de transporte de mail instalados porque " +"ambos precisam de escutar na rede para receberem mail. Tentar instalar dois " +"irá danificar seriamente o sistema, por isso todos os agentes de transporte " +"de mail têm uma dependência de conflito com todos os outros agentes de " +"transporte de mail." + +#. type:

+#: guide.sgml:83 +msgid "" +"As an added complication there is the possibility for a package to pretend " +"to be another package. Consider that exim and sendmail for many intents are " +"identical, they both deliver mail and understand a common interface. Hence, " +"the package system has a way for them to declare that they are both mail-" +"transport-agents. So, exim and sendmail both declare that they provide a " +"mail-transport-agent and other packages that need a mail transport agent " +"depend on mail-transport-agent. This can add a great deal of confusion when " +"trying to manually fix packages." +msgstr "" +"Como uma complicação adicional existe a possibilidade de um pacote fingir " +"ser outro pacote. Considere que exim e sendmail para muitas intenções são " +"idênticos, ambos entregam mail e compreendem uma interface comum. Por isso, " +"o sistema de pacotes tem um modo para eles declararem que são ambos mail-" +"transport-agents. Portanto, ambos exim e sendmail declaram que " +"disponibilizam um mail-transport-agent e outros pacotes que precisam de um " +"agente de transporte de mail dependem de um mail-transport-agent. Isto pode " +"adicionar uma grande confusão quando se tenta corrigir pacotes manualmente." + +#. type:

+#: guide.sgml:88 +msgid "" +"At any given time a single dependency may be met by packages that are " +"already installed or it may not be. APT attempts to help resolve dependency " +"issues by providing a number of automatic algorithms that help in selecting " +"packages for installation." +msgstr "" +"Em qualquer altura uma única dependência pode ser satisfeita por pacotes que " +"já estão instalados ou podem não estar. O APT tenta ajudar a resolver " +"problemas com dependências ao disponibilizar um número de algoritmos " +"automáticos que ajudam a seleccionar os pacotes para instalação." + +#. type:

+#: guide.sgml:102 +msgid "" +"apt-get provides a simple way to install packages from the " +"command line. Unlike dpkg, apt-get does not " +"understand .deb files, it works with the package's proper name and can only " +"install .deb archives from a Source." +msgstr "" +"apt-get fornece uma maneira simples de instalar pacotes a " +"partir da linha de comandos. Ao contrário do dpkg, o apt-" +"get não compreende os ficheiros .deb, funciona com o nome próprio do " +"pacote e apenas pode instalar arquivos .deb a partir de uma Source." + +#. type:

+#: guide.sgml:109 +msgid "" +"The first

If you are using an http proxy server you must set " +"the http_proxy environment variable first, see sources.list(5)

thing that should be done before using apt-get is to " +"fetch the package lists from the Sources so that it knows what " +"packages are available. This is done with apt-get update. For " +"instance," +msgstr "" +"O primeira

se você está a usar um servidor proxy http você tem " +"que definir a variável de ambiente http_proxy primeiro, veja sources.list(5)" +"

 coisa que deve ser feita antes de usar apt-get " +"é obter as listas de pacotes a partir das Sources para que ele " +"saiba que pacotes estão disponíveis. Isto é feito com apt-get update. Por exemplo," + +#. type: +#: guide.sgml:116 +#, no-wrap +msgid "" +"# apt-get update\n" +"Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n" +"Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n" +"Reading Package Lists... Done\n" +"Building Dependency Tree... Done" +msgstr "" +"# apt-get update\n" +"Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n" +"Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n" +"Reading Package Lists... Done\n" +"Building Dependency Tree... Done" + +#. type:

+#: guide.sgml:120 +msgid "Once updated there are several commands that can be used:" +msgstr "Uma vez actualizado existem vários comandos que podem ser usados:" + +#. type:

+#: guide.sgml:131 +msgid "" +"Upgrade will attempt to gently upgrade the whole system. Upgrade will never " +"install a new package or remove an existing package, nor will it ever " +"upgrade a package that might cause some other package to break. This can be " +"used daily to relatively safely upgrade the system. Upgrade will list all of " +"the packages that it could not upgrade, this usually means that they depend " +"on new packages or conflict with some other package. dselect or " +"apt-get install can be used to force these packages to install." +msgstr "" +"Upgrade irá tentar actualizar gentilmente todo o sistema. Upgrade nunca irá " +"instalar um pacote novo ou remover um pacote existente, nem nunca irá " +"actualizar um pacote que possa causar a quebra de outro pacote. Isto pode " +"ser usado diariamente para actualizar o sistema com relativa segurança. " +"Upgrade ira listar todos os pacotes que não pode actualizar, isto geralmente " +"significa que eles dependem de novos pacotes ou entram em conflito com algum " +"outro pacote. dselect ou apt-get install podem ser " +"usados para forçar estes pacotes a instalar." + +#. type:

+#: guide.sgml:140 +msgid "" +"Install is used to install packages by name. The package is automatically " +"fetched and installed. This can be useful if you already know the name of " +"the package to install and do not want to go into a GUI to select it. Any " +"number of packages may be passed to install, they will all be fetched. " +"Install automatically attempts to resolve dependency problems with the " +"listed packages and will print a summary and ask for confirmation if " +"anything other than its arguments are changed." +msgstr "" +"Install é usado para instalar pacotes pelo nome. O pacote é obtido " +"automaticamente e instalado. Isto pode ser útil se você já conhecer o nome " +"do pacote a instalar e não quer ir para uma GUI para o seleccionar. Podem " +"ser passados qualquer número de pacotes para instalar, todos eles serão " +"obtidos. Install tenta automaticamente resolver problemas de dependências " +"com os pacotes listados e irá escrever um sumário e pedir confirmação se " +"algo mais que os seus argumentos serão alterados." + +#. type:

+#: guide.sgml:149 +msgid "" +"Dist-upgrade is a complete upgrader designed to simplify upgrading between " +"releases of Debian. It uses a sophisticated algorithm to determine the best " +"set of packages to install, upgrade and remove to get as much of the system " +"to the newest release. In some situations it may be desired to use dist-" +"upgrade rather than spend the time manually resolving dependencies in " +"dselect. Once dist-upgrade has completed then dselect can be used to install any packages that may have been left out." +msgstr "" +"Dist-upgrade é um actualizador completo desenhado para simplificar a " +"actualização entre lançamentos da Debian. Usa um algoritmo sofisticado para " +"determinar o melhor conjunto de pacotes a instalar, actualizar ou remover " +"para obter o máximo do sistema para o novo lançamento. Em algumas situações " +"pode ser desejável usar o dist-upgrade em vez de passar o tempo a resolver " +"dependências manualmente no dselect. Assim que o dist-upgrade " +"tiver terminado então pode ser usado o dselect para instalar " +"quaisquer pacotes que tenham ficado de fora." + +#. type:

+#: guide.sgml:152 +msgid "" +"It is important to closely look at what dist-upgrade is going to do, its " +"decisions may sometimes be quite surprising." +msgstr "" +"É importante observar de perto o que o dist-upgrade vai fazer, as suas " +"decisões podem por vezes ser bastante surpreendentes." + +#. type:

+#: guide.sgml:163 +msgid "" +"apt-get has several command line options that are detailed in " +"its man page, . The most useful " +"option is -d which does not install the fetched files. If the " +"system has to download a large number of package it would be undesired to " +"start installing them in case something goes wrong. When -d is used " +"the downloaded archives can be installed by simply running the command that " +"caused them to be downloaded again without -d." +msgstr "" +"apt-get tem várias opções de linha de comandos que estão " +"detalhados no seu manual, . A opção " +"mais útil é -d que não instala os pacotes obtidos, Se o sistema " +"tiver que descarregar um grande número de pacotes seria indesejável começar " +"a instalá-los no caso de algo correr mal. Quando se usa -d os " +"arquivos descarregados podem ser instalados simplesmente ao correr de novo " +"comando que s descarregou mas sem o -d." + +#. type: +#: guide.sgml:168 +msgid "DSelect" +msgstr "DSelect" + +#. type:

+#: guide.sgml:173 +msgid "" +"The APT dselect method provides the complete APT system with " +"the dselect package selection GUI. dselect is used " +"to select the packages to be installed or removed and APT actually installs " +"them." +msgstr "" +"O método dselect do APT disponibiliza o sistema APT completo " +"com a GUI de selecção de pacotes dselect. O dselect é usado para seleccionar os pacotes a serem instalados ou removidos e " +"o APT instala-os." + +#. type:

+#: guide.sgml:184 +msgid "" +"To enable the APT method you need to select [A]ccess in dselect " +"and then choose the APT method. You will be prompted for a set of " +"Sources which are places to fetch archives from. These can be " +"remote Internet sites, local Debian mirrors or CDROMs. Each source can " +"provide a fragment of the total Debian archive, APT will automatically " +"combine them to form a complete set of packages. If you have a CDROM then it " +"is a good idea to specify it first and then specify a mirror so that you " +"have access to the latest bug fixes. APT will automatically use packages on " +"your CDROM before downloading from the Internet." +msgstr "" +"Para activar o método APT você precisa de seleccionar [A]ccess no " +"dselect e depois escolher o método APT. Ser-lhe-à perguntado " +"por um conjunto de Sources que são os lugares de onde obter os " +"arquivos. Estes podem ser sites remotos da Internet, mirrors Debian locais " +"ou CDROMs. Cada source pode disponibilizar um fragmento do arquivo Debian " +"total. O APT irá automaticamente combiná-los para formar um conjunto " +"completo de pacotes. Se tem um CDROM, então é boa ideia especificá-lo em " +"primeiro lugar e depois especificar um mirror para ter acesso às correcções " +"de bugs mais recentes. O APT irá automaticamente usar os pacotes no seu " +"CDROM antes de descarregar da Internet." + +#. type: +#: guide.sgml:198 +#, no-wrap +msgid "" +" Set up a list of distribution source locations\n" +"\t \n" +" Please give the base URL of the debian distribution.\n" +" The access schemes I know about are: http file\n" +"\t \n" +" For example:\n" +" file:/mnt/debian,\n" +" ftp://ftp.debian.org/debian,\n" +" http://ftp.de.debian.org/debian,\n" +" \n" +" \n" +" URL [http://llug.sep.bnl.gov/debian]:" +msgstr "" +" Configurar uma lista de localizações fonte da distribuição\n" +"\t \n" +" Por favor forneça o URL base da distribuição Debian.\n" +" Os esquemas de acesso que conheço são: http file\n" +"\t \n" +" Por exemplo:\n" +" file:/mnt/debian,\n" +" ftp://ftp.debian.org/debian,\n" +" http://ftp.de.debian.org/debian,\n" +" \n" +" \n" +" URL [http://llug.sep.bnl.gov/debian]:" + +#. type:

+#: guide.sgml:205 +msgid "" +"The Sources setup starts by asking for the base of the Debian " +"archive, defaulting to a HTTP mirror. Next it asks for the distribution to " +"get." +msgstr "" +"A configuração de Sources começa por perguntar pela base do arquivo " +"Debian, usando por predefinição um mirror HTTP. Depois pergunta qual a " +"distribuição a obter." + +#. type: +#: guide.sgml:212 +#, no-wrap +msgid "" +" Please give the distribution tag to get or a path to the\n" +" package file ending in a /. The distribution\n" +" tags are typically something like: stable unstable testing non-US\n" +" \n" +" Distribution [stable]:" +msgstr "" +" Por favor forneça a etiqueta da distribuição a obter ou um caminho para o\n" +" ficheiro package terminando com um /. As etiquetas da\n" +" distribuição são tipicamente algo como: stable unstable testing non-US\n" +" \n" +" Distribution [stable]:" + +#. type:

+#: guide.sgml:222 +msgid "" +"The distribution refers to the Debian version in the archive, stable refers to the latest released version and unstable refers to " +"the developmental version. non-US is only available on some mirrors " +"and refers to packages that contain encryption technology or other things " +"that cannot be exported from the United States. Importing these packages " +"into the US is legal however." +msgstr "" +"A distribuição refere-se à versão Debian no arquivo, stable refere-" +"se à última versão lançada e unstable refere-se à versão de " +"desenvolvimento. non-US apenas está disponível em alguns mirrors e " +"refere-se a pacotes que contém tecnologia de encriptação ou outras coisas " +"que não podem ser exportadas dos Estados Unidos. No entanto importar estes " +"pacotes para os US é legal." + +#. type: +#: guide.sgml:228 +#, no-wrap +msgid "" +" Please give the components to get\n" +" The components are typically something like: main contrib non-free\n" +" \n" +" Components [main contrib non-free]:" +msgstr "" +" Por favor forneça os componentes a obter\n" +" Tipicamente os componentes são algo como: main contrib non-free\n" +" \n" +" Componentes [main contrib non-free]:" + +#. type:

+#: guide.sgml:236 +msgid "" +"The components list refers to the list of sub distributions to fetch. The " +"distribution is split up based on software licenses, main being DFSG free " +"packages while contrib and non-free contain things that have various " +"restrictions placed on their use and distribution." +msgstr "" +"A lista de componentes refere-se à lista das sub-distribuições a obter. A " +"distribuição é dividida baseando-se nas licenças do software, sendo main " +"pacotes livres DFSG enquanto contrib e non-free contêm coisas que têm várias " +"restrições colocadas no seu uso e distribuição." + +#. type:

+#: guide.sgml:240 +msgid "" +"Any number of sources can be added, the setup script will continue to prompt " +"until you have specified all that you want." +msgstr "" +"Pode ser adicionado qualquer número de fontes, o script de configuração irá " +"continuar a perguntar-lhe até que tenha especificado todas as que deseja." + +#. type:

+#: guide.sgml:247 +msgid "" +"Before starting to use dselect it is necessary to update the " +"available list by selecting [U]pdate from the menu. This is a superset of " +"apt-get update that makes the fetched information available to " +"dselect. [U]pdate must be performed even if apt-get update has been run before." +msgstr "" +"Antes de começar a usar o dselect é necessário actualizar a " +"lista disponível ao seleccionar [U]pdate no menu. Isto é um super-conjunto " +"do apt-get update que torna a informação obtida disponível ao " +"dselect. Deve ser executado o [U]pdate mesmo que tenha sido " +"feito apt-get update antes." + +#. type:

+#: guide.sgml:253 +msgid "" +"You can then go on and make your selections using [S]elect and then perform " +"the installation using [I]nstall. When using the APT method the [C]onfig and " +"[R]emove commands have no meaning, the [I]nstall command performs both of " +"them together." +msgstr "" +"Você pode depois fazer as suas selecções usando [S]elect e depois executar a " +"instalação usando [I]nstall. Quando se usa o método APT os comandos [C]onfig " +"e [R]emove não fazem sentido, o comando [I]nstall executa ambos juntamente." + +#. type:

+#: guide.sgml:258 +msgid "" +"By default APT will automatically remove the package (.deb) files once they " +"have been successfully installed. To change this behavior place Dselect::" +"clean \"prompt\"; in /etc/apt/apt.conf." +msgstr "" +"Por predefinição o APT irá automaticamente remover o ficheiro de pacote (." +"deb) assim que ele tenha sido instalado com sucesso. Para alterar este " +"comportamento coloque Dselect::clean \"prompt\"; em /etc/apt/apt." +"conf." + +#. type: +#: guide.sgml:264 +msgid "The Interface" +msgstr "A Interface" + +#. type:

+#: guide.sgml:278 +msgid "" +"Both that APT dselect method and apt-get share the " +"same interface. It is a simple system that generally tells you what it will " +"do and then goes and does it.

The dselect method " +"actually is a set of wrapper scripts to apt-get. The method " +"actually provides more functionality than is present in apt-get " +"alone.

 After printing out a summary of what will happen APT " +"then will print out some informative status messages so that you can " +"estimate how far along it is and how much is left to do." +msgstr "" +"Ambos método dselect do APT e apt-get partilham a " +"mesma interface. É um sistema simples que geralmente lhe diz o que vai fazer " +"e depois fá-lo.

O método dselect na verdade é um " +"conjunto de scripts wrapper para o apt-get. O método " +"disponibiliza mais funcionalidades que aquelas presentes no apt-get sozinho.

 Após escrever um sumário do que vai acontecer, " +"o APT depois irá escrever algumas mensagens de estado informativo para que " +"você possa estimar o progresso e quanto falta fazer." + +#. type: +#: guide.sgml:280 +msgid "Startup" +msgstr "Arranque" + +#. type:

+#: guide.sgml:284 +msgid "" +"Before all operations except update, APT performs a number of actions to " +"prepare its internal state. It also does some checks of the system's state. " +"At any time these operations can be performed by running apt-get check." +msgstr "" +"Antes de todas as operações, excepto a update, o APT executa um número de " +"acções para preparar o seu estado interno. Também faz algumas verificações " +"do estado do sistema. A qualquer altura estas operações pode ser executadas " +"correndo apt-get check." + +#. type: +#: guide.sgml:289 +#, no-wrap +msgid "" +"# apt-get check\n" +"Reading Package Lists... Done\n" +"Building Dependency Tree... Done" +msgstr "" +"# apt-get check\n" +"Reading Package Lists... Done\n" +"Building Dependency Tree... Done" + +#. type:

+#: guide.sgml:297 +msgid "" +"The first thing it does is read all the package files into memory. APT uses " +"a caching scheme so this operation will be faster the second time it is run. " +"If some of the package files are not found then they will be ignored and a " +"warning will be printed when apt-get exits." +msgstr "" +"A primeira coisa que faz é ler todos os ficheiros de pacotes para a memória. " +"O APT usa um esquema de cache para que esta operação seja mais rápida na " +"segunda vez que é executada. Se alguns dos ficheiros de pacotes não forem " +"encontrados serão ignorados e será mostrado um aviso quando o apt-get " +"terminar." + +#. type:

+#: guide.sgml:303 +msgid "" +"The final operation performs a detailed analysis of the system's " +"dependencies. It checks every dependency of every installed or unpacked " +"package and considers if it is OK. Should this find a problem then a report " +"will be printed out and apt-get will refuse to run." +msgstr "" +"A operação final executa uma análise detalhada das dependências do sistema. " +"Verifica cada dependência de cada pacote instalado ou desempacotado e " +"considera se está OK. Caso isto encontre um problema, então é escrito um " +"relatório e o apt-get recusa-se a funcionar." + +#. type: +#: guide.sgml:320 +#, no-wrap +msgid "" +"# apt-get check\n" +"Reading Package Lists... Done\n" +"Building Dependency Tree... Done\n" +"You might want to run apt-get -f install' to correct these.\n" +"Sorry, but the following packages have unmet dependencies:\n" +" 9fonts: Depends: xlib6g but it is not installed\n" +" uucp: Depends: mailx but it is not installed\n" +" blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n" +" adduser: Depends: perl-base but it is not installed\n" +" aumix: Depends: libgpmg1 but it is not installed\n" +" debiandoc-sgml: Depends: sgml-base but it is not installed\n" +" bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n" +" cthugha: Depends: svgalibg1 but it is not installed\n" +" Depends: xlib6g (>= 3.3-5) but it is not installed\n" +" libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)" +msgstr "" +"# apt-get check\n" +"Reading Package Lists... Done\n" +"Building Dependency Tree... Done\n" +"You might want to run apt-get -f install' to correct these.\n" +"Sorry, but the following packages have unmet dependencies:\n" +" 9fonts: Depends: xlib6g but it is not installed\n" +" uucp: Depends: mailx but it is not installed\n" +" blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n" +" adduser: Depends: perl-base but it is not installed\n" +" aumix: Depends: libgpmg1 but it is not installed\n" +" debiandoc-sgml: Depends: sgml-base but it is not installed\n" +" bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n" +" cthugha: Depends: svgalibg1 but it is not installed\n" +" Depends: xlib6g (>= 3.3-5) but it is not installed\n" +" libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)" + +#. type:

+#: guide.sgml:329 +msgid "" +"In this example the system has many problems, including a serious problem " +"with libreadlineg2. For each package that has unmet dependencies a line is " +"printed out indicating the package with the problem and the dependencies " +"that are unmet. A short explanation of why the package has a dependency " +"problem is also included." +msgstr "" +"Neste exemplo o sistema tem muitos problemas, incluindo um sério problema " +"com libreadlineg2. Para cada pacote que tem dependências não satisfeitas, é " +"escrita uma linha indicando o pacote com o problema e as dependências que " +"não estão satisfeitas. É também incluída uma explicação curta de porquê o " +"pacote tem um problema de dependência." + +#. type:

+#: guide.sgml:337 +msgid "" +"There are two ways a system can get into a broken state like this. The first " +"is caused by dpkg missing some subtle relationships between " +"packages when performing upgrades.

APT however considers all " +"known dependencies and attempts to prevent broken packages

. " +"The second is if a package installation fails during an operation. In this " +"situation a package may have been unpacked without its dependents being " +"installed." +msgstr "" +"Existem duas maneiras de um sistema entrar num estado de quebra como este. A " +"primeira é causada pelo dpkg que não vê algumas relações subtis " +"entre pacotes quando executa actualizações.

No entanto o APT " +"considera todas as dependências conhecidas e tenta prevenir pacotes " +"quebrados

. A segunda é se uma instalação de pacote falha " +"durante uma operação. Nesta situação um pacote pode ter sido desempacotado " +"sem que as suas dependências tenham sido instaladas." + +#. type:

+#: guide.sgml:345 +msgid "" +"The second situation is much less serious than the first because APT places " +"certain constraints on the order that packages are installed. In both cases " +"supplying the -f option to apt-get will cause APT to " +"deduce a possible solution to the problem and then continue on. The APT " +"dselect method always supplies the -f option to allow " +"for easy continuation of failed maintainer scripts." +msgstr "" +"A segunda situação é muito menos séria que a primeira porque o APT coloca " +"certos constrangimentos na ordem que os pacotes são instalados. Em ambos os " +"casos, fornecer a opção -f ao apt-get irá fazer com " +"que o APT deduza uma solução possível para o problema e depois continue. O " +"método dselect do APT fornece sempre a opção -f para " +"permitir uma continuação fácil de scripts do responsável com falhas." + +#. type:

+#: guide.sgml:351 +msgid "" +"However, if the -f option is used to correct a seriously broken " +"system caused by the first case then it is possible that it will either fail " +"immediately or the installation sequence will fail. In either case it is " +"necessary to manually use dpkg (possibly with forcing options) to correct " +"the situation enough to allow APT to proceed." +msgstr "" +"No entanto, se for usada a opção -f para corrigir um sistema " +"seriamente quebrado causado pelo primeiro caso, então é possível que ou " +"falhe imediatamente ou falhe na sequência de instalação. Em qualquer dos " +"casos é necessário usar o dpkg manualmente (possivelmente com opções de " +"forçar) para corrigir a situação o suficiente para permitir ao APT continuar." + +#. type: +#: guide.sgml:356 +msgid "The Status Report" +msgstr "O Relatório de Estado" + +#. type:

+#: guide.sgml:363 +msgid "" +"Before proceeding apt-get will present a report on what will " +"happen. Generally the report reflects the type of operation being performed " +"but there are several common elements. In all cases the lists reflect the " +"final state of things, taking into account the -f option and any " +"other relevant activities to the command being executed." +msgstr "" +"Antes de prosseguir, o apt-get irá apresentar um relatório do " +"que irá acontecer. Geralmente o relatório reflecte o tipo de operações a ser " +"executadas mas há vários elementos comuns. Em todos os casos a lista " +"reflecte o estado final das coisas, tendo em conta a opção -f e " +"quaisquer outras actividades relevantes ao comando que vai ser executado." + +#. type: +#: guide.sgml:364 +msgid "The Extra Package list" +msgstr "A lista de Pacotes Extra" + +#. type: +#: guide.sgml:372 +#, no-wrap +msgid "" +"The following extra packages will be installed:\n" +" libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n" +" mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n" +" bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n" +" squake pgp-i python-base debmake ldso perl libreadlineg2\n" +" ssh" +msgstr "" +"Os seguinte pacotes extra serão instalados:\n" +" libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n" +" mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n" +" bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n" +" squake pgp-i python-base debmake ldso perl libreadlineg2\n" +" ssh" + +#. type:

+#: guide.sgml:379 +msgid "" +"The Extra Package list shows all of the packages that will be installed or " +"upgraded in excess of the ones mentioned on the command line. It is only " +"generated for an install command. The listed packages are often the " +"result of an Auto Install." +msgstr "" +"A lista de Pacotes Extra mostra todos os pacotes que irão ser instalados ou " +"actualizados em excesso daqueles mencionados na linha de comandos. É apenas " +"gerada para um comando install. Os pacotes listados são geralmente " +"o resultado de uma Auto instalação." + +#. type: +#: guide.sgml:382 +msgid "The Packages to Remove" +msgstr "Os Pacotes para Remover" + +#. type: +#: guide.sgml:389 +#, no-wrap +msgid "" +"The following packages will be REMOVED:\n" +" xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n" +" xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n" +" xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n" +" nas xpilot xfig" +msgstr "" +"Os seguintes pacotes irão ser REMOVIDOS:\n" +" xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n" +" xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n" +" xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n" +" nas xpilot xfig" + +#. type:

+#: guide.sgml:399 +msgid "" +"The Packages to Remove list shows all of the packages that will be removed " +"from the system. It can be shown for any of the operations and should be " +"given a careful inspection to ensure nothing important is to be taken off. " +"The -f option is especially good at generating packages to remove " +"so extreme care should be used in that case. The list may contain packages " +"that are going to be removed because they are only partially installed, " +"possibly due to an aborted installation." +msgstr "" +"A lista Pacotes para Remover mostra todos os pacotes que irão ser removidos " +"do sistema. Pode ser mostrada para qualquer das operações e deve ser-lhe " +"dada uma inspecção cuidadosa para assegurar que nada de importante vai ser " +"removido. A opção -f é especialmente boa a gerar pacotes para " +"remover, portanto neste caso deve-se usar cuidados extremos. A lista pode " +"conter pacotes que vão ser removidos porque estão apenas parcialmente " +"instalados, possivelmente devido a uma instalação abortada." + +#. type: +#: guide.sgml:402 +msgid "The New Packages list" +msgstr "A lista de Novos Pacotes" + +#. type: +#: guide.sgml:406 +#, no-wrap +msgid "" +"The following NEW packages will installed:\n" +" zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base" +msgstr "" +"Os seguintes pacotes NOVOS irão ser instalados:\n" +" zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base" + +#. type:

+#: guide.sgml:411 +msgid "" +"The New Packages list is simply a reminder of what will happen. The packages " +"listed are not presently installed in the system but will be when APT is " +"done." +msgstr "" +"A lista de Novos Pacotes é simplesmente um lembrete do que vai acontecer. Os " +"pacotes listados não estão instalados presentemente no sistema mas irão " +"estar quando o APT terminar." + +#. type: +#: guide.sgml:414 +msgid "The Kept Back list" +msgstr "A lista Kept Back" + +#. type: +#: guide.sgml:419 +#, no-wrap +msgid "" +"The following packages have been kept back\n" +" compface man-db tetex-base msql libpaper svgalib1\n" +" gs snmp arena lynx xpat2 groff xscreensaver" +msgstr "" +"Os seguintes pacotes formam mantidos na versão antiga\n" +" compface man-db tetex-base msql libpaper svgalib1\n" +" gs snmp arena lynx xpat2 groff xscreensaver" + +#. type:

+#: guide.sgml:428 +msgid "" +"Whenever the whole system is being upgraded there is the possibility that " +"new versions of packages cannot be installed because they require new things " +"or conflict with already installed things. In this case the package will " +"appear in the Kept Back list. The best way to convince packages listed there " +"to install is with apt-get install or by using dselect " +"to resolve their problems." +msgstr "" +"Sempre que todo o sistema é actualizado existe a possibilidade que novas " +"versões de pacotes não possam ser instaladas porque requerem coisas novas ou " +"entram em conflito com coisas já instaladas. Nestes casos o pacote irá " +"aparecer na lista Kept Back. A melhor maneira de convencer os pacotes " +"listados aqui a instalarem é com o apt-get install ou usando o " +"dselect para resolver os seus problemas." + +#. type: +#: guide.sgml:431 +msgid "Held Packages warning" +msgstr "Aviso de Pacotes Mantidos" + +#. type: +#: guide.sgml:435 +#, no-wrap +msgid "" +"The following held packages will be changed:\n" +" cvs" +msgstr "" +"Os seguintes pacotes mantidos irão ser alterados:\n" +" cvs" + +#. type:

+#: guide.sgml:441 +msgid "" +"Sometimes you can ask APT to install a package that is on hold, in such a " +"case it prints out a warning that the held package is going to be changed. " +"This should only happen during dist-upgrade or install." +msgstr "" +"Por vezes você pode pedir ao APT para instalar um pacote que está retido, " +"nestes casos ele mostra um aviso que o pacote retido vai ser alterado. Isto " +"apenas deve acontecer durante um dist-upgrade ou install." + +#. type: +#: guide.sgml:444 +msgid "Final summary" +msgstr "Sumário final" + +#. type:

+#: guide.sgml:447 +msgid "" +"Finally, APT will print out a summary of all the changes that will occur." +msgstr "" +"Finalmente, o APT irá escrever um sumário de todas as alterações que irão " +"acontecer." + +#. type: +#: guide.sgml:452 +#, no-wrap +msgid "" +"206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n" +"12 packages not fully installed or removed.\n" +"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used." +msgstr "" +"206 pacotes actualizados, 8 instalados de novo, 23 para remover e 51 não actualizados.\n" +"12 pacotes não totalmente instalados ou removidos.\n" +"É necessário obter 65.7M/66.7M de arquivos. Após desempacotamento será usado 26.5M." + +#. type:

+#: guide.sgml:470 +msgid "" +"The first line of the summary simply is a reduced version of all of the " +"lists and includes the number of upgrades - that is packages already " +"installed that have new versions available. The second line indicates the " +"number of poorly configured packages, possibly the result of an aborted " +"installation. The final line shows the space requirements that the " +"installation needs. The first pair of numbers refer to the size of the " +"archive files. The first number indicates the number of bytes that must be " +"fetched from remote locations and the second indicates the total size of all " +"the archives required. The next number indicates the size difference between " +"the presently installed packages and the newly installed packages. It is " +"roughly equivalent to the space required in /usr after everything is done. " +"If a large number of packages are being removed then the value may indicate " +"the amount of space that will be freed." +msgstr "" +"A primeira linha do sumário é simplesmente uma versão reduzida de todas as " +"listas e inclui o número de actualizações - que é os pacotes já instalados " +"que têm novas versões disponíveis. A segunda linha indica o número de " +"pacotes mal configurados, possivelmente o resultado de uma instalação " +"abortada. A linha final mostra os requisitos de espaço que a instalação " +"precisa. O primeiro par de número refere-se ao tamanho dos ficheiros de " +"arquivos. O primeiro número indica o número de bytes que precisam ser " +"obtidos a partir das localizações remotas e o segundo indica o tamanho total " +"do todos os arquivos necessários. O número seguinte indica a diferença de " +"tamanho entre os pacotes presentemente instalados e os pacotes instalados de " +"fresco. É aproximadamente equivalente ao espaço requerido em /usr após tudo " +"estar feito. Se forem removidos um grande número de pacotes então o valor " +"pode indicar a quantidade de espaço que irá ser libertado." + +#. type:

+#: guide.sgml:473 +msgid "" +"Some other reports can be generated by using the -u option to show packages " +"to upgrade, they are similar to the previous examples." +msgstr "" +"Outros relatórios podem ser gerados ao usar a opção -u para mostrar os " +"pacotes a actualizar, e são semelhantes aos exemplos prévios." + +#. type: +#: guide.sgml:477 +msgid "The Status Display" +msgstr "O Mostrador de Estado" + +#. type:

+#: guide.sgml:481 +msgid "" +"During the download of archives and package files APT prints out a series of " +"status messages." +msgstr "" +"Durante a descarga dos arquivos e ficheiros de pacotes, o APT escreve uma " +"série de mensagens de estado." + +#. type: +#: guide.sgml:490 +#, no-wrap +msgid "" +"# apt-get update\n" +"Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n" +"Get:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n" +"Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n" +"Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n" +"Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n" +"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s" +msgstr "" +"# apt-get update\n" +"Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n" +"Get:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n" +"Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n" +"Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n" +"Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n" +"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s" + +#. type:

+#: guide.sgml:500 +msgid "" +"The lines starting with Get are printed out when APT begins to " +"fetch a file while the last line indicates the progress of the download. The " +"first percent value on the progress line indicates the total percent done of " +"all files. Unfortunately since the size of the Package files is unknown " +"apt-get update estimates the percent done which causes some " +"inaccuracies." +msgstr "" +"A linhas iniciadas com Get são escritas quando o APT começa a obter " +"um ficheiro enquanto a última linha indica o progresso da descarga. O " +"primeiro valor percentual na linha de progresso indica a percentagem total " +"completa de todos os ficheiros. Infelizmente como o tamanho dos ficheiros de " +"Pacotes é desconhecido o apt-get update estima a percentagem de " +"pronto o que causa algumas imprecisões." + +#. type:

+#: guide.sgml:509 +msgid "" +"The next section of the status line is repeated once for each download " +"thread and indicates the operation being performed and some useful " +"information about what is happening. Sometimes this section will simply read " +"Forking which means the OS is loading the download module. The " +"first word after the [ is the fetch number as shown on the history lines. " +"The next word is the short form name of the object being downloaded. For " +"archives it will contain the name of the package that is being fetched." +msgstr "" +"A secção seguinte da linha de estado é repetida para cada processo de " +"descarga e indica a operação a ser executada e alguma informação útil acerca " +"do que está a acontecer. Por vezes esta secção irá simplesmente ler " +"Forking o que representa que o SO está a carregar o módulo de " +"download. A primeira palavra após o [ é o número de obtenção como mostrado " +"nas linhas de histórico. A palavra seguinte é o nome em formato curto do " +"objecto a ser descarregado. Para os arquivos irá conter o nome do pacote que " +"está a ser descarregado." + +#. type:

+#: guide.sgml:524 +msgid "" +"Inside of the single quote is an informative string indicating the progress " +"of the negotiation phase of the download. Typically it progresses from " +"Connecting to Waiting for file to Downloading or " +"Resuming. The final value is the number of bytes downloaded from " +"the remote site. Once the download begins this is represented as " +"102/10.2k indicating that 102 bytes have been fetched and 10.2 " +"kilobytes is expected. The total size is always shown in 4 figure notation " +"to preserve space. After the size display is a percent meter for the file " +"itself. The second last element is the instantaneous average speed. This " +"values is updated every 5 seconds and reflects the rate of data transfer for " +"that period. Finally is shown the estimated transfer time. This is updated " +"regularly and reflects the time to complete everything at the shown transfer " +"rate." +msgstr "" +"Dentro da única citação está uma string de informação que indica o progresso " +"da fase de negociação do download. Progride tipicamente de A Ligar " +"para À espera do ficheiro para A descarregar ou A " +"resumir. O valor final é o número de bytes descarregados a partir do " +"site remoto. Uma vez começado a descarga isto é representado como " +"102/10.2k indicando que 102 bytes foram obtidos e são esperados " +"10.2kilobytes. O tamanho total é sempre representado numa anotação de 4 " +"figuras para preservar espaço. Após a amostragem do tamanho está um medidor " +"de percentagem para o próprio ficheiro. O segundo último elemento é a " +"velocidade média instantânea. Estes valores são actualizados a cada 5 " +"segundos e reflectem a taxa de dados transferidos para esse período. " +"Finalmente é mostrado o tempo estimado de transferência. Isto é actualizado " +"regularmente e reflecte o tempo para completar tudo ao ritmo de " +"transferência mostrado." + +#. type:

+#: guide.sgml:530 +msgid "" +"The status display updates every half second to provide a constant feedback " +"on the download progress while the Get lines scroll back whenever a new file " +"is started. Since the status display is constantly updated it is unsuitable " +"for logging to a file, use the -q option to remove the status " +"display." +msgstr "" +"O mostrador de estado actualiza-se a cada meio segundo para disponibilizar " +"uma informação de retorno constante do progresso de descarga enquanto as " +"linhas Get deslocam-se para trás sempre que uma nova linha é iniciada. Como " +"o mostrador de estado é constantemente actualizado não é apropriado para " +"registar num ficheiro, use a opção -q para remover o mostrador de " +"estado." + +#. type: +#: guide.sgml:535 +msgid "Dpkg" +msgstr "Dpkg" + +#. type:

+#: guide.sgml:542 +msgid "" +"APT uses dpkg for installing the archives and will switch over " +"to the dpkg interface once downloading is completed. " +"dpkg will also ask a number of questions as it processes the " +"packages and the packages themselves may also ask several questions. Before " +"each question there is usually a description of what it is asking and the " +"questions are too varied to discuss completely here." +msgstr "" +"O APT usa o dpkg para instalar os arquivos e irá mudar para a " +"interface do dpkg assim que a descarga estiver completa. O " +"dpkg irá também fazer um número de perguntas conforme vai " +"processando os pacotes e os próprios pacotes podem também fazer várias " +"questões. Antes de cada pergunta há geralmente uma descrição do que se está " +"a perguntar e as perguntas são demasiado variadas para serem discutidas aqui." + +#. type: +#: offline.sgml:4 +msgid "Using APT Offline" +msgstr "Usando o APT Offline" + +#. type: +#: offline.sgml:7 +msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $" +msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $" + +#. type: +#: offline.sgml:12 +msgid "" +"This document describes how to use APT in a non-networked environment, " +"specifically a 'sneaker-net' approach for performing upgrades." +msgstr "" +"Este documento descreve como usar o APT num ambiente sem rede, " +"especificamente uma aproximação 'sneaker-net' para executar actualizações." + +#. type: +#: offline.sgml:16 +msgid "Copyright © Jason Gunthorpe, 1999." +msgstr "Copyright © Jason Gunthorpe, 1999." + +#. type: +#: offline.sgml:32 +msgid "Introduction" +msgstr "Introdução" + +#. type: +#: offline.sgml:34 offline.sgml:65 offline.sgml:180 +msgid "Overview" +msgstr "Visão geral" + +#. type:

+#: offline.sgml:40 +msgid "" +"Normally APT requires direct access to a Debian archive, either from a local " +"media or through a network. Another common complaint is that a Debian " +"machine is on a slow link, such as a modem and another machine has a very " +"fast connection but they are physically distant." +msgstr "" +"Normalmente o APT requer acesso directo a um arquivo Debian, seja duma media " +"local ou através de rede. Outra queixa comum e que uma máquina Debian está " +"numa ligação lenta, como um modem e outra máquina tem uma ligação muito " +"rápida mas estão fisicamente distantes." + +#. type:

+#: offline.sgml:51 +msgid "" +"The solution to this is to use large removable media such as a Zip disc or a " +"SuperDisk disc. These discs are not large enough to store the entire Debian " +"archive but can easily fit a subset large enough for most users. The idea is " +"to use APT to generate a list of packages that are required and then fetch " +"them onto the disc using another machine with good connectivity. It is even " +"possible to use another Debian machine with APT or to use a completely " +"different OS and a download tool like wget. Let remote host mean " +"the machine downloading the packages, and target host the one with " +"bad or no connection." +msgstr "" +"A solução para isto é usar grandes médias amovíveis como um disco Zip ou um " +"disco SuperDisk. Estes discos não são suficientemente grandes para armazenar " +"o arquivo Debian inteiro mas podem facilmente conter um subconjunto " +"suficientemente grande para a maioria dos utilizadores. A ideia é usar o APT " +"para gerar uma lista de pacotes que são necessários e depois obter-los para " +"o disco usando outra máquina com boa ligação. É até possível usar outra " +"máquina Debian com APT ou usar um SO completamente diferente e uma " +"ferramenta de download como o wget. Deixe remote host representar a " +"máquina que descarrega os pacotes, e target host aquela com má ou " +"nenhuma ligação." + +#. type:

+#: offline.sgml:57 +msgid "" +"This is achieved by creatively manipulating the APT configuration file. The " +"essential premise to tell APT to look on a disc for it's archive files. Note " +"that the disc should be formated with a filesystem that can handle long file " +"names such as ext2, fat32 or vfat." +msgstr "" +"Isto é conseguido ao manipular criativamente o ficheiro de configuração do " +"APT. A premissa essencial para dizer ao APT para procurar num disco pelos " +"seus ficheiros de arquivo. Note que o disco deve estar formatado com um " +"sistema de ficheiros que saiba lidar com nomes de ficheiros longos como o " +"ext2, fat32 ou vfat." + +#. type: +#: offline.sgml:63 +msgid "Using APT on both machines" +msgstr "Usando o APT em ambas máquinas" + +#. type:

+#: offline.sgml:71 +msgid "" +"APT being available on both machines gives the simplest configuration. The " +"basic idea is to place a copy of the status file on the disc and use the " +"remote machine to fetch the latest package files and decide which packages " +"to download. The disk directory structure should look like:" +msgstr "" +"Estando o APT disponível em ambas máquinas dá a configuração mais simples. A " +"ideia básica é colocar uma cópia do ficheiro de estado no disco e usar a " +"máquina remota para obter os ficheiros de pacotes mais recentes e decidir " +"quais pacotes descarregar. A estrutura de directórios do disco deverá " +"parecer-se com:" + +#. type: +#: offline.sgml:80 +#, no-wrap +msgid "" +" /disc/\n" +" archives/\n" +" partial/\n" +" lists/\n" +" partial/\n" +" status\n" +" sources.list\n" +" apt.conf" +msgstr "" +" /disc/\n" +" archives/\n" +" partial/\n" +" lists/\n" +" partial/\n" +" status\n" +" sources.list\n" +" apt.conf" + +#. type: +#: offline.sgml:88 +msgid "The configuration file" +msgstr "O ficheiro de configuração" + +#. type:

+#: offline.sgml:96 +msgid "" +"The configuration file should tell APT to store its files on the disc and to " +"use the configuration files on the disc as well. The sources.list should " +"contain the proper sites that you wish to use from the remote machine, and " +"the status file should be a copy of /var/lib/dpkg/status from the " +"target host. Please note, if you are using a local archive you must " +"use copy URIs, the syntax is identical to file URIs." +msgstr "" +"O ficheiro de configuração deve dizer ao APT para armazenar os seus ficheiro " +"no disco e usar os ficheiros de configuração do disco também. O sources.list " +"deve conter os sites apropriados que deseja usar a partir da máquina remota, " +"e o ficheiro de estado deve ser uma cópia de /var/lib/dpkg/status a " +"partir do target host. Por favor note, se está a usar um arquivo " +"local você deve usar copy URIs, a sintaxe é idêntica a file URIs." + +#. type:

+#: offline.sgml:100 +msgid "" +"apt.conf must contain the necessary information to make APT use the " +"disc:" +msgstr "" +"apt.conf tem de conter a informação necessária para fazer o APT " +"usar o disco:" + +#. type: +#: offline.sgml:124 +#, no-wrap +msgid "" +" APT\n" +" {\n" +" /* This is not necessary if the two machines are the same arch, it tells\n" +" the remote APT what architecture the target machine is */\n" +" Architecture \"i386\";\n" +" \n" +" Get::Download-Only \"true\";\n" +" };\n" +" \n" +" Dir\n" +" {\n" +" /* Use the disc for state information and redirect the status file from\n" +" the /var/lib/dpkg default */\n" +" State \"/disc/\";\n" +" State::status \"status\";\n" +"\n" +" // Binary caches will be stored locally\n" +" Cache::archives \"/disc/archives/\";\n" +" Cache \"/tmp/\";\n" +" \n" +" // Location of the source list.\n" +" Etc \"/disc/\";\n" +" };" +msgstr "" +" APT\n" +" {\n" +" /* Isto não é necessário se as duas máquinas forem da mesma arquitectura, diz\n" +" ao APT remoto que arquitectura tem a máquina de destino */\n" +" Architecture \"i386\";\n" +" \n" +" Get::Download-Only \"true\";\n" +" };\n" +" \n" +" Dir\n" +" {\n" +" /* Usa o disco para informação de estado e redirecciona o ficheiro de estado a partir de\n" +" the /var/lib/dpkg default */\n" +" State \"/disc/\";\n" +" State::status \"status\";\n" +"\n" +" // Caches binárias serão armazenadas localmente\n" +" Cache::archives \"/disc/archives/\";\n" +" Cache \"/tmp/\";\n" +" \n" +" // Localização da lista de fontes.\n" +" Etc \"/disc/\";\n" +" };" + +#. type:

+#: offline.sgml:129 +msgid "" +"More details can be seen by examining the apt.conf man page and the sample " +"configuration file in /usr/share/doc/apt/examples/apt.conf." +msgstr "" +"Mais detalhes podem ser vistos ao examinar o manual do apt.conf e o exemplo " +"de ficheiro de configuração em /usr/share/doc/apt/examples/apt.conf." + +#. type:

+#: offline.sgml:136 +msgid "" +"On the target machine the first thing to do is mount the disc and copy /" +"var/lib/dpkg/status to it. You will also need to create the directories " +"outlined in the Overview, archives/partial/ and lists/partial/. Then take the disc to the remote machine and configure the sources." +"list. On the remote machine execute the following:" +msgstr "" +"Na máquina de destino a primeira coisa a fazer é montar o disco e copiar " +"/var/lib/dpkg/status para ele. Você também precisa de criar os " +"directórios delineados na Visão Geral, archives/partial/ e " +"lists/partial/. Depois leve o disco até à máquina remota e " +"configure o sources.list. Na máquina remota execute o seguinte:" + +#. type: +#: offline.sgml:142 +#, no-wrap +msgid "" +" # export APT_CONFIG=\"/disc/apt.conf\"\n" +" # apt-get update\n" +" [ APT fetches the package files ]\n" +" # apt-get dist-upgrade\n" +" [ APT fetches all the packages needed to upgrade the target machine ]" +msgstr "" +" # export APT_CONFIG=\"/disc/apt.conf\"\n" +" # apt-get update\n" +" [ APT obtém os ficheiros de pacotes ]\n" +" # apt-get dist-upgrade\n" +" [ APT obtém todos os pacotes necessários para actualizar a máquina de destino ]" + +#. type:

+#: offline.sgml:149 +msgid "" +"The dist-upgrade command can be replaced with any other standard APT " +"commands, particularly dselect-upgrade. You can even use an APT front end " +"such as dselect. However this presents a problem in communicating " +"your selections back to the local computer." +msgstr "" +"O comando dist-upgrade pode ser substituído por qualquer outro comando APT " +"standard, particularmente dselect-upgrade. Você até pode usar um front-end " +"do APT como o dselect. No entanto isto apresenta um problema ao " +"comunicar as suas selecções de volta ao computador local." + +#. type:

+#: offline.sgml:153 +msgid "" +"Now the disc contains all of the index files and archives needed to upgrade " +"the target machine. Take the disc back and run:" +msgstr "" +"Agora o disco contém todos os ficheiros de índice e os arquivos necessários " +"para actualizar a máquina de destino. Devolva o disco e corra:" + +#. type: +#: offline.sgml:159 +#, no-wrap +msgid "" +" # export APT_CONFIG=\"/disc/apt.conf\"\n" +" # apt-get check\n" +" [ APT generates a local copy of the cache files ]\n" +" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n" +" [ Or any other APT command ]" +msgstr "" +" # export APT_CONFIG=\"/disc/apt.conf\"\n" +" # apt-get check\n" +" [ APT gera uma cópia local dos ficheiros de cache ]\n" +" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n" +" [ Ou qualquer outro comando APT ]" + +#. type:

+#: offline.sgml:165 +msgid "" +"It is necessary for proper function to re-specify the status file to be the " +"local one. This is very important!" +msgstr "" +"Para uma função apropriada é necessário re-especificar que o ficheiro de " +"estado seja o ficheiro local. Isto é muito importante!" + +#. type:

+#: offline.sgml:172 +msgid "" +"If you are using dselect you can do the very risky operation of copying disc/" +"status to /var/lib/dpkg/status so that any selections you made on the remote " +"machine are updated. I highly recommend that people only make selections on " +"the local machine - but this may not always be possible. DO NOT copy the " +"status file if dpkg or APT have been run in the mean time!!" +msgstr "" +"Se está a usar dselect você pode fazer a operação muito arriscada de copiar " +"disc/status para /var/lib/dpkg/status para que quaisquer selecções que faça " +"na máquina remota sejam actualizadas. Eu recomendo altamente que as pessoas " +"apenas façam selecções na máquina local - mas isto pode nem sempre ser " +"possível. NÃO copie o ficheiro de estado se entretanto correu o dpkg ou o " +"APT!!" + +#. type: +#: offline.sgml:178 +msgid "Using APT and wget" +msgstr "Usando APT e wget" + +#. type:

+#: offline.sgml:185 +msgid "" +"wget is a popular and portable download tool that can run on nearly " +"any machine. Unlike the method above this requires that the Debian machine " +"already has a list of available packages." +msgstr "" +"wget é uma ferramenta popular e portável de download que pode " +"correr praticamente em qualquer máquina. Ao contrário do método acima, este " +"requer que a máquina Debian já tenha uma lista de pacotes disponíveis." + +#. type:

+#: offline.sgml:190 +msgid "" +"The basic idea is to create a disc that has only the archive files " +"downloaded from the remote site. This is done by using the --print-uris " +"option to apt-get and then preparing a wget script to actually fetch the " +"packages." +msgstr "" +"A ideia básica é criar um disco que tem apenas os ficheiros de arquivo " +"descarregados do site remoto. Isto é feito ao usar a opção --print-uris no " +"apt-get e depois preparar um script wget para realmente ir buscar os pacotes." + +#. type: +#: offline.sgml:196 +msgid "Operation" +msgstr "Operação" + +#. type:

+#: offline.sgml:200 +msgid "" +"Unlike the previous technique no special configuration files are required. " +"We merely use the standard APT commands to generate the file list." +msgstr "" +"Ao contrário da técnica anterior, não são necessários ficheiros de " +"configuração especiais. Nós usamos meramente os comandos standard do APT " +"para gerar a lista de ficheiros." + +#. type: +#: offline.sgml:205 +#, no-wrap +msgid "" +" # apt-get dist-upgrade \n" +" [ Press no when prompted, make sure you are happy with the actions ]\n" +" # apt-get -qq --print-uris dist-upgrade > uris\n" +" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script" +msgstr "" +" # apt-get dist-upgrade \n" +" [ Escolha não quando perguntado, certifique-se que está contente com as acções ]\n" +" # apt-get -qq --print-uris dist-upgrade > uris\n" +" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script" + +#. type:

+#: offline.sgml:210 +msgid "" +"Any command other than dist-upgrade could be used here, including dselect-" +"upgrade." +msgstr "" +"Qualquer comando além do dist-upgrade pode ser usado aqui, incluindo dselect-" +"upgrade." + +#. type:

+#: offline.sgml:216 +msgid "" +"The /disc/wget-script file will now contain a list of wget commands to " +"execute in order to fetch the necessary archives. This script should be run " +"with the current directory as the disc's mount point so as to save the " +"output on the disc." +msgstr "" +"O ficheiro /disc/wget-script irá agora conter uma lista de comandos do wget " +"para executar de modo a obter os arquivos necessários. Este script deve ser " +"corrido com o directório actual sendo o ponto de montagem do disco para que " +"grave os resultados no disco." + +#. type:

+#: offline.sgml:219 +msgid "The remote machine would do something like" +msgstr "A máquina remota deverá fazer algo como" + +#. type: +#: offline.sgml:223 +#, no-wrap +msgid "" +" # cd /disc\n" +" # sh -x ./wget-script\n" +" [ wait.. ]" +msgstr "" +" # cd /disc\n" +" # sh -x ./wget-script\n" +" [ wait.. ]" + +#. type: +#: offline.sgml:228 +msgid "" +"Once the archives are downloaded and the disc returned to the Debian machine " +"installation can proceed using," +msgstr "" +"Após os arquivos serem descarregados e o disco retornado à máquina Debian, a " +"instalação pode prosseguir usando," + +#. type: +#: offline.sgml:230 +#, no-wrap +msgid " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade" +msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade" + +#. type:

+#: offline.sgml:234 +msgid "Which will use the already fetched archives on the disc." +msgstr "O qual irá usar os arquivos já obtidos e que estão no disco." + +#~ msgid "/etc/apt/trusted.gpg" +#~ msgstr "/etc/apt/trusted.gpg" + +#~ msgid "Keyring of local trusted keys, new keys will be added here." +#~ msgstr "" +#~ "Chaveiro das chaves de confiança locais, as novas chaves serão " +#~ "adicionadas aqui." + +#~ msgid "" +#~ "apt.conf is the main configuration file for the APT " +#~ "suite of tools, all tools make use of the configuration file and a common " +#~ "command line parser to provide a uniform environment. When an APT tool " +#~ "starts up it will read the configuration specified by the " +#~ "APT_CONFIG environment variable (if any) and then read the " +#~ "files in Dir::Etc::Parts then read the main " +#~ "configuration file specified by Dir::Etc::main then " +#~ "finally apply the command line options to override the configuration " +#~ "directives, possibly loading even more config files." +#~ msgstr "" +#~ "apt.conf é o ficheiro de configuração principal para " +#~ "a suite de ferramentas do APT, todas as ferramentas usam o ficheiro de " +#~ "configuração e um analisador de linha de comandos comum para " +#~ "disponibilizar um ambiente uniforme. Quando uma ferramenta do APT arranca " +#~ "lê a configuração especificada pela variável de ambiente " +#~ "APT_CONFIG (se existir alguma) e depois lê os ficheiros em " +#~ "Dir::Etc::Parts, depois lê o ficheiro de configuração " +#~ "principal especificado por Dir::Etc::main e finalmente " +#~ "aplica as opções de linha de comandos para sobrepor as directivas de " +#~ "configuração, possivelmente carregando ainda mais ficheiros de " +#~ "configuração." -- cgit v1.2.3 From d8b3cbb61d93228ec984befefa1abfb16555f12a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 19 Mar 2010 12:36:20 +0100 Subject: modify and clarify the comments for the translation placeholders a bit and as it was only a comment change unfuzzy the translations. --- doc/apt.ent | 9 +++++++-- doc/po/apt-doc.pot | 26 +++++++++++++++++++------- doc/po/de.po | 23 +++++++++++++++-------- doc/po/es.po | 21 ++++++++++++++------- doc/po/fr.po | 23 +++++++++++++++-------- doc/po/it.po | 21 ++++++++++++++------- doc/po/ja.po | 23 +++++++++++++++-------- doc/po/pl.po | 26 ++++++++++++++------------ doc/po/pt.po | 23 +++++++++++++++-------- doc/po/pt_BR.po | 26 ++++++++++++++++---------- 10 files changed, 144 insertions(+), 77 deletions(-) diff --git a/doc/apt.ent b/doc/apt.ent index c23d906e2..19da4429e 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -367,9 +367,11 @@ "> + - + in a shipped manpage newer/modified paragraphs will maybe appear in english in + the generated manpage. This sentence is therefore here to tell the reader that this + is not a mistake by the translator - obviously the target is that at least for stable + releases this sentence is not needed. :) --> \n" "Language-Team: LANGUAGE \n" @@ -799,16 +799,22 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:371 -msgid "" +#: apt.ent:373 +#, no-wrap +msgid "" +"\n" +"\n" msgstr "" #. type: Plain text -#: apt.ent:380 +#: apt.ent:382 #, no-wrap msgid "" "\n" @@ -823,12 +829,18 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:387 +#: apt.ent:392 #, no-wrap msgid "" "\n" +" in a shipped manpage newer/modified paragraphs will maybe appear in " +"english in\n" +" the generated manpage. This sentence is therefore here to tell the " +"reader that this\n" +" is not a mistake by the translator - obviously the target is that at " +"least for stable\n" +" releases this sentence is not needed. :) -->\n" "\n" -"POT-Creation-Date: 2010-03-14 16:41+0100\n" +"POT-Creation-Date: 2010-03-19 11:14+0100\n" "PO-Revision-Date: 2009-12-31 17:41+GMT\n" "Last-Translator: Chris Leick \n" "Language-Team: German \n" @@ -1097,15 +1097,19 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:371 -msgid "" -msgstr "" +#: apt.ent:373 +#, no-wrap +msgid "" +"\n" +"\n" +msgstr "\n" #. type: Plain text -#: apt.ent:380 +#: apt.ent:382 #, no-wrap msgid "" -"\n" "\n" #. type: Plain text -#: apt.ent:387 +#: apt.ent:392 #, no-wrap msgid "" "\n" +" in a shipped manpage newer/modified paragraphs will maybe appear in english in\n" +" the generated manpage. This sentence is therefore here to tell the reader that this\n" +" is not a mistake by the translator - obviously the target is that at least for stable\n" +" releases this sentence is not needed. :) -->\n" "\n" "Language-Team: Debian Spanish l10n \n" @@ -1131,15 +1131,19 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:371 -msgid "" +#: apt.ent:373 +#, no-wrap +msgid "" +"\n" +"\n" msgstr "" #. type: Plain text -#: apt.ent:380 +#: apt.ent:382 #, no-wrap msgid "" -"\n" "\n" +" in a shipped manpage newer/modified paragraphs will maybe appear in english in\n" +" the generated manpage. This sentence is therefore here to tell the reader that this\n" +" is not a mistake by the translator - obviously the target is that at least for stable\n" +" releases this sentence is not needed. :) -->\n" "\n" "Language-Team: French \n" @@ -1096,15 +1096,19 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:371 -msgid "" -msgstr "" +#: apt.ent:373 +#, no-wrap +msgid "" +"\n" +"\n" +msgstr "\n" #. type: Plain text -#: apt.ent:380 +#: apt.ent:382 #, no-wrap msgid "" -"\n" "\n" #. type: Plain text -#: apt.ent:387 +#: apt.ent:392 #, no-wrap msgid "" "\n" +" in a shipped manpage newer/modified paragraphs will maybe appear in english in\n" +" the generated manpage. This sentence is therefore here to tell the reader that this\n" +" is not a mistake by the translator - obviously the target is that at least for stable\n" +" releases this sentence is not needed. :) -->\n" "\n" "Language-Team: \n" @@ -773,15 +773,19 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:371 -msgid "" +#: apt.ent:373 +#, no-wrap +msgid "" +"\n" +"\n" msgstr "" #. type: Plain text -#: apt.ent:380 +#: apt.ent:382 #, no-wrap msgid "" -"\n" "\n" +" in a shipped manpage newer/modified paragraphs will maybe appear in english in\n" +" the generated manpage. This sentence is therefore here to tell the reader that this\n" +" is not a mistake by the translator - obviously the target is that at least for stable\n" +" releases this sentence is not needed. :) -->\n" "\n" "Language-Team: LANGUAGE \n" @@ -1100,15 +1100,19 @@ msgid "" msgstr "取得中状態情報格納エリア。設定項目 - Dir::State::Lists (必然的に不完全)" #. type: Plain text -#: apt.ent:371 -msgid "" -msgstr "" +#: apt.ent:373 +#, no-wrap +msgid "" +"\n" +"\n" +msgstr "\n" #. type: Plain text -#: apt.ent:380 +#: apt.ent:382 #, no-wrap msgid "" -"\n" "\n" #. type: Plain text -#: apt.ent:387 +#: apt.ent:392 #, no-wrap msgid "" "\n" +" in a shipped manpage newer/modified paragraphs will maybe appear in english in\n" +" the generated manpage. This sentence is therefore here to tell the reader that this\n" +" is not a mistake by the translator - obviously the target is that at least for stable\n" +" releases this sentence is not needed. :) -->\n" "\n" "Language-Team: \n" @@ -1105,15 +1105,19 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:371 -msgid "" +#: apt.ent:373 +#, no-wrap +msgid "" +"\n" +"\n" msgstr "" #. type: Plain text -#: apt.ent:380 +#: apt.ent:382 #, no-wrap msgid "" -"\n" "debian-l10n-dummy@lists.debian.org.\n" "\">\n" msgstr "" -"\n" "robert@debian.org, 2000-2010.\n" " Tłumaczenie przewodnika offline: Krzysztof Fiertek akfedux@megapolis.pl, 2004\n" "\">\n" #. type: Plain text -#: apt.ent:387 +#: apt.ent:392 #, no-wrap msgid "" "\n" +" in a shipped manpage newer/modified paragraphs will maybe appear in english in\n" +" the generated manpage. This sentence is therefore here to tell the reader that this\n" +" is not a mistake by the translator - obviously the target is that at least for stable\n" +" releases this sentence is not needed. :) -->\n" "\n" msgstr "" -"\n" "\n" "Language-Team: Portuguese \n" @@ -1089,15 +1089,19 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:371 -msgid "" -msgstr "" +#: apt.ent:373 +#, no-wrap +msgid "" +"\n" +"\n" +msgstr "\n" #. type: Plain text -#: apt.ent:380 +#: apt.ent:382 #, no-wrap msgid "" -"\n" "\n" #. type: Plain text -#: apt.ent:387 +#: apt.ent:392 #, no-wrap msgid "" "\n" +" in a shipped manpage newer/modified paragraphs will maybe appear in english in\n" +" the generated manpage. This sentence is therefore here to tell the reader that this\n" +" is not a mistake by the translator - obviously the target is that at least for stable\n" +" releases this sentence is not needed. :) -->\n" "\n" "Language-Team: \n" @@ -816,16 +816,19 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:371 -#, fuzzy -msgid "" -msgstr "" +#: apt.ent:373 +#, no-wrap +msgid "" +"\n" +"\n" +msgstr "\n" #. type: Plain text -#: apt.ent:380 -#, fuzzy, no-wrap +#: apt.ent:382 +#, no-wrap msgid "" -"\n" "\n" #. type: Plain text -#: apt.ent:387 +#: apt.ent:392 #, no-wrap msgid "" "\n" +" in a shipped manpage newer/modified paragraphs will maybe appear in english in\n" +" the generated manpage. This sentence is therefore here to tell the reader that this\n" +" is not a mistake by the translator - obviously the target is that at least for stable\n" +" releases this sentence is not needed. :) -->\n" " Date: Fri, 19 Mar 2010 13:06:48 +0100 Subject: add a missing non-const & Accessors to the Iterator class --- apt-pkg/cacheiterators.h | 1 + 1 file changed, 1 insertion(+) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 28e062f3c..e2ca74683 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -62,6 +62,7 @@ template class pkgCache::Iterator { inline Str const *operator ->() const {return S;}; inline operator Str *() {return S == OwnerPointer() ? 0 : S;}; inline operator Str const *() const {return S == OwnerPointer() ? 0 : S;}; + inline Str &operator *() {return *S;}; inline Str const &operator *() const {return *S;}; inline pkgCache *Cache() {return Owner;}; -- cgit v1.2.3 From 22d1b5c9bcfa69cfc4279370a5e8938079d28773 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 19 Mar 2010 16:29:40 +0100 Subject: first-time build the translated manpages and remove the directories in the veryclean target to get right of all autogenerated files. --- doc/makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/doc/makefile b/doc/makefile index 93504e23e..8a889c94c 100644 --- a/doc/makefile +++ b/doc/makefile @@ -51,10 +51,7 @@ doc: for i in $(shell ls po/*.po | sed -r 's#po/([a-z]+[A-Z_]*).po#\1#'); do \ test -d $$i || mkdir $$i; \ test -f $$i/makefile || sed "s#@@LANG@@#$$i#" lang.makefile > $$i/makefile; \ - done - # it is likely that we have changed the list, so SUBDIRS is incorrect - for dir in $(dir $(wildcard */makefile)); do\ - $(MAKE) -C $$dir $@; \ + $(MAKE) -C $$i $@; \ done clean: clean-subdirs @@ -67,7 +64,7 @@ clean-subdirs: veryclean-subdirs: for dir in $(SUBDIRS); do\ - $(MAKE) -C $$dir veryclean; \ + rm -rf $$dir; \ done ifdef PO4A -- cgit v1.2.3 From aa85a4e2a7ef7c057d979f4e115f92993e04bbe8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 19 Mar 2010 16:41:35 +0100 Subject: add a missing \n to pl translation i had removed previously by accident --- doc/po/pl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/po/pl.po b/doc/po/pl.po index 78b2faba6..577a002a0 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -1111,7 +1111,7 @@ msgid "" "\n" "\n" -msgstr "" +msgstr "\n" #. type: Plain text #: apt.ent:382 -- cgit v1.2.3 From 8f5525e96777133e18772e398a2bb22ffc497d44 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sun, 21 Mar 2010 17:38:43 +0100 Subject: * apt-pkg/policy.cc: - Always return a candidate if there is at least one version pinned > 0 (Closes: #512318) --- apt-pkg/policy.cc | 14 ++++++++++++++ debian/changelog | 3 +++ 2 files changed, 17 insertions(+) diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index f9901bc9a..b12a50d0a 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -121,6 +121,10 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg) signed Max = GetPriority(Pkg); pkgCache::VerIterator Pref = GetMatch(Pkg); + // Alternatives in case we can not find our package pin (Bug#512318). + signed MaxAlt = 0; + pkgCache::VerIterator PrefAlt; + // no package = no candidate version if (Pkg.end() == true) return Pref; @@ -159,6 +163,11 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg) { Pref = Ver; Max = Prio; + } + if (Prio > MaxAlt) + { + PrefAlt = Ver; + MaxAlt = Prio; } } @@ -175,6 +184,11 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg) break; } } + // If we do not find our candidate, use the one with the highest pin. + // This means that if there is a version available with pin > 0; there + // will always be a candidate (Closes: #512318) + if (!Pref.IsGood() && MaxAlt > 0) + Pref = PrefAlt; return Pref; } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 24bea801d..c53c2a468 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,9 @@ apt (0.7.26~exp3) UNRELEASED; urgency=low - Use the new python-apt API (and conflict with python-apt << 0.7.93.2). * apt-inst/contrib/arfile.h: - Add public ARArchive::Members() which returns the list of members. + * apt-pkg/policy.cc: + - Always return a candidate if there is at least one version pinned > 0 + (Closes: #512318) * debian/rules: - Fix the libraries name to be e.g. libapt-pkg4.9 instead of libapt-pkg-4.9. -- cgit v1.2.3 From 6520109c98500cc1ca6d6b581cc0980531ef8f83 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sun, 21 Mar 2010 17:58:58 +0100 Subject: * cmdline/apt-key: - Honor Apt::GPGV::TrustedKeyring (Closes: #316390) --- cmdline/apt-key | 1 + debian/changelog | 2 ++ 2 files changed, 3 insertions(+) diff --git a/cmdline/apt-key b/cmdline/apt-key index e45468fd4..27731ef7d 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -146,6 +146,7 @@ if [ "$1" = "--keyring" ]; then else #echo "generate list" TRUSTEDFILE="/etc/apt/trusted.gpg" + eval $(apt-config shell TRUSTEDFILE Apt::GPGV::TrustedKeyring) if [ -r "$TRUSTEDFILE" ]; then GPG="$GPG --keyring $TRUSTEDFILE" fi diff --git a/debian/changelog b/debian/changelog index c53c2a468..cc5b03a63 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ apt (0.7.26~exp3) UNRELEASED; urgency=low that package that was providing some manpages for APT utilities. [ Julian Andres Klode ] + * cmdline/apt-key: + - Honor Apt::GPGV::TrustedKeyring (Closes: #316390) * cmdline/apt-mark: - Use the new python-apt API (and conflict with python-apt << 0.7.93.2). * apt-inst/contrib/arfile.h: -- cgit v1.2.3 From 0458a81120b78339a49febde73934e08f37c03f7 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sun, 21 Mar 2010 18:11:46 +0100 Subject: cmdline/apt-cache.cc: Change behavior of showsrc to match the one of show (Closes: #512046). --- cmdline/apt-cache.cc | 17 ++++++++++++++--- debian/changelog | 2 ++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 286f306cd..3f68579cc 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1498,15 +1498,26 @@ bool ShowSrcPackage(CommandLine &CmdL) if (_error->PendingError() == true) return false; + unsigned found = 0; for (const char **I = CmdL.FileList + 1; *I != 0; I++) { SrcRecs.Restart(); pkgSrcRecords::Parser *Parse; - while ((Parse = SrcRecs.Find(*I,false)) != 0) - cout << Parse->AsStr() << endl;; + unsigned found_this = 0; + while ((Parse = SrcRecs.Find(*I,false)) != 0) { + cout << Parse->AsStr() << endl;; + found++; + found_this++; + } + if (found_this == 0) { + _error->Warning(_("Unable to locate package %s"),*I); + continue; + } } - return true; + if (found > 0) + return true; + return _error->Error(_("No packages found")); } /*}}}*/ // Policy - Show the results of the preferences file /*{{{*/ diff --git a/debian/changelog b/debian/changelog index cc5b03a63..fc5d0f90c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ apt (0.7.26~exp3) UNRELEASED; urgency=low that package that was providing some manpages for APT utilities. [ Julian Andres Klode ] + * cmdline/apt-cache.cc: + - Change behavior of showsrc to match the one of show (Closes: #512046). * cmdline/apt-key: - Honor Apt::GPGV::TrustedKeyring (Closes: #316390) * cmdline/apt-mark: -- cgit v1.2.3 From 6bc703c22970055d9e1a1b4e3e0efe74f4cefda5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 21 Mar 2010 21:48:09 +0100 Subject: =?UTF-8?q?Add=20with=20pkgCacheGen::Essential=20a=20way=20to=20co?= =?UTF-8?q?ntrol=20which=20packages=20get=20the=20essential=20flag:=20*=20?= =?UTF-8?q?native=20is=20the=20default=20and=20will=20only=20mark=20packag?= =?UTF-8?q?es=20of=20the=20main=20arch=20*=20all=20will=20mark=20all=20pac?= =?UTF-8?q?kages=20which=20have=20these=20flag=20in=20Packages=20*=20none?= =?UTF-8?q?=20will=20obviously=20do=20the=20opposite=20*=20installed=20wil?= =?UTF-8?q?l=20only=20mark=20packages=20which=20are=20installed=20as=20ess?= =?UTF-8?q?ential,=20=20=20so=20it=20will=20behave=20in=20the=20same=20way?= =?UTF-8?q?=20as=20dpkg=20does=20it.=20It=20is=20mostly=20needed=20sometim?= =?UTF-8?q?es=20for=20debugging=20but=20some=20users=20with=20special=20ne?= =?UTF-8?q?eds=20might=20like=20to=20switch=20the=20mode=20as=20well=20und?= =?UTF-8?q?er=20the=20expense=20to=20be=20on=20their=20own=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apt-pkg/deb/deblistparser.cc | 16 +++++++++++++--- doc/examples/configure-index | 2 ++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 5c9cf6d4b..947e060e3 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -255,9 +255,13 @@ bool debListParser::UsePackage(pkgCache::PkgIterator Pkg, if (Pkg->Section == 0) Pkg->Section = UniqFindTagWrite("Section"); - // Packages which are not from "our" arch doesn't get the essential flag + // Packages which are not from the "native" arch doesn't get the essential flag + // in the default "native" mode - it is also possible to mark "all" or "none". + // The "installed" mode is handled by ParseStatus(), See #544481 and friends. string const static myArch = _config->Find("APT::Architecture"); - if (Pkg->Arch != 0 && myArch == Pkg.Arch()) + string const static essential = _config->Find("pkgCacheGen::Essential", "native"); + if ((essential == "native" && Pkg->Arch != 0 && myArch == Pkg.Arch()) || + essential == "all") if (Section.FindFlag("Essential",Pkg->Flags,pkgCache::Flag::Essential) == false) return false; if (Section.FindFlag("Important",Pkg->Flags,pkgCache::Flag::Important) == false) @@ -333,7 +337,13 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator Pkg, const char *Stop; if (Section.Find("Status",Start,Stop) == false) return true; - + + // UsePackage() is responsible for setting the flag in the default case + bool const static essential = _config->Find("pkgCacheGen::Essential", "") == "installed"; + if (essential == true && + Section.FindFlag("Essential",Pkg->Flags,pkgCache::Flag::Essential) == false) + return false; + // Isolate the first word const char *I = Start; for(; I < Stop && *I != ' '; I++); diff --git a/doc/examples/configure-index b/doc/examples/configure-index index f07302efd..f08a42ec7 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -432,6 +432,8 @@ Debug } +pkgCacheGen::Essential "native"; // other modes: all, none, installed + /* Whatever you do, do not use this configuration file!! Take out ONLY the portions you need! */ This Is Not A Valid Config File -- cgit v1.2.3 From 66905344357d03c206d99964a0d941b261f7146c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 22 Mar 2010 18:25:37 +0100 Subject: * ftparchive/writer.cc: - write LongDescriptions if they shouldn't be included in Packages file into i18n/Translation-en by default. It is ensured that each package+description is listed only ones in the Translation file even if we generate multiple Packages file in one run. The file is only generated in "generate" - the simple file commands can't create it by now. Also, the LongDescription is currently a global setting, so generating archives with and without LongDescriptions in the Packages file in the same run are currently not possible. --- debian/changelog | 3 +++ ftparchive/apt-ftparchive.cc | 47 +++++++++++++++++++++++++++++++++------- ftparchive/writer.cc | 51 ++++++++++++++++++++++++++++++++++++++++++-- ftparchive/writer.h | 19 +++++++++++++++++ 4 files changed, 110 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index d08bfb20c..d8b8244bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,6 +51,9 @@ apt (0.7.26) UNRELEASED; urgency=low - merge versions correctly even if multiple different versions with the same version number are available. Thanks to Magnus Holmgren for the patch! (Closes: #351056) + * ftparchive/writer.cc: + - write LongDescriptions if they shouldn't be included in Packages + file into i18n/Translation-en by default. [ Julian Andres Klode ] * cmdline/apt-mark: diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index f1a182e52..e69c88ddd 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -62,6 +62,9 @@ struct PackageMap string SrcOverride; string SrcExtraOverride; + // Translation master file + TranslationWriter *TransWriter; + // Contents string Contents; string ContentsHead; @@ -100,8 +103,9 @@ struct PackageMap vector::iterator End, unsigned long &Left); - PackageMap() : DeLinkLimit(0), Permissions(1), ContentsDone(false), - PkgDone(false), SrcDone(false), ContentsMTime(0) {}; + PackageMap() : TransWriter(NULL), DeLinkLimit(0), Permissions(1), + ContentsDone(false), PkgDone(false), SrcDone(false), + ContentsMTime(0) {}; }; /*}}}*/ @@ -169,6 +173,8 @@ bool PackageMap::GenPackages(Configuration &Setup,struct CacheDB::Stats &Stats) Packages.DirStrip = ArchiveDir; Packages.InternalPrefix = flCombine(ArchiveDir,InternalPrefix); + Packages.TransWriter = TransWriter; + Packages.Stats.DeLinkBytes = Stats.DeLinkBytes; Packages.DeLinkLimit = DeLinkLimit; @@ -436,6 +442,8 @@ void LoadTree(vector &PkgList,Configuration &Setup) "$(DIST)/$(SECTION)/source/"); string DPkg = Setup.Find("TreeDefault::Packages", "$(DIST)/$(SECTION)/binary-$(ARCH)/Packages"); + string DTrans = Setup.Find("TreeDefault::Translation", + "$(DIST)/$(SECTION)/i18n/Translation-en"); string DIPrfx = Setup.Find("TreeDefault::InternalPrefix", "$(DIST)/$(SECTION)/"); string DContents = Setup.Find("TreeDefault::Contents", @@ -461,15 +469,25 @@ void LoadTree(vector &PkgList,Configuration &Setup) string Section; while (ParseQuoteWord(Sections,Section) == true) { - string Tmp2 = Block.Find("Architectures"); string Arch; + struct SubstVar const Vars[] = {{"$(DIST)",&Dist}, + {"$(SECTION)",&Section}, + {"$(ARCH)",&Arch}, + {}}; + TranslationWriter *TransWriter; + if (DTrans.empty() == false) + { + string const TranslationFile = flCombine(Setup.FindDir("Dir::ArchiveDir"), + SubstVar(Block.Find("Translation", DTrans.c_str()), Vars)); + TransWriter = new TranslationWriter(TranslationFile); + } + else + TransWriter = NULL; + + string const Tmp2 = Block.Find("Architectures"); const char *Archs = Tmp2.c_str(); while (ParseQuoteWord(Archs,Arch) == true) { - struct SubstVar Vars[] = {{"$(DIST)",&Dist}, - {"$(SECTION)",&Section}, - {"$(ARCH)",&Arch}, - {}}; PackageMap Itm; Itm.BinOverride = SubstVar(Block.Find("BinOverride"),Vars); @@ -491,6 +509,11 @@ void LoadTree(vector &PkgList,Configuration &Setup) Itm.PkgFile = SubstVar(Block.Find("Packages",DPkg.c_str()),Vars); Itm.Tag = SubstVar("$(DIST)/$(SECTION)/$(ARCH)",Vars); Itm.Arch = Arch; + if (TransWriter != NULL) + { + TransWriter->IncreaseRefCounter(); + Itm.TransWriter = TransWriter; + } Itm.Contents = SubstVar(Block.Find("Contents",DContents.c_str()),Vars); Itm.ContentsHead = SubstVar(Block.Find("Contents::Header",DContentsH.c_str()),Vars); Itm.FLFile = SubstVar(Block.Find("FileList",DFLFile.c_str()),Vars); @@ -500,6 +523,9 @@ void LoadTree(vector &PkgList,Configuration &Setup) Itm.GetGeneral(Setup,Block); PkgList.push_back(Itm); } + // we didn't use this TransWriter, so we can release it + if (TransWriter != NULL && TransWriter->GetRefCounter() == 0) + delete TransWriter; } Top = Top->Next; @@ -788,7 +814,12 @@ bool Generate(CommandLine &CmdL) delete [] List; } - + + // close the Translation master files + for (vector::iterator I = PkgList.begin(); I != PkgList.end(); I++) + if (I->TransWriter != NULL && I->TransWriter->DecreaseRefCounter() == 0) + delete I->TransWriter; + if (_config->FindB("APT::FTPArchive::Contents",true) == false) return true; diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 9e5b7d4f3..b395903b7 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -300,7 +300,7 @@ bool FTWScanner::Delink(string &FileName,const char *OriginalPath, /* */ PackagesWriter::PackagesWriter(string const &DB,string const &Overrides,string const &ExtOverrides, string const &Arch) : - FTWScanner(Arch), Db(DB), Stats(Db.Stats) + FTWScanner(Arch), Db(DB), Stats(Db.Stats), TransWriter(NULL) { Output = stdout; SetExts(".deb .udeb"); @@ -317,7 +317,7 @@ PackagesWriter::PackagesWriter(string const &DB,string const &Overrides,string c if (Db.Loaded() == false) DoContents = false; - + // Read the override file if (Overrides.empty() == false && Over.ReadOverride(Overrides) == false) return; @@ -448,6 +448,8 @@ bool PackagesWriter::DoPackage(string FileName) descmd5.Add(desc.c_str()); DescriptionMd5 = descmd5.Result().Value(); SetTFRewriteData(Changes[End++], "Description-md5", DescriptionMd5.c_str()); + if (TransWriter != NULL) + TransWriter->DoPackage(Package, desc, DescriptionMd5); } // Rewrite the maintainer field if necessary @@ -494,6 +496,51 @@ bool PackagesWriter::DoPackage(string FileName) } /*}}}*/ +// TranslationWriter::TranslationWriter - Constructor /*{{{*/ +// --------------------------------------------------------------------- +/* Create a Translation-Master file for this Packages file */ +TranslationWriter::TranslationWriter(string const &File) : Output(NULL), + RefCounter(0) +{ + if (File.empty() == true) + return; + + Output = fopen(File.c_str(), "w"); +} + /*}}}*/ +// TranslationWriter::DoPackage - Process a single package /*{{{*/ +// --------------------------------------------------------------------- +/* Create a Translation-Master file for this Packages file */ +bool TranslationWriter::DoPackage(string const &Pkg, string const &Desc, + string const &MD5) +{ + if (Output == NULL) + return true; + + // Different archs can include different versions and therefore + // different descriptions - so we need to check for both name and md5. + string const Record = Pkg + ":" + MD5; + + if (Included.find(Record) != Included.end()) + return true; + + fprintf(Output, "Package: %s\nDescription-md5: %s\nDescription-en: %s\n", + Pkg.c_str(), MD5.c_str(), Desc.c_str()); + + Included.insert(Record); + return true; +} + /*}}}*/ +// TranslationWriter::~TranslationWriter - Destructor /*{{{*/ +// --------------------------------------------------------------------- +/* */ +TranslationWriter::~TranslationWriter() +{ + if (Output != NULL) + fclose(Output); +} + /*}}}*/ + // SourcesWriter::SourcesWriter - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ diff --git a/ftparchive/writer.h b/ftparchive/writer.h index af7ba4edd..2afd1af1f 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -19,6 +19,7 @@ #include #include #include +#include #include "cachedb.h" #include "override.h" @@ -72,6 +73,23 @@ class FTWScanner FTWScanner(string const &Arch = string()); }; +class TranslationWriter +{ + FILE *Output; + std::set Included; + unsigned short RefCounter; + + public: + void IncreaseRefCounter() { ++RefCounter; }; + unsigned short DecreaseRefCounter() { return (RefCounter == 0) ? 0 : --RefCounter; }; + unsigned short GetRefCounter() const { return RefCounter; }; + bool DoPackage(string const &Pkg, string const &Desc, string const &MD5); + + TranslationWriter(string const &File); + TranslationWriter() : Output(NULL), RefCounter(0) {}; + ~TranslationWriter(); +}; + class PackagesWriter : public FTWScanner { Override Over; @@ -93,6 +111,7 @@ class PackagesWriter : public FTWScanner string DirStrip; FILE *Output; struct CacheDB::Stats &Stats; + TranslationWriter *TransWriter; inline bool ReadOverride(string const &File) {return Over.ReadOverride(File);}; inline bool ReadExtraOverride(string const &File) -- cgit v1.2.3 From 1ac89b1ae1c0cdab8b02bad36795a3a799a31c9a Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Tue, 23 Mar 2010 13:07:31 +0100 Subject: French translation completed --- doc/po/fr.po | 185 +++++++++++++++++++++++++++-------------------------------- 1 file changed, 84 insertions(+), 101 deletions(-) diff --git a/doc/po/fr.po b/doc/po/fr.po index de84a2ffe..9a076f2b3 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: 2010-02-18 20:53+0100\n" -"PO-Revision-Date: 2010-01-29 19:58+0100\n" +"PO-Revision-Date: 2010-03-23 09:02+0100\n" "Last-Translator: Christian Perrier \n" -"Language-Team: French \n" +"Language-Team: fr \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -1074,7 +1074,7 @@ msgstr "" #. type: Plain text #: apt.ent:369 -#, fuzzy, no-wrap +#, no-wrap #| msgid "" #| " /etc/apt/sources.list.d/\n" #| " File fragments for locations to fetch packages from.\n" @@ -1089,9 +1089,10 @@ msgid "" " \n" "\">\n" msgstr "" -" /etc/apt/sources.list.d/\n" -" Fragments de fichiers définissant les emplacements de récupération de paquets.\n" -" Élément de configuration : Dir::Etc::SourceParts.\n" +" /etc/apt/trusted.gpg.d/\n" +" Fragments de fichiers pou rles clés de signatures sûres. Des fichiers\n" +" supplémentaires peuvent être placés à cet endroit (par des paquets ou par l'administrateur).\n" +" Élément de configuration : Dir::Etc::TrustedParts.\n" " \n" "\">\n" @@ -1136,7 +1137,7 @@ msgstr "" " traduction est légèrement en retard sur le contenu d'origine.\n" "\">\n" -#. The last update date +#. The last update date #. type: Content of: #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 #: apt-sortpkgs.1.xml:13 sources.list.5.xml:13 @@ -2104,7 +2105,6 @@ msgstr "add" #. type: Content of: #: apt-cdrom.8.xml:66 -#, fuzzy #| msgid "" #| "add is used to add a new disc to the source list. It " #| "will unmount the CDROM device, prompt for a disk to be inserted and then " @@ -2519,7 +2519,7 @@ msgstr "" "apt-extracttemplates retourne zéro si tout se passe bien, " "le nombre 100 en cas d'erreur." -#. The last update date +#. The last update date #. type: Content of: #: apt-ftparchive.1.xml:13 msgid "" @@ -2541,7 +2541,6 @@ msgstr "Outil de création de fichiers d'index" #. type: Content of: #: apt-ftparchive.1.xml:36 -#, fuzzy #| msgid "" #| "apt-ftparchive " #| " " @@ -2585,6 +2584,7 @@ msgstr "" "apt-ftparchive " " " " " @@ -2665,8 +2665,7 @@ msgstr "" #. type: Content of: #: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107 -msgid "" -"The option can be used to specify a binary caching DB." +msgid "The option can be used to specify a binary caching DB." msgstr "" "On peut se servir de l'option pour demander un cache " "binaire." @@ -2821,10 +2820,8 @@ msgstr "" #. type: Content of: #: apt-ftparchive.1.xml:156 -msgid "" -"The generate configuration has 4 separate sections, each described below." -msgstr "" -"Ce fichier de configuration possède quatre sections, décrites ci-dessous." +msgid "The generate configuration has 4 separate sections, each described below." +msgstr "Ce fichier de configuration possède quatre sections, décrites ci-dessous." #. type: Content of: #: apt-ftparchive.1.xml:158 @@ -3643,14 +3640,12 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:548 -#, fuzzy #| msgid "<option>-a</option>" msgid "<option>--arch</option>" -msgstr "<option>-a</option>" +msgstr "<option>--arch</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 -#, fuzzy #| msgid "" #| "If the command is either <literal>install</literal> or <literal>remove</" #| "literal>, then this option acts like running <literal>autoremove</" @@ -3662,17 +3657,16 @@ msgid "" "<literal>*_all.deb</literal> instead of all package files in the given " "path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>." msgstr "" -"Si la commande utilisée est soit <literal>install</literal> soit " -"<literal>remove</literal>, cette option a le même effet " -"qu'<literal>autoremove</literal> et supprime les paquets de dépendance " -"inutilisés. Élément de configuration : <literal>APT::Get::Upgrade</literal>." +"N'accepte dans les commandes <literal>packages</literal> et <literal>contents</literal> " +"que les fichiers de paquets correspondant à <literal>*_arch.deb</literal> ou " +"<literal>*_all.deb</literal> au lieu de tous les fichiers de paquets du chemin indiqué." +"Élément de configuration : <literal>APT::FTPArchive::Architecture</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:555 -#, fuzzy #| msgid "<option>APT::FTPArchive::LongDescription</option>" msgid "<option>APT::FTPArchive::AlwaysStat</option>" -msgstr "<option>APT::FTPArchive::LongDescription</option>" +msgstr "<option>APT::FTPArchive::AlwaysStat</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:557 @@ -3687,6 +3681,10 @@ msgid "" "theory nobody will have these problems and therefore all these extra checks " "are useless." msgstr "" +"&apt-ftparchive; met le plus de métadonnées possible en cache dans une base de données. Si les paquets sont recompilés ou republiés avec à nouveau la même version, cela " +"pourra causer des problèmes car, alors, les métadonnées en cache (p. ex. les tailles et les sommes de contrôle) seront utilisées. Si cette option est choisie, cela " +"n'arrivera plus car le fichier sera contrôlé pour vérifier s'il a été modifié. Veuillez noter que cette option n'est pas activée par défaut car il est déconseillé " +"d'envoyer dans les archives des versions identiques. En théorie, donc, ces problème ne devraient pas survenir et l'ensemble de ces contrôles devient inutile." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:567 @@ -3738,7 +3736,7 @@ msgstr "" "<command>apt-ftparchive</command> retourne zéro si tout se passe bien, le " "nombre 100 en cas d'erreur." -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-get.8.xml:13 msgid "" @@ -3756,8 +3754,7 @@ msgstr "apt-get" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-get.8.xml:30 msgid "APT package handling utility -- command-line interface" -msgstr "" -"Utilitaire APT pour la gestion des paquets -- interface en ligne de commande." +msgstr "Utilitaire APT pour la gestion des paquets -- interface en ligne de commande." #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-get.8.xml:36 @@ -4299,7 +4296,6 @@ msgstr "<option>--fix-broken</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:334 -#, fuzzy #| msgid "" #| "Fix; attempt to correct a system with broken dependencies in place. This " #| "option, when used with install/remove, can omit any packages to permit " @@ -4661,7 +4657,6 @@ msgstr "<option>--purge</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:467 -#, fuzzy #| msgid "" #| "Use purge instead of remove for anything that would be removed. An " #| "asterisk (\"*\") will be displayed next to packages which are scheduled " @@ -4676,7 +4671,8 @@ msgid "" msgstr "" "Utiliser « purge » à la place de « remove » pour supprimer tout ce qui peut " "être supprimé. Un astérisque (*) sera accolé aux noms des paquets qui vont " -"être purgés. Élément de configuration : <literal>APT::Get::Purge</literal>." +"être purgés. <option>remove --purge</option> est équivalent à la commande <option>purge</option>. " +"Élément de configuration : <literal>APT::Get::Purge</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:474 @@ -4944,7 +4940,6 @@ msgstr "Utilitaire de gestion des clés d'APT" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-key.8.xml:28 -#, fuzzy #| msgid "" #| "<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> " #| "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></" @@ -4955,7 +4950,8 @@ msgid "" "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></" "arg>" msgstr "" -"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> " +"<command>apt-key</command> <arg><option>--keyring <replaceable>fichier</" +"replaceable></option></arg> <arg><replaceable>commande</replaceable></arg> " "<arg rep=\"repeat\"><option><replaceable>paramètres</replaceable></option></" "arg>" @@ -5068,14 +5064,13 @@ msgstr "" msgid "" "Note that options need to be defined before the commands described in the " "previous section." -msgstr "" +msgstr "Veuillez noter que les options doivent être utilisées avant les commandes décrites dans la section suivante." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:142 -#, fuzzy #| msgid "add <replaceable>filename</replaceable>" msgid "--keyring <replaceable>filename</replaceable>" -msgstr "add <replaceable>fichier</replaceable>" +msgstr "--keyring <replaceable>fichier</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:143 @@ -5087,11 +5082,14 @@ msgid "" "filename> is the primary keyring which means that e.g. new keys are added to " "this one." msgstr "" +"Cette option permet d'indiquer le fichier porte-clés sur lequel la commande doit agir. Par défaut, une commande sera exécutée sur le fichier <filename>trusted.gpg<" +"/filename> ainsi que sur tous les fichiers du répertoire <filename>trusted.gpg.d</filename>. Le fichier <filename>trusted.gpg</" +"filename> reste le fichier principal pour les clés donc, par exemple, les nouvelles clés y seront ajoutées." #. type: Content of: <refentry><refsect1><variablelist> #: apt-key.8.xml:156 msgid "&file-trustedgpg;" -msgstr "" +msgstr "&file-trustedgpg;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:158 @@ -5115,10 +5113,8 @@ msgstr "Trousseau des clés fiables de l'archive Debian." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:166 -msgid "" -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" -msgstr "" -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +msgstr "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:167 @@ -5130,7 +5126,7 @@ msgstr "Trousseau des clés fiables supprimées de l'archive Debian." msgid "&apt-get;, &apt-secure;" msgstr "&apt-get;, &apt-secure;" -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-mark.8.xml:13 msgid "" @@ -5240,10 +5236,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:93 -msgid "" -"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" -msgstr "" -"<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>" +msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" +msgstr "<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:94 @@ -5703,10 +5697,9 @@ msgstr "" "<command>apt-sortpkgs</command> retourne zéro si tout se passe bien ou 100 " "en cas d'erreur." -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt.conf.5.xml:13 -#, fuzzy #| msgid "" #| "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" #| "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " @@ -5721,7 +5714,7 @@ msgstr "" "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" "firstname> <surname>Burrows</surname> <contrib>Documentation d'origine de " "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " -"&apt-product; <date>18 septembre 2009</date>" +"&apt-product; <date>16 janvier 2010</date>" #. type: Content of: <refentry><refnamediv><refname> #: apt.conf.5.xml:28 apt.conf.5.xml:35 @@ -5746,20 +5739,23 @@ msgid "" "made. All tools therefore share the configuration files and also use a " "common command line parser to provide a uniform environment." msgstr "" +"Le fichier <filename>apt.conf</filename> est le fichier de configuration principal du l'ensemble de programmes APT, mais n'est de loin pas le seul endroit où des choix " +"d'options peuvent être effectués. Tous les outils partagent les fichiers de configuration et utilisent également une analyse commune de la ligne de commande, ce qui permet " +"de garantir un environnement d'utilisation uniforme." #. type: Content of: <refentry><refsect1><orderedlist><para> #: apt.conf.5.xml:45 msgid "" "When an APT tool starts up it will read the configuration files in the " "following order:" -msgstr "" +msgstr "Lorsqu'un programme de l'ensemble APT est utilisé, il lit le fichier de configuration dans l'ordre suivant :" #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> #: apt.conf.5.xml:47 msgid "" "the file specified by the <envar>APT_CONFIG</envar> environment variable (if " "any)" -msgstr "" +msgstr "fichier indiqué par la variable d'environnement <envar>APT_CONFIG</envar> si elle existe" #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> #: apt.conf.5.xml:49 @@ -5769,30 +5765,30 @@ msgid "" "which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " "characters - otherwise they will be silently ignored." msgstr "" +"tous les fichiers de <literal>Dir::Etc::Parts</literal> dans l'ordre alphanumérique ascendant qui ont soit l'extension \"<literal>conf</literal>\", soit aucune extension " +"et qui ne contiennent que des caractères alphanumériques, des tirets (-), des caractères de soulignement (_) et des points (.), les autres fichiers étant ignorés." #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> #: apt.conf.5.xml:54 -#, fuzzy #| msgid "" #| "APT configuration file. Configuration Item: <literal>Dir::Etc::Main</" #| "literal>." -msgid "" -"the main configuration file specified by <literal>Dir::Etc::main</literal>" +msgid "the main configuration file specified by <literal>Dir::Etc::main</literal>" msgstr "" -"Fichier de configuration d'APT. Élément de configuration : <literal>Dir::" -"Etc::Main</literal>." +"le fichier de configuration défini par <literal>Dir::" +"Etc::Main</literal>" #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> #: apt.conf.5.xml:56 msgid "" "the command line options are applied to override the configuration " "directives or to load even more configuration files." -msgstr "" +msgstr "les options de ligne de commande sont appliquées pour remplacer les directives de configuration ou pour charger d'autres fichiers de configuration." #. type: Content of: <refentry><refsect1><title> #: apt.conf.5.xml:60 msgid "Syntax" -msgstr "" +msgstr "Syntaxe" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:61 @@ -6084,7 +6080,6 @@ msgstr "Immediate-Configure" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:170 -#, fuzzy #| msgid "" #| "Defaults to on which will cause APT to install essential and important " #| "packages as fast as possible in the install/upgrade operation. This is " @@ -6158,7 +6153,7 @@ msgstr "" "ne fonctionnera plus nécessairement puisque sa dépendance n'est pas " "satisfaite. Le marqueur de configuration immédiate sera aussi utilisé pour " "toute dépendance qui peut créer un problème, par exemple les dépendances " -"circulaires. En effet, les marqueur de configuration immédiate revient à " +"circulaires. En effet, utiliser le marqueur de configuration immédiate revient à " "gérer une pré-dépendance. Il est donc possible, en théorie, qu'APT rencontre " "une situation où il lui est impossible d'effectuer la configuration " "immédiate, qu'il se termine alors avec une erreur en faisant référence à " @@ -6168,7 +6163,7 @@ msgstr "" "rares cas, sur des versions instables de distributions, la cause étant des " "dépendances incorrectes ou un système déjà dans un état instable. Il est " "donc déconseillé de désactiver cette option sans réfléchir car la situation " -"décrite précédemmebnt n'est qu'un des cas où la configuration immédiate " +"décrite précédemment n'est qu'un des cas où la configuration immédiate " "permet de résoudre des situations complexes. Avant de tenter une opération " "telle que <literal>dist-upgrade</literal> avec cette option désactivée, il " "est largement préférable d'essayer une opération <literal>install</literal> " @@ -6301,6 +6296,10 @@ msgid "" "the size of the targeted file. If one of these limits is exceeded the " "complete file is downloaded instead of the patches." msgstr "" +"Deux sous-options permettant de limite l'utilisation de fichiers « pdiff » sont également disponibles. <literal>FileLimit</literal> permet d'indiquer le nombre maximal de " +"fichiers de différences peuvent être téléchargés pour modifier un fichier. <literal>SizeLimit</literal> permet par ailleurs de limiter la taille combinée des fichiers de " +"différences récupérés à un certain pourcentage du fichier à modifier. Si une de ces limites est dépassée, le fichier complet est téléchargé au lieu de télécharger les " +"fichiers de différences." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:245 @@ -6780,7 +6779,6 @@ msgstr "Langues" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:415 -#, fuzzy #| msgid "" #| "The Languages subsection controls which <filename>Translation</filename> " #| "files are downloaded and in which order APT tries to display the " @@ -6807,7 +6805,7 @@ msgstr "" "choisie en premier. Les langues peuvent être indiquées par leur code long ou " "court. Veuillez noter que tous les dépôts ne fournissent pas les fichiers " "<filename>Translation</filename> pour toutes les langues, particulièrement " -"pour les code de langues long sont rares. Il est donc conseillé de vous " +"pour les codes rarement utilisés. Il est donc conseillé de vous " "renseigner sur ce qui est disponible avant d'établir des réglages " "impossibles." @@ -6819,7 +6817,6 @@ msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:421 -#, fuzzy #| msgid "" #| "The default list includes \"environment\" and \"en\". " #| "\"<literal>environment</literal>\" has a special meaning here: It will be " @@ -7526,7 +7523,7 @@ msgstr "" #. TODO: provide a #. motivating example, except I haven't a clue why you'd want -#. to do this. +#. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: apt.conf.5.xml:692 msgid "" @@ -7548,8 +7545,7 @@ msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:711 -msgid "" -"Print information related to accessing <literal>cdrom://</literal> sources." +msgid "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" "Affiche les informations concernant les sources de type <literal>cdrom://</" "literal>" @@ -7562,8 +7558,7 @@ msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:722 msgid "Print information related to downloading packages using FTP." -msgstr "" -"Affiche les informations concernant le téléchargement de paquets par FTP." +msgstr "Affiche les informations concernant le téléchargement de paquets par FTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:729 @@ -7573,8 +7568,7 @@ msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTP." -msgstr "" -"Affiche les informations concernant le téléchargement de paquets par HTTP." +msgstr "Affiche les informations concernant le téléchargement de paquets par HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:740 @@ -7735,8 +7729,7 @@ msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:862 -msgid "" -"Log all interactions with the sub-processes that actually perform downloads." +msgid "Log all interactions with the sub-processes that actually perform downloads." msgstr "" "Affiche toutes les interactions avec les processus enfants qui se chargent " "effectivement des téléchargements." @@ -7877,8 +7870,7 @@ msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:963 -msgid "" -"Output status messages tracing the steps performed when invoking &dpkg;." +msgid "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> @@ -7949,20 +7941,18 @@ msgstr "" msgid "&file-aptconf;" msgstr "&file-aptconf;" -#. ? reading apt.conf +#. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:1042 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt_preferences.5.xml:13 -#, fuzzy #| msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" -msgid "" -"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>" -msgstr "&apt-author.team; &apt-email; &apt-product; <date>04 mai 2009</date>" +msgid "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>" +msgstr "&apt-author.team; &apt-email; &apt-product; <date>16 février 2010</date>" #. type: Content of: <refentry><refnamediv><refname> #: apt_preferences.5.xml:21 apt_preferences.5.xml:28 @@ -8034,6 +8024,9 @@ msgid "" "more problems will arise if multiply distribution releases are mixed without " "a good understanding of the following paragraphs. You have been warned." msgstr "" +"Les préférences sont un outil puissant pour les administrateurs système mais peuvent devenir leur pire cauchemar si elles sont utilisées sans précautions. APT ne remettra " +"pas en doute les réglages choisis. Des valeurs erronées pourront alors conduire à des paquets non installables ou à des décisions incorrectes lors de la mise à jour des " +"paquets. Des problèmes supplémentaires peuvent survenir si des distributions multiples sont mélangées sans une bonne compréhension des paragraphes qui suivent." #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:64 @@ -8045,6 +8038,9 @@ msgid "" "underscore (_) and period (.) characters - otherwise they will be silently " "ignored." msgstr "" +"Veuillez noter que les fichiers du répertoire <filename>/etc/apt/preferences.d</filename> sont analysés par ordre alphanumérique ascendant, doivent avoir l'extension \"<" +"literal>pref</literal>\" ou aucune extension et ne peuvent continir que des caractères alphanumériques, des tirets (-), des caractères de soulignement (_) et des points (." +"). Dans le cas contraire, ils seront ignorés sans avertissement." #. type: Content of: <refentry><refsect1><refsect2><title> #: apt_preferences.5.xml:71 @@ -8119,8 +8115,7 @@ msgstr "une priorité égale à 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:109 -msgid "" -"to the versions that are not installed and belong to the target release." +msgid "to the versions that are not installed and belong to the target release." msgstr "" "est affectée aux versions qui ne sont pas installées et qui appartiennent à " "la distribution par défaut." @@ -8605,8 +8600,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> #: apt_preferences.5.xml:321 msgid "Determination of Package Version and Distribution Properties" -msgstr "" -"Détermination de la version des paquets et des propriétés des distributions" +msgstr "Détermination de la version des paquets et des propriétés des distributions" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:323 @@ -9503,14 +9497,12 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: sources.list.5.xml:178 -#, fuzzy #| msgid "more recongnizable URI types" msgid "more recognizable URI types" -msgstr "type d'URI les plus simples à reconnaître" +msgstr "plus de types d'URI simples à reconnaître" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: sources.list.5.xml:180 -#, fuzzy #| msgid "" #| "APT can be extended with more methods shipped in other optional packages " #| "which should follow the nameing scheme <literal>apt-transport-" @@ -9699,8 +9691,7 @@ msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $" #. type: <abstract></abstract> #: guide.sgml:11 -msgid "" -"This document provides an overview of how to use the the APT package manager." +msgid "This document provides an overview of how to use the the APT package manager." msgstr "" "Ce document fournit un aperçu des méthode d'utilisation du gestionnaire de " "paquets APT." @@ -9799,7 +9790,6 @@ msgstr "" #. type: <p></p> #: guide.sgml:63 -#, fuzzy #| msgid "" #| "For instance, mailcrypt is an emacs extension that aids in encrypting " #| "email with GPG. Without GPGP installed mail-crypt is useless, so " @@ -10049,7 +10039,6 @@ msgstr "" #. type: <p></p> #: guide.sgml:184 -#, fuzzy #| msgid "" #| "To enable the APT method you need to to select [A]ccess in <prgn>dselect</" #| "prgn> and then choose the APT method. You will be prompted for a set of " @@ -10071,7 +10060,7 @@ msgid "" "have access to the latest bug fixes. APT will automatically use packages on " "your CDROM before downloading from the Internet." msgstr "" -"Pou ractiver la méthode APT, il est nécessaire de choisir [A]ccéder dans " +"Pour activer la méthode APT, il est nécessaire de choisir [A]ccéder dans " "<prgn>dselect</prgn> puis utiliser le choix permettant d'activer APT. Des " "<em>Sources</em> d'installation seront demandées, qui sont les emplacements " "d'où les paquets seront récupérés. Cela peut être des sites Internet " @@ -10202,7 +10191,6 @@ msgstr "" #. type: <p></p> #: guide.sgml:247 -#, fuzzy #| msgid "" #| "Before starting to use <prgn>dselect</prgn> it is necessary to update the " #| "available list by selecting [U]pdate from the menu. This is a super-set " @@ -10631,10 +10619,8 @@ msgstr "Résumé final" #. type: <p></p> #: guide.sgml:447 -msgid "" -"Finally, APT will print out a summary of all the changes that will occur." -msgstr "" -"Anfin, APT affichera un résumé de toutes les opérations qui prendront place." +msgid "Finally, APT will print out a summary of all the changes that will occur." +msgstr "Anfin, APT affichera un résumé de toutes les opérations qui prendront place." #. type: <example></example> #: guide.sgml:452 @@ -10908,7 +10894,6 @@ msgstr "" #. type: <p></p> #: offline.sgml:57 -#, fuzzy #| msgid "" #| "This is achieved by creatively manipulating the APT configuration file. " #| "The essential premis to tell APT to look on a disc for it's archive " @@ -11063,7 +11048,6 @@ msgstr "" #. type: <p><example> #: offline.sgml:136 -#, fuzzy #| msgid "" #| "On the target machine the first thing to do is mount the disc and copy " #| "<em>/var/lib/dpkg/status</em> to it. You will also need to create the " @@ -11102,7 +11086,6 @@ msgstr "" #. type: </example></p> #: offline.sgml:149 -#, fuzzy #| msgid "" #| "The dist-upgrade command can be replaced with any-other standard APT " #| "commands, particularly dselect-upgrade. You can even use an APT front end " -- cgit v1.2.3 From b34d4b4745e4f7ead090a03e5efe35bd2e2e82b5 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode <jak@debian.org> Date: Fri, 26 Mar 2010 15:35:36 +0100 Subject: * ftparchive/apt-ftparchive.cc: - Read default configuration (Closes: #383257) --- debian/NEWS | 7 +++++++ debian/changelog | 2 ++ ftparchive/apt-ftparchive.cc | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/NEWS b/debian/NEWS index a12f1a4f8..775dc9458 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,10 @@ +apt (0.7.26~exp3) experimental; urgency=low + + * apt-ftparchive now reads the standard configuration files in + /etc/apt/apt.conf and /etc/apt/apt.conf.d. + + -- Julian Andres Klode <jak@debian.org> Fri, 26 Mar 2010 15:34:16 +0100 + apt (0.7.24) unstable; urgency=low * Already included in the last version but now with better documentation diff --git a/debian/changelog b/debian/changelog index fc5d0f90c..133d3874d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ apt (0.7.26~exp3) UNRELEASED; urgency=low * apt-pkg/policy.cc: - Always return a candidate if there is at least one version pinned > 0 (Closes: #512318) + * ftparchive/apt-ftparchive.cc: + - Read default configuration (Closes: #383257) * debian/rules: - Fix the libraries name to be e.g. libapt-pkg4.9 instead of libapt-pkg-4.9. diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index f1a182e52..5456dd474 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -925,7 +925,7 @@ int main(int argc, const char *argv[]) // Parse the command line and initialize the package library CommandLine CmdL(Args,_config); - if (CmdL.Parse(argc,argv) == false) + if (pkgInitConfig(*_config) == false || CmdL.Parse(argc,argv) == false) { _error->DumpErrors(); return 100; -- cgit v1.2.3 From 3b1fffc35f3eb277d92f38c687c270edd1d8550d Mon Sep 17 00:00:00 2001 From: Julian Andres Klode <jak@debian.org> Date: Fri, 26 Mar 2010 16:37:16 +0100 Subject: ftparchive/apt-ftparchive.cc: Include apt-pkg/init.h. --- ftparchive/apt-ftparchive.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index 5456dd474..4c26f79b8 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -16,6 +16,7 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/cmndline.h> #include <apt-pkg/strutl.h> +#include <apt-pkg/init.h> #include <config.h> #include <apti18n.h> #include <algorithm> -- cgit v1.2.3 From 4e794c509becfd7e2bddfddc1205dc81397a48bd Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 26 Mar 2010 19:18:21 +0100 Subject: Inclusion of Long Descriptions in the Packages files can be set now also in TreeDefaults and Tree to support generation of archives which should support and which shouldn't support splitted out Translation-en files in the same run. --- doc/apt-ftparchive.1.xml | 27 +++++++++++++++++++++++---- ftparchive/apt-ftparchive.cc | 11 +++++++++-- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index f88dbe631..e639924ce 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -289,7 +289,20 @@ Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/source/Sources</filename></para></listitem> </varlistentry> - + + <varlistentry><term>Translation</term> + <listitem><para> + Set the output Translation-en master file with the long descriptions if they + should be not included in the Packages file. Defaults to + <filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename></para></listitem> + </varlistentry> + + <varlistentry><term>LongDescription</term> + <listitem><para> + Sets if long descriptions should be included in the Packages file or split + out into a master Translation-en file.</para></listitem> + </varlistentry> + <varlistentry><term>InternalPrefix</term> <listitem><para> Sets the path prefix that causes a symlink to be @@ -371,7 +384,13 @@ for i in Sections do architectures that appear under search section. The special architecture 'source' is used to indicate that this tree has a source archive.</para></listitem> </varlistentry> - + + <varlistentry><term>LongDescription</term> + <listitem><para> + Sets if long descriptions should be included in the Packages file or split + out into a master Translation-en file.</para></listitem> + </varlistentry> + <varlistentry><term>BinOverride</term> <listitem><para> Sets the binary override file. The override file @@ -568,8 +587,8 @@ for i in Sections do <listitem><para> This configuration option defaults to "<literal>true</literal>" and should only be set to <literal>"false"</literal> if the Archive generated with &apt-ftparchive; also provides - <filename>Translation</filename> files. Note that it is currently not possible to create these - files with <command>apt-ftparchive</command>. + <filename>Translation</filename> files. Note that the <filename>Translation-en</filename> + master file can only be created in the generate command. </para></listitem> </varlistentry> diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index e69c88ddd..f3e91d90d 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -63,6 +63,7 @@ struct PackageMap string SrcExtraOverride; // Translation master file + bool LongDesc; TranslationWriter *TransWriter; // Contents @@ -103,7 +104,7 @@ struct PackageMap vector<PackageMap>::iterator End, unsigned long &Left); - PackageMap() : TransWriter(NULL), DeLinkLimit(0), Permissions(1), + PackageMap() : LongDesc(true), TransWriter(NULL), DeLinkLimit(0), Permissions(1), ContentsDone(false), PkgDone(false), SrcDone(false), ContentsMTime(0) {}; }; @@ -174,6 +175,7 @@ bool PackageMap::GenPackages(Configuration &Setup,struct CacheDB::Stats &Stats) Packages.InternalPrefix = flCombine(ArchiveDir,InternalPrefix); Packages.TransWriter = TransWriter; + Packages.LongDescription = LongDesc; Packages.Stats.DeLinkBytes = Stats.DeLinkBytes; Packages.DeLinkLimit = DeLinkLimit; @@ -456,6 +458,9 @@ void LoadTree(vector<PackageMap> &PkgList,Configuration &Setup) string DFLFile = Setup.Find("TreeDefault::FileList", ""); string DSFLFile = Setup.Find("TreeDefault::SourceFileList", ""); + bool const LongDescription = Setup.FindB("TreeDefault::LongDescription", + _config->FindB("APT::FTPArchive::LongDescription", true)); + // Process 'tree' type sections const Configuration::Item *Top = Setup.Tree("tree"); for (Top = (Top == 0?0:Top->Child); Top != 0;) @@ -474,8 +479,9 @@ void LoadTree(vector<PackageMap> &PkgList,Configuration &Setup) {"$(SECTION)",&Section}, {"$(ARCH)",&Arch}, {}}; + bool const LongDesc = Block.FindB("LongDescription", LongDescription); TranslationWriter *TransWriter; - if (DTrans.empty() == false) + if (DTrans.empty() == false && LongDesc == false) { string const TranslationFile = flCombine(Setup.FindDir("Dir::ArchiveDir"), SubstVar(Block.Find("Translation", DTrans.c_str()), Vars)); @@ -509,6 +515,7 @@ void LoadTree(vector<PackageMap> &PkgList,Configuration &Setup) Itm.PkgFile = SubstVar(Block.Find("Packages",DPkg.c_str()),Vars); Itm.Tag = SubstVar("$(DIST)/$(SECTION)/$(ARCH)",Vars); Itm.Arch = Arch; + Itm.LongDesc = LongDesc; if (TransWriter != NULL) { TransWriter->IncreaseRefCounter(); -- cgit v1.2.3 From 34f1d96cf5657b5e34cd9880dccfa2028fa16b13 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 26 Mar 2010 22:38:50 +0100 Subject: Switch the TranslationWriter to use MultiCompress to be able to generate the compressed files as we want them and to prevent the file to be replaced without a reason which could save us from steady redownloads of a file with the same content. --- doc/apt-ftparchive.1.xml | 20 +++++++++++++------- ftparchive/apt-ftparchive.cc | 13 ++++++++----- ftparchive/writer.cc | 12 ++++++++---- ftparchive/writer.h | 6 ++++-- 4 files changed, 33 insertions(+), 18 deletions(-) diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index e639924ce..5bf47f32a 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -224,7 +224,13 @@ This is similar to <literal>Packages::Compress</literal> except that it controls the compression for the Contents files.</para></listitem> </varlistentry> - + + <varlistentry><term>Translation::Compress</term> + <listitem><para> + This is similar to <literal>Packages::Compress</literal> + except that it controls the compression for the Translation-en master file.</para></listitem> + </varlistentry> + <varlistentry><term>DeLinkLimit</term> <listitem><para> Specifies the number of kilobytes to delink (and @@ -238,6 +244,12 @@ defaults to 0644. All index files are set to this mode with no regard to the umask.</para></listitem> </varlistentry> + + <varlistentry><term>LongDescription</term> + <listitem><para> + Sets if long descriptions should be included in the Packages file or split + out into a master Translation-en file.</para></listitem> + </varlistentry> </variablelist> </refsect2> @@ -297,12 +309,6 @@ <filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename></para></listitem> </varlistentry> - <varlistentry><term>LongDescription</term> - <listitem><para> - Sets if long descriptions should be included in the Packages file or split - out into a master Translation-en file.</para></listitem> - </varlistentry> - <varlistentry><term>InternalPrefix</term> <listitem><para> Sets the path prefix that causes a symlink to be diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index f3e91d90d..46831b385 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -134,8 +134,6 @@ void PackageMap::GetGeneral(Configuration &Setup,Configuration &Block) PkgExt = Block.Find("Packages::Extensions", Setup.Find("Default::Packages::Extensions",".deb").c_str()); - Permissions = Setup.FindI("Default::FileMode",0644); - if (FLFile.empty() == false) FLFile = flCombine(Setup.Find("Dir::FileListDir"),FLFile); @@ -458,8 +456,11 @@ void LoadTree(vector<PackageMap> &PkgList,Configuration &Setup) string DFLFile = Setup.Find("TreeDefault::FileList", ""); string DSFLFile = Setup.Find("TreeDefault::SourceFileList", ""); - bool const LongDescription = Setup.FindB("TreeDefault::LongDescription", + int const Permissions = Setup.FindI("Default::FileMode",0644); + + bool const LongDescription = Setup.FindB("Default::LongDescription", _config->FindB("APT::FTPArchive::LongDescription", true)); + string const TranslationCompress = Setup.Find("Default::Translation::Compress",". gzip").c_str(); // Process 'tree' type sections const Configuration::Item *Top = Setup.Tree("tree"); @@ -479,13 +480,15 @@ void LoadTree(vector<PackageMap> &PkgList,Configuration &Setup) {"$(SECTION)",&Section}, {"$(ARCH)",&Arch}, {}}; + mode_t const Perms = Block.FindI("FileMode", Permissions); bool const LongDesc = Block.FindB("LongDescription", LongDescription); TranslationWriter *TransWriter; if (DTrans.empty() == false && LongDesc == false) { string const TranslationFile = flCombine(Setup.FindDir("Dir::ArchiveDir"), SubstVar(Block.Find("Translation", DTrans.c_str()), Vars)); - TransWriter = new TranslationWriter(TranslationFile); + string const TransCompress = Block.Find("Translation::Compress", TranslationCompress); + TransWriter = new TranslationWriter(TranslationFile, TransCompress, Perms); } else TransWriter = NULL; @@ -495,7 +498,7 @@ void LoadTree(vector<PackageMap> &PkgList,Configuration &Setup) while (ParseQuoteWord(Archs,Arch) == true) { PackageMap Itm; - + Itm.Permissions = Perms; Itm.BinOverride = SubstVar(Block.Find("BinOverride"),Vars); Itm.InternalPrefix = SubstVar(Block.Find("InternalPrefix",DIPrfx.c_str()),Vars); diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index b395903b7..45a8d212b 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -499,13 +499,15 @@ bool PackagesWriter::DoPackage(string FileName) // TranslationWriter::TranslationWriter - Constructor /*{{{*/ // --------------------------------------------------------------------- /* Create a Translation-Master file for this Packages file */ -TranslationWriter::TranslationWriter(string const &File) : Output(NULL), +TranslationWriter::TranslationWriter(string const &File, string const &TransCompress, + mode_t const &Permissions) : Output(NULL), RefCounter(0) { if (File.empty() == true) return; - Output = fopen(File.c_str(), "w"); + Comp = new MultiCompress(File, TransCompress, Permissions); + Output = Comp->Input; } /*}}}*/ // TranslationWriter::DoPackage - Process a single package /*{{{*/ @@ -536,8 +538,10 @@ bool TranslationWriter::DoPackage(string const &Pkg, string const &Desc, /* */ TranslationWriter::~TranslationWriter() { - if (Output != NULL) - fclose(Output); + if (Comp == NULL) + return; + + delete Comp; } /*}}}*/ diff --git a/ftparchive/writer.h b/ftparchive/writer.h index 2afd1af1f..3123a7f46 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -22,6 +22,7 @@ #include <set> #include "cachedb.h" +#include "multicompress.h" #include "override.h" #include "apt-ftparchive.h" @@ -75,6 +76,7 @@ class FTWScanner class TranslationWriter { + MultiCompress *Comp; FILE *Output; std::set<string> Included; unsigned short RefCounter; @@ -85,8 +87,8 @@ class TranslationWriter unsigned short GetRefCounter() const { return RefCounter; }; bool DoPackage(string const &Pkg, string const &Desc, string const &MD5); - TranslationWriter(string const &File); - TranslationWriter() : Output(NULL), RefCounter(0) {}; + TranslationWriter(string const &File, string const &TransCompress, mode_t const &Permissions); + TranslationWriter() : Comp(NULL), Output(NULL), RefCounter(0) {}; ~TranslationWriter(); }; -- cgit v1.2.3 From 4a2bb9e60e942b6749c7dbb3763ddf0e3663d5f1 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 26 Mar 2010 22:48:09 +0100 Subject: * doc/apt_preferences.5.xml: - fix a=sid vs. n=sid typo, thanks Ansgar Burchardt! --- debian/changelog | 1 + doc/apt_preferences.5.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d8b8244bf..787a97e3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,7 @@ apt (0.7.26) UNRELEASED; urgency=low * doc/apt_preferences.5.xml: - fix two typos and be more verbose in the novice warning. Thanks to Osamu Aoki for pointing it out! (Closes: #567669) + - fix a=sid vs. n=sid typo, thanks Ansgar Burchardt! * apt-pkg/deb/dpkgpm.cc: - fix error message construction in OpenLog() - if available store the Commandline in the history diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index e773ad144..c4f18d90a 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -594,7 +594,7 @@ Pin-Priority: 900 Explanation: Debian unstable is always codenamed with sid Package: * -Pin: release a=sid +Pin: release n=sid Pin-Priority: 800 Package: * -- cgit v1.2.3 From 5b71abddc4c7dc5b8e2176319814da586eac839a Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 26 Mar 2010 23:24:13 +0100 Subject: * doc/po/de.po: - correct a few typos in the german manpage translation. Thanks to Chris Leick and Georg Koppen! (Closes: #574962) --- debian/changelog | 3 +++ doc/po/de.po | 68 ++++++++++++++++++-------------------------------------- 2 files changed, 25 insertions(+), 46 deletions(-) diff --git a/debian/changelog b/debian/changelog index 787a97e3f..f48cbf275 100644 --- a/debian/changelog +++ b/debian/changelog @@ -55,6 +55,9 @@ apt (0.7.26) UNRELEASED; urgency=low * ftparchive/writer.cc: - write LongDescriptions if they shouldn't be included in Packages file into i18n/Translation-en by default. + * doc/po/de.po: + - correct a few typos in the german manpage translation. + Thanks to Chris Leick and Georg Koppen! (Closes: #574962) [ Julian Andres Klode ] * cmdline/apt-mark: diff --git a/doc/po/de.po b/doc/po/de.po index c431178fb..9270ecef3 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: apt-doc 0.7.24\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" "POT-Creation-Date: 2010-03-19 11:14+0100\n" -"PO-Revision-Date: 2009-12-31 17:41+GMT\n" +"PO-Revision-Date: 2010-03-22 07:41+0100\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -8046,7 +8046,7 @@ msgid "" msgstr "" "Die APT-Einstellungsdatei <filename>/etc/apt/preferences</filename> und " "Teildateien im Verzeichnis <filename>/etc/apt/preferences.d/</filename> " -"können benutzt werden, um zu steuern, welcher Versionen von Paketen zur " +"können benutzt werden, um zu steuern, welche Versionen von Paketen zur " "Installation ausgewählt werden." #. type: Content of: <refentry><refsect1><para> @@ -8064,8 +8064,8 @@ msgstr "" "Es könnten mehrere Versionen eines Pakets zur Installation verfügbar sein, " "wenn die Datei &sources-list; Bezüge zu mehr als einer Distribution enthält " "(zum Beispiel <literal>stable</literal> und <literal>testing</literal>). APT " -"weist jeder verfügbaren Version eine Priorität zu. Abhängig von " -"Abhängigkeitsbedingungen, wählt <command>apt-get</command> die Version mit " +"weist jeder verfügbaren Version eine Priorität zu. Je nach " +"Abhängigkeitsbedingungen wählt <command>apt-get</command> die Version mit " "der höchsten Priorität zur Installation aus. Die APT-Einstellungsdatei " "überschreibt die Prioritäten, die APT den Paketversionen standardmäßig " "zuweist, was dem Anwender die Kontrolle darüber gibt, welche zur " @@ -8111,6 +8111,12 @@ msgid "" "underscore (_) and period (.) characters - otherwise they will be silently " "ignored." msgstr "" +"Beachten Sie, dass die Dateien im Verzeichnis /etc/apt/preferences.d in " +"alphanumerisch aufsteigender Richtung ausgewertet werden und der folgenden " +"Namenskonvention unterliegen: Die Dateien haben keine oder »pref« als " +"Dateierweiterung und sie enthalten nur alphanumerische Zeichen, Bindestriche " +"(-), Unterstriche (_) oder Punkte (.). Wenn dies nicht der Fall ist, werden " +"sie stillschweigend ignoriert." #. type: Content of: <refentry><refsect1><refsect2><title> #: apt_preferences.5.xml:74 @@ -8278,7 +8284,7 @@ msgid "" msgstr "" "In einer typischen Situation ist die Version eines Paketes (Priorität 100) " "nicht so aktuell, wie eine der verfügbaren Versionen, die in der Quellliste " -"der Datei &sources-list; steht (Priorität 500 oder 900). Dann wird ein " +"der Datei &sources-list; steht (Priorität 500 oder 990). Dann wird ein " "Upgrade des Pakets durchgeführt, wenn <command>apt-get install " "<replaceable>irgendein_Paket</replaceable></command> oder <command>apt-get " "upgrade</command> ausgeführt wird." @@ -8374,7 +8380,7 @@ msgid "" "fully qualified domain name." msgstr "" "Die allgemeine Form weist allen Paketversionen in einer gegebenen " -"Distribution (d.h. alle Versionen von Paketen, die in einer bestimmten " +"Distribution (d.h. allen Versionen von Paketen, die in einer bestimmten " "<filename>Release</filename>-Datei gelistet sind) oder allen Paketversionen, " "die von einer speziellen Internet-Site kommen, die durch ihren voll " "ausgebildeten Domänennamen identifiziert wird, eine Priorität zu." @@ -8653,7 +8659,7 @@ msgstr "" "Es wird die aktuellste verfügbare Version des Pakets <literal>perl</literal> " "installiert, so lange die Versionsnummer mit »<literal>5.8</literal>« " "anfängt. Wenn <emphasis>irgendeine</emphasis> 5.8*-Version von " -"<literal>perl</literal>verfügbar ist und die installierte Version 5.9* ist, " +"<literal>perl</literal> verfügbar ist und die installierte Version 5.9* ist, " "dann wird von <literal>perl</literal> ein Downgrade durchgeführt." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> @@ -8912,12 +8918,12 @@ msgstr "" "Die <filename>Release</filename>-Datei ist normalerweise im Verzeichnis " "<filename>.../dists/<replaceable>Distributionsname</replaceable></filename> " "zu finden, zum Beispiel <filename>.../dists/stable/Release</filename> oder " -"<filename>.../dists/woody/Release</filename>. Es besteht aus einem einzelnen " -"mehrzeiligen Datensatz, der auf <emphasis>alle</emphasis> Pakete im " -"Verzeichnisbaum unterhalb des übergeordneten Verzeichnisses zutrifft. Anders " -"als die <filename>Packages</filename>-Datei sind nahezu alle Zeilen in einer " -"<filename>Release</filename>-Datei für das Setzen von APT-Prioritäten " -"relevant: <placeholder type=\"variablelist\" id=\"0\"/>" +"<filename>.../dists/woody/Release</filename>. Sie besteht aus einem " +"einzelnen mehrzeiligen Datensatz, der auf <emphasis>alle</emphasis> Pakete " +"im Verzeichnisbaum unterhalb des übergeordneten Verzeichnisses zutrifft. " +"Anders als die <filename>Packages</filename>-Datei sind nahezu alle Zeilen " +"in einer <filename>Release</filename>-Datei für das Setzen von " +"APT-Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:454 @@ -8957,7 +8963,7 @@ msgid "" "more lines beginning with the word <literal>Explanation:</literal>. This " "provides a place for comments." msgstr "" -"Optional kann jeder Datensatz im der APT-Einstellungsdatei mit einer oder " +"Optional kann jeder Datensatz in der APT-Einstellungsdatei mit einer oder " "mehreren Zeilen beginnen, die mit dem Wort <literal>Explanation:</literal> " "anfangen. Dieses stellt einen Platz für Kommentare bereit." @@ -8995,7 +9001,7 @@ msgid "" "Pin-Priority: -10\n" msgstr "" "Explanation: Deinstallieren oder nicht installieren von anderen von Debian\n" -"Explanation: stammenden Paketversionen, als denen der Stable-Distribution\n" +"Explanation: stammenden Paketversionen als denen der Stable-Distribution\n" "Package: *\n" "Pin: release a=stable\n" "Pin-Priority: 900\n" @@ -9179,7 +9185,7 @@ msgid "" "Pin-Priority: -10\n" msgstr "" "Explanation: Deinstallieren oder nicht installieren von anderen von Debian\n" -"Explanation: stammenden Paketversionen, als denen der Squeeze- oder Sid-Distribution\n" +"Explanation: stammenden Paketversionen als denen der Squeeze- oder Sid-Distribution\n" "Package: *\n" "Pin: release n=squeeze\n" "Pin-Priority: 900\n" @@ -11372,33 +11378,3 @@ msgstr " # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade" #: offline.sgml:234 msgid "Which will use the already fetched archives on the disc." msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen." - -#~ msgid "" -#~ "<filename>apt.conf</filename> is the main configuration file for the APT " -#~ "suite of tools, all tools make use of the configuration file and a common " -#~ "command line parser to provide a uniform environment. When an APT tool " -#~ "starts up it will read the configuration specified by the " -#~ "<envar>APT_CONFIG</envar> environment variable (if any) and then read the " -#~ "files in <literal>Dir::Etc::Parts</literal> then read the main " -#~ "configuration file specified by <literal>Dir::Etc::main</literal> then " -#~ "finally apply the command line options to override the configuration " -#~ "directives, possibly loading even more config files." -#~ msgstr "" -#~ "<filename>apt.conf</filename> ist die Hauptkonfigurationsdatei für die " -#~ "APT-Werkzeugsammlung. Alle Werkzeuge benutzen die Konfigurationsdatei und " -#~ "einen gemeinsamen Befehlszeilenauswerter, um eine einheitliche Umgebung " -#~ "bereitzustellen. Wenn ein APT-Werkzeug startet, liest es die in der " -#~ "Umgebungsvariablen <envar>APT_CONFIG</envar> (falls vorhanden) angegebene " -#~ "Konfiguration, dann die Dateien in <literal>Dir::Etc::Parts</literal>, " -#~ "dann die durch <literal>Dir::Etc::main</literal> angegebene " -#~ "Konfigurationsdatei und übernimmt am Ende die Befehlszeilenoptionen, um " -#~ "Konfigurationsdirektiven zu überschreiben und möglicherweise sogar " -#~ "weitere Konfigurationsdateien zu laden." - -#~ msgid "<filename>/etc/apt/trusted.gpg</filename>" -#~ msgstr "<filename>/etc/apt/trusted.gpg</filename>" - -#~ msgid "Keyring of local trusted keys, new keys will be added here." -#~ msgstr "" -#~ "Schlüsselring der lokalen vertrauenswürdigen Schlüssel, neue Schlüssel " -#~ "werden hier hinzugefügt." -- cgit v1.2.3 From 4fb6fdaf95de3db51ef386de7b494ed4c889bedc Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 26 Mar 2010 23:51:14 +0100 Subject: origin can be used to match a hostname (Closes: #352667) --- debian/changelog | 1 + doc/apt_preferences.5.xml | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f48cbf275..9bae5210e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,7 @@ apt (0.7.26) UNRELEASED; urgency=low - fix two typos and be more verbose in the novice warning. Thanks to Osamu Aoki for pointing it out! (Closes: #567669) - fix a=sid vs. n=sid typo, thanks Ansgar Burchardt! + - origin can be used to match a hostname (Closes: #352667) * apt-pkg/deb/dpkgpm.cc: - fix error message construction in OpenLog() - if available store the Commandline in the history diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index c4f18d90a..c927f327a 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -195,8 +195,15 @@ Pin: origin "" Pin-Priority: 999 </programlisting> -<simpara>A note of caution: the keyword used here is "<literal>origin</literal>". -This should not be confused with the Origin of a distribution as +<simpara>A note of caution: the keyword used here is "<literal>origin</literal>" +which can be used to match a hostname. The following record will assign a high priority +to all versions available from the server identified by the hostname "ftp.de.debian.org"</simpara> +<programlisting> +Package: * +Pin: origin "ftp.de.debian.org" +Pin-Priority: 999 +</programlisting> +<simpara>This should <emphasis>not</emphasis> be confused with the Origin of a distribution as specified in a <filename>Release</filename> file. What follows the "Origin:" tag in a <filename>Release</filename> file is not an Internet address but an author or vendor name, such as "Debian" or "Ximian".</simpara> -- cgit v1.2.3 From b569b4650c647c3aef5341c40d208a37211b57aa Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 27 Mar 2010 00:01:34 +0100 Subject: remove wrong pin-priority is optional remark (Closes: #574944) --- debian/changelog | 1 + doc/apt_preferences.5.xml | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9bae5210e..17affee4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,7 @@ apt (0.7.26) UNRELEASED; urgency=low Thanks to Osamu Aoki for pointing it out! (Closes: #567669) - fix a=sid vs. n=sid typo, thanks Ansgar Burchardt! - origin can be used to match a hostname (Closes: #352667) + - remove wrong pin-priority is optional remark (Closes: #574944) * apt-pkg/deb/dpkgpm.cc: - fix error message construction in OpenLog() - if available store the Commandline in the history diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index c927f327a..77b7776e8 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -476,10 +476,6 @@ distribution.</para> <para>Each record in the APT preferences file can optionally begin with one or more lines beginning with the word <literal>Explanation:</literal>. This provides a place for comments.</para> - -<para>The <literal>Pin-Priority:</literal> line in each APT preferences record is -optional. If omitted, APT assigns a priority of 1 less than the last value -specified on a line beginning with <literal>Pin-Priority: release ...</literal>.</para> </refsect2> </refsect1> -- cgit v1.2.3 From 6dc60370a750334cb701386cfa4ef9719db9078a Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 30 Mar 2010 12:38:38 +0200 Subject: replace every call to toupper with one to our own tolower_ascii This sounds like a premature optimization and since Mr. Knuth we all know that they are the root of all evil - but, and here it starts to be interesting: As the tolower_ascii method is by far the most called method we have (~60 Mio. times) and as we compare only strings containing ascii characters (package names, configuration options) using our own method reduces execution time of APT by 4% plus it avoids that the locale settings can influence us. --- apt-pkg/contrib/error.h | 8 ++++---- apt-pkg/contrib/macros.h | 10 ++++++---- apt-pkg/contrib/strutl.cc | 49 +++++++++++++++++++++++++---------------------- apt-pkg/contrib/strutl.h | 21 ++++++-------------- debian/changelog | 2 ++ 5 files changed, 44 insertions(+), 46 deletions(-) diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index 90747ff7e..8d5ec05ea 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -60,13 +60,13 @@ class GlobalError public: // Call to generate an error from a library call. - bool Errno(const char *Function,const char *Description,...) __like_printf_2 __cold; - bool WarningE(const char *Function,const char *Description,...) __like_printf_2 __cold; + bool Errno(const char *Function,const char *Description,...) __like_printf(3) __cold; + bool WarningE(const char *Function,const char *Description,...) __like_printf(3) __cold; /* A warning should be considered less severe than an error, and may be ignored by the client. */ - bool Error(const char *Description,...) __like_printf_1 __cold; - bool Warning(const char *Description,...) __like_printf_1 __cold; + bool Error(const char *Description,...) __like_printf(2) __cold; + bool Warning(const char *Description,...) __like_printf(2) __cold; // Simple accessors inline bool PendingError() {return PendingFlag;}; diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h index c39caf198..62e7b65db 100644 --- a/apt-pkg/contrib/macros.h +++ b/apt-pkg/contrib/macros.h @@ -58,6 +58,7 @@ #if __GNUC__ >= 3 #define __must_check __attribute__ ((warn_unused_result)) #define __deprecated __attribute__ ((deprecated)) + #define __attrib_const __attribute__ ((__const__)) /* likely() and unlikely() can be used to mark boolean expressions as (not) likely true which will help the compiler to optimise */ #define likely(x) __builtin_expect (!!(x), 1) @@ -65,6 +66,7 @@ #else #define __must_check /* no warn_unused_result */ #define __deprecated /* no deprecated */ + #define __attrib_const /* no const attribute */ #define likely(x) (x) #define unlikely(x) (x) #endif @@ -72,17 +74,17 @@ // cold functions are unlikely() to be called #if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4 #define __cold __attribute__ ((__cold__)) + #define __hot __attribute__ ((__hot__)) #else #define __cold /* no cold marker */ + #define __hot /* no hot marker */ #endif #ifdef __GNUG__ // Methods have a hidden this parameter that is visible to this attribute - #define __like_printf_1 __attribute__ ((format (printf, 2, 3))) - #define __like_printf_2 __attribute__ ((format (printf, 3, 4))) + #define __like_printf(n) __attribute__((format(printf, n, n + 1))) #else - #define __like_printf_1 /* no like-printf */ - #define __like_printf_2 /* no like-printf */ + #define __like_printf(n) /* no like-printf */ #endif #endif diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 1b9922a31..ab47cdede 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -566,7 +566,7 @@ int stringcmp(string::const_iterator A,string::const_iterator AEnd, int stringcasecmp(const char *A,const char *AEnd,const char *B,const char *BEnd) { for (; A != AEnd && B != BEnd; A++, B++) - if (toupper(*A) != toupper(*B)) + if (tolower_ascii(*A) != tolower_ascii(*B)) break; if (A == AEnd && B == BEnd) @@ -575,7 +575,7 @@ int stringcasecmp(const char *A,const char *AEnd,const char *B,const char *BEnd) return 1; if (B == BEnd) return -1; - if (toupper(*A) < toupper(*B)) + if (tolower_ascii(*A) < tolower_ascii(*B)) return -1; return 1; } @@ -584,7 +584,7 @@ int stringcasecmp(string::const_iterator A,string::const_iterator AEnd, const char *B,const char *BEnd) { for (; A != AEnd && B != BEnd; A++, B++) - if (toupper(*A) != toupper(*B)) + if (tolower_ascii(*A) != tolower_ascii(*B)) break; if (A == AEnd && B == BEnd) @@ -593,7 +593,7 @@ int stringcasecmp(string::const_iterator A,string::const_iterator AEnd, return 1; if (B == BEnd) return -1; - if (toupper(*A) < toupper(*B)) + if (tolower_ascii(*A) < tolower_ascii(*B)) return -1; return 1; } @@ -601,7 +601,7 @@ int stringcasecmp(string::const_iterator A,string::const_iterator AEnd, string::const_iterator B,string::const_iterator BEnd) { for (; A != AEnd && B != BEnd; A++, B++) - if (toupper(*A) != toupper(*B)) + if (tolower_ascii(*A) != tolower_ascii(*B)) break; if (A == AEnd && B == BEnd) @@ -610,7 +610,7 @@ int stringcasecmp(string::const_iterator A,string::const_iterator AEnd, return 1; if (B == BEnd) return -1; - if (toupper(*A) < toupper(*B)) + if (tolower_ascii(*A) < tolower_ascii(*B)) return -1; return 1; } @@ -789,28 +789,28 @@ bool ReadMessages(int Fd, vector<string> &List) // MonthConv - Converts a month string into a number /*{{{*/ // --------------------------------------------------------------------- /* This was lifted from the boa webserver which lifted it from 'wn-v1.07' - Made it a bit more robust with a few touppers though. */ + Made it a bit more robust with a few tolower_ascii though. */ static int MonthConv(char *Month) { - switch (toupper(*Month)) + switch (tolower_ascii(*Month)) { - case 'A': - return toupper(Month[1]) == 'P'?3:7; - case 'D': + case 'a': + return tolower_ascii(Month[1]) == 'p'?3:7; + case 'd': return 11; - case 'F': + case 'f': return 1; - case 'J': - if (toupper(Month[1]) == 'A') + case 'j': + if (tolower_ascii(Month[1]) == 'a') return 0; - return toupper(Month[2]) == 'N'?5:6; - case 'M': - return toupper(Month[2]) == 'R'?2:4; - case 'N': + return tolower_ascii(Month[2]) == 'n'?5:6; + case 'm': + return tolower_ascii(Month[2]) == 'r'?2:4; + case 'n': return 10; - case 'O': + case 'o': return 9; - case 'S': + case 's': return 8; // Pretend it is January.. @@ -1133,10 +1133,13 @@ char *safe_snprintf(char *Buffer,char *End,const char *Format,...) // tolower_ascii - tolower() function that ignores the locale /*{{{*/ // --------------------------------------------------------------------- -/* */ -int tolower_ascii(int c) +/* This little function is the most called method we have and tries + therefore to do the absolut minimum - and is noteable faster than + standard tolower/toupper and as a bonus avoids problems with different + locales - we only operate on ascii chars anyway. */ +int tolower_ascii(int const c) { - if (c >= 'A' and c <= 'Z') + if (c >= 'A' && c <= 'Z') return c + 32; return c; } diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index e72288f4c..cdf78f317 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -25,19 +25,12 @@ #include <iostream> #include <time.h> +#include "macros.h" + using std::string; using std::vector; using std::ostream; -#ifdef __GNUG__ -// Methods have a hidden this parameter that is visible to this attribute -#define APT_FORMAT2 __attribute__ ((format (printf, 2, 3))) -#define APT_FORMAT3 __attribute__ ((format (printf, 3, 4))) -#else -#define APT_FORMAT2 -#define APT_FORMAT3 -#endif - bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest); char *_strstrip(char *String); char *_strtabexpand(char *String,size_t Len); @@ -60,11 +53,11 @@ bool Hex2Num(const string &Str,unsigned char *Num,unsigned int Length); bool TokSplitString(char Tok,char *Input,char **List, unsigned long ListMax); vector<string> ExplodeString(string const &haystack, char const &split); -void ioprintf(ostream &out,const char *format,...) APT_FORMAT2; -void strprintf(string &out,const char *format,...) APT_FORMAT2; -char *safe_snprintf(char *Buffer,char *End,const char *Format,...) APT_FORMAT3; +void ioprintf(ostream &out,const char *format,...) __like_printf(2); +void strprintf(string &out,const char *format,...) __like_printf(2); +char *safe_snprintf(char *Buffer,char *End,const char *Format,...) __like_printf(3); bool CheckDomainList(const string &Host, const string &List); -int tolower_ascii(int c); +int tolower_ascii(int const c) __attrib_const __hot; #define APT_MKSTRCMP(name,func) \ inline int name(const char *A,const char *B) {return func(A,A+strlen(A),B,B+strlen(B));}; \ @@ -144,6 +137,4 @@ struct RxChoiceList unsigned long RegexChoice(RxChoiceList *Rxs,const char **ListBegin, const char **ListEnd); -#undef APT_FORMAT2 - #endif diff --git a/debian/changelog b/debian/changelog index 17affee4f..bd1fda316 100644 --- a/debian/changelog +++ b/debian/changelog @@ -60,6 +60,8 @@ apt (0.7.26) UNRELEASED; urgency=low * doc/po/de.po: - correct a few typos in the german manpage translation. Thanks to Chris Leick and Georg Koppen! (Closes: #574962) + * apt-pkg/contrib/strutl.cc: + - convert all toupper calls to tolower_ascii for a little speedup [ Julian Andres Klode ] * cmdline/apt-mark: -- cgit v1.2.3 From c408e01e546e641a0906f188ca6bb924a2f17b40 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 30 Mar 2010 12:39:33 +0200 Subject: Group packages in the same group together in the package list so it is easier to find them later on as we have no "noice" anymore between them. --- apt-pkg/pkgcache.cc | 17 +++++------------ apt-pkg/pkgcachegen.cc | 26 +++++++++++++++++--------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index fe8757ded..1bbd74bd9 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -343,24 +343,17 @@ pkgCache::PkgIterator pkgCache::GrpIterator::FindPkg(string Arch) { // GrpIterator::NextPkg - Locate the next package in the group /*{{{*/ // --------------------------------------------------------------------- /* Returns an End-Pointer on error, pointer to the package otherwise. - We can't simply ++ to the next as the list of packages includes - "package noise" (= packages with the same hash value but different name) */ + We can't simply ++ to the next as the next package of the last will + be from a different group (with the same hash value) */ pkgCache::PkgIterator pkgCache::GrpIterator::NextPkg(pkgCache::PkgIterator const &LastPkg) { if (unlikely(IsGood() == false || S->FirstPackage == 0 || LastPkg.end() == true)) return PkgIterator(*Owner, 0); - // Iterate over the list to find the next package - pkgCache::Package *Pkg = Owner->PkgP + LastPkg.Index(); - Pkg = Owner->PkgP + Pkg->NextPackage; - for (; Pkg != Owner->PkgP; Pkg = Owner->PkgP + Pkg->NextPackage) { - if (S->Name == Pkg->Name) - return PkgIterator(*Owner, Pkg); - if ((Owner->PkgP + S->LastPackage) == Pkg) - break; - } + if (S->LastPackage == LastPkg.Index()) + return PkgIterator(*Owner, 0); - return PkgIterator(*Owner, 0); + return PkgIterator(*Owner, Owner->PkgP + LastPkg->NextPackage); } /*}}}*/ // GrpIterator::operator ++ - Postfix incr /*{{{*/ diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 8187b3950..577e2f1d4 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -379,15 +379,23 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name return false; Pkg = pkgCache::PkgIterator(Cache,Cache.PkgP + Package); - // Insert it into the hash table - unsigned long const Hash = Cache.Hash(Name); - Pkg->NextPackage = Cache.HeaderP->PkgHashTable[Hash]; - Cache.HeaderP->PkgHashTable[Hash] = Package; - - // remember the packages in the group - Grp->FirstPackage = Package; - if (Grp->LastPackage == 0) - Grp->LastPackage = Package; + // Insert the package into our package list + if (Grp->FirstPackage == 0) // the group is new + { + // Insert it into the hash table + unsigned long const Hash = Cache.Hash(Name); + Pkg->NextPackage = Cache.HeaderP->PkgHashTable[Hash]; + Cache.HeaderP->PkgHashTable[Hash] = Package; + Grp->FirstPackage = Package; + } + else // Group the Packages together + { + // this package is the new last package + pkgCache::PkgIterator LastPkg(Cache, Cache.PkgP + Grp->LastPackage); + Pkg->NextPackage = LastPkg->NextPackage; + LastPkg->NextPackage = Package; + } + Grp->LastPackage = Package; // Set the name, arch and the ID Pkg->Name = Grp->Name; -- cgit v1.2.3 From 3f42500d6b9eb318c46cacafdcfd6beb707ef9e9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 30 Mar 2010 14:25:57 +0200 Subject: rename ExplodeString to VectorizeString --- apt-pkg/aptconfiguration.cc | 2 +- apt-pkg/contrib/strutl.cc | 6 +++--- apt-pkg/contrib/strutl.h | 2 +- apt-pkg/deb/debmetaindex.cc | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index a1379ce7d..2acf8dd9f 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -221,7 +221,7 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All, const char *language_env = getenv("LANGUAGE") == 0 ? "" : getenv("LANGUAGE"); string envLang = Locale == 0 ? language_env : *(Locale+1); if (envLang.empty() == false) { - std::vector<string> env = ExplodeString(envLang,':'); + std::vector<string> env = VectorizeString(envLang,':'); short addedLangs = 0; // add a maximum of 3 fallbacks from the environment for (std::vector<string>::const_iterator e = env.begin(); e != env.end() && addedLangs < 3; ++e) { diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index ab47cdede..7eb986ac0 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -1000,12 +1000,12 @@ bool TokSplitString(char Tok,char *Input,char **List, return true; } /*}}}*/ -// ExplodeString - Split a string up into a vector /*{{{*/ +// VectorizeString - Split a string up into a vector of strings /*{{{*/ // --------------------------------------------------------------------- /* This can be used to split a given string up into a vector, so the propose is the same as in the method above and this one is a bit slower - also, but the advantage is that we an iteratable vector */ -vector<string> ExplodeString(string const &haystack, char const &split) + also, but the advantage is that we have an iteratable vector */ +vector<string> VectorizeString(string const &haystack, char const &split) { string::const_iterator start = haystack.begin(); string::const_iterator end = start; diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index cdf78f317..d8070d3f5 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -52,7 +52,7 @@ bool StrToNum(const char *Str,unsigned long &Res,unsigned Len,unsigned Base = 0) bool Hex2Num(const string &Str,unsigned char *Num,unsigned int Length); bool TokSplitString(char Tok,char *Input,char **List, unsigned long ListMax); -vector<string> ExplodeString(string const &haystack, char const &split); +vector<string> VectorizeString(string const &haystack, char const &split) __attrib_const; void ioprintf(ostream &out,const char *format,...) __like_printf(2); void strprintf(string &out,const char *format,...) __like_printf(2); char *safe_snprintf(char *Buffer,char *End,const char *Format,...) __like_printf(3); diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 947a7f04b..8df3ed18d 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -313,7 +313,7 @@ class debSLTypeDebian : public pkgSourceList::Type { map<string, string>::const_iterator const arch = Options.find("arch"); vector<string> const Archs = - (arch != Options.end()) ? ExplodeString(arch->second, ',') : + (arch != Options.end()) ? VectorizeString(arch->second, ',') : APT::Configuration::getArchitectures(); for (vector<metaIndex *>::const_iterator I = List.begin(); -- cgit v1.2.3 From 33dd02e3a95141d4e16677048614c3171c4c4ffc Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 30 Mar 2010 14:45:38 +0200 Subject: convert some tabs to spaces to respect the style guide --- apt-pkg/deb/deblistparser.cc | 39 +++++----- apt-pkg/pkgcachegen.cc | 169 +++++++++++++++++++++++-------------------- 2 files changed, 109 insertions(+), 99 deletions(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 947e060e3..0551a5f7c 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -36,8 +36,8 @@ static debListParser::WordList PrioList[] = {{"important",pkgCache::State::Impor we would accept in general with checkArchitecture() */ debListParser::debListParser(FileFd *File, string const &Arch) : Tags(File), Arch(Arch) { - if (Arch == "native") - this->Arch = _config->Find("APT::Architecture"); + if (Arch == "native") + this->Arch = _config->Find("APT::Architecture"); } /*}}}*/ // ListParser::UniqFindTagWrite - Find the tag and write a unq string /*{{{*/ @@ -56,10 +56,10 @@ unsigned long debListParser::UniqFindTagWrite(const char *Tag) // --------------------------------------------------------------------- /* This is to return the name of the package this section describes */ string debListParser::Package() { - string const Result = Section.FindS("Package"); - if(unlikely(Result.empty() == true)) - _error->Error("Encountered a section with no Package: header"); - return Result; + string const Result = Section.FindS("Package"); + if(unlikely(Result.empty() == true)) + _error->Error("Encountered a section with no Package: header"); + return Result; } /*}}}*/ // ListParser::Architecture - Return the package arch /*{{{*/ @@ -68,25 +68,26 @@ string debListParser::Package() { Note that architecture "all" packages will get the architecture of the Packages file parsed here. */ string debListParser::Architecture() { - string const Result = Section.FindS("Architecture"); - if (Result.empty() == true || Result == "all") { - if (Arch.empty() == true) - /* FIXME: this is a problem for installed arch all - packages as we don't know from which arch this - package was installed - and therefore which - dependency this package resolves. */ - return _config->Find("APT::Architecture"); - else - return Arch; - } - return Result; + string const Result = Section.FindS("Architecture"); + if (Result.empty() == true || Result == "all") + { + if (Arch.empty() == true) + /* FIXME: this is a problem for installed arch all + packages as we don't know from which arch this + package was installed - and therefore which + dependency this package resolves. */ + return _config->Find("APT::Architecture"); + else + return Arch; + } + return Result; } /*}}}*/ // ListParser::ArchitectureAll /*{{{*/ // --------------------------------------------------------------------- /* */ bool debListParser::ArchitectureAll() { - return Section.FindS("Architecture") == "all"; + return Section.FindS("Architecture") == "all"; } /*}}}*/ // ListParser::Version - Return the version string /*{{{*/ diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 577e2f1d4..21240b951 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -335,29 +335,30 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List) // CacheGenerator::NewGroup - Add a new group /*{{{*/ // --------------------------------------------------------------------- /* This creates a new group structure and adds it to the hash table */ -bool pkgCacheGenerator::NewGroup(pkgCache::GrpIterator &Grp, const string &Name) { - Grp = Cache.FindGrp(Name); - if (Grp.end() == false) - return true; +bool pkgCacheGenerator::NewGroup(pkgCache::GrpIterator &Grp, const string &Name) +{ + Grp = Cache.FindGrp(Name); + if (Grp.end() == false) + return true; - // Get a structure - unsigned long const Group = Map.Allocate(sizeof(pkgCache::Group)); - if (unlikely(Group == 0)) - return false; + // Get a structure + unsigned long const Group = Map.Allocate(sizeof(pkgCache::Group)); + if (unlikely(Group == 0)) + return false; - Grp = pkgCache::GrpIterator(Cache, Cache.GrpP + Group); - Grp->Name = Map.WriteString(Name); - if (unlikely(Grp->Name == 0)) - return false; + Grp = pkgCache::GrpIterator(Cache, Cache.GrpP + Group); + Grp->Name = Map.WriteString(Name); + if (unlikely(Grp->Name == 0)) + return false; - // Insert it into the hash table - unsigned long const Hash = Cache.Hash(Name); - Grp->Next = Cache.HeaderP->GrpHashTable[Hash]; - Cache.HeaderP->GrpHashTable[Hash] = Group; + // Insert it into the hash table + unsigned long const Hash = Cache.Hash(Name); + Grp->Next = Cache.HeaderP->GrpHashTable[Hash]; + Cache.HeaderP->GrpHashTable[Hash] = Group; - Cache.HeaderP->GroupCount++; + Cache.HeaderP->GroupCount++; - return true; + return true; } /*}}}*/ // CacheGenerator::NewPackage - Add a new package /*{{{*/ @@ -526,68 +527,76 @@ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc, // CacheGenerator::FinishCache - do various finish operations /*{{{*/ // --------------------------------------------------------------------- /* This prepares the Cache for delivery */ -bool pkgCacheGenerator::FinishCache(OpProgress &Progress) { - // FIXME: add progress reporting for this operation - // Do we have different architectures in your groups ? - vector<string> archs = APT::Configuration::getArchitectures(); - if (archs.size() > 1) { - // Create Conflicts in between the group - for (pkgCache::GrpIterator G = GetCache().GrpBegin(); G.end() != true; G++) { - string const PkgName = G.Name(); - for (pkgCache::PkgIterator P = G.PackageList(); P.end() != true; P = G.NextPkg(P)) { - if (strcmp(P.Arch(),"all") == 0) - continue; - pkgCache::PkgIterator allPkg; - for (pkgCache::VerIterator V = P.VersionList(); V.end() != true; V++) { - string const Arch = V.Arch(true); - map_ptrloc *OldDepLast = NULL; - /* MultiArch handling introduces a lot of implicit Dependencies: - - MultiArch: same → Co-Installable if they have the same version - - Architecture: all → Need to be Co-Installable for internal reasons - - All others conflict with all other group members */ - bool const coInstall = (V->MultiArch == pkgCache::Version::All || - V->MultiArch == pkgCache::Version::Same); - if (V->MultiArch == pkgCache::Version::All && allPkg.end() == true) - allPkg = G.FindPkg("all"); - for (vector<string>::const_iterator A = archs.begin(); A != archs.end(); ++A) { - if (*A == Arch) - continue; - /* We allow only one installed arch at the time - per group, therefore each group member conflicts - with all other group members */ - pkgCache::PkgIterator D = G.FindPkg(*A); - if (D.end() == true) - continue; - if (coInstall == true) { - // Replaces: ${self}:other ( << ${binary:Version}) - NewDepends(D, V, V.VerStr(), - pkgCache::Dep::Less, pkgCache::Dep::Replaces, - OldDepLast); - // Breaks: ${self}:other (!= ${binary:Version}) - NewDepends(D, V, V.VerStr(), - pkgCache::Dep::Less, pkgCache::Dep::DpkgBreaks, - OldDepLast); - NewDepends(D, V, V.VerStr(), - pkgCache::Dep::Greater, pkgCache::Dep::DpkgBreaks, - OldDepLast); - if (V->MultiArch == pkgCache::Version::All) { - // Depend on ${self}:all which does depend on nothing - NewDepends(allPkg, V, V.VerStr(), - pkgCache::Dep::Equals, pkgCache::Dep::Depends, - OldDepLast); - } - } else { - // Conflicts: ${self}:other - NewDepends(D, V, "", - pkgCache::Dep::NoOp, pkgCache::Dep::Conflicts, - OldDepLast); - } - } - } - } - } - } - return true; +bool pkgCacheGenerator::FinishCache(OpProgress &Progress) +{ + // FIXME: add progress reporting for this operation + // Do we have different architectures in your groups ? + vector<string> archs = APT::Configuration::getArchitectures(); + if (archs.size() > 1) + { + // Create Conflicts in between the group + for (pkgCache::GrpIterator G = GetCache().GrpBegin(); G.end() != true; G++) + { + string const PkgName = G.Name(); + for (pkgCache::PkgIterator P = G.PackageList(); P.end() != true; P = G.NextPkg(P)) + { + if (strcmp(P.Arch(),"all") == 0) + continue; + pkgCache::PkgIterator allPkg; + for (pkgCache::VerIterator V = P.VersionList(); V.end() != true; V++) + { + string const Arch = V.Arch(true); + map_ptrloc *OldDepLast = NULL; + /* MultiArch handling introduces a lot of implicit Dependencies: + - MultiArch: same → Co-Installable if they have the same version + - Architecture: all → Need to be Co-Installable for internal reasons + - All others conflict with all other group members */ + bool const coInstall = (V->MultiArch == pkgCache::Version::All || + V->MultiArch == pkgCache::Version::Same); + if (V->MultiArch == pkgCache::Version::All && allPkg.end() == true) + allPkg = G.FindPkg("all"); + for (vector<string>::const_iterator A = archs.begin(); A != archs.end(); ++A) + { + if (*A == Arch) + continue; + /* We allow only one installed arch at the time + per group, therefore each group member conflicts + with all other group members */ + pkgCache::PkgIterator D = G.FindPkg(*A); + if (D.end() == true) + continue; + if (coInstall == true) + { + // Replaces: ${self}:other ( << ${binary:Version}) + NewDepends(D, V, V.VerStr(), + pkgCache::Dep::Less, pkgCache::Dep::Replaces, + OldDepLast); + // Breaks: ${self}:other (!= ${binary:Version}) + NewDepends(D, V, V.VerStr(), + pkgCache::Dep::Less, pkgCache::Dep::DpkgBreaks, + OldDepLast); + NewDepends(D, V, V.VerStr(), + pkgCache::Dep::Greater, pkgCache::Dep::DpkgBreaks, + OldDepLast); + if (V->MultiArch == pkgCache::Version::All) + { + // Depend on ${self}:all which does depend on nothing + NewDepends(allPkg, V, V.VerStr(), + pkgCache::Dep::Equals, pkgCache::Dep::Depends, + OldDepLast); + } + } else { + // Conflicts: ${self}:other + NewDepends(D, V, "", + pkgCache::Dep::NoOp, pkgCache::Dep::Conflicts, + OldDepLast); + } + } + } + } + } + } + return true; } /*}}}*/ // CacheGenerator::NewDepends - Create a dependency element /*{{{*/ -- cgit v1.2.3 From e84adb76c87f419ed5bad8f7d08a4132de2bc406 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 30 Mar 2010 17:47:19 +0200 Subject: try version match in FindSrc first exact than fuzzy (LP: #551178) --- cmdline/apt-get.cc | 32 +++++++++++++++++++++----------- debian/changelog | 1 + 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 7875ae20f..5af2dca04 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1291,12 +1291,26 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, { if(VerTag.empty() == false || DefRel.empty() == false) { + bool fuzzy = false; // we have a default release, try to locate the pkg. we do it like // this because GetCandidateVer() will not "downgrade", that means // "apt-get source -t stable apt" won't work on a unstable system - for (pkgCache::VerIterator Ver = Pkg.VersionList(); - Ver.end() == false; Ver++) + for (pkgCache::VerIterator Ver = Pkg.VersionList();; Ver++) { + // try first only exact matches, later fuzzy matches + if (Ver.end() == true) + { + if (fuzzy == true) + break; + fuzzy = true; + Ver = Pkg.VersionList(); + } + // We match against a concrete version (or a part of this version) + if (VerTag.empty() == false && + (fuzzy == true || Cache.VS().CmpVersion(VerTag, Ver.VerStr()) != 0) && // exact match + (fuzzy == false || strncmp(VerTag.c_str(), Ver.VerStr(), VerTag.size()) != 0)) // fuzzy match + continue; + for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false; VF++) { @@ -1309,10 +1323,6 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, pkgCache::Flag::NotSource && Pkg.CurrentVer() != Ver) continue; - // We match against a concrete version (or a part of this version) - if (VerTag.empty() == false && strncmp(VerTag.c_str(), Ver.VerStr(), VerTag.size()) != 0) - continue; - // or we match against a release if(VerTag.empty() == false || (VF.File().Archive() != 0 && VF.File().Archive() == DefRel) || @@ -1323,10 +1333,9 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, // no SourcePkg name, so it is the "binary" name if (Src.empty() == true) Src = TmpSrc; - // no Version, so we try the Version of the SourcePkg - - // and after that the version of the binary package - if (VerTag.empty() == true) - VerTag = Parse.SourceVer(); + // the Version we have is possibly fuzzy or includes binUploads, + // so we use the Version of the SourcePkg (empty if same as package) + VerTag = Parse.SourceVer(); if (VerTag.empty() == true) VerTag = Ver.VerStr(); break; @@ -1390,7 +1399,8 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, const string Ver = Parse->Version(); // Ignore all versions which doesn't fit - if (VerTag.empty() == false && strncmp(VerTag.c_str(), Ver.c_str(), VerTag.size()) != 0) + if (VerTag.empty() == false && + Cache.VS().CmpVersion(VerTag, Ver) != 0) // exact match continue; // Newer version or an exact match? Save the hit diff --git a/debian/changelog b/debian/changelog index bd1fda316..61a4dc618 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,7 @@ apt (0.7.26) UNRELEASED; urgency=low * cmdline/apt-get.cc: - add a --only-upgrade flag to install command (Closes: #572259) - fix memory leaks in error conditions in DoSource() + - try version match in FindSrc first exact than fuzzy (LP: #551178) * apt-pkg/contrib/cmndline.cc: - save Commandline in Commandline::AsString for logging * apt-pkg/deb/debversion.cc: -- cgit v1.2.3 From 436d7eab92bb8f9cc6498acfbf2055e717be6fd0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 31 Mar 2010 17:19:10 +0200 Subject: Userinfo is urlencoded in URIs (RFC 3986) Thanks to Jean-Baptiste Lallement for spotting and fixing it! * apt-pkg/contrib/strutl.cc: - always escape '%' (LP: #130289) (Closes: #500560) - unescape '%' sequence only if followed by 2 hex digit - username/password are urlencoded in proxy string (RFC 3986) --- apt-pkg/contrib/strutl.cc | 21 +++++++++++++++------ apt-pkg/contrib/strutl.h | 1 + debian/changelog | 6 ++++++ 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 7eb986ac0..c7d63ce8a 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -198,7 +198,8 @@ bool ParseQuoteWord(const char *&String,string &Res) char *I; for (I = Buffer; I < Buffer + sizeof(Buffer) && Start != C; I++) { - if (*Start == '%' && Start + 2 < C) + if (*Start == '%' && Start + 2 < C && + isxdigit(Start[1]) && isxdigit(Start[2])) { Tmp[0] = Start[1]; Tmp[1] = Start[2]; @@ -273,7 +274,8 @@ string QuoteString(const string &Str, const char *Bad) for (string::const_iterator I = Str.begin(); I != Str.end(); I++) { if (strchr(Bad,*I) != 0 || isprint(*I) == 0 || - *I <= 0x20 || *I >= 0x7F) + *I == 0x25 || // percent '%' char + *I <= 0x20 || *I >= 0x7F) // control chars { char Buf[10]; sprintf(Buf,"%%%02x",(int)*I); @@ -289,11 +291,17 @@ string QuoteString(const string &Str, const char *Bad) // --------------------------------------------------------------------- /* This undoes QuoteString */ string DeQuoteString(const string &Str) +{ + return DeQuoteString(Str.begin(),Str.end()); +} +string DeQuoteString(string::const_iterator const &begin, + string::const_iterator const &end) { string Res; - for (string::const_iterator I = Str.begin(); I != Str.end(); I++) + for (string::const_iterator I = begin; I != end; I++) { - if (*I == '%' && I + 2 < Str.end()) + if (*I == '%' && I + 2 < end && + isxdigit(I[1]) && isxdigit(I[2])) { char Tmp[3]; Tmp[0] = I[1]; @@ -1238,9 +1246,10 @@ void URI::CopyFrom(const string &U) else { Host.assign(At+1,SingleSlash); - User.assign(FirstColon,SecondColon); + // username and password must be encoded (RFC 3986) + User.assign(DeQuoteString(FirstColon,SecondColon)); if (SecondColon < At) - Password.assign(SecondColon+1,At); + Password.assign(DeQuoteString(SecondColon+1,At)); } // Now we parse the RFC 2732 [] hostnames. diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index d8070d3f5..e509145f9 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -38,6 +38,7 @@ bool ParseQuoteWord(const char *&String,string &Res); bool ParseCWord(const char *&String,string &Res); string QuoteString(const string &Str,const char *Bad); string DeQuoteString(const string &Str); +string DeQuoteString(string::const_iterator const &begin, string::const_iterator const &end); string SizeToStr(double Bytes); string TimeToStr(unsigned long Sec); string Base64Encode(const string &Str); diff --git a/debian/changelog b/debian/changelog index 61a4dc618..205db85e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -64,6 +64,12 @@ apt (0.7.26) UNRELEASED; urgency=low * apt-pkg/contrib/strutl.cc: - convert all toupper calls to tolower_ascii for a little speedup + [ Jean-Baptiste Lallement ] + * apt-pkg/contrib/strutl.cc: + - always escape '%' (LP: #130289) (Closes: #500560) + - unescape '%' sequence only if followed by 2 hex digit + - username/password are urlencoded in proxy string (RFC 3986) + [ Julian Andres Klode ] * cmdline/apt-mark: - Use the new python-apt API (and conflict with python-apt << 0.7.93.2). -- cgit v1.2.3 From 482def9c186ccba47be481bd39430f4251ce218d Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Thu, 1 Apr 2010 17:26:32 +0200 Subject: prepare for upload --- debian/changelog | 2 +- debian/control | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 49987385a..247f45d01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.26~exp3) UNRELEASED; urgency=low +apt (0.7.26~exp3) experimental; urgency=low [ Christian Perrier ] * German translation update. Closes: #571037 diff --git a/debian/control b/debian/control index 5843820d7..f0178d571 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,6 @@ Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>, Standards-Version: 3.8.4 Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, autoconf, automake Build-Conflicts: autoconf2.13, automake1.4 -Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Package: apt Architecture: any -- cgit v1.2.3 From 1ee0448569975a9e7676b4e426385469017a754f Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Thu, 1 Apr 2010 18:17:23 +0200 Subject: releasing version 0.7.26~exp3 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 247f45d01..5658c7040 100644 --- a/debian/changelog +++ b/debian/changelog @@ -102,7 +102,7 @@ apt (0.7.26~exp3) experimental; urgency=low * doc/examples/configure-index: - add missing Debug::pkgPackageManager option - -- Christian Perrier <bubulle@debian.org> Wed, 24 Feb 2010 22:13:50 +0100 + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 01 Apr 2010 17:30:43 +0200 apt (0.7.26~exp2) experimental; urgency=low -- cgit v1.2.3 From 22326578d84ee9df4b192dd5ba5120098afe97ea Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Thu, 1 Apr 2010 22:50:10 +0200 Subject: make changelog match upload --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5658c7040..edc82e1d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -102,7 +102,7 @@ apt (0.7.26~exp3) experimental; urgency=low * doc/examples/configure-index: - add missing Debug::pkgPackageManager option - -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 01 Apr 2010 17:30:43 +0200 + -- Michael Vogt <mvo@debian.org> Thu, 01 Apr 2010 17:30:43 +0200 apt (0.7.26~exp2) experimental; urgency=low -- cgit v1.2.3 From c753eec1d192a56e7f4ba1b07ae766b740185a3f Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 3 Apr 2010 17:07:30 +0200 Subject: * apt-pkg/depcache.cc: - "reinstall" the correct version for a killed pseudo package --- apt-pkg/depcache.cc | 7 +++++-- debian/changelog | 7 +++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 75f69ee11..0f07de2fe 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -855,13 +855,16 @@ void pkgDepCache::Update(OpProgress *Prog) if (P.end() == true) continue; for (VerIterator V = P.VersionList(); V.end() != true; ++V) { - // FIXME: String comparison isn't a save indicator! - if (strcmp(allV.VerStr(),V.VerStr()) != 0) + if (allV->Hash != V->Hash || + strcmp(allV.VerStr(),V.VerStr()) != 0) continue; unsigned char const CurDepState = VersionState(V.DependsList(),DepInstall,DepInstMin,DepInstPolicy); if ((CurDepState & DepInstMin) != DepInstMin) break; // we found the correct version, but it is broken. Better try another arch or later again + RemoveSizes(P); + RemoveStates(P); P->CurrentVer = V.Index(); + PkgState[P->ID].InstallVer = V; AddStates(P); Update(P); AddSizes(P); diff --git a/debian/changelog b/debian/changelog index edc82e1d7..16800a9d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.26~exp4) experimental; urgency=low + + * apt-pkg/depcache.cc: + - "reinstall" the correct version for a killed pseudo package + + -- David Kalnischkies <kalnischkies@gmail.com> Sat, 03 Apr 2010 14:58:39 +0200 + apt (0.7.26~exp3) experimental; urgency=low [ Christian Perrier ] -- cgit v1.2.3 From 5e8b2b74ab565ffb72e035ce89a7a991d4de3dcf Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 3 Apr 2010 17:57:41 +0200 Subject: Initialize history_out always with NULL so apt will not segfault later in the event of a failure in OpenLog() (which will happen if called with Debug::NoLocking as user) --- apt-pkg/deb/dpkgpm.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index c0efa7b59..14a4968f7 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -105,7 +105,7 @@ ionice(int PID) /* */ pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) : pkgPackageManager(Cache), dpkgbuf_pos(0), - term_out(NULL), PackagesDone(0), PackagesTotal(0) + term_out(NULL), history_out(NULL), PackagesDone(0), PackagesTotal(0) { } /*}}}*/ @@ -651,6 +651,7 @@ bool pkgDPkgPM::CloseLog() fprintf(history_out, "End-Date: %s\n", timestr); fclose(history_out); } + history_out = NULL; return true; } -- cgit v1.2.3 From 87af68aa09fd1b0ab4f87fd064654a032c4daf30 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 3 Apr 2010 18:50:07 +0200 Subject: * apt-pkg/packagemanager.cc: - don't try to "unpack" pseudo packages twice --- apt-pkg/packagemanager.cc | 14 +++++++++++--- debian/changelog | 2 ++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 034cc8339..eef79cccd 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -596,9 +596,17 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg) { if(Install(Pkg,FileNames[Pkg->ID]) == false) return false; - } else if (SmartUnPack(Pkg.Group().FindPkg("all")) == false) - return false; - + } else { + // Pseudo packages will not be unpacked - instead we will do this + // for the "real" package, but only once and if it is already + // configured we don't need to unpack it again… + PkgIterator const P = Pkg.Group().FindPkg("all"); + if (List->IsFlag(P,pkgOrderList::UnPacked) != true && + List->IsFlag(P,pkgOrderList::Configured) != true) { + if (SmartUnPack(P) == false) + return false; + } + } List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States); // Perform immedate configuration of the package. diff --git a/debian/changelog b/debian/changelog index 16800a9d1..71aeb1504 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ apt (0.7.26~exp4) experimental; urgency=low * apt-pkg/depcache.cc: - "reinstall" the correct version for a killed pseudo package + * apt-pkg/packagemanager.cc: + - don't try to "unpack" pseudo packages twice -- David Kalnischkies <kalnischkies@gmail.com> Sat, 03 Apr 2010 14:58:39 +0200 -- cgit v1.2.3 From b3793d41d420a895ef5be4521a56535cc79f0d4a Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 4 Apr 2010 10:34:45 +0200 Subject: remove the ABI compatible stub for GetListOfFilesInDir --- apt-pkg/contrib/fileutl.cc | 5 ----- apt-pkg/contrib/fileutl.h | 5 +---- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index da32983f1..75adce305 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -201,11 +201,6 @@ bool FileExists(string File) // --------------------------------------------------------------------- /* If an extension is given only files with this extension are included in the returned vector, otherwise every "normal" file is included. */ -std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext, - bool const &SortList) -{ - return GetListOfFilesInDir(Dir, Ext, SortList, false); -} std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext, bool const &SortList, bool const &AllowNoExt) { diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 85a94898c..351d53c5e 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -82,11 +82,8 @@ bool RunScripts(const char *Cnf); bool CopyFile(FileFd &From,FileFd &To); int GetLock(string File,bool Errors = true); bool FileExists(string File); -// FIXME: next ABI-Break: merge the two method-headers std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext, - bool const &SortList); -std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext, - bool const &SortList, bool const &AllowNoExt); + bool const &SortList, bool const &AllowNoExt=false); std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> const &Ext, bool const &SortList); string SafeGetCWD(); -- cgit v1.2.3 From 1cd1c398d18b78f4aa9d882a5de5385f4538e0be Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 7 Apr 2010 16:38:18 +0200 Subject: * apt-pkg/contrib/fileutl.cc: - add a parent-guarded "mkdir -p" as CreateDirectory() * apt-pkg/acquire.{cc,h}: - add a delayed constructor with Setup() for success reporting - check for and create directories in Setup if needed instead of error out unfriendly in the Constructor (Closes: #523920, #525783) - optional handle a lock file in Setup() * cmdline/apt-get.cc: - remove the lock file handling and let Acquire take care of it instead --- apt-pkg/acquire.cc | 89 ++++++++++++++++++++++++++++++++++------------ apt-pkg/acquire.h | 31 +++++++++++++--- apt-pkg/algorithms.cc | 4 ++- apt-pkg/contrib/fileutl.cc | 52 +++++++++++++++++++++++++++ apt-pkg/contrib/fileutl.h | 3 ++ apt-pkg/pkgcachegen.cc | 15 +++++++- cmdline/apt-get.cc | 38 ++++++++------------ debian/changelog | 9 +++++ 8 files changed, 187 insertions(+), 54 deletions(-) diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 74510ae21..d83d80fac 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -19,6 +19,7 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/error.h> #include <apt-pkg/strutl.h> +#include <apt-pkg/fileutl.h> #include <apti18n.h> @@ -29,7 +30,6 @@ #include <dirent.h> #include <sys/time.h> #include <errno.h> -#include <sys/stat.h> /*}}}*/ using namespace std; @@ -37,32 +37,72 @@ using namespace std; // Acquire::pkgAcquire - Constructor /*{{{*/ // --------------------------------------------------------------------- /* We grab some runtime state from the configuration space */ -pkgAcquire::pkgAcquire(pkgAcquireStatus *Log) : Log(Log) +pkgAcquire::pkgAcquire() : Queues(0), Workers(0), Configs(0), Log(NULL), ToFetch(0), + Debug(_config->FindB("Debug::pkgAcquire",false)), + Running(false), LockFD(-1) { - Queues = 0; - Configs = 0; - Workers = 0; - ToFetch = 0; - Running = false; - - string Mode = _config->Find("Acquire::Queue-Mode","host"); + string const Mode = _config->Find("Acquire::Queue-Mode","host"); + if (strcasecmp(Mode.c_str(),"host") == 0) + QueueMode = QueueHost; + if (strcasecmp(Mode.c_str(),"access") == 0) + QueueMode = QueueAccess; +} +pkgAcquire::pkgAcquire(pkgAcquireStatus *Progress) : Queues(0), Workers(0), + Configs(0), Log(Progress), ToFetch(0), + Debug(_config->FindB("Debug::pkgAcquire",false)), + Running(false), LockFD(-1) +{ + string const Mode = _config->Find("Acquire::Queue-Mode","host"); if (strcasecmp(Mode.c_str(),"host") == 0) QueueMode = QueueHost; if (strcasecmp(Mode.c_str(),"access") == 0) - QueueMode = QueueAccess; + QueueMode = QueueAccess; + Setup(Progress, ""); +} + /*}}}*/ +// Acquire::Setup - Delayed Constructor /*{{{*/ +// --------------------------------------------------------------------- +/* Do everything needed to be a complete Acquire object and report the + success (or failure) back so the user knows that something is wrong… */ +bool pkgAcquire::Setup(pkgAcquireStatus *Progress, string const &Lock) +{ + Log = Progress; - Debug = _config->FindB("Debug::pkgAcquire",false); - - // This is really a stupid place for this - struct stat St; - if (stat((_config->FindDir("Dir::State::lists") + "partial/").c_str(),&St) != 0 || - S_ISDIR(St.st_mode) == 0) - _error->Error(_("Lists directory %spartial is missing."), - _config->FindDir("Dir::State::lists").c_str()); - if (stat((_config->FindDir("Dir::Cache::Archives") + "partial/").c_str(),&St) != 0 || - S_ISDIR(St.st_mode) == 0) - _error->Error(_("Archive directory %spartial is missing."), - _config->FindDir("Dir::Cache::Archives").c_str()); + // check for existence and possibly create auxiliary directories + if (CheckDirectory(_config->FindDir("Dir::State"), _config->FindDir("Dir::State::lists") + "partial/") == false || + CheckDirectory(_config->FindDir("Dir::Cache"), _config->FindDir("Dir::Cache::Archives") + "partial/") == false) + return false; + + if (Lock.empty() == true || _config->FindB("Debug::NoLocking", false) == true) + return true; + + // Lock the directory this acquire object will work in + LockFD = GetLock(flCombine(Lock, "lock")); + if (LockFD == -1) + return _error->Error(_("Unable to lock directory %s"), Lock.c_str()); + + return true; +} + /*}}}*/ +// Acquire::CheckDirectory - ensure that the given directory exists /*{{{*/ +// --------------------------------------------------------------------- +/* a small wrapper around CreateDirectory to check if it exists and to + remove the trailing "/apt/" from the parent directory if needed */ +bool pkgAcquire::CheckDirectory(string const &Parent, string const &Path) const +{ + if (DirectoryExists(Path) == true) + return true; + + size_t const len = Parent.size(); + if (len > 5 && Parent.find("/apt/", len - 6, 5) != len - 5) + { + if (CreateDirectory(Parent.substr(0,len-5), Path) == true) + return true; + } + else if (CreateDirectory(Parent, Path) == true) + return true; + + return _error->Errno("Acquire", _("Directory %s can't be created."), Path.c_str()); } /*}}}*/ // Acquire::~pkgAcquire - Destructor /*{{{*/ @@ -71,7 +111,10 @@ pkgAcquire::pkgAcquire(pkgAcquireStatus *Log) : Log(Log) pkgAcquire::~pkgAcquire() { Shutdown(); - + + if (LockFD != -1) + close(LockFD); + while (Configs != 0) { MethodConfig *Jnk = Configs; diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h index 6c130c1b3..9e91a9f67 100644 --- a/apt-pkg/acquire.h +++ b/apt-pkg/acquire.h @@ -66,6 +66,8 @@ #ifndef PKGLIB_ACQUIRE_H #define PKGLIB_ACQUIRE_H +#include <apt-pkg/macros.h> + #include <vector> #include <string> @@ -161,7 +163,7 @@ class pkgAcquire QueueAccess} QueueMode; /** \brief If \b true, debugging information will be dumped to std::clog. */ - bool Debug; + bool const Debug; /** \brief If \b true, a download is currently in progress. */ bool Running; @@ -332,15 +334,22 @@ class pkgAcquire */ double PartialPresent(); - /** \brief Construct a new pkgAcquire. + /** \brief Delayed constructor * - * \param Log The progress indicator associated with this - * download, or \b NULL for none. This object is not owned by the + * \param Progress indicator associated with this download or + * \b NULL for none. This object is not owned by the * download process and will not be deleted when the pkgAcquire * object is destroyed. Naturally, it should live for at least as * long as the pkgAcquire object does. + * \param Lock defines a lock file that should be acquired to ensure + * only one Acquire class is in action at the time or an empty string + * if no lock file should be used. */ - pkgAcquire(pkgAcquireStatus *Log = 0); + bool Setup(pkgAcquireStatus *Progress = NULL, string const &Lock = ""); + + /** \brief Construct a new pkgAcquire. */ + pkgAcquire(pkgAcquireStatus *Log) __deprecated; + pkgAcquire(); /** \brief Destroy this pkgAcquire object. * @@ -348,6 +357,18 @@ class pkgAcquire * this download. */ virtual ~pkgAcquire(); + + private: + /** \brief FD of the Lock file we acquire in Setup (if any) */ + int LockFD; + + /** \brief Ensure the existence of the given Path + * + * \param Parent directory of the Path directory - a trailing + * /apt/ will be removed before CreateDirectory call. + * \param Path which should exist after (successful) call + */ + bool CheckDirectory(string const &Parent, string const &Path) const; }; /** \brief Represents a single download source from which an item diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index f8a9e210c..f1e51131a 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1398,7 +1398,9 @@ bool ListUpdate(pkgAcquireStatus &Stat, int PulseInterval) { pkgAcquire::RunResult res; - pkgAcquire Fetcher(&Stat); + pkgAcquire Fetcher; + if (Fetcher.Setup(&Stat, _config->FindDir("Dir::State::Lists")) == false) + return false; // Populate it with the source selection if (List.GetIndexes(&Fetcher) == false) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 75adce305..16f7ce929 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -18,6 +18,7 @@ /*}}}*/ // Include Files /*{{{*/ #include <apt-pkg/fileutl.h> +#include <apt-pkg/strutl.h> #include <apt-pkg/error.h> #include <apt-pkg/sptr.h> #include <apt-pkg/configuration.h> @@ -197,6 +198,57 @@ bool FileExists(string File) return true; } /*}}}*/ +// DirectoryExists - Check if a directory exists and is really one /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool DirectoryExists(string const &Path) +{ + struct stat Buf; + if (stat(Path.c_str(),&Buf) != 0) + return false; + return ((Buf.st_mode & S_IFDIR) != 0); +} + /*}}}*/ +// CreateDirectory - poor man's mkdir -p guarded by a parent directory /*{{{*/ +// --------------------------------------------------------------------- +/* This method will create all directories needed for path in good old + mkdir -p style but refuses to do this if Parent is not a prefix of + this Path. Example: /var/cache/ and /var/cache/apt/archives are given, + so it will create apt/archives if /var/cache exists - on the other + hand if the parent is /var/lib the creation will fail as this path + is not a parent of the path to be generated. */ +bool CreateDirectory(string const &Parent, string const &Path) +{ + if (Parent.empty() == true || Path.empty() == true) + return false; + + if (DirectoryExists(Path) == true) + return true; + + if (DirectoryExists(Parent) == false) + return false; + + // we are not going to create directories "into the blue" + if (Path.find(Parent, 0) != 0) + return false; + + vector<string> const dirs = VectorizeString(Path.substr(Parent.size()), '/'); + string progress = Parent; + for (vector<string>::const_iterator d = dirs.begin(); d != dirs.end(); ++d) + { + if (d->empty() == true) + continue; + + progress.append("/").append(*d); + if (DirectoryExists(progress) == true) + continue; + + if (mkdir(progress.c_str(), 0755) != 0) + return false; + } + return true; +} + /*}}}*/ // GetListOfFilesInDir - returns a vector of files in the given dir /*{{{*/ // --------------------------------------------------------------------- /* If an extension is given only files with this extension are included diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 351d53c5e..003bd9b83 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -21,6 +21,7 @@ #ifndef PKGLIB_FILEUTL_H #define PKGLIB_FILEUTL_H +#include <apt-pkg/macros.h> #include <string> #include <vector> @@ -82,6 +83,8 @@ bool RunScripts(const char *Cnf); bool CopyFile(FileFd &From,FileFd &To); int GetLock(string File,bool Errors = true); bool FileExists(string File); +bool DirectoryExists(string const &Path) __attrib_const; +bool CreateDirectory(string const &Parent, string const &Path); std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext, bool const &SortList, bool const &AllowNoExt=false); std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> const &Ext, diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 21240b951..114c9d5ed 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -1003,7 +1003,20 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, // Decide if we can write to the files.. string const CacheFile = _config->FindFile("Dir::Cache::pkgcache"); string const SrcCacheFile = _config->FindFile("Dir::Cache::srcpkgcache"); - + + // ensure the cache directory exists + if (CacheFile.empty() == false || SrcCacheFile.empty() == false) + { + string dir = _config->FindDir("Dir::Cache"); + size_t const len = dir.size(); + if (len > 5 && dir.find("/apt/", len - 6, 5) == len - 5) + dir = dir.substr(0, len - 5); + if (CacheFile.empty() == false) + CreateDirectory(dir, flNotFile(CacheFile)); + if (SrcCacheFile.empty() == false) + CreateDirectory(dir, flNotFile(SrcCacheFile)); + } + // Decide if we can write to the cache bool Writeable = false; if (CacheFile.empty() == false) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 62f712c39..416d316da 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -811,20 +811,13 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, pkgRecords Recs(Cache); if (_error->PendingError() == true) return false; - - // Lock the archive directory - FileFd Lock; - if (_config->FindB("Debug::NoLocking",false) == false && - _config->FindB("APT::Get::Print-URIs") == false) - { - Lock.Fd(GetLock(_config->FindDir("Dir::Cache::Archives") + "lock")); - if (_error->PendingError() == true) - return _error->Error(_("Unable to lock the download directory")); - } - + // Create the download object + pkgAcquire Fetcher; AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0)); - pkgAcquire Fetcher(&Stat); + if (Fetcher.Setup(&Stat, _config->FindB("APT::Get::Print-URIs", false) + ? "" : _config->FindDir("Dir::Cache::Archives")) == false) + return false; // Read the source list pkgSourceList List; @@ -1442,15 +1435,6 @@ bool DoUpdate(CommandLine &CmdL) if (List.ReadMainList() == false) return false; - // Lock the list directory - FileFd Lock; - if (_config->FindB("Debug::NoLocking",false) == false) - { - Lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock")); - if (_error->PendingError() == true) - return _error->Error(_("Unable to lock the list directory")); - } - // Create the progress AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0)); @@ -1458,7 +1442,9 @@ bool DoUpdate(CommandLine &CmdL) if (_config->FindB("APT::Get::Print-URIs") == true) { // get a fetcher - pkgAcquire Fetcher(&Stat); + pkgAcquire Fetcher; + if (Fetcher.Setup(&Stat) == false) + return false; // Populate it with the source selection and get all Indexes // (GetAll=true) @@ -2207,7 +2193,9 @@ bool DoSource(CommandLine &CmdL) // Create the download object AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0)); - pkgAcquire Fetcher(&Stat); + pkgAcquire Fetcher; + if (Fetcher.Setup(&Stat) == false) + return false; DscFile *Dsc = new DscFile[CmdL.FileSize()]; @@ -2464,7 +2452,9 @@ bool DoBuildDep(CommandLine &CmdL) // Create the download object AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0)); - pkgAcquire Fetcher(&Stat); + pkgAcquire Fetcher; + if (Fetcher.Setup(&Stat) == false) + return false; unsigned J = 0; for (const char **I = CmdL.FileList + 1; *I != 0; I++, J++) diff --git a/debian/changelog b/debian/changelog index 71aeb1504..ffab08eb1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,15 @@ apt (0.7.26~exp4) experimental; urgency=low - "reinstall" the correct version for a killed pseudo package * apt-pkg/packagemanager.cc: - don't try to "unpack" pseudo packages twice + * apt-pkg/contrib/fileutl.cc: + - add a parent-guarded "mkdir -p" as CreateDirectory() + * apt-pkg/acquire.{cc,h}: + - add a delayed constructor with Setup() for success reporting + - check for and create directories in Setup if needed instead of + error out unfriendly in the Constructor (Closes: #523920, #525783) + - optional handle a lock file in Setup() + * cmdline/apt-get.cc: + - remove the lock file handling and let Acquire take care of it instead -- David Kalnischkies <kalnischkies@gmail.com> Sat, 03 Apr 2010 14:58:39 +0200 -- cgit v1.2.3 From 259f688a29728604d7930662e9743619982706ab Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Thu, 8 Apr 2010 20:57:01 +0200 Subject: * cmdline/apt-get.cc: - fix crash when pkg.VersionList() is empty --- cmdline/apt-get.cc | 4 ++++ debian/changelog | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 62f712c39..cd450b27a 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1304,6 +1304,10 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, break; fuzzy = true; Ver = Pkg.VersionList(); + // exit right away from the Pkg.VersionList() loop if we + // don't have any versions + if (Ver.end() == true) + break; } // We match against a concrete version (or a part of this version) if (VerTag.empty() == false && diff --git a/debian/changelog b/debian/changelog index edc82e1d7..9e3223abf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.26~exp4) UNRELEASEDexperimental; urgency=low + + * cmdline/apt-get.cc: + - fix crash when pkg.VersionList() is empty + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 08 Apr 2010 20:56:30 +0200 + apt (0.7.26~exp3) experimental; urgency=low [ Christian Perrier ] -- cgit v1.2.3 From a722b2c5c935768efbdd5b23eed7ce32ccd60908 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 9 Apr 2010 15:38:48 +0200 Subject: * apt-pkg/acquire-item.cc: - Acquire::ForceHash to force method for expected hash - display MD5Sum in --print-uris if not forced to use another method instead of displaying the strongest available (Closes: #576420) --- apt-pkg/acquire-item.cc | 28 +++++++++++++++++++++------- cmdline/apt-get.cc | 13 +++++++++++-- debian/changelog | 4 ++++ doc/examples/configure-index | 1 + test/makefile | 8 ++++---- 5 files changed, 41 insertions(+), 13 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 4f0abbb91..916fca71e 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1327,7 +1327,8 @@ pkgAcqArchive::pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources, the archive is already available in the cache and stashs the MD5 for checking later. */ bool pkgAcqArchive::QueueNext() -{ +{ + string const ForceHash = _config->Find("Acquire::ForceHash"); for (; Vf.end() == false; Vf++) { // Ignore not source sources @@ -1350,12 +1351,25 @@ bool pkgAcqArchive::QueueNext() return false; string PkgFile = Parse.FileName(); - if(Parse.SHA256Hash() != "") - ExpectedHash = HashString("SHA256", Parse.SHA256Hash()); - else if (Parse.SHA1Hash() != "") - ExpectedHash = HashString("SHA1", Parse.SHA1Hash()); - else - ExpectedHash = HashString("MD5Sum", Parse.MD5Hash()); + if (ForceHash.empty() == false) + { + if(stringcasecmp(ForceHash, "sha256") == 0) + ExpectedHash = HashString("SHA256", Parse.SHA256Hash()); + else if (stringcasecmp(ForceHash, "sha1") == 0) + ExpectedHash = HashString("SHA1", Parse.SHA1Hash()); + else + ExpectedHash = HashString("MD5Sum", Parse.MD5Hash()); + } + else + { + string Hash; + if ((Hash = Parse.SHA256Hash()).empty() == false) + ExpectedHash = HashString("SHA256", Hash); + else if ((Hash = Parse.SHA1Hash()).empty() == false) + ExpectedHash = HashString("SHA1", Hash); + else + ExpectedHash = HashString("MD5Sum", Parse.MD5Hash()); + } if (PkgFile.empty() == true) return _error->Error(_("The package index files are corrupted. No Filename: " "field for package %s."), diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 416d316da..7c42e672d 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -815,8 +815,14 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, // Create the download object pkgAcquire Fetcher; AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0)); - if (Fetcher.Setup(&Stat, _config->FindB("APT::Get::Print-URIs", false) - ? "" : _config->FindDir("Dir::Cache::Archives")) == false) + if (_config->FindB("APT::Get::Print-URIs", false) == true) + { + // force a hashsum for compatibility reasons + _config->CndSet("Acquire::ForceHash", "md5sum"); + if (Fetcher.Setup(&Stat, "") == false) + return false; + } + else if (Fetcher.Setup(&Stat, _config->FindDir("Dir::Cache::Archives")) == false) return false; // Read the source list @@ -1441,6 +1447,9 @@ bool DoUpdate(CommandLine &CmdL) // Just print out the uris an exit if the --print-uris flag was used if (_config->FindB("APT::Get::Print-URIs") == true) { + // force a hashsum for compatibility reasons + _config->CndSet("Acquire::ForceHash", "md5sum"); + // get a fetcher pkgAcquire Fetcher; if (Fetcher.Setup(&Stat) == false) diff --git a/debian/changelog b/debian/changelog index ffab08eb1..4cdbd4d93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,8 +11,12 @@ apt (0.7.26~exp4) experimental; urgency=low - check for and create directories in Setup if needed instead of error out unfriendly in the Constructor (Closes: #523920, #525783) - optional handle a lock file in Setup() + * apt-pkg/acquire-item.cc: + - Acquire::ForceHash to force method for expected hash * cmdline/apt-get.cc: - remove the lock file handling and let Acquire take care of it instead + - display MD5Sum in --print-uris if not forced to use another method + instead of displaying the strongest available (Closes: #576420) -- David Kalnischkies <kalnischkies@gmail.com> Sat, 03 Apr 2010 14:58:39 +0200 diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 3167e46da..d168417d8 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -169,6 +169,7 @@ Acquire Queue-Mode "host"; // host|access Retries "0"; Source-Symlinks "true"; + ForceHash "sha256"; // hashmethod used for expected hash: sha256, sha1 or md5sum PDiffs "true"; // try to get the IndexFile diffs PDiffs::FileLimit "4"; // don't use diffs if we would need more than 4 diffs diff --git a/test/makefile b/test/makefile index b8c104eae..52adb96a2 100644 --- a/test/makefile +++ b/test/makefile @@ -68,7 +68,7 @@ SOURCE = test_udevcdrom.cc include $(PROGRAM_H) # Program for checking rpm versions -PROGRAM=rpmver -SLIBS = -lapt-pkg -lrpm -SOURCE = rpmver.cc -include $(PROGRAM_H) +#PROGRAM=rpmver +#SLIBS = -lapt-pkg -lrpm +#SOURCE = rpmver.cc +#include $(PROGRAM_H) -- cgit v1.2.3 From 3d5a34b22a83eb4bf9b1407e13240b8e2a333d5f Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 13 Apr 2010 09:28:57 +0200 Subject: regex for package names executed on Grp- not PkgIterator --- apt-pkg/depcache.h | 1 + cmdline/apt-get.cc | 9 ++++++--- debian/changelog | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 6765d3e7c..72b9b5d4d 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -331,6 +331,7 @@ class pkgDepCache : protected pkgCache::Namespace // Legacy.. We look like a pkgCache inline operator pkgCache &() {return *Cache;}; inline Header &Head() {return *Cache->HeaderP;}; + inline GrpIterator GrpBegin() {return Cache->GrpBegin();}; inline PkgIterator PkgBegin() {return Cache->PkgBegin();}; inline GrpIterator FindGrp(string const &Name) {return Cache->FindGrp(Name);}; inline PkgIterator FindPkg(string const &Name) {return Cache->FindPkg(Name);}; diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 7c42e672d..52cbce945 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1772,11 +1772,14 @@ bool DoInstall(CommandLine &CmdL) // Run over the matches bool Hit = false; - for (Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) + for (pkgCache::GrpIterator Grp = Cache->GrpBegin(); Grp.end() == false; ++Grp) { - if (regexec(&Pattern,Pkg.Name(),0,0,0) != 0) + if (regexec(&Pattern,Grp.Name(),0,0,0) != 0) continue; - + Pkg = Grp.FindPkg("native"); + if (unlikely(Pkg.end() == true)) + continue; + ioprintf(c1out,_("Note, selecting %s for regex '%s'\n"), Pkg.Name(),S); diff --git a/debian/changelog b/debian/changelog index 4cdbd4d93..6cf067952 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ apt (0.7.26~exp4) experimental; urgency=low - remove the lock file handling and let Acquire take care of it instead - display MD5Sum in --print-uris if not forced to use another method instead of displaying the strongest available (Closes: #576420) + - regex for package names executed on Grp- not PkgIterator -- David Kalnischkies <kalnischkies@gmail.com> Sat, 03 Apr 2010 14:58:39 +0200 -- cgit v1.2.3 From 9c2c9c24f7027a0299e545e55c38ac4c557359a5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 13 Apr 2010 10:18:19 +0200 Subject: create the partial dirs also automatic if only Dir::Cache::archives or Dir::Cache::lists was set --- apt-pkg/acquire.cc | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index d83d80fac..832eaa02c 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -69,9 +69,18 @@ bool pkgAcquire::Setup(pkgAcquireStatus *Progress, string const &Lock) Log = Progress; // check for existence and possibly create auxiliary directories - if (CheckDirectory(_config->FindDir("Dir::State"), _config->FindDir("Dir::State::lists") + "partial/") == false || - CheckDirectory(_config->FindDir("Dir::Cache"), _config->FindDir("Dir::Cache::Archives") + "partial/") == false) - return false; + string const listDir = _config->FindDir("Dir::State::lists"); + string const partialListDir = listDir + "partial/"; + string const archivesDir = _config->FindDir("Dir::Cache::Archives"); + string const partialArchivesDir = archivesDir + "partial/"; + + if (CheckDirectory(_config->FindDir("Dir::State"), partialListDir) == false && + CheckDirectory(listDir, partialListDir) == false) + return _error->Errno("Acquire", _("List directory %spartial is missing."), listDir.c_str()); + + if (CheckDirectory(_config->FindDir("Dir::Cache"), partialArchivesDir) == false && + CheckDirectory(archivesDir, partialArchivesDir) == false) + return _error->Errno("Acquire", _("Archives directory %spartial is missing."), archivesDir.c_str()); if (Lock.empty() == true || _config->FindB("Debug::NoLocking", false) == true) return true; @@ -94,7 +103,7 @@ bool pkgAcquire::CheckDirectory(string const &Parent, string const &Path) const return true; size_t const len = Parent.size(); - if (len > 5 && Parent.find("/apt/", len - 6, 5) != len - 5) + if (len > 5 && Parent.find("/apt/", len - 6, 5) == len - 5) { if (CreateDirectory(Parent.substr(0,len-5), Path) == true) return true; @@ -102,7 +111,7 @@ bool pkgAcquire::CheckDirectory(string const &Parent, string const &Path) const else if (CreateDirectory(Parent, Path) == true) return true; - return _error->Errno("Acquire", _("Directory %s can't be created."), Path.c_str()); + return false; } /*}}}*/ // Acquire::~pkgAcquire - Destructor /*{{{*/ -- cgit v1.2.3 From 05bae55fb7fe23b2061182a60db2f2f914a2d3ec Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 14 Apr 2010 18:01:11 +0200 Subject: * apt-pkg/deb/dpkgpm.cc: - remove Chroot-Directory from files passed to install commands. Thanks to Kel Modderman for report & patch! (Closes: #577226) --- apt-pkg/deb/dpkgpm.cc | 14 +++++++++++++- debian/changelog | 3 +++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 14a4968f7..ca8faa8a5 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -124,7 +124,19 @@ bool pkgDPkgPM::Install(PkgIterator Pkg,string File) if (File.empty() == true || Pkg.end() == true) return _error->Error("Internal Error, No file name for %s",Pkg.Name()); - List.push_back(Item(Item::Install,Pkg,File)); + // If the filename string begins with DPkg::Chroot-Directory, return the + // substr that is within the chroot so dpkg can access it. + string const chrootdir = _config->FindDir("DPkg::Chroot-Directory","/"); + if (chrootdir != "/" && File.find(chrootdir) == 0) + { + size_t len = chrootdir.length(); + if (chrootdir.at(len - 1) == '/') + len--; + List.push_back(Item(Item::Install,Pkg,File.substr(len))); + } + else + List.push_back(Item(Item::Install,Pkg,File)); + return true; } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 6cf067952..7d2417cf4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,9 @@ apt (0.7.26~exp4) experimental; urgency=low - display MD5Sum in --print-uris if not forced to use another method instead of displaying the strongest available (Closes: #576420) - regex for package names executed on Grp- not PkgIterator + * apt-pkg/deb/dpkgpm.cc: + - remove Chroot-Directory from files passed to install commands. + Thanks to Kel Modderman for report & patch! (Closes: #577226) -- David Kalnischkies <kalnischkies@gmail.com> Sat, 03 Apr 2010 14:58:39 +0200 -- cgit v1.2.3 From b564740226100331f1aba8a1e35a57e5483361f7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 21 Apr 2010 13:14:40 +0200 Subject: replace backticks with single quote in broken packages message. Thanks to Jari Aalto for spotting & patching! (Closes: #577168) --- cmdline/apt-get.cc | 4 ++-- debian/changelog | 2 ++ po/apt-all.pot | 4 ++-- po/ar.po | 8 ++++---- po/ast.po | 8 ++++---- po/bg.po | 4 ++-- po/bs.po | 4 ++-- po/ca.po | 12 ++++++------ po/cs.po | 4 ++-- po/cy.po | 8 ++++---- po/da.po | 6 +++--- po/de.po | 4 ++-- po/dz.po | 8 ++++---- po/el.po | 4 ++-- po/en_GB.po | 4 ++-- po/es.po | 12 ++++++------ po/eu.po | 8 ++++---- po/fi.po | 4 ++-- po/fr.po | 4 ++-- po/gl.po | 4 ++-- po/he.po | 4 ++-- po/hu.po | 4 ++-- po/it.po | 4 ++-- po/ja.po | 4 ++-- po/km.po | 8 ++++---- po/ko.po | 8 ++++---- po/ku.po | 4 ++-- po/lt.po | 4 ++-- po/mr.po | 8 ++++---- po/nb.po | 4 ++-- po/ne.po | 8 ++++---- po/nl.po | 4 ++-- po/nn.po | 4 ++-- po/pl.po | 4 ++-- po/pt.po | 14 +++++++------- po/pt_BR.po | 8 ++++---- po/ro.po | 4 ++-- po/ru.po | 4 ++-- po/sk.po | 4 ++-- po/sl.po | 4 ++-- po/sv.po | 4 ++-- po/th.po | 8 ++++---- po/tl.po | 8 ++++---- po/uk.po | 4 ++-- po/vi.po | 4 ++-- po/zh_CN.po | 4 ++-- po/zh_TW.po | 8 ++++---- 47 files changed, 134 insertions(+), 132 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 52cbce945..9d67a82f8 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -692,7 +692,7 @@ bool CacheFile::CheckDeps(bool AllowBroken) } else { - c1out << _("You might want to run `apt-get -f install' to correct these.") << endl; + c1out << _("You might want to run 'apt-get -f install' to correct these.") << endl; ShowBroken(c1out,*this,true); return _error->Error(_("Unmet dependencies. Try using -f.")); @@ -1826,7 +1826,7 @@ bool DoInstall(CommandLine &CmdL) packages */ if (BrokenFix == true && Cache->BrokenCount() != 0) { - c1out << _("You might want to run `apt-get -f install' to correct these:") << endl; + c1out << _("You might want to run 'apt-get -f install' to correct these:") << endl; ShowBroken(c1out,Cache,false); return _error->Error(_("Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution).")); diff --git a/debian/changelog b/debian/changelog index 7d2417cf4..d1068b64d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ apt (0.7.26~exp4) experimental; urgency=low - display MD5Sum in --print-uris if not forced to use another method instead of displaying the strongest available (Closes: #576420) - regex for package names executed on Grp- not PkgIterator + - replace backticks with single quote in broken packages message. + Thanks to Jari Aalto for spotting & patching! (Closes: #577168) * apt-pkg/deb/dpkgpm.cc: - remove Chroot-Directory from files passed to install commands. Thanks to Kel Modderman for report & patch! (Closes: #577226) diff --git a/po/apt-all.pot b/po/apt-all.pot index ae0a7c375..41b46aeff 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -670,7 +670,7 @@ msgid " Done" msgstr "" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" #: cmdline/apt-get.cc:687 @@ -981,7 +981,7 @@ msgid "%s set to manually installed.\n" msgstr "" #: cmdline/apt-get.cc:1808 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" #: cmdline/apt-get.cc:1811 diff --git a/po/ar.po b/po/ar.po index 15d5f7205..c0864ec00 100644 --- a/po/ar.po +++ b/po/ar.po @@ -672,8 +672,8 @@ msgid " Done" msgstr " تم" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "قد ترغب بتنفيذ الأمر `apt-get -f install' لتصحيح هذه." +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "قد ترغب بتنفيذ الأمر 'apt-get -f install' لتصحيح هذه." #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -979,8 +979,8 @@ msgid "%s set to manually installed.\n" msgstr "إلا أنه سيتم تثبيت %s" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "قد ترغب بتشغيل `apt-get -f install' لتصحيح هذه:" +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "قد ترغب بتشغيل 'apt-get -f install' لتصحيح هذه:" #: cmdline/apt-get.cc:1797 msgid "" diff --git a/po/ast.po b/po/ast.po index 7df0e8f06..d3005dc3c 100644 --- a/po/ast.po +++ b/po/ast.po @@ -766,8 +766,8 @@ msgid " Done" msgstr " Fecho" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "Habres d'executar `apt-get -f install' para igualo." +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "Habres d'executar 'apt-get -f install' para igualo." #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -1080,8 +1080,8 @@ msgid "%s set to manually installed.\n" msgstr "%s axustu como instalu manualmente.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Habres d'executar `apt-get -f install' para iguar estos:" +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "Habres d'executar 'apt-get -f install' para iguar estos:" #: cmdline/apt-get.cc:1797 msgid "" diff --git a/po/bg.po b/po/bg.po index 5c366b765..9d9b1c2d1 100644 --- a/po/bg.po +++ b/po/bg.po @@ -779,7 +779,7 @@ msgid " Done" msgstr " Готово" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "Възможно е да изпълните „apt-get -f install“, за да коригирате тези " "неизправности." @@ -1098,7 +1098,7 @@ msgid "%s set to manually installed.\n" msgstr "%s е отбелязан като ръчно инсталиран.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:" #: cmdline/apt-get.cc:1797 diff --git a/po/bs.po b/po/bs.po index 7b2316bdb..aca1298aa 100644 --- a/po/bs.po +++ b/po/bs.po @@ -679,7 +679,7 @@ msgid " Done" msgstr " Urađeno" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" #: cmdline/apt-get.cc:687 @@ -982,7 +982,7 @@ msgid "%s set to manually installed.\n" msgstr "ali se %s treba instalirati" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" #: cmdline/apt-get.cc:1797 diff --git a/po/ca.po b/po/ca.po index fa4c4a414..4cedaf9fc 100644 --- a/po/ca.po +++ b/po/ca.po @@ -769,8 +769,8 @@ msgid " Done" msgstr " Fet" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho." +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "Potser voldreu executar 'apt-get -f install' per a corregir-ho." #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -1089,8 +1089,8 @@ msgid "%s set to manually installed.\n" msgstr "S'ha marcat %s com instal·lat manualment.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho:" +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "Potser voldreu executar 'apt-get -f install' per a corregir-ho:" #: cmdline/apt-get.cc:1797 msgid "" @@ -3153,8 +3153,8 @@ msgstr "La connexió s'ha tancat prematurament" #~ msgid "" #~ "Some broken packages were found while trying to process build-" #~ "dependencies for %s.\n" -#~ "You might want to run `apt-get -f install' to correct these." +#~ "You might want to run 'apt-get -f install' to correct these." #~ msgstr "" #~ "S'han trobat alguns paquets trencats mentre es processaven les\n" #~ "dependències de construcció per a %s.\n" -#~ "Potser voldreu executar `apt-get -f install' per a corregir-ho." +#~ "Potser voldreu executar 'apt-get -f install' per a corregir-ho." diff --git a/po/cs.po b/po/cs.po index 9b1eccdb8..63094e903 100644 --- a/po/cs.po +++ b/po/cs.po @@ -764,7 +764,7 @@ msgid " Done" msgstr " Hotovo" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Pro opravení můžete spustit „apt-get -f install“." #: cmdline/apt-get.cc:687 @@ -1077,7 +1077,7 @@ msgid "%s set to manually installed.\n" msgstr "%s nastaven jako instalovaný ručně.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Pro opravení následujících můžete spustit „apt-get -f install“:" #: cmdline/apt-get.cc:1797 diff --git a/po/cy.po b/po/cy.po index 09f9a8869..05f8762cb 100644 --- a/po/cy.po +++ b/po/cy.po @@ -797,8 +797,8 @@ msgid " Done" msgstr " Wedi Gorffen" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain." +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain." #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -1116,8 +1116,8 @@ msgid "%s set to manually installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain:" +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain:" # FIXME #: cmdline/apt-get.cc:1797 diff --git a/po/da.po b/po/da.po index ffac0e91f..0db88f72a 100644 --- a/po/da.po +++ b/po/da.po @@ -773,7 +773,7 @@ msgid " Done" msgstr " Frdig" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Du kan muligvis rette dette ved at kre 'apt-get -f install'." #: cmdline/apt-get.cc:687 @@ -1087,7 +1087,7 @@ msgid "%s set to manually installed.\n" msgstr "%s sat til manuelt installeret.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Du kan muligvis rette det ved at kre 'apt-get -f install':" #: cmdline/apt-get.cc:1797 @@ -3142,7 +3142,7 @@ msgstr "Forbindelsen lukkedes for hurtigt" #~ msgid "" #~ "Some broken packages were found while trying to process build-" #~ "dependencies.\n" -#~ "You might want to run `apt-get -f install' to correct these." +#~ "You might want to run 'apt-get -f install' to correct these." #~ msgstr "" #~ "Det blev fundet delagte pakker under behandlingen af " #~ "opbygningsafhngighederne.\n" diff --git a/po/de.po b/po/de.po index 17d4c9b24..2f354b323 100644 --- a/po/de.po +++ b/po/de.po @@ -785,7 +785,7 @@ msgid " Done" msgstr " Fertig" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren." #: cmdline/apt-get.cc:687 @@ -1107,7 +1107,7 @@ msgid "%s set to manually installed.\n" msgstr "%s wurde als manuell installiert festgelegt.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren:" #: cmdline/apt-get.cc:1797 diff --git a/po/dz.po b/po/dz.po index 3d0644477..526ba2fcf 100644 --- a/po/dz.po +++ b/po/dz.po @@ -778,8 +778,8 @@ msgid " Done" msgstr "འབད་ཚར་ཡི།" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད་ནི་ལུ་ཁྱོད་ཀྱི་`apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་།" +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད་ནི་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་།" #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -1094,8 +1094,8 @@ msgid "%s set to manually installed.\n" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "འདི་ཚུ་ནོར་བཅོས་འབད་ནིའི་དོན་ལུ་ཁྱོད་ཀྱི་`apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:" +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "འདི་ཚུ་ནོར་བཅོས་འབད་ནིའི་དོན་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:" #: cmdline/apt-get.cc:1797 msgid "" diff --git a/po/el.po b/po/el.po index 5c4ead054..6cbadb132 100644 --- a/po/el.po +++ b/po/el.po @@ -786,7 +786,7 @@ msgid " Done" msgstr " Ετοιμο" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα " "προβλήματα." @@ -1108,7 +1108,7 @@ msgid "%s set to manually installed.\n" msgstr "το %s έχει εγκατασταθεί με το χέρι\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Aν τρέξετε 'apt-get -f install' ίσως να διορθώσετε αυτά τα προβλήματα:" #: cmdline/apt-get.cc:1797 diff --git a/po/en_GB.po b/po/en_GB.po index 39163a47e..fa67efa0b 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -765,7 +765,7 @@ msgid " Done" msgstr "Done" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "You might want to run ‘apt-get -f install’ to correct these." #: cmdline/apt-get.cc:687 @@ -1079,7 +1079,7 @@ msgid "%s set to manually installed.\n" msgstr "%s set to manually installed.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "You might want to run 'apt-get -f install' to correct these:" #: cmdline/apt-get.cc:1797 diff --git a/po/es.po b/po/es.po index f8d09b3f5..70cad63dc 100644 --- a/po/es.po +++ b/po/es.po @@ -780,8 +780,8 @@ msgid " Done" msgstr " Listo" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo." +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "Tal vez quiera ejecutar 'apt-get -f install' para corregirlo." #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -1098,8 +1098,8 @@ msgid "%s set to manually installed.\n" msgstr "fijado %s como instalado manualmente.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo:" +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "Tal vez quiera ejecutar 'apt-get -f install' para corregirlo:" #: cmdline/apt-get.cc:1797 msgid "" @@ -3180,11 +3180,11 @@ msgstr "La conexi #~ msgid "" #~ "Some broken packages were found while trying to process build-" #~ "dependencies.\n" -#~ "You might want to run `apt-get -f install' to correct these." +#~ "You might want to run 'apt-get -f install' to correct these." #~ msgstr "" #~ "Se encontraron algunos paquetes rotos mientras se intentaba procesar\n" #~ "las dependencies de construccin. Tal vez quiera ejecutar \n" -#~ "`apt-get -f install' para corregirlos." +#~ "'apt-get -f install' para corregirlos." #~ msgid "" #~ "Usage: apt-cache [options] command\n" diff --git a/po/eu.po b/po/eu.po index 40ee7ce9a..dcb126a2d 100644 --- a/po/eu.po +++ b/po/eu.po @@ -768,8 +768,8 @@ msgid " Done" msgstr " Eginda" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu zuzentzeko." +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu zuzentzeko." #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -1084,8 +1084,8 @@ msgid "%s set to manually installed.\n" msgstr "%s eskuz instalatua bezala ezarri.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:" +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:" #: cmdline/apt-get.cc:1797 msgid "" diff --git a/po/fi.po b/po/fi.po index c345a749e..0337b2f99 100644 --- a/po/fi.po +++ b/po/fi.po @@ -769,7 +769,7 @@ msgid " Done" msgstr " Valmis" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä." #: cmdline/apt-get.cc:687 @@ -1086,7 +1086,7 @@ msgid "%s set to manually installed.\n" msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:" #: cmdline/apt-get.cc:1797 diff --git a/po/fr.po b/po/fr.po index 26c52fe3c..47652cb29 100644 --- a/po/fr.po +++ b/po/fr.po @@ -778,7 +778,7 @@ msgid " Done" msgstr " Fait" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes." #: cmdline/apt-get.cc:687 @@ -1107,7 +1107,7 @@ msgid "%s set to manually installed.\n" msgstr "%s passé en « installé manuellement ».\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :" #: cmdline/apt-get.cc:1797 diff --git a/po/gl.po b/po/gl.po index a8be68b13..341750e94 100644 --- a/po/gl.po +++ b/po/gl.po @@ -780,7 +780,7 @@ msgid " Done" msgstr " Rematado" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Pode querer executar \"apt-get -f install\" para corrixilos." #: cmdline/apt-get.cc:687 @@ -1097,7 +1097,7 @@ msgid "%s set to manually installed.\n" msgstr "%s cambiouse a instalado manualmente.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Pode querer executar \"apt-get -f install\" corrixir isto:" #: cmdline/apt-get.cc:1797 diff --git a/po/he.po b/po/he.po index a5cfcf6a8..a715fd46d 100644 --- a/po/he.po +++ b/po/he.po @@ -667,7 +667,7 @@ msgid " Done" msgstr "סיום" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "אולי תרצה להריץ 'apt-get -f install' כדי לתקן את אלו." #: cmdline/apt-get.cc:687 @@ -971,7 +971,7 @@ msgid "%s set to manually installed.\n" msgstr "אבל %s הולכת להיות מותקנת" #: cmdline/apt-get.cc:1784 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" #: cmdline/apt-get.cc:1787 diff --git a/po/hu.po b/po/hu.po index 95a845819..1db0d379f 100644 --- a/po/hu.po +++ b/po/hu.po @@ -773,7 +773,7 @@ msgid " Done" msgstr " Kész" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Ezek kijavításához próbáld futtatni az 'apt-get -f install'-t ." #: cmdline/apt-get.cc:687 @@ -1082,7 +1082,7 @@ msgid "%s set to manually installed.\n" msgstr "%s kézi telepítésre állított.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Próbáld futtatni az 'apt-get -f install'-t az alábbiak javításához:" #: cmdline/apt-get.cc:1797 diff --git a/po/it.po b/po/it.po index 9208fcc7f..012fe655b 100644 --- a/po/it.po +++ b/po/it.po @@ -773,7 +773,7 @@ msgid " Done" msgstr " Fatto" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "È utile eseguire \"apt-get -f install\" per correggere questi problemi." @@ -1098,7 +1098,7 @@ msgid "%s set to manually installed.\n" msgstr "È stato impostato %s per l'installazione manuale.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "È utile eseguire \"apt-get -f install\" per correggere questi problemi:" diff --git a/po/ja.po b/po/ja.po index e60501fc3..020e01e1e 100644 --- a/po/ja.po +++ b/po/ja.po @@ -769,7 +769,7 @@ msgid " Done" msgstr " 完了" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ" "ん。" @@ -1087,7 +1087,7 @@ msgid "%s set to manually installed.\n" msgstr "%s は手動でインストールしたと設定されました。\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ" "ません:" diff --git a/po/km.po b/po/km.po index 0b197126b..7ce844830 100644 --- a/po/km.po +++ b/po/km.po @@ -773,8 +773,8 @@ msgid " Done" msgstr " ធ្វើ​រួច" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "អ្នក​ប្រហែល​ជា​ចង់រត់ `apt-get -f install' ដើម្បី​កែ​វា​​ទាំងនេះ​ហើយ ។" +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "អ្នក​ប្រហែល​ជា​ចង់រត់ 'apt-get -f install' ដើម្បី​កែ​វា​​ទាំងនេះ​ហើយ ។" #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -1083,8 +1083,8 @@ msgid "%s set to manually installed.\n" msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "អ្នក​ប្រហែល​ជា​ចង់​រត់ `apt-get -f install' ដើម្បី​កែ​ពួក​វា​ទាំង​នេះ ៖" +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "អ្នក​ប្រហែល​ជា​ចង់​រត់ 'apt-get -f install' ដើម្បី​កែ​ពួក​វា​ទាំង​នេះ ៖" #: cmdline/apt-get.cc:1797 msgid "" diff --git a/po/ko.po b/po/ko.po index ec4b95ac9..4557eb96d 100644 --- a/po/ko.po +++ b/po/ko.po @@ -766,9 +766,9 @@ msgid " Done" msgstr " 완료" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" -"이 상황을 바로잡으려면 `apt-get -f install'을 실행해야 할 수도 있습니다." +"이 상황을 바로잡으려면 'apt-get -f install'을 실행해야 할 수도 있습니다." #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -1083,8 +1083,8 @@ msgid "%s set to manually installed.\n" msgstr "%s 패키지 수동설치로 지정합니다.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "다음을 바로잡으려면 `apt-get -f install'을 실행해 보십시오:" +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "다음을 바로잡으려면 'apt-get -f install'을 실행해 보십시오:" # FIXME: specify a solution? 무슨 솔루션? #: cmdline/apt-get.cc:1797 diff --git a/po/ku.po b/po/ku.po index c22027eb1..54c8e976a 100644 --- a/po/ku.po +++ b/po/ku.po @@ -682,7 +682,7 @@ msgid " Done" msgstr " Temam" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" #: cmdline/apt-get.cc:687 @@ -983,7 +983,7 @@ msgid "%s set to manually installed.\n" msgstr "lê %s dê were sazkirin" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" #: cmdline/apt-get.cc:1797 diff --git a/po/lt.po b/po/lt.po index 4d081b0c1..5cbecdf8d 100644 --- a/po/lt.po +++ b/po/lt.po @@ -741,7 +741,7 @@ msgid " Done" msgstr " Įvykdyta" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Įvykdykite „apt-get -f install“, jei norite ištaisyti šias klaidas." #: cmdline/apt-get.cc:687 @@ -1050,7 +1050,7 @@ msgid "%s set to manually installed.\n" msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Jūs galite norėti paleisti 'apt-get -f install\" klaidų taisymui:" #: cmdline/apt-get.cc:1797 diff --git a/po/mr.po b/po/mr.po index 646661c56..89fa7370e 100644 --- a/po/mr.po +++ b/po/mr.po @@ -766,7 +766,7 @@ msgid " Done" msgstr "झाले" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "हे बरोबर करण्यासाठी तुम्हाला `apt-get -f संस्थापना' प्रोग्राम चालू करावा लागेल." #: cmdline/apt-get.cc:687 @@ -1077,9 +1077,9 @@ msgid "%s set to manually installed.\n" msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" -"तुम्हाला कदाचित `apt-get -f install'(एपीटी-गेट -एफ संस्थापन') प्रोग्राम चालू करावा " +"तुम्हाला कदाचित 'apt-get -f install'(एपीटी-गेट -एफ संस्थापन') प्रोग्राम चालू करावा " "लागेल'यात बदल करण्यासाठी:" #: cmdline/apt-get.cc:1797 @@ -1087,7 +1087,7 @@ msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"अनमेट डिपेंडन्सीज.एपीटी-गेट -एफ संस्थापन (`apt-get -f install') पॅकेजशिवाय प्रयत्न करा " +"अनमेट डिपेंडन्सीज.एपीटी-गेट -एफ संस्थापन ('apt-get -f install') पॅकेजशिवाय प्रयत्न करा " "(किंवा पर्याय सांगा)." #: cmdline/apt-get.cc:1809 diff --git a/po/nb.po b/po/nb.po index 7f92788f1..6a661c7d8 100644 --- a/po/nb.po +++ b/po/nb.po @@ -776,7 +776,7 @@ msgid " Done" msgstr " Utfrt" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Du vil kanskje kjre apt-get -f install for rette p dette." #: cmdline/apt-get.cc:687 @@ -1090,7 +1090,7 @@ msgid "%s set to manually installed.\n" msgstr "%s satt til manuell installasjon.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Du vil kanskje utfre apt-get -f install for rette p disse:" #: cmdline/apt-get.cc:1797 diff --git a/po/ne.po b/po/ne.po index 08d1225f3..495f19372 100644 --- a/po/ne.po +++ b/po/ne.po @@ -770,8 +770,8 @@ msgid " Done" msgstr "काम भयो" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "यी सुधार गर्न तपाईँले `apt-get -f install' चलाउन पर्छ ।" +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "यी सुधार गर्न तपाईँले 'apt-get -f install' चलाउन पर्छ ।" #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -1080,8 +1080,8 @@ msgid "%s set to manually installed.\n" msgstr "तर %s स्थापना हुनुपर्यो" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "तपाईँ यसलाई सुधार गर्न `apt-get -f install' चलाउन चाहनुहुन्छ:" +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "तपाईँ यसलाई सुधार गर्न 'apt-get -f install' चलाउन चाहनुहुन्छ:" #: cmdline/apt-get.cc:1797 msgid "" diff --git a/po/nl.po b/po/nl.po index 98cb798b7..d49ec66d8 100644 --- a/po/nl.po +++ b/po/nl.po @@ -775,7 +775,7 @@ msgid " Done" msgstr " Klaar" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "U kunt 'apt-get -f install' uitvoeren om dit op te lossen." #: cmdline/apt-get.cc:687 @@ -1094,7 +1094,7 @@ msgid "%s set to manually installed.\n" msgstr "%s is ingesteld voor handmatige installatie.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "U wilt waarschijnlijk 'apt-get -f install' uitvoeren om volgende op te " "lossen:" diff --git a/po/nn.po b/po/nn.po index 428d07152..1e45cd8fa 100644 --- a/po/nn.po +++ b/po/nn.po @@ -772,7 +772,7 @@ msgid " Done" msgstr " Ferdig" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Du vil kanskje prva retta p desse ved kyra apt-get -f install." #: cmdline/apt-get.cc:687 @@ -1086,7 +1086,7 @@ msgid "%s set to manually installed.\n" msgstr "men %s skal installerast" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Du vil kanskje prva retta p desse ved kyra apt-get -f install." #: cmdline/apt-get.cc:1797 diff --git a/po/pl.po b/po/pl.po index f21b2cf21..c8649e0ec 100644 --- a/po/pl.po +++ b/po/pl.po @@ -775,7 +775,7 @@ msgid " Done" msgstr " Gotowe" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić." #: cmdline/apt-get.cc:687 @@ -1093,7 +1093,7 @@ msgid "%s set to manually installed.\n" msgstr "%s zaznaczony jako zainstalowany ręcznie.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić:" #: cmdline/apt-get.cc:1797 diff --git a/po/pt.po b/po/pt.po index 4026e76ff..f970f242d 100644 --- a/po/pt.po +++ b/po/pt.po @@ -771,8 +771,8 @@ msgid " Done" msgstr " Feito" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "Você pode querer executar `apt-get -f install' para corrigir isso." +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "Você pode querer executar 'apt-get -f install' para corrigir isso." #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -1089,15 +1089,15 @@ msgid "%s set to manually installed.\n" msgstr "%s está definido para ser instalado manualmente.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Você deve querer executar `apt-get -f install' para corrigir estes:" +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "Você deve querer executar 'apt-get -f install' para corrigir estes:" #: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote " +"Dependências não satisfeitas. Tente 'apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." #: cmdline/apt-get.cc:1809 @@ -3202,12 +3202,12 @@ msgstr "Ligação encerrada prematuramente" #~ msgid "" #~ "Some broken packages were found while trying to process build-" #~ "dependencies.\n" -#~ "You might want to run `apt-get -f install' to correct these." +#~ "You might want to run 'apt-get -f install' to correct these." #~ msgstr "" #~ "Alguns pacotes quebrados foram encontrados enquanto se tentava " #~ "processar \n" #~ "as dependências de construção.\n" -#~ "Você pode querer rodar `apt-get -f install' para corrigí-los." +#~ "Você pode querer rodar 'apt-get -f install' para corrigí-los." #~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs." #~ msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index b02214a9b..967707e99 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -777,7 +777,7 @@ msgid " Done" msgstr " Pronto" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Você pode querer executar 'apt-get -f install' para corrigí-los." #: cmdline/apt-get.cc:687 @@ -1094,7 +1094,7 @@ msgid "%s set to manually installed.\n" msgstr "%s configurado para instalar manualmente.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Você deve querer executar 'apt-get -f install' para corrigí-los:" #: cmdline/apt-get.cc:1797 @@ -3172,12 +3172,12 @@ msgstr "Conexão encerrada prematuramente" #~ msgid "" #~ "Some broken packages were found while trying to process build-" #~ "dependencies.\n" -#~ "You might want to run `apt-get -f install' to correct these." +#~ "You might want to run 'apt-get -f install' to correct these." #~ msgstr "" #~ "Alguns pacotes quebrados foram encontrados enquanto se tentava " #~ "processar \n" #~ "as dependências de construção.\n" -#~ "Você pode querer rodar `apt-get -f install' para corrigí-los." +#~ "Você pode querer rodar 'apt-get -f install' para corrigí-los." #~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs." #~ msgstr "" diff --git a/po/ro.po b/po/ro.po index f99371e7f..311071a30 100644 --- a/po/ro.po +++ b/po/ro.po @@ -778,7 +778,7 @@ msgid " Done" msgstr " Terminat" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Ați putea să porniți 'apt-get -f install' pentru a corecta acestea." #: cmdline/apt-get.cc:687 @@ -1092,7 +1092,7 @@ msgid "%s set to manually installed.\n" msgstr "%s este marcat ca fiind instalat manual.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Ați putea porni 'apt-get -f install' pentru a corecta acestea:" #: cmdline/apt-get.cc:1797 diff --git a/po/ru.po b/po/ru.po index 60f73f7de..98e9e15ae 100644 --- a/po/ru.po +++ b/po/ru.po @@ -781,7 +781,7 @@ msgid " Done" msgstr " Готово" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -" "f install'." @@ -1101,7 +1101,7 @@ msgid "%s set to manually installed.\n" msgstr "%s установлен вручную.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -" "f install':" diff --git a/po/sk.po b/po/sk.po index d5fe16c1a..c4db257df 100644 --- a/po/sk.po +++ b/po/sk.po @@ -768,7 +768,7 @@ msgid " Done" msgstr " Hotovo" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Opravu môžete spustiť pomocu „apt-get -f install“." #: cmdline/apt-get.cc:687 @@ -1081,7 +1081,7 @@ msgid "%s set to manually installed.\n" msgstr "%s je nastavený na manuálnu inštaláciu.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Na opravu nasledovných môžete spustiť „apt-get -f install“:" #: cmdline/apt-get.cc:1797 diff --git a/po/sl.po b/po/sl.po index 59351e42f..c279507ac 100644 --- a/po/sl.po +++ b/po/sl.po @@ -767,7 +767,7 @@ msgid " Done" msgstr " Opravljeno" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "e elite popraviti napake, poskusite pognati 'apt-get -f install'." #: cmdline/apt-get.cc:687 @@ -1078,7 +1078,7 @@ msgid "%s set to manually installed.\n" msgstr "vendar bo paket %s nameen" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Poskusite zagnati 'apt-get -f install', e elite popraviti:" #: cmdline/apt-get.cc:1797 diff --git a/po/sv.po b/po/sv.po index e14b57df5..6836371ea 100644 --- a/po/sv.po +++ b/po/sv.po @@ -772,7 +772,7 @@ msgid " Done" msgstr " Färdig" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "Du kan möjligen rätta till dessa genom att köra \"apt-get -f install\"." @@ -1091,7 +1091,7 @@ msgid "%s set to manually installed.\n" msgstr "%s är satt till manuellt installerad.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Du kan möjligen rätta till detta genom att köra \"apt-get -f install\":" diff --git a/po/th.po b/po/th.po index 5cd9e120b..19b629499 100644 --- a/po/th.po +++ b/po/th.po @@ -762,8 +762,8 @@ msgid " Done" msgstr " เสร็จแล้ว" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "คุณอาจต้องเรียก `apt-get -f install' เพื่อแก้ปัญหาเหล่านี้" +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "คุณอาจต้องเรียก 'apt-get -f install' เพื่อแก้ปัญหาเหล่านี้" #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -1071,8 +1071,8 @@ msgid "%s set to manually installed.\n" msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "คุณอาจเรียก `apt-get -f install' เพื่อแก้ปัญหานี้ได้:" +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "คุณอาจเรียก 'apt-get -f install' เพื่อแก้ปัญหานี้ได้:" #: cmdline/apt-get.cc:1797 msgid "" diff --git a/po/tl.po b/po/tl.po index a44d44b07..e91e0b717 100644 --- a/po/tl.po +++ b/po/tl.po @@ -780,8 +780,8 @@ msgid " Done" msgstr " Tapos" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "Maaari ninyong patakbuhin ang `apt-get -f install' upang ayusin ito." +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "Maaari ninyong patakbuhin ang 'apt-get -f install' upang ayusin ito." #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -1099,9 +1099,9 @@ msgid "%s set to manually installed.\n" msgstr "ngunit ang %s ay iluluklok" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" -"Maaaring patakbuhin niyo ang `apt-get -f install' upang ayusin ang mga ito:" +"Maaaring patakbuhin niyo ang 'apt-get -f install' upang ayusin ang mga ito:" #: cmdline/apt-get.cc:1797 msgid "" diff --git a/po/uk.po b/po/uk.po index 84ee8e0ce..ccccd7ad1 100644 --- a/po/uk.po +++ b/po/uk.po @@ -778,7 +778,7 @@ msgid " Done" msgstr " Виконано" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "Можливо, для виправлення цих помилок ви захочете скористатися 'apt-get -f " "install'." @@ -1100,7 +1100,7 @@ msgid "%s set to manually installed.\n" msgstr "але %s буде встановлений" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Можливо, для виправлення цих помилок Ви захочете скористатися 'apt-get -f " "install':" diff --git a/po/vi.po b/po/vi.po index eb509c29b..323175952 100644 --- a/po/vi.po +++ b/po/vi.po @@ -796,7 +796,7 @@ msgid " Done" msgstr " Đã xong" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Có lẽ bạn hãy chay lệnh « apt-get -f install » để sửa hết." #: cmdline/apt-get.cc:687 @@ -1114,7 +1114,7 @@ msgid "%s set to manually installed.\n" msgstr "%s được đặt thành « được cài đặt bằng tay ».\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Có lẽ bạn hãy chạy lênh « apt-get -f install » để sửa hết:" #: cmdline/apt-get.cc:1797 diff --git a/po/zh_CN.po b/po/zh_CN.po index 56c64e451..87dfe051f 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -765,7 +765,7 @@ msgid " Done" msgstr " 完成" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。" #: cmdline/apt-get.cc:687 @@ -1073,7 +1073,7 @@ msgid "%s set to manually installed.\n" msgstr "%s 被设置为手动安装。\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "您可能需要运行“apt-get -f install”来纠正下列错误：" #: cmdline/apt-get.cc:1797 diff --git a/po/zh_TW.po b/po/zh_TW.po index 7033d8d7b..4ebdf64fc 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -764,8 +764,8 @@ msgid " Done" msgstr " 完成" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "您也許得執行 `apt-get -f install' 以修正這些問題。" +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "您也許得執行 'apt-get -f install' 以修正這些問題。" #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -1073,8 +1073,8 @@ msgid "%s set to manually installed.\n" msgstr "%s 被設定為手動安裝。\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "您也許得執行 `apt-get -f install' 以修正這些問題：" +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "您也許得執行 'apt-get -f install' 以修正這些問題：" #: cmdline/apt-get.cc:1797 msgid "" -- cgit v1.2.3 From d9319cee6ff10b42e64145c82dfb246a1b3e551c Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 21 Apr 2010 15:16:13 +0200 Subject: * dselect/install: - modernize if-statements not to use 'x' (Closes: #577117) Thanks to Jari Aalto for spotting & patching! --- debian/changelog | 10 ++++++++-- dselect/install | 6 +++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index d1068b64d..712437a6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ apt (0.7.26~exp4) experimental; urgency=low + [ David Kalnischkies ] * apt-pkg/depcache.cc: - "reinstall" the correct version for a killed pseudo package * apt-pkg/packagemanager.cc: @@ -18,12 +19,17 @@ apt (0.7.26~exp4) experimental; urgency=low - display MD5Sum in --print-uris if not forced to use another method instead of displaying the strongest available (Closes: #576420) - regex for package names executed on Grp- not PkgIterator - - replace backticks with single quote in broken packages message. - Thanks to Jari Aalto for spotting & patching! (Closes: #577168) * apt-pkg/deb/dpkgpm.cc: - remove Chroot-Directory from files passed to install commands. Thanks to Kel Modderman for report & patch! (Closes: #577226) + [ Jari Aalto ] + * cmdline/apt-get.cc: + - replace backticks with single quotes around fix-broken command + in the broken packages message. (Closes: #577168) + * dselect/install: + - modernize if-statements not to use 'x' (Closes: #577117) + -- David Kalnischkies <kalnischkies@gmail.com> Sat, 03 Apr 2010 14:58:39 +0200 apt (0.7.26~exp3) experimental; urgency=low diff --git a/dselect/install b/dselect/install index 6779698e0..109307f4d 100755 --- a/dselect/install +++ b/dselect/install @@ -46,7 +46,7 @@ yesno() { echo $ans | tr YN yn } -if [ x$WAIT = "xtrue" ]; then +if [ "$WAIT" = "true" ]; then $APTGET $OPTS "$APT_OPT0" "$APT_OPT1" -d dselect-upgrade echo $"Press enter to continue." && read RES $APTGET $OPTS "$APT_OPT0" "$APT_OPT1" dselect-upgrade @@ -70,8 +70,8 @@ if [ $RES -eq 0 ]; then fi NEWLS=`ls -ld $ARCHIVES` - if [ x$CHECKDIR = "xtrue" ]; then - if [ "x$OLDLS" = "x$NEWLS" ]; then + if [ "$CHECKDIR" = "true" ]; then + if [ "$OLDLS" = "$NEWLS" ]; then exit 0 fi fi -- cgit v1.2.3 From cb658c4eea4bf18295c4acacd637cd94e2473bbc Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 21 Apr 2010 15:25:12 +0200 Subject: replace backticks with POSIX $() (Closes: #577116) And again thanks to Jari Aalto for spotting & patching! --- debian/changelog | 1 + dselect/install | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 712437a6d..44ddf1f82 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,7 @@ apt (0.7.26~exp4) experimental; urgency=low in the broken packages message. (Closes: #577168) * dselect/install: - modernize if-statements not to use 'x' (Closes: #577117) + - replace backticks with POSIX $() (Closes: #577116) -- David Kalnischkies <kalnischkies@gmail.com> Sat, 03 Apr 2010 14:58:39 +0200 diff --git a/dselect/install b/dselect/install index 109307f4d..3ef213550 100755 --- a/dselect/install +++ b/dselect/install @@ -12,11 +12,11 @@ DPKG_OPTS="--admindir=$1" APT_OPT0="-oDir::State::status=$1/status" APT_OPT1="-oDPkg::Options::=$DPKG_OPTS" set -e -RES=`apt-config shell CLEAN DSelect::Clean OPTS DSelect::Options \ +RES=$(apt-config shell CLEAN DSelect::Clean OPTS DSelect::Options \ DPKG Dir::Bin::dpkg/f APTGET Dir::Bin::apt-get/f \ ARCHIVES Dir::Cache::Archives/d \ WAIT DSelect::WaitAfterDownload/b \ - CHECKDIR DSelect::CheckDir/b` + CHECKDIR DSelect::CheckDir/b) eval $RES set +e @@ -64,12 +64,12 @@ fi # Finished OK if [ $RES -eq 0 ]; then - if [ `ls $ARCHIVES $ARCHIVES/partial | egrep -v "^lock$|^partial$" | wc -l` \ + if [ $(ls $ARCHIVES $ARCHIVES/partial | egrep -v "^lock$|^partial$" | wc -l) \ -eq 0 ]; then exit 0 fi - NEWLS=`ls -ld $ARCHIVES` + NEWLS=$(ls -ld $ARCHIVES) if [ "$CHECKDIR" = "true" ]; then if [ "$OLDLS" = "$NEWLS" ]; then exit 0 @@ -77,7 +77,7 @@ if [ $RES -eq 0 ]; then fi # Check the cleaning mode - case `echo $CLEAN | tr '[:upper:]' '[:lower:]'` in + case $(echo $CLEAN | tr '[:upper:]' '[:lower:]') in auto) $APTGET "$APT_OPT0" "$APT_OPT1" autoclean && echo $"Press enter to continue." && read RES && exit 0; @@ -89,7 +89,7 @@ if [ $RES -eq 0 ]; then prompt) exec 3>&1 echo -n $"Do you want to erase any previously downloaded .deb files?" - if [ `yesno "" y` = y ]; then + if [ $(yesno "" y) = y ]; then $APTGET "$APT_OPT0" "$APT_OPT1" clean && echo $"Press enter to continue." && read RES && exit 0; fi -- cgit v1.2.3 From bf99a6d3307af667a23fe09bfc437a553bbbd182 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 23 Apr 2010 17:13:02 +0200 Subject: * ftparchive/writer.cc: - remove 999 chars Files and Checksums rewrite limit (Closes: #577759) --- debian/changelog | 2 ++ ftparchive/writer.cc | 40 +++++++++++++++++++--------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index 44ddf1f82..8c0ac3314 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ apt (0.7.26~exp4) experimental; urgency=low * apt-pkg/deb/dpkgpm.cc: - remove Chroot-Directory from files passed to install commands. Thanks to Kel Modderman for report & patch! (Closes: #577226) + * ftparchive/writer.cc: + - remove 999 chars Files and Checksums rewrite limit (Closes: #577759) [ Jari Aalto ] * cmdline/apt-get.cc: diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 45a8d212b..6cda29b21 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -28,6 +28,7 @@ #include <ftw.h> #include <fnmatch.h> #include <iostream> +#include <sstream> #include <memory> #include "cachedb.h" @@ -706,23 +707,20 @@ bool SourcesWriter::DoPackage(string FileName) // Add the dsc to the files hash list string const strippedName = flNotDir(FileName); - char Files[1000]; - snprintf(Files,sizeof(Files),"\n %s %lu %s\n %s", - string(MD5.Result()).c_str(),St.st_size, - strippedName.c_str(), - Tags.FindS("Files").c_str()); - - char ChecksumsSha1[1000]; - snprintf(ChecksumsSha1,sizeof(ChecksumsSha1),"\n %s %lu %s\n %s", - string(SHA1.Result()).c_str(),St.st_size, - strippedName.c_str(), - Tags.FindS("Checksums-Sha1").c_str()); - - char ChecksumsSha256[1000]; - snprintf(ChecksumsSha256,sizeof(ChecksumsSha256),"\n %s %lu %s\n %s", - string(SHA256.Result()).c_str(),St.st_size, - strippedName.c_str(), - Tags.FindS("Checksums-Sha256").c_str()); + std::ostringstream ostreamFiles; + ostreamFiles << "\n " << string(MD5.Result()) << " " << St.st_size << " " + << strippedName << "\n " << Tags.FindS("Files"); + string const Files = ostreamFiles.str(); + + std::ostringstream ostreamSha1; + ostreamSha1 << "\n " << string(SHA1.Result()) << " " << St.st_size << " " + << strippedName << "\n " << Tags.FindS("Checksums-Sha1"); + string const ChecksumsSha1 = ostreamSha1.str(); + + std::ostringstream ostreamSha256; + ostreamSha256 << "\n " << string(SHA256.Result()) << " " << St.st_size << " " + << strippedName << "\n " << Tags.FindS("Checksums-Sha256"); + string const ChecksumsSha256 = ostreamSha256.str(); // Strip the DirStrip prefix from the FileName and add the PathPrefix string NewFileName; @@ -740,7 +738,7 @@ bool SourcesWriter::DoPackage(string FileName) // Perform the delinking operation over all of the files string ParseJnk; - const char *C = Files; + const char *C = Files.c_str(); char *RealPath = NULL; for (;isspace(*C); C++); while (*C != 0) @@ -773,9 +771,9 @@ bool SourcesWriter::DoPackage(string FileName) unsigned int End = 0; SetTFRewriteData(Changes[End++],"Source",Package.c_str(),"Package"); - SetTFRewriteData(Changes[End++],"Files",Files); - SetTFRewriteData(Changes[End++],"Checksums-Sha1",ChecksumsSha1); - SetTFRewriteData(Changes[End++],"Checksums-Sha256",ChecksumsSha256); + SetTFRewriteData(Changes[End++],"Files",Files.c_str()); + SetTFRewriteData(Changes[End++],"Checksums-Sha1",ChecksumsSha1.c_str()); + SetTFRewriteData(Changes[End++],"Checksums-Sha256",ChecksumsSha256.c_str()); if (Directory != "./") SetTFRewriteData(Changes[End++],"Directory",Directory.c_str()); SetTFRewriteData(Changes[End++],"Priority",BestPrio.c_str()); -- cgit v1.2.3 From ca964703dd3442724c0ccac0ade717042ca8fce5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 23 Apr 2010 17:19:57 +0200 Subject: * cmdline/apt-cache.cc: - align Installed and Candidate Version in policy so they can be compared easier, thanks Ralf Gesellensetter for the pointer! (Closes: #578657) --- cmdline/apt-cache.cc | 12 ++++++++++-- debian/changelog | 3 +++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 07b95e3ca..b0034bf6d 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1585,6 +1585,14 @@ bool Policy(CommandLine &CmdL) } string const myArch = _config->Find("APT::Architecture"); + char const * const msgInstalled = _(" Installed: "); + char const * const msgCandidate = _(" Candidate: "); + short const InstalledLessCandidate = + mbstowcs(NULL, msgInstalled, 0) - mbstowcs(NULL, msgCandidate, 0); + short const deepInstalled = + (InstalledLessCandidate < 0 ? (InstalledLessCandidate*-1) : 0) - 1; + short const deepCandidate = + (InstalledLessCandidate > 0 ? (InstalledLessCandidate) : 0) - 1; // Print out detailed information for each package for (const char **I = CmdL.FileList + 1; *I != 0; I++) @@ -1604,14 +1612,14 @@ bool Policy(CommandLine &CmdL) cout << Pkg.FullName(true) << ":" << endl; // Installed version - cout << _(" Installed: "); + cout << msgInstalled << OutputInDepth(deepInstalled, " "); if (Pkg->CurrentVer == 0) cout << _("(none)") << endl; else cout << Pkg.CurrentVer().VerStr() << endl; // Candidate Version - cout << _(" Candidate: "); + cout << msgCandidate << OutputInDepth(deepCandidate, " "); pkgCache::VerIterator V = Plcy.GetCandidateVer(Pkg); if (V.end() == true) cout << _("(none)") << endl; diff --git a/debian/changelog b/debian/changelog index 8c0ac3314..7ef1fb2a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,9 @@ apt (0.7.26~exp4) experimental; urgency=low Thanks to Kel Modderman for report & patch! (Closes: #577226) * ftparchive/writer.cc: - remove 999 chars Files and Checksums rewrite limit (Closes: #577759) + * cmdline/apt-cache.cc: + - align Installed and Candidate Version in policy so they can be compared + easier, thanks Ralf Gesellensetter for the pointer! (Closes: #578657) [ Jari Aalto ] * cmdline/apt-get.cc: -- cgit v1.2.3 From 75a53a7c29bf3b2dd8d898ed650b1fe937119080 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 24 Apr 2010 09:39:46 +0200 Subject: * doc/apt.ent: - Add a note about APT_CONFIG in the -c description (Closes: #578267) --- debian/changelog | 2 ++ doc/apt.ent | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7ef1fb2a7..2e786c68f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ apt (0.7.26~exp4) experimental; urgency=low * cmdline/apt-cache.cc: - align Installed and Candidate Version in policy so they can be compared easier, thanks Ralf Gesellensetter for the pointer! (Closes: #578657) + * doc/apt.ent: + - Add a note about APT_CONFIG in the -c description (Closes: #578267) [ Jari Aalto ] * cmdline/apt-get.cc: diff --git a/doc/apt.ent b/doc/apt.ent index 19da4429e..c463f7811 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -261,7 +261,9 @@ <term><option>--config-file</option></term> <listitem><para>Configuration File; Specify a configuration file to use. The program will read the default configuration file and then this - configuration file. See &apt-conf; for syntax information. + configuration file. If configuration settings need to be set before the + default configuration files are parsed specify a file with the <envar>APT_CONFIG</envar> + environment variable. See &apt-conf; for syntax information. </para> </listitem> </varlistentry> -- cgit v1.2.3 From 3b796dfc90d6ca9d42077bddd38665b0b93a2266 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 24 Apr 2010 10:49:48 +0200 Subject: show non-candidates as fallback for virtual packages (Closes: #578385) --- cmdline/apt-get.cc | 19 +++++++++++++------ debian/changelog | 1 + 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 9d67a82f8..672f64c68 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1147,20 +1147,27 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, Pkg.FullName(true).c_str()); pkgCache::PrvIterator I = Pkg.ProvidesList(); + unsigned short provider = 0; for (; I.end() == false; I++) { pkgCache::PkgIterator Pkg = I.OwnerPkg(); if (Cache[Pkg].CandidateVerIter(Cache) == I.OwnerVer()) { + c1out << " " << Pkg.FullName(true) << " " << I.OwnerVer().VerStr(); if (Cache[Pkg].Install() == true && Cache[Pkg].NewInstall() == false) - c1out << " " << Pkg.FullName(true) << " " << I.OwnerVer().VerStr() << - _(" [Installed]") << endl; - else - c1out << " " << Pkg.FullName(true) << " " << I.OwnerVer().VerStr() << endl; - } + c1out << _(" [Installed]"); + c1out << endl; + ++provider; + } } - c1out << _("You should explicitly select one to install.") << endl; + // if we found no candidate which provide this package, show non-candidates + if (provider == 0) + for (I = Pkg.ProvidesList(); I.end() == false; I++) + c1out << " " << I.OwnerPkg().FullName(true) << " " << I.OwnerVer().VerStr() + << _(" [Not candidate version]") << endl; + else + c1out << _("You should explicitly select one to install.") << endl; } else { diff --git a/debian/changelog b/debian/changelog index 2e786c68f..8adfca8fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ apt (0.7.26~exp4) experimental; urgency=low - display MD5Sum in --print-uris if not forced to use another method instead of displaying the strongest available (Closes: #576420) - regex for package names executed on Grp- not PkgIterator + - show non-candidates as fallback for virtual packages (Closes: #578385) * apt-pkg/deb/dpkgpm.cc: - remove Chroot-Directory from files passed to install commands. Thanks to Kel Modderman for report & patch! (Closes: #577226) -- cgit v1.2.3 From 972556e368479736720cba242dfdf6baa961b0d9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 24 Apr 2010 11:02:30 +0200 Subject: * doc/po/de.po: - correct typos in german apt_preferences manpage, thanks Chris Leick! --- debian/changelog | 2 ++ doc/po/de.po | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8adfca8fb..94f0cf688 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,8 @@ apt (0.7.26~exp4) experimental; urgency=low easier, thanks Ralf Gesellensetter for the pointer! (Closes: #578657) * doc/apt.ent: - Add a note about APT_CONFIG in the -c description (Closes: #578267) + * doc/po/de.po: + - correct typos in german apt_preferences manpage, thanks Chris Leick! [ Jari Aalto ] * cmdline/apt-get.cc: diff --git a/doc/po/de.po b/doc/po/de.po index 9270ecef3..5664eb780 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: apt-doc 0.7.24\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" "POT-Creation-Date: 2010-03-19 11:14+0100\n" -"PO-Revision-Date: 2010-03-22 07:41+0100\n" +"PO-Revision-Date: 2010-04-21 14:04+0200\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -1120,7 +1120,7 @@ msgid "" msgstr "" "<!ENTITY translation-holder \"\n" " Die deutsche Übersetzung wurde 2009 von Chris Leick <email>c.leick@vollbio.de</email> angefertigt\n" -" in Zusammenarbeit mit dem Debian German-l10n-Team <email>debian-l10n-german@lists.debian.org</email>.\n" +" in Zusammenarbeit mit dem Deutschen l10n-Team von Debian <email>debian-l10n-german@lists.debian.org</email>.\n" "\">\n" #. type: Plain text @@ -8683,7 +8683,7 @@ msgid "" msgstr "" "Eine Version eines Pakets, dessen Ursprung nicht das lokale System ist, aber " "ein anderer in &sources-list; aufgelisteter Ort und der zu einer " -"<literal>unstable</literal>-Distribution gehört. wird nur installiert, falls " +"<literal>unstable</literal>-Distribution gehört, wird nur installiert, falls " "es zur Installation ausgewählt wurde und nicht bereits eine Version des " "Pakets installiert ist." @@ -9023,7 +9023,7 @@ msgstr "" "Paketversionen eine höhere Priorität als die Vorgabe (500) zu geben, die zu " "einer <literal>stable</literal>-Distribution gehören und eine ungeheuer " "niedrige Priorität Paketversionen, die zu anderen <literal>Debian</literal>-" -"Distribution gehören. <placeholder type=\"programlisting\" id=\"0\"/>" +"Distributionen gehören. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml:507 apt_preferences.5.xml:553 -- cgit v1.2.3 From 6838dd8781d2986e51b7c65b7b404a70cfcd2321 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 24 Apr 2010 12:15:59 +0200 Subject: * apt-pkg/sourcelist.cc: - be less strict and accept [option=value] as well --- apt-pkg/sourcelist.cc | 7 +++++++ debian/changelog | 2 ++ 2 files changed, 9 insertions(+) diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index a860c7eac..e13472fa6 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -94,6 +94,13 @@ bool pkgSourceList::Type::ParseLine(vector<metaIndex *> &List, if (option.length() < 3) return _error->Error(_("Malformed line %lu in source list %s ([option] too short)"),CurLine,File.c_str()); + // accept options even if the last has no space before the ]-end marker + if (option.at(option.length()-1) == ']') + { + for (; *Buffer != ']'; --Buffer); + option.resize(option.length()-1); + } + size_t const needle = option.find('='); if (needle == string::npos) return _error->Error(_("Malformed line %lu in source list %s ([%s] is not an assignment)"),CurLine,File.c_str(), option.c_str()); diff --git a/debian/changelog b/debian/changelog index 94f0cf688..f78f80936 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,8 @@ apt (0.7.26~exp4) experimental; urgency=low - Add a note about APT_CONFIG in the -c description (Closes: #578267) * doc/po/de.po: - correct typos in german apt_preferences manpage, thanks Chris Leick! + * apt-pkg/sourcelist.cc: + - be less strict and accept [option=value] as well [ Jari Aalto ] * cmdline/apt-get.cc: -- cgit v1.2.3 From c3a3a1b1b68706df40dc022bdcdf8ede684f5956 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 24 Apr 2010 12:44:11 +0200 Subject: * apt-pkg/contrib/configuration.cc: - error out if #clear directive has no argument --- apt-pkg/contrib/configuration.cc | 2 ++ debian/changelog | 2 ++ 2 files changed, 4 insertions(+) diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 7588b041c..9129d92f0 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -773,6 +773,8 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool const &AsSectio else return _error->Error(_("Syntax error %s:%u: Unsupported directive '%s'"),FName.c_str(),CurLine,Tag.c_str()); } + else if (Tag.empty() == true && NoWord == false && Word == "#clear") + return _error->Error(_("Syntax error %s:%u: clear directive requires an option tree as argument"),FName.c_str(),CurLine); else { // Set the item in the configuration class diff --git a/debian/changelog b/debian/changelog index f78f80936..ee2be291b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,8 @@ apt (0.7.26~exp4) experimental; urgency=low - correct typos in german apt_preferences manpage, thanks Chris Leick! * apt-pkg/sourcelist.cc: - be less strict and accept [option=value] as well + * apt-pkg/contrib/configuration.cc: + - error out if #clear directive has no argument [ Jari Aalto ] * cmdline/apt-get.cc: -- cgit v1.2.3 From 08bd372d9dd5e4a56176ec08bf6e7870ecd41b32 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 24 Apr 2010 13:15:33 +0200 Subject: set also "all" to this version for pseudo packages in TryToChangeVer --- cmdline/apt-get.cc | 5 +++++ debian/changelog | 1 + 2 files changed, 6 insertions(+) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 672f64c68..b43164c2f 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1264,6 +1264,11 @@ bool TryToChangeVer(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, } Cache.SetCandidateVersion(Ver); + + // Set the all package to the same candidate + if (Ver.Pseudo() == true) + Cache.SetCandidateVersion(Match.Find(Pkg.Group().FindPkg("all"))); + return true; } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index ee2be291b..a1a289ab3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ apt (0.7.26~exp4) experimental; urgency=low instead of displaying the strongest available (Closes: #576420) - regex for package names executed on Grp- not PkgIterator - show non-candidates as fallback for virtual packages (Closes: #578385) + - set also "all" to this version for pseudo packages in TryToChangeVer * apt-pkg/deb/dpkgpm.cc: - remove Chroot-Directory from files passed to install commands. Thanks to Kel Modderman for report & patch! (Closes: #577226) -- cgit v1.2.3 From 77278c2b5249162036121c20d537ca53e5914f0d Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Wed, 28 Apr 2010 09:41:44 +0200 Subject: * [ Abi break ] apt-pkg/acquire-item.{cc,h}: - add "IsIndexFile" to constructor of pkgAcqFile so that it sends the right cache control headers --- apt-pkg/acquire-item.cc | 14 ++++++++++++-- apt-pkg/acquire-item.h | 9 ++++++++- debian/changelog | 3 +++ 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index d2aca597e..270838f0e 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1539,8 +1539,9 @@ void pkgAcqArchive::Finished() /* The file is added to the queue */ pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string Hash, unsigned long Size,string Dsc,string ShortDesc, - const string &DestDir, const string &DestFilename) : - Item(Owner), ExpectedHash(Hash) + const string &DestDir, const string &DestFilename, + bool IsIndexFile) : + Item(Owner), ExpectedHash(Hash), IsIndexFile(IsIndexFile) { Retries = _config->FindI("Acquire::Retries",0); @@ -1655,3 +1656,12 @@ void pkgAcqFile::Failed(string Message,pkgAcquire::MethodConfig *Cnf) Item::Failed(Message,Cnf); } /*}}}*/ +// AcqIndex::Custom600Headers - Insert custom request headers /*{{{*/ +// --------------------------------------------------------------------- +/* The only header we use is the last-modified header. */ +string pkgAcqFile::Custom600Headers() +{ + if (IsIndexFile) + return "\nIndex-File: true"; +} + /*}}}*/ diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index 3f073de5b..592924f3b 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -856,6 +856,9 @@ class pkgAcqFile : public pkgAcquire::Item */ unsigned int Retries; + /** \brief Should this file be considered a index file */ + bool IsIndexFile; + public: // Specialized action members @@ -864,6 +867,7 @@ class pkgAcqFile : public pkgAcquire::Item pkgAcquire::MethodConfig *Cnf); virtual string DescURI() {return Desc.URI;}; virtual string HashSum() {return ExpectedHash.toStr(); }; + virtual string Custom600Headers(); /** \brief Create a new pkgAcqFile object. * @@ -887,6 +891,8 @@ class pkgAcqFile : public pkgAcquire::Item * * \param DestFilename The filename+path the file is downloaded to. * + * \param IsIndexFile The file is considered a IndexFile and cache-control + * headers like "cache-control: max-age=0" are send * * If DestFilename is empty, download to DestDir/<basename> if * DestDir is non-empty, $CWD/<basename> otherwise. If @@ -896,7 +902,8 @@ class pkgAcqFile : public pkgAcquire::Item pkgAcqFile(pkgAcquire *Owner, string URI, string Hash, unsigned long Size, string Desc, string ShortDesc, - const string &DestDir="", const string &DestFilename=""); + const string &DestDir="", const string &DestFilename="", + bool IsIndexFile=false); }; /*}}}*/ /** @} */ diff --git a/debian/changelog b/debian/changelog index 896f850b0..b23327be1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,9 @@ apt (0.7.25.4) UNRELEASED; urgency=low error out (LP: #502641) * apt-pkg/indexfile.cc: - deal correctly with three letter langcodes (LP: #391409) + * [ Abi break ] apt-pkg/acquire-item.{cc,h}: + - add "IsIndexFile" to constructor of pkgAcqFile so that it sends + the right cache control headers [ Robert Collins ] * Change the package index Info methods to allow apt-cache policy to be -- cgit v1.2.3 From 0c01e682d29051d4e26ea60e378796d30569ba5f Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Wed, 28 Apr 2010 15:45:06 +0200 Subject: * apt-pkg/depcache.cc: - fix incorrect std::cout usage for debug output --- apt-pkg/depcache.cc | 4 ++-- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index ec7a5de64..37b1c889d 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -186,7 +186,7 @@ bool pkgDepCache::readStateFile(OpProgress *Prog) /*{{{*/ if(reason > 0) PkgState[pkg->ID].Flags |= Flag::Auto; if(debug_autoremove) - std::cout << "Auto-Installed : " << pkgname << std::endl; + std::clog << "Auto-Installed : " << pkgname << std::endl; amt+=section.size(); if(Prog != NULL) Prog->OverallProgress(amt, file_size, 1, @@ -1511,7 +1511,7 @@ bool pkgDepCache::Sweep() /*{{{*/ { state.Garbage=true; if(debug_autoremove) - std::cout << "Garbage: " << p.Name() << std::endl; + std::clog << "Garbage: " << p.Name() << std::endl; } } diff --git a/debian/changelog b/debian/changelog index b23327be1..5211fc649 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,8 @@ apt (0.7.25.4) UNRELEASED; urgency=low * [ Abi break ] apt-pkg/acquire-item.{cc,h}: - add "IsIndexFile" to constructor of pkgAcqFile so that it sends the right cache control headers + * apt-pkg/depcache.cc: + - fix incorrect std::cout usage for debug output [ Robert Collins ] * Change the package index Info methods to allow apt-cache policy to be -- cgit v1.2.3 From 4dec007b1d8af31824903ffa3099ff4839ab528e Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Wed, 28 Apr 2010 15:49:55 +0200 Subject: apt-pkg/policy.cc: yet another cout -> clog fix --- apt-pkg/policy.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index f9901bc9a..a24ab7452 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -106,7 +106,7 @@ bool pkgPolicy::InitDefaults() if (_config->FindB("Debug::pkgPolicy",false) == true) for (pkgCache::PkgFileIterator F = Cache->FileBegin(); F != Cache->FileEnd(); F++) - cout << "Prio of " << F.FileName() << ' ' << PFPriority[F->ID] << endl; + std::clog << "Prio of " << F.FileName() << ' ' << PFPriority[F->ID] << std::endl; return true; } -- cgit v1.2.3 From edde664d0cc5fe46f572696c605832700c553b9e Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 28 Apr 2010 16:25:05 +0200 Subject: rewrite the pseudo package reinstaller to be more intelligent in his package choices The previous implementation tried to install the package for arch A and if this fails B, C and so on. This results in wrong architecture choices for packages which depend on other pseudo packages, so he will now try to install the dependencies first before trying the package itself and only if this fails he tries the next architecture. --- apt-pkg/depcache.cc | 120 +++++++++++++++++++++++++++++++++++----------------- apt-pkg/depcache.h | 2 + debian/changelog | 3 +- 3 files changed, 86 insertions(+), 39 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 0f07de2fe..a63deee3a 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -841,45 +841,15 @@ void pkgDepCache::Update(OpProgress *Prog) if (installed == false) recheck.insert(G.Index()); } - std::vector<std::string> Archs = APT::Configuration::getArchitectures(); - bool checkChanged = false; - do { - for(std::set<unsigned long>::const_iterator g = recheck.begin(); - g != recheck.end(); ++g) { - GrpIterator G = GrpIterator(*Cache, Cache->GrpP + *g); - VerIterator allV = G.FindPkg("all").CurrentVer(); - for (std::vector<std::string>::const_iterator a = Archs.begin(); - a != Archs.end(); ++a) - { - PkgIterator P = G.FindPkg(*a); - if (P.end() == true) continue; - for (VerIterator V = P.VersionList(); V.end() != true; ++V) - { - if (allV->Hash != V->Hash || - strcmp(allV.VerStr(),V.VerStr()) != 0) - continue; - unsigned char const CurDepState = VersionState(V.DependsList(),DepInstall,DepInstMin,DepInstPolicy); - if ((CurDepState & DepInstMin) != DepInstMin) - break; // we found the correct version, but it is broken. Better try another arch or later again - RemoveSizes(P); - RemoveStates(P); - P->CurrentVer = V.Index(); - PkgState[P->ID].InstallVer = V; - AddStates(P); - Update(P); - AddSizes(P); - checkChanged = true; - break; - } - } - recheck.erase(g); - } - } while (checkChanged == true && recheck.empty() == false); - if (_config->FindB("Debug::MultiArchKiller", false) == true) - for(std::set<unsigned long>::const_iterator g = recheck.begin(); - g != recheck.end(); ++g) - std::cout << "No pseudo package for »" << GrpIterator(*Cache, Cache->GrpP + *g).Name() << "« installed" << std::endl; + while (recheck.empty() != true) + { + std::set<unsigned long>::const_iterator g = recheck.begin(); + unsigned long const G = *g; + recheck.erase(g); + if (unlikely(ReInstallPseudoForGroup(G, recheck) == false)) + _error->Warning(_("Internal error, group »%s« has no installable pseudo package"), GrpIterator(*Cache, Cache->GrpP + *g).Name()); + } } if (Prog != 0) @@ -888,6 +858,80 @@ void pkgDepCache::Update(OpProgress *Prog) readStateFile(Prog); } /*}}}*/ +// DepCache::ReInstallPseudoForGroup - MultiArch helper for Update() /*{{{*/ +// --------------------------------------------------------------------- +/* RemovePseudoInstalledPkg() is very successful. It even kills packages + to an amount that no pseudo package is left, but we need a pseudo package + for upgrading senarios so we need to reinstall one pseudopackage which + doesn't break everything. Thankfully we can't have architecture depending + negative dependencies so this problem is already eliminated */ +bool pkgDepCache::ReInstallPseudoForGroup(pkgCache::PkgIterator const &P, std::set<unsigned long> &recheck) +{ + if (P->CurrentVer != 0) + return true; + // recursive call for packages which provide this package + for (pkgCache::PrvIterator Prv = P.ProvidesList(); Prv.end() != true; ++Prv) + ReInstallPseudoForGroup(Prv.OwnerPkg(), recheck); + // check if we actually need to look at this group + unsigned long const G = P->Group; + std::set<unsigned long>::const_iterator Pi = recheck.find(G); + if (Pi == recheck.end()) + return true; + recheck.erase(Pi); // remove here, so we can't fall into an endless loop + if (unlikely(ReInstallPseudoForGroup(G, recheck) == false)) + { + recheck.insert(G); + return false; + } + return true; +} +bool pkgDepCache::ReInstallPseudoForGroup(unsigned long const &G, std::set<unsigned long> &recheck) +{ + std::vector<std::string> static const Archs = APT::Configuration::getArchitectures(); + pkgCache::GrpIterator Grp(*Cache, Cache->GrpP + G); + if (unlikely(Grp.end() == true)) + return false; + for (std::vector<std::string>::const_iterator a = Archs.begin(); + a != Archs.end(); ++a) + { + pkgCache::PkgIterator P = Grp.FindPkg(*a); + if (P.end() == true) + continue; + pkgCache::VerIterator allV = Grp.FindPkg("all").CurrentVer(); + for (VerIterator V = P.VersionList(); V.end() != true; ++V) + { + // search for the same version as the all package + if (allV->Hash != V->Hash || strcmp(allV.VerStr(),V.VerStr()) != 0) + continue; + unsigned char const CurDepState = VersionState(V.DependsList(),DepInstall,DepInstMin,DepInstPolicy); + // If it is broken, try to install dependencies first before retry + if ((CurDepState & DepInstMin) != DepInstMin) + { + for (pkgCache::DepIterator D = V.DependsList(); D.end() != true; ++D) + { + if (D->Type != pkgCache::Dep::PreDepends && D->Type != pkgCache::Dep::Depends) + continue; + ReInstallPseudoForGroup(D.TargetPkg(), recheck); + } + unsigned char const CurDepState = VersionState(V.DependsList(),DepInstall,DepInstMin,DepInstPolicy); + // if package ist still broken… try another arch + if ((CurDepState & DepInstMin) != DepInstMin) + break; + } + // dependencies satisfied: reinstall the package + RemoveSizes(P); + RemoveStates(P); + P->CurrentVer = V.Index(); + PkgState[P->ID].InstallVer = V; + AddStates(P); + Update(P); + AddSizes(P); + return true; + } + } + return false; +} + /*}}}*/ // DepCache::Update - Update the deps list of a package /*{{{*/ // --------------------------------------------------------------------- /* This is a helper for update that only does the dep portion of the scan. diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 72b9b5d4d..3decc7a5f 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -470,6 +470,8 @@ class pkgDepCache : protected pkgCache::Namespace private: // Helper for Update(OpProgress) to remove pseudoinstalled arch all packages bool RemovePseudoInstalledPkg(PkgIterator &Pkg, std::set<unsigned long> &recheck); + bool ReInstallPseudoForGroup(unsigned long const &Grp, std::set<unsigned long> &recheck); + bool ReInstallPseudoForGroup(pkgCache::PkgIterator const &P, std::set<unsigned long> &recheck); }; #endif diff --git a/debian/changelog b/debian/changelog index a1a289ab3..dd003938a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,8 @@ apt (0.7.26~exp4) experimental; urgency=low [ David Kalnischkies ] * apt-pkg/depcache.cc: - - "reinstall" the correct version for a killed pseudo package + - rewrite the pseudo package reinstaller to be more intelligent + in his package choices * apt-pkg/packagemanager.cc: - don't try to "unpack" pseudo packages twice * apt-pkg/contrib/fileutl.cc: -- cgit v1.2.3 From 8f40076991ecc89ab1e3c486da2696a44c285f18 Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Mon, 3 May 2010 10:07:13 +0200 Subject: * apt-pkg/indexfile.cc: - If no "_" is found in the language code, try to find a "." This is required for languages like Esperanto that have no county associated with them (LP: #560956) Thanks to "Aisano" for the fix --- apt-pkg/indexfile.cc | 2 ++ debian/changelog | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc index 34fd71b20..5a82b7b2e 100644 --- a/apt-pkg/indexfile.cc +++ b/apt-pkg/indexfile.cc @@ -127,6 +127,8 @@ string pkgIndexFile::LanguageCode() if(lang.find("_") != lang.npos) return lang.substr(0, lang.find("_")); + else if(lang.find(".") != lang.npos) + return lang.substr(0, lang.find(".")); else return lang; } diff --git a/debian/changelog b/debian/changelog index 5211fc649..7c0024160 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,11 @@ apt (0.7.25.4) UNRELEASED; urgency=low the right cache control headers * apt-pkg/depcache.cc: - fix incorrect std::cout usage for debug output + * apt-pkg/indexfile.cc: + - If no "_" is found in the language code, try to find a "." + This is required for languages like Esperanto that have no + county associated with them (LP: #560956) + Thanks to "Aisano" for the fix [ Robert Collins ] * Change the package index Info methods to allow apt-cache policy to be -- cgit v1.2.3 From 583f7c147dc479bbdb431aa94c4d589d785207c3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Mon, 3 May 2010 16:55:11 +0200 Subject: =?UTF-8?q?replace=20=C2=BB=C2=AB=20with=20''=20in=20the=20interna?= =?UTF-8?q?l=20error=20msg=20to=20have=20ascii=20chars=20for=20gettext?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apt-pkg/depcache.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index a63deee3a..659c4227e 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -848,7 +848,7 @@ void pkgDepCache::Update(OpProgress *Prog) unsigned long const G = *g; recheck.erase(g); if (unlikely(ReInstallPseudoForGroup(G, recheck) == false)) - _error->Warning(_("Internal error, group »%s« has no installable pseudo package"), GrpIterator(*Cache, Cache->GrpP + *g).Name()); + _error->Warning(_("Internal error, group '%s' has no installable pseudo package"), GrpIterator(*Cache, Cache->GrpP + *g).Name()); } } -- cgit v1.2.3 From 86435b7d7bbf5bc7fab48a35631b8d20e61587b5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Mon, 3 May 2010 17:19:09 +0200 Subject: * doc/files.sgml: - sync documentation with status quo, regarding files/directories in use, extended_states and uri schemes. --- debian/changelog | 3 + doc/files.sgml | 181 ++++++++++++++++++++++++------------------------------- 2 files changed, 81 insertions(+), 103 deletions(-) diff --git a/debian/changelog b/debian/changelog index dd003938a..2f262a3a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -114,6 +114,9 @@ apt (0.7.26~exp3) experimental; urgency=low Thanks to Chris Leick and Georg Koppen! (Closes: #574962) * apt-pkg/contrib/strutl.cc: - convert all toupper calls to tolower_ascii for a little speedup + * doc/files.sgml: + - sync documentation with status quo, regarding files/directories in + use, extended_states and uri schemes. [ Jean-Baptiste Lallement ] * apt-pkg/contrib/strutl.cc: diff --git a/doc/files.sgml b/doc/files.sgml index 2293e204a..108e73670 100644 --- a/doc/files.sgml +++ b/doc/files.sgml @@ -42,40 +42,68 @@ multiple package files. The var directory structure is as follows: <example> /var/lib/apt/ - lists/ + lists/ partial/ - xstatus - userstatus - cdroms.list + periodic/ + extended_states + cdroms.list /var/cache/apt/ - pkgcache.bin - srcpkgcache.bin archives/ partial/ + pkgcache.bin + srcpkgcache.bin /etc/apt/ - sources.list - apt.conf + sources.list.d/ + apt.conf.d/ + preferences.d/ + trusted.gpg.d/ + sources.list + apt.conf + apt_preferences + trusted.gpg /usr/lib/apt/ - methods/ - cdrom - ftp - http - file - gzip - copy + methods/ + bzip2 + cdrom + copy + file + ftp + gpgv + gzip + http + https + lzma + rred + rsh + ssh </example> <p> As is specified in the FHS 2.1 /var/lib/apt is used for application data that is not expected to be user modified. /var/cache/apt is used for regeneratable data and is where the package cache and downloaded .debs -go. +go. /etc/apt is the place where configuration should happen and +/usr/lib/apt is the place where the apt and other packages can place +binaries which can be used by the acquire system of APT. </sect> <!-- }}} --> <chapt>Files <!-- Distribution Source List {{{ --> <!-- ===================================================================== --> +<sect>Files and fragment directories in /etc/apt + +<p> +All files in /etc/apt are used to modify specific aspects of APT. To enable +other packages to ship needed configuration herself all these files have +a fragment directory packages can place their files in instead of mangling +with the main files. The main files are therefore considered to be only +used by the user and not by a package. The documentation omits this directories +most of the time to be easier readable, so every time the documentation includes +a reference to a main file it really means the file or the fragment directories. + +</sect> + <sect>Distribution Source list (sources.list) <p> @@ -121,7 +149,10 @@ which indicates a standard debian archive with a dists dir. <sect1>URI specification <p> -URIs in the source list support a large number of access schemes. +URIs in the source list support a large number of access schemes which +are listed in the sources.list manpage and can be further extended by +transport binaries placed in /usr/lib/apt/methods. The most important +builtin schemes are: <taglist> <tag>cdrom<item> @@ -161,13 +192,6 @@ URIs in the source list support a large number of access schemes. <example> file:/var/debian </example> - -<tag>smb<item> - A possible future expansion may be to have direct support for smb (Samba - servers). - <example> - smb://ftp.kernel.org/pub/mirrors/debian - </example> </taglist> </sect1> @@ -201,38 +225,31 @@ here as well. </sect> <!-- }}} --> -<!-- Extra Status {{{ --> +<!-- Extended Status {{{ --> <!-- ===================================================================== --> -<sect>Extra Status File (xstatus) +<sect>Extended States File (extended_states) <p> -The extra status file serves the same purpose as the normal dpkg status file +The extended_states file serves the same purpose as the normal dpkg status file (/var/lib/dpkg/status) except that it stores information unique to apt. -This includes the autoflag, target distribution and version and any other -unique features that come up over time. It duplicates nothing from the normal +This includes currently only the autoflag but is open to store more +unique data that come up over time. It duplicates nothing from the normal dpkg status file. Please see other APT documentation for a discussion -of the exact internal behaviour of these fields. The Package field is -placed directly before the new fields to indicate which package they -apply to. The new fields are as follows: +of the exact internal behaviour of these fields. The Package and the +Architecture field are placed directly before the new fields to indicate +which package they apply to. The new fields are as follows: <taglist> -<tag>X-Auto<item> - The Auto flag can be Yes or No and controls whether the package is in - auto mode. - -<tag>X-TargetDist<item> - The TargetDist item indicates which distribution versions are offered for - installation from. It should be stable, unstable or testing. - -<tag>X-TargetVersion<item> - The target version item is set if the user selects a specific version, it - overrides the TargetDist selection if both are present. +<tag>Auto-Installed<item> + The Auto flag can be 1 (Yes) or 0 (No) and controls whether the package + was automatical installed to satisfy a dependency or if the user requested + the installation </taglist> </sect> <!-- }}} --> <!-- Binary Package Cache {{{ --> <!-- ===================================================================== --> -<sect>Binary Package Cache (pkgcache.bin) +<sect>Binary Package Cache (srcpkgcache.bin and pkgcache.bin) <p> Please see cache.sgml for a complete description of what this file is. The @@ -278,69 +295,27 @@ The Methods directory is more fully described in the APT Methods interface document. </sect> <!-- }}} --> -<!-- The Mirror List {{{ --> +<!-- The Configuration File {{{ --> <!-- ===================================================================== --> -<sect> The Mirror List +<sect> The Configuration File (/etc/apt/apt.conf) <p> -The mirror list is stored on the primary debian web server (www.debian.org) -and contains a machine readable list of all known debian mirrors. It's -format and style mirror the Package file. - -<taglist> -<tag>Site<item> -This is the proper host name of the site. It should not be a host within -debian.org and generally cnames should be avoided here. - -<tag>Aliases<item> -These list any commonly used aliases for the site. This field is used to make -sure that a site is not added twice. - -<tag>Type<item> -This field can either be <em>Push-Primary</> or <em>leaf</>. -<em>Push-Primary</> are authorized top level mirrors of the archive, all -other mirrors are leaf. - -<tag>Archive-[access]<item> -The Archive field gives the path(s) to the debian archive. [access] -specifies the access method and may be one of ftp, http, rsync, nfs, or -smb. For many of the types it is possible to prefix the path with :### -indicating that an alternate port should be used. Generally paths -start with a / and end with a /, rsync is an exception in that the -first directory component is not a path but a label. - -<tag>WWW-[access]<item> -The WWW field gives the path(s) to the debian web site. - -<tag>CDImage-[access]<item> -The WWW field gives the path(s) to the debian CD-ROM images - -<tag>Incoming-[access]<item> -The Incoming field gives the path(s) to a mirror of the debian incoming -directory. - -<tag>nonUS-[access]<item> -The nonUS field gives the path(s) to a mirror of the non-US distribution. - -<tag>Maintainer<item> -This is the email address of the maintainer of the mirror. - -<tag>Location<item> -Location gives the general geographical region the mirror is in. - -<tag>Sponsor<item> -The Sponsor field indicates who owns the mirror and a URL to a web page -describing the organization. - -<tag>Comment<item> -General free-form text. - -</taglist> +The configuration file (and the associated fragments directory +/etc/apt/apt.conf.d/) is described in the apt.conf manpage. +</sect> + <!-- }}} --> +<!-- The trusted.gpg File {{{ --> +<!-- ===================================================================== --> +<sect> The trusted.gpg File (/etc/apt/trusted.gpg) <p> -Some form of network measurement will have to be used to gauge performance -of each of the mirrors. This will be discussed later, initial versions -will use the first found URI. +The trusted.gpg file (and the files in the associated fragments directory +/etc/apt/trusted.gpg.d/) is a binary file including the keyring used +by apt to validate that the information (e.g. the Release file) it +downloads are really from the distributor it clams to be and is +unmodified and is therefore the last step in the chain of trust between +the archive and the end user. This security system is described in the +apt-secure manpage. </sect> <!-- }}} --> <!-- The Release File {{{ --> @@ -348,7 +323,7 @@ will use the first found URI. <sect> The Release File <p> -This file plays and important role in how APT presents the archive to the +This file plays an important role in how APT presents the archive to the user. Its main purpose is to present a descriptive name for the source of each version of each package. It also is used to detect when new versions of debian are released. It augments the package file it is associated with -- cgit v1.2.3 From 94449d7cd3eed7637c1ed78863c01ff207faa31e Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 4 May 2010 12:30:13 +0200 Subject: * doc/cache.sgml: - drop the file in favor of inplace documentation with doxygen --- apt-pkg/pkgcache.h | 469 ++++++++++++++++++++++++------ debian/changelog | 8 +- doc/cache.sgml | 824 ----------------------------------------------------- 3 files changed, 390 insertions(+), 911 deletions(-) delete mode 100644 doc/cache.sgml diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 577eebad9..a2e63ff03 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -1,20 +1,75 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: pkgcache.h,v 1.25 2001/07/01 22:28:24 jgg Exp $ -/* ###################################################################### - - Cache - Structure definitions for the cache file - - Please see doc/apt-pkg/cache.sgml for a more detailed description of - this format. Also be sure to keep that file up-to-date!! - +/**\file pkgcache.h + \brief pkgCache - Structure definitions for the cache file + + The goal of the cache file is two fold: + Firstly to speed loading and processing of the package file array and + secondly to reduce memory consumption of the package file array. + + The implementation is aimed at an environment with many primary package + files, for instance someone that has a Package file for their CD-ROM, a + Package file for the latest version of the distribution on the CD-ROM and a + package file for the development version. Always present is the information + contained in the status file which might be considered a separate package + file. + + Please understand, this is designed as a <b>Cache file</b> it is not meant to be + used on any system other than the one it was created for. It is not meant to + be authoritative either, i.e. if a system crash or software failure occurs it + must be perfectly acceptable for the cache file to be in an inconsistent + state. Furthermore at any time the cache file may be erased without losing + any information. + + Also the structures and storage layout is optimized for use by the APT + and may not be suitable for all purposes. However it should be possible + to extend it with associate cache files that contain other information. + + To keep memory use down the cache file only contains often used fields and + fields that are inexpensive to store, the Package file has a full list of + fields. Also the client may assume that all items are perfectly valid and + need not perform checks against their correctness. Removal of information + from the cache is possible, but blanks will be left in the file, and + unused strings will also be present. The recommended implementation is to + simply rebuild the cache each time any of the data files change. It is + possible to add a new package file to the cache without any negative side + effects. + + <b>Note on Pointer access</b> Clients should always use the CacheIterators classes for access to the - cache. They provide a simple STL-like method for traversing the links - of the datastructure. - - See pkgcachegen.h for information about generating cache structures. - - ##################################################################### */ + cache and the data in it. They also provide a simple STL-like method for + traversing the links of the datastructure. + + Every item in every structure is stored as the index to that structure. + What this means is that once the files is mmaped every data access has to + go through a fix up stage to get a real memory pointer. This is done + by taking the index, multiplying it by the type size and then adding + it to the start address of the memory block. This sounds complex, but + in C it is a single array dereference. Because all items are aligned to + their size and indexes are stored as multiples of the size of the structure + the format is immediately portable to all possible architectures - BUT the + generated files are -NOT-. + + This scheme allows code like this to be written: + <example> + void *Map = mmap(...); + Package *PkgList = (Package *)Map; + Header *Head = (Header *)Map; + char *Strings = (char *)Map; + cout << (Strings + PkgList[Head->HashTable[0]]->Name) << endl; + </example> + Notice the lack of casting or multiplication. The net result is to return + the name of the first package in the first hash bucket, without error + checks. + + The generator uses allocation pools to group similarly sized structures in + large blocks to eliminate any alignment overhead. The generator also + assures that no structures overlap and all indexes are unique. Although + at first glance it may seem like there is the potential for two structures + to exist at the same point the generator never allows this to happen. + (See the discussion of free space pools) + + See \ref pkgcachegen.h for more information about generating cache structures. */ /*}}}*/ #ifndef PKGLIB_PKGCACHE_H #define PKGLIB_PKGCACHE_H @@ -66,12 +121,20 @@ class pkgCache /*{{{*/ { enum DepType {Depends=1,PreDepends=2,Suggests=3,Recommends=4, Conflicts=5,Replaces=6,Obsoletes=7,DpkgBreaks=8,Enhances=9}; + /** \brief available compare operators + + The lower 4 bits are used to indicate what operator is being specified and + the upper 4 bits are flags. OR indicates that the next package is + or'd with the current package. */ enum DepCompareOp {Or=0x10,NoOp=0,LessEq=0x1,GreaterEq=0x2,Less=0x3, Greater=0x4,Equals=0x5,NotEquals=0x6}; }; struct State { + /** \brief priority of a package version + + Zero is used for unparsable or absent Priority fields. */ enum VerPriority {Important=1,Required=2,Standard=3,Optional=4,Extra=5}; enum PkgSelectedState {Unknown=0,Install=1,Hold=2,DeInstall=3,Purge=4}; enum PkgInstState {Ok=0,ReInstReq=1,HoldInst=2,HoldReInstReq=3}; @@ -120,7 +183,7 @@ class pkgCache /*{{{*/ inline unsigned long Hash(const string &S) const {return sHash(S);}; inline unsigned long Hash(const char *S) const {return sHash(S);}; - // Usefull transformation things + // Useful transformation things const char *Priority(unsigned char Priority); // Accessors @@ -157,13 +220,29 @@ private: // Header structure /*{{{*/ struct pkgCache::Header { - // Signature information + /** \brief Signature information + + This must contain the hex value 0x98FE76DC which is designed to + verify that the system loading the image has the same byte order + and byte size as the system saving the image */ unsigned long Signature; + /** These contain the version of the cache file */ short MajorVersion; short MinorVersion; + /** \brief indicates if the cache should be erased + + Dirty is true if the cache file was opened for reading, the client + expects to have written things to it and have not fully synced it. + The file should be erased and rebuilt if it is true. */ bool Dirty; - - // Size of structure values + + /** \brief Size of structure values + + All *Sz variables contains the sizeof() that particular structure. + It is used as an extra consistency check on the structure of the file. + + If any of the size values do not exactly match what the client expects + then the client should refuse the load the file. */ unsigned short HeaderSz; unsigned short PackageSz; unsigned short PackageFileSz; @@ -173,8 +252,12 @@ struct pkgCache::Header unsigned short ProvidesSz; unsigned short VerFileSz; unsigned short DescFileSz; - - // Structure counts + + /** \brief Structure counts + + These indicate the number of each structure contained in the cache. + PackageCount is especially useful for generating user state structures. + See Package::Id for more info. */ unsigned long GroupCount; unsigned long PackageCount; unsigned long VersionCount; @@ -184,22 +267,48 @@ struct pkgCache::Header unsigned long VerFileCount; unsigned long DescFileCount; unsigned long ProvidesCount; - - // Offsets - map_ptrloc FileList; // struct PackageFile - map_ptrloc StringList; // struct StringItem - map_ptrloc VerSysName; // StringTable - map_ptrloc Architecture; // StringTable + + /** \brief index of the first PackageFile structure + + The PackageFile structures are singly linked lists that represent + all package files that have been merged into the cache. */ + map_ptrloc FileList; + /** \brief index of the first StringItem structure + + The cache contains a list of all the unique strings (StringItems). + The parser reads this list into memory so it can match strings + against it.*/ + map_ptrloc StringList; + /** \brief String representing the version system used */ + map_ptrloc VerSysName; + /** \brief Architecture(s) the cache was built against */ + map_ptrloc Architecture; + /** \brief The maximum size of a raw entry from the original Package file */ unsigned long MaxVerFileSize; + /** \brief The maximum size of a raw entry from the original Translation file */ unsigned long MaxDescFileSize; - /* Allocation pools, there should be one of these for each structure - excluding the header */ + /** \brief The Pool structures manage the allocation pools that the generator uses + + Start indicates the first byte of the pool, Count is the number of objects + remaining in the pool and ItemSize is the structure size (alignment factor) + of the pool. An ItemSize of 0 indicates the pool is empty. There should be + the same number of pools as there are structure types. The generator + stores this information so future additions can make use of any unused pool + blocks. */ DynamicMMap::Pool Pools[9]; - // Rapid package and group name lookup - // Notice: Increase only both table sizes as the - // hashmethod assume the size of the Pkg one + /** \brief hash tables providing rapid group/package name lookup + + Each group/package name is inserted into the hash table using pkgCache::Hash(const &string) + By iterating over each entry in the hash table it is possible to iterate over + the entire list of packages. Hash Collisions are handled with a singly linked + list of packages based at the hash item. The linked list contains only + packages that match the hashing function. + In the PkgHashTable is it possible that multiple packages have the same name - + these packages are stored as a sequence in the list. + + Beware: The Hashmethod assumes that the hash table sizes are equal */ map_ptrloc PkgHashTable[2*1048]; map_ptrloc GrpHashTable[2*1048]; @@ -207,140 +316,332 @@ struct pkgCache::Header Header(); }; /*}}}*/ -struct pkgCache::Group { /*{{{*/ - map_ptrloc Name; // Stringtable +// Group structure /*{{{*/ +/** \brief groups architecture depending packages together - // Linked List - map_ptrloc FirstPackage;// Package - map_ptrloc LastPackage; // Package - map_ptrloc Next; // Group + On or more packages with the same name form a group, so we have + a simple way to access a package built for different architectures + Group exists in a singly linked list of group records starting at + the hash index of the name in the pkgCache::Header::GrpHashTable */ +struct pkgCache::Group +{ + /** \brief Name of the group */ + map_ptrloc Name; // StringItem + + // Linked List + /** Link to the first package which belongs to the group */ + map_ptrloc FirstPackage; // Package + /** Link to the last package which belongs to the group */ + map_ptrloc LastPackage; // Package + /** Link to the next Group */ + map_ptrloc Next; // Group }; /*}}}*/ -struct pkgCache::Package /*{{{*/ +// Package structure /*{{{*/ +/** \brief contains information for a single unique package + + There can be any number of versions of a given package. + Package exists in a singly linked list of package records starting at + the hash index of the name in the pkgCache::Header::PkgHashTable + + A package can be created for every architecture so package names are + not unique, but it is garanteed that packages with the same name + are sequencel ordered in the list. Packages with the same name can be + accessed with the Group. +*/ +struct pkgCache::Package { - // Pointers - map_ptrloc Name; // Stringtable - map_ptrloc Arch; // StringTable (StringItem) + /** \brief Name of the package */ + map_ptrloc Name; // StringItem + /** \brief Architecture of the package */ + map_ptrloc Arch; // StringItem + /** \brief Base of a singly linked list of versions + + Each structure represents a unique version of the package. + The version structures contain links into PackageFile and the + original text file as well as detailed information about the size + and dependencies of the specific package. In this way multiple + versions of a package can be cleanly handled by the system. + Furthermore, this linked list is guaranteed to be sorted + from Highest version to lowest version with no duplicate entries. */ map_ptrloc VersionList; // Version + /** \brief index to the installed version */ map_ptrloc CurrentVer; // Version - map_ptrloc Section; // StringTable (StringItem) + /** \brief indicates the deduced section + + Should be the index to the string "Unknown" or to the section + of the last parsed item. */ + map_ptrloc Section; // StringItem + /** \brief index of the group this package belongs to */ map_ptrloc Group; // Group the Package belongs to - - // Linked list + + // Linked list + /** \brief Link to the next package in the same bucket */ map_ptrloc NextPackage; // Package + /** \brief List of all dependencies on this package */ map_ptrloc RevDepends; // Dependency + /** \brief List of all "packages" this package provide */ map_ptrloc ProvidesList; // Provides // Install/Remove/Purge etc + /** \brief state that the user wishes the package to be in */ unsigned char SelectedState; // What + /** \brief installation state of the package + + This should be "ok" but in case the installation failed + it will be different. + */ unsigned char InstState; // Flags + /** \brief indicates if the package is installed */ unsigned char CurrentState; // State - + + /** \brief unique sequel ID + + ID is a unique value from 0 to Header->PackageCount assigned by the generator. + This allows clients to create an array of size PackageCount and use it to store + state information for the package map. For instance the status file emitter uses + this to track which packages have been emitted already. */ unsigned int ID; + /** \brief some useful indicators of the package's state */ unsigned long Flags; }; /*}}}*/ -struct pkgCache::PackageFile /*{{{*/ +// Package File structure /*{{{*/ +/** \brief stores information about the files used to generate the cache + + Package files are referenced by Version structures to be able to know + after the generation still from which Packages file includes this Version + as we need this information later on e.g. for pinning. */ +struct pkgCache::PackageFile { - // Names - map_ptrloc FileName; // Stringtable - map_ptrloc Archive; // Stringtable - map_ptrloc Codename; // Stringtable - map_ptrloc Component; // Stringtable - map_ptrloc Version; // Stringtable - map_ptrloc Origin; // Stringtable - map_ptrloc Label; // Stringtable - map_ptrloc Architecture; // Stringtable - map_ptrloc Site; // Stringtable - map_ptrloc IndexType; // Stringtable - unsigned long Size; + /** \brief physical disk file that this PackageFile represents */ + map_ptrloc FileName; // StringItem + /** \brief the release information + + Please see the files document for a description of what the + release information means. */ + map_ptrloc Archive; // StringItem + map_ptrloc Codename; // StringItem + map_ptrloc Component; // StringItem + map_ptrloc Version; // StringItem + map_ptrloc Origin; // StringItem + map_ptrloc Label; // StringItem + map_ptrloc Architecture; // StringItem + /** \brief The site the index file was fetched from */ + map_ptrloc Site; // StringItem + /** \brief indicates what sort of index file this is + + @TODO enumerate at least the possible indexes */ + map_ptrloc IndexType; // StringItem + /** \brief Size of the file + + Used together with the modification time as a + simple check to ensure that the Packages + file has not been altered since Cache generation. */ + unsigned long Size; + /** \brief Modification time for the file */ + time_t mtime; + + /* @TODO document PackageFile::Flags */ unsigned long Flags; - + // Linked list + /** \brief Link to the next PackageFile in the Cache */ map_ptrloc NextFile; // PackageFile + /** \brief unique sequel ID */ unsigned int ID; - time_t mtime; // Modification time for the file }; /*}}}*/ -struct pkgCache::VerFile /*{{{*/ +// VerFile structure /*{{{*/ +/** \brief associates a version with a PackageFile + + This allows a full description of all Versions in all files + (and hence all sources) under consideration. */ +struct pkgCache::VerFile { + /** \brief index of the package file that this version was found in */ map_ptrloc File; // PackageFile + /** \brief next step in the linked list */ map_ptrloc NextFile; // PkgVerFile + /** \brief position in the package file */ map_ptrloc Offset; // File offset + /* @TODO document pkgCache::VerFile::Size */ unsigned long Size; }; /*}}}*/ -struct pkgCache::DescFile /*{{{*/ +// DescFile structure /*{{{*/ +/** \brief associates a description with a Translation file */ +struct pkgCache::DescFile { + /** \brief index of the file that this description was found in */ map_ptrloc File; // PackageFile + /** \brief next step in the linked list */ map_ptrloc NextFile; // PkgVerFile + /** \brief position in the file */ map_ptrloc Offset; // File offset + /* @TODO document pkgCache::DescFile::Size */ unsigned long Size; }; /*}}}*/ -struct pkgCache::Version /*{{{*/ +// Version structure /*{{{*/ +/** \brief information for a single version of a package + + The version list is always sorted from highest version to lowest + version by the generator. Equal version numbers are either merged + or handled as separate versions based on the Hash value. */ +struct pkgCache::Version { - map_ptrloc VerStr; // Stringtable - map_ptrloc Section; // StringTable (StringItem) + /** \brief complete version string */ + map_ptrloc VerStr; // StringItem + /** \brief section this version is filled in */ + map_ptrloc Section; // StringItem + /** \brief stores the MultiArch capabilities of this version + + None is the default and doesn't trigger special behaviour, + Foreign means that this version can fulfill dependencies even + if it is built for another architecture as the requester. + Same indicates that builds for different architectures can + be co-installed on the system and All is the marker for a + version with the Architecture: all. */ enum {None, All, Foreign, Same, Allowed} MultiArch; - // Lists + /** \brief references all the PackageFile's that this version came from + + FileList can be used to determine what distribution(s) the Version + applies to. If FileList is 0 then this is a blank version. + The structure should also have a 0 in all other fields excluding + pkgCache::Version::VerStr and Possibly pkgCache::Version::NextVer. */ map_ptrloc FileList; // VerFile + /** \brief next (lower or equal) version in the linked list */ map_ptrloc NextVer; // Version + /** \brief next description in the linked list */ map_ptrloc DescriptionList; // Description + /** \brief base of the dependency list */ map_ptrloc DependsList; // Dependency + /** \brief links to the owning package + + This allows reverse dependencies to determine the package */ map_ptrloc ParentPkg; // Package + /** \brief list of pkgCache::Provides */ map_ptrloc ProvidesList; // Provides - + + /** \brief archive size for this version + + For Debian this is the size of the .deb file. */ map_ptrloc Size; // These are the .deb size + /** \brief uncompressed size for this version */ map_ptrloc InstalledSize; + /** \brief characteristic value representing this version + + No two packages in existence should have the same VerStr + and Hash with different contents. */ unsigned short Hash; + /** \brief unique sequel ID */ unsigned int ID; + /** \brief parsed priority value */ unsigned char Priority; }; /*}}}*/ -struct pkgCache::Description /*{{{*/ +// Description structure /*{{{*/ +/** \brief datamember of a linked list of available description for a version */ +struct pkgCache::Description { - // Language Code store the description translation language code. If - // the value has a 0 lenght then this is readed using the Package - // file else the Translation-CODE are used. - map_ptrloc language_code; // StringTable - map_ptrloc md5sum; // StringTable + /** \brief Language code of this description (translation) + + If the value has a 0 length then this is read using the Package + file else the Translation-CODE file is used. */ + map_ptrloc language_code; // StringItem + /** \brief MD5sum of the original description + + Used to map Translations of a description to a version + and to check that the Translation is up-to-date. */ + map_ptrloc md5sum; // StringItem - // Linked list + /* @TODO document pkgCache::Description::FileList */ map_ptrloc FileList; // DescFile + /** \brief next translation for this description */ map_ptrloc NextDesc; // Description + /** \brief the text is a description of this package */ map_ptrloc ParentPkg; // Package + /** \brief unique sequel ID */ unsigned int ID; }; /*}}}*/ -struct pkgCache::Dependency /*{{{*/ +// Dependency structure /*{{{*/ +/** \brief information for a single dependency record + + The records are split up like this to ease processing by the client. + The base of the linked list is pkgCache::Version::DependsList. + All forms of dependencies are recorded here including Depends, + Recommends, Suggests, Enhances, Conflicts, Replaces and Breaks. */ +struct pkgCache::Dependency { - map_ptrloc Version; // Stringtable + /** \brief string of the version the dependency is applied against */ + map_ptrloc Version; // StringItem + /** \brief index of the package this depends applies to + + The generator will - if the package does not already exist - + create a blank (no version records) package. */ map_ptrloc Package; // Package + /** \brief next dependency of this version */ map_ptrloc NextDepends; // Dependency + /** \brief next reverse dependency of this package */ map_ptrloc NextRevDepends; // Dependency + /** \brief version of the package which has the reverse depends */ map_ptrloc ParentVer; // Version - - // Specific types of depends - map_ptrloc ID; + + /** \brief unique sequel ID */ + map_ptrloc ID; + /** \brief Dependency type - Depends, Recommends, Conflicts, etc */ unsigned char Type; + /** \brief comparison operator specified on the depends line + + If the high bit is set then it is a logical OR with the previous record. */ unsigned char CompareOp; }; /*}}}*/ -struct pkgCache::Provides /*{{{*/ +// Provides structure /*{{{*/ +/** \brief handles virtual packages + + When a Provides: line is encountered a new provides record is added + associating the package with a virtual package name. + The provides structures are linked off the package structures. + This simplifies the analysis of dependencies and other aspects A provides + refers to a specific version of a specific package, not all versions need to + provide that provides.*/ +struct pkgCache::Provides { - map_ptrloc ParentPkg; // Pacakge + /** \brief index of the package providing this */ + map_ptrloc ParentPkg; // Package + /** \brief index of the version this provide line applies to */ map_ptrloc Version; // Version - map_ptrloc ProvideVersion; // Stringtable + /** \brief version in the provides line (if any) + + This version allows dependencies to depend on specific versions of a + Provides, as well as allowing Provides to override existing packages. + This is experimental. Note that Debian doesn't allow versioned provides */ + map_ptrloc ProvideVersion; // StringItem + /** \brief next provides (based of package) */ map_ptrloc NextProvides; // Provides + /** \brief next provides (based of version) */ map_ptrloc NextPkgProv; // Provides }; /*}}}*/ -struct pkgCache::StringItem /*{{{*/ +// StringItem structure /*{{{*/ +/** \brief used for generating single instances of strings + + Some things like Section Name are are useful to have as unique tags. + It is part of a linked list based at pkgCache::Header::StringList + + All strings are simply inlined any place in the file that is natural + for the writer. The client should make no assumptions about the positioning + of strings. All StringItems should be null-terminated. */ +struct pkgCache::StringItem { - map_ptrloc String; // Stringtable + /** \brief string this refers to */ + map_ptrloc String; // StringItem + /** \brief Next link in the chain */ map_ptrloc NextItem; // StringItem }; /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 2f262a3a9..76fc2550b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,11 @@ apt (0.7.26~exp4) experimental; urgency=low - be less strict and accept [option=value] as well * apt-pkg/contrib/configuration.cc: - error out if #clear directive has no argument + * doc/files.sgml: + - sync documentation with status quo, regarding files/directories in + use, extended_states and uri schemes. + * doc/cache.sgml: + - drop the file in favor of inplace documentation with doxygen [ Jari Aalto ] * cmdline/apt-get.cc: @@ -114,9 +119,6 @@ apt (0.7.26~exp3) experimental; urgency=low Thanks to Chris Leick and Georg Koppen! (Closes: #574962) * apt-pkg/contrib/strutl.cc: - convert all toupper calls to tolower_ascii for a little speedup - * doc/files.sgml: - - sync documentation with status quo, regarding files/directories in - use, extended_states and uri schemes. [ Jean-Baptiste Lallement ] * apt-pkg/contrib/strutl.cc: diff --git a/doc/cache.sgml b/doc/cache.sgml deleted file mode 100644 index aea5a45c3..000000000 --- a/doc/cache.sgml +++ /dev/null @@ -1,824 +0,0 @@ -<!-- -*- mode: sgml; mode: fold -*- --> -<!doctype debiandoc PUBLIC "-//DebianDoc//DTD DebianDoc//EN"> -<book> -<title>APT Cache File Format - -Jason Gunthorpe jgg@debian.org -$Id: cache.sgml,v 1.11 2003/02/12 15:05:44 doogie Exp $ - - -This document describes the complete implementation and format of the APT -Cache file. The APT Cache file is a way for APT to parse and store a -large number of package files for display in the UI. It's primary design -goal is to make display of a single package in the tree very fast by -pre-linking important things like dependencies and provides. - -The specification doubles as documentation for one of the in-memory -structures used by the package library and the APT GUI. - - - - -Copyright © Jason Gunthorpe, 1997-1998. -

-APT and this document are free software; you can redistribute them and/or -modify them under the terms of the GNU General Public License as published -by the Free Software Foundation; either version 2 of the License, or (at your -option) any later version. - -

-For more details, on Debian GNU/Linux systems, see the file -/usr/share/common-licenses/GPL for the full license. - - - - -Introduction - - -Purpose - -

-This document describes the implementation of an architecture -dependent binary cache file. The goal of this cache file is two fold, -firstly to speed loading and processing of the package file array and -secondly to reduce memory consumption of the package file array. - -

-The implementation is aimed at an environment with many primary package -files, for instance someone that has a Package file for their CD-ROM, a -Package file for the latest version of the distribution on the CD-ROM and a -package file for the development version. Always present is the information -contained in the status file which might be considered a separate package -file. - -

-Please understand, this is designed as a -CACHE FILE- it is not meant to be -used on any system other than the one it was created for. It is not meant to -be authoritative either, i.e. if a system crash or software failure occurs it -must be perfectly acceptable for the cache file to be in an inconsistent -state. Furthermore at any time the cache file may be erased without losing -any information. - -

-Also the structures and storage layout is optimized for use by the APT -GUI and may not be suitable for all purposes. However it should be possible -to extend it with associate cache files that contain other information. - -

-To keep memory use down the cache file only contains often used fields and -fields that are inexpensive to store, the Package file has a full list of -fields. Also the client may assume that all items are perfectly valid and -need not perform checks against their correctness. Removal of information -from the cache is possible, but blanks will be left in the file, and -unused strings will also be present. The recommended implementation is to -simply rebuild the cache each time any of the data files change. It is -possible to add a new package file to the cache without any negative side -effects. - -Note on Pointer access -

-Every item in every structure is stored as the index to that structure. -What this means is that once the files is mmaped every data access has to -go through a fixup stage to get a real memory pointer. This is done -by taking the index, multiplying it by the type size and then adding -it to the start address of the memory block. This sounds complex, but -in C it is a single array dereference. Because all items are aligned to -their size and indexes are stored as multiples of the size of the structure -the format is immediately portable to all possible architectures - BUT the -generated files are -NOT-. - -

-This scheme allows code like this to be written: - - void *Map = mmap(...); - Package *PkgList = (Package *)Map; - Header *Head = (Header *)Map; - char *Strings = (char *)Map; - cout << (Strings + PkgList[Head->HashTable[0]]->Name) << endl; - -

-Notice the lack of casting or multiplication. The net result is to return -the name of the first package in the first hash bucket, without error -checks. - -

-The generator uses allocation pools to group similarly sized structures in -large blocks to eliminate any alignment overhead. The generator also -assures that no structures overlap and all indexes are unique. Although -at first glance it may seem like there is the potential for two structures -to exist at the same point the generator never allows this to happen. -(See the discussion of free space pools) - - -Structures - - -Header -

-This is the first item in the file. - - struct Header - { - // Signature information - unsigned long Signature; - short MajorVersion; - short MinorVersion; - bool Dirty; - - // Size of structure values - unsigned short HeaderSz; - unsigned short PackageSz; - unsigned short PackageFileSz; - unsigned short VersionSz; - unsigned short DependencySz; - unsigned short ProvidesSz; - unsigned short VerFileSz; - - // Structure counts - unsigned long PackageCount; - unsigned long VersionCount; - unsigned long DependsCount; - unsigned long PackageFileCount; - - // Offsets - unsigned long FileList; // PackageFile - unsigned long StringList; // StringItem - unsigned long VerSysName; // StringTable - unsigned long Architecture; // StringTable - unsigned long MaxVerFileSize; - - // Allocation pools - struct - { - unsigned long ItemSize; - unsigned long Start; - unsigned long Count; - } Pools[7]; - - // Package name lookup - unsigned long HashTable[2*1024]; // Package - }; - - -Signature -This must contain the hex value 0x98FE76DC which is designed to verify -that the system loading the image has the same byte order and byte size as -the system saving the image - -MajorVersion -MinorVersion -These contain the version of the cache file, currently 0.2. - -Dirty -Dirty is true if the cache file was opened for reading, the client expects -to have written things to it and have not fully synced it. The file should -be erased and rebuilt if it is true. - -HeaderSz -PackageSz -PackageFileSz -VersionSz -DependencySz -VerFileSz -ProvidesSz -*Sz contains the sizeof() that particular structure. It is used as an -extra consistency check on the structure of the file. - -If any of the size values do not exactly match what the client expects then -the client should refuse the load the file. - -PackageCount -VersionCount -DependsCount -PackageFileCount -These indicate the number of each structure contained in the cache. -PackageCount is especially useful for generating user state structures. -See Package::Id for more info. - -VerSysName -String representing the version system used for this cache - -Architecture -Architecture the cache was built against. - -MaxVerFileSize -The maximum size of a raw entry from the original Package file -(i.e. VerFile::Size) is stored here. - -FileList -This contains the index of the first PackageFile structure. The PackageFile -structures are singly linked lists that represent all package files that -have been merged into the cache. - -StringList -This contains a list of all the unique strings (string item type strings) in -the cache. The parser reads this list into memory so it can match strings -against it. - -Pools -The Pool structures manage the allocation pools that the generator uses. -Start indicates the first byte of the pool, Count is the number of objects -remaining in the pool and ItemSize is the structure size (alignment factor) -of the pool. An ItemSize of 0 indicates the pool is empty. There should be -the same number of pools as there are structure types. The generator -stores this information so future additions can make use of any unused pool -blocks. - -HashTable -HashTable is a hash table that provides indexing for all of the packages. -Each package name is inserted into the hash table using the following has -function: - - unsigned long Hash(string Str) - { - unsigned long Hash = 0; - for (const char *I = Str.begin(); I != Str.end(); I++) - Hash += *I * ((Str.end() - I + 1)); - return Hash % _count(Head.HashTable); - } - -

-By iterating over each entry in the hash table it is possible to iterate over -the entire list of packages. Hash Collisions are handled with a singly linked -list of packages based at the hash item. The linked list contains only -packages that match the hashing function. - - - - - -Package -

-This contains information for a single unique package. There can be any -number of versions of a given package. Package exists in a singly -linked list of package records starting at the hash index of the name in -the Header->HashTable. - - struct Pacakge - { - // Pointers - unsigned long Name; // Stringtable - unsigned long VersionList; // Version - unsigned long CurrentVer; // Version - unsigned long Section; // StringTable (StringItem) - - // Linked lists - unsigned long NextPackage; // Package - unsigned long RevDepends; // Dependency - unsigned long ProvidesList; // Provides - - // Install/Remove/Purge etc - unsigned char SelectedState; // What - unsigned char InstState; // Flags - unsigned char CurrentState; // State - - // Unique ID for this pkg - unsigned short ID; - unsigned long Flags; - }; - - - -Name -Name of the package. - -VersionList -Base of a singly linked list of version structures. Each structure -represents a unique version of the package. The version structures -contain links into PackageFile and the original text file as well as -detailed information about the size and dependencies of the specific -package. In this way multiple versions of a package can be cleanly handled -by the system. Furthermore, this linked list is guaranteed to be sorted -from Highest version to lowest version with no duplicate entries. - -CurrentVer -CurrentVer is an index to the installed version, either can be -0. - -Section -This indicates the deduced section. It should be "Unknown" or the section -of the last parsed item. - -NextPackage -Next link in this hash item. This linked list is based at Header.HashTable -and contains only packages with the same hash value. - -RevDepends -Reverse Depends is a linked list of all dependencies linked to this package. - -ProvidesList -This is a linked list of all provides for this package name. - -SelectedState -InstState -CurrentState -These correspond to the 3 items in the Status field found in the status -file. See the section on defines for the possible values. -

-SelectedState is the state that the user wishes the package to be -in. -

-InstState is the installation state of the package. This normally -should be OK, but if the installation had an accident it may be otherwise. -

-CurrentState indicates if the package is installed, partially installed or -not installed. - -ID -ID is a value from 0 to Header->PackageCount. It is a unique value assigned -by the generator. This allows clients to create an array of size PackageCount -and use it to store state information for the package map. For instance the -status file emitter uses this to track which packages have been emitted -already. - -Flags -Flags are some useful indicators of the package's state. - - - - - - -PackageFile -

-This contains information for a single package file. Package files are -referenced by Version structures. This is a singly linked list based from -Header.FileList - - struct PackageFile - { - // Names - unsigned long FileName; // Stringtable - unsigned long Archive; // Stringtable - unsigned long Component; // Stringtable - unsigned long Version; // Stringtable - unsigned long Origin; // Stringtable - unsigned long Label; // Stringtable - unsigned long Architecture; // Stringtable - unsigned long Site; // Stringtable - unsigned long IndexType; // Stringtable - unsigned long Size; - - // Linked list - unsigned long NextFile; // PackageFile - unsigned short ID; - unsigned long Flags; - time_t mtime; // Modification time - }; - - - -FileName -Refers the the physical disk file that this PacakgeFile represents. - -Archive -Component -Version -Origin -Label -Architecture -NotAutomatic -This is the release information. Please see the files document for a -description of what the release information means. - -Site -The site the index file was fetched from. - -IndexType -A string indicating what sort of index file this is. - -Size -Size is provided as a simple check to ensure that the package file has not -been altered. - -ID -See Package::ID. - -Flags -Provides some flags for the PackageFile, see the section on defines. - -mtime -Modification time for the file at time of cache generation. - - - - - - -Version -

-This contains the information for a single version of a package. This is a -single linked list based from Package.Versionlist. - -

-The version list is always sorted from highest version to lowest version by -the generator. Also there may not be any duplicate entries in the list (same -VerStr). - - - struct Version - { - unsigned long VerStr; // Stringtable - unsigned long Section; // StringTable (StringItem) - unsigned long Arch; // StringTable - - // Lists - unsigned long FileList; // VerFile - unsigned long NextVer; // Version - unsigned long DependsList; // Dependency - unsigned long ParentPkg; // Package - unsigned long ProvidesList; // Provides - - unsigned long Size; - unsigned long InstalledSize; - unsigned long Hash; - unsigned short ID; - unsigned char Priority; - }; - - - -VerStr -This is the complete version string. - -FileList -References the all the PackageFile's that this version came out of. FileList -can be used to determine what distribution(s) the Version applies to. If -FileList is 0 then this is a blank version. The structure should also have -a 0 in all other fields excluding VerStr and Possibly NextVer. - -Section -This string indicates which section it is part of. The string should be -contained in the StringItem list. - -Arch -Architecture the package was compiled for. - -NextVer -Next step in the linked list. - -DependsList -This is the base of the dependency list. - -ParentPkg -This links the version to the owning package, allowing reverse dependencies -to determine the package. - -ProvidesList -Head of the linked list of Provides::NextPkgProv, forward provides. - -Size -InstalledSize -The archive size for this version. For Debian this is the size of the .deb -file. Installed size is the uncompressed size for this version - -Hash -This is a characteristic value representing this package. No two packages -in existence should have the same VerStr and Hash with different contents. - -ID -See Package::ID. - -Priority -This is the parsed priority value of the package. - - - - - -Dependency -

-Dependency contains the information for a single dependency record. The records -are split up like this to ease processing by the client. The base of list -linked list is Version.DependsList. All forms of dependencies are recorded -here including Conflicts, Breaks, Suggests and Recommends. - -

-Multiple depends on the same package must be grouped together in -the Dependency lists. Clients should assume this is always true. - - - struct Dependency - { - unsigned long Version; // Stringtable - unsigned long Package; // Package - unsigned long NextDepends; // Dependency - unsigned long NextRevDepends; // Reverse dependency linking - unsigned long ParentVer; // Upwards parent version link - - // Specific types of depends - unsigned char Type; - unsigned char CompareOp; - unsigned short ID; - }; - - -Version -The string form of the version that the dependency is applied against. - -Package -The index of the package file this depends applies to. If the package file -does not already exist when the dependency is inserted a blank one (no -version records) should be created. - -NextDepends -Linked list based off a Version structure of all the dependencies in that -version. - -NextRevDepends -Reverse dependency linking, based off a Package structure. This linked list -is a list of all packages that have a depends line for a given package. - -ParentVer -Parent version linking, allows the reverse dependency list to link -back to the version and package that the dependency are for. - -Type -Describes weather it is depends, predepends, recommends, suggests, etc. - -CompareOp -Describes the comparison operator specified on the depends line. If the high -bit is set then it is a logical or with the previous record. - -ID -See Package::ID. - - - - - - -Provides -

-Provides handles virtual packages. When a Provides: line is encountered -a new provides record is added associating the package with a virtual -package name. The provides structures are linked off the package structures. -This simplifies the analysis of dependencies and other aspects A provides -refers to a specific version of a specific package, not all versions need to -provide that provides. - -

-There is a linked list of provided package names started from each -version that provides packages. This is the forwards provides mechanism. - - struct Provides - { - unsigned long ParentPkg; // Package - unsigned long Version; // Version - unsigned long ProvideVersion; // Stringtable - unsigned long NextProvides; // Provides - unsigned long NextPkgProv; // Provides - }; - - -ParentPkg -The index of the package that head of this linked list is in. ParentPkg->Name -is the name of the provides. - -Version -The index of the version this provide line applies to. - -ProvideVersion -Each provides can specify a version in the provides line. This version allows -dependencies to depend on specific versions of a Provides, as well as allowing -Provides to override existing packages. This is experimental. - -NextProvides -Next link in the singly linked list of provides (based off package) - -NextPkgProv -Next link in the singly linked list of provides for 'Version'. - - - - - - -VerFile -

-VerFile associates a version with a PackageFile, this allows a full -description of all Versions in all files (and hence all sources) under -consideration. - - - struct pkgCache::VerFile - { - unsigned long File; // PackageFile - unsigned long NextFile; // PkgVerFile - unsigned long Offset; - unsigned short Size; - } - - -File -The index of the package file that this version was found in. - -NextFile -The next step in the linked list. - -Offset -Size -These describe the exact position in the package file for the section from -this version. - - - - - -StringItem -

-StringItem is used for generating single instances of strings. Some things -like Section Name are are useful to have as unique tags. It is part of -a linked list based at Header::StringList. - - struct StringItem - { - unsigned long String; // Stringtable - unsigned long NextItem; // StringItem - }; - - -String -The string this refers to. - -NextItem -Next link in the chain. - - - - -StringTable -

-All strings are simply inlined any place in the file that is natural for the -writer. The client should make no assumptions about the positioning of -strings. All stringtable values point to a byte offset from the start of the -file that a null terminated string will begin. - - - -Defines -

-Several structures use variables to indicate things. Here is a list of all -of them. - -Definitions for Dependency::Type -

- -#define pkgDEP_Depends 1 -#define pkgDEP_PreDepends 2 -#define pkgDEP_Suggests 3 -#define pkgDEP_Recommends 4 -#define pkgDEP_Conflicts 5 -#define pkgDEP_Replaces 6 -#define pkgDEP_Breaks 8 - - - -Definitions for Dependency::CompareOp -

- -#define pkgOP_OR 0x10 -#define pkgOP_LESSEQ 0x1 -#define pkgOP_GREATEREQ 0x2 -#define pkgOP_LESS 0x3 -#define pkgOP_GREATER 0x4 -#define pkgOP_EQUALS 0x5 - -The lower 4 bits are used to indicate what operator is being specified and -the upper 4 bits are flags. pkgOP_OR indicates that the next package is -or'd with the current package. - - -Definitions for Package::SelectedState -

- -#define pkgSTATE_Unkown 0 -#define pkgSTATE_Install 1 -#define pkgSTATE_Hold 2 -#define pkgSTATE_DeInstall 3 -#define pkgSTATE_Purge 4 - - - -Definitions for Package::InstState -

- -#define pkgSTATE_Ok 0 -#define pkgSTATE_ReInstReq 1 -#define pkgSTATE_Hold 2 -#define pkgSTATE_HoldReInstReq 3 - - - -Definitions for Package::CurrentState -

- -#define pkgSTATE_NotInstalled 0 -#define pkgSTATE_UnPacked 1 -#define pkgSTATE_HalfConfigured 2 -#define pkgSTATE_UnInstalled 3 -#define pkgSTATE_HalfInstalled 4 -#define pkgSTATE_ConfigFiles 5 -#define pkgSTATE_Installed 6 -#define pkgSTATE_TriggersAwaited 7 -#define pkgSTATE_TriggersPending 8 - - - -Definitions for Package::Flags -

- -#define pkgFLAG_Auto (1 << 0) -#define pkgFLAG_New (1 << 1) -#define pkgFLAG_Obsolete (1 << 2) -#define pkgFLAG_Essential (1 << 3) -#define pkgFLAG_ImmediateConf (1 << 4) - - - -Definitions for Version::Priority -

-Zero is used for unparsable or absent Priority fields. - -#define pkgPRIO_Important 1 -#define pkgPRIO_Required 2 -#define pkgPRIO_Standard 3 -#define pkgPRIO_Optional 4 -#define pkgPRIO_Extra 5 - - - -Definitions for PackageFile::Flags -

- -#define pkgFLAG_NotSource (1 << 0) -#define pkgFLAG_NotAutomatic (1 << 1) - - - - - -Notes on the Generator - - -

-The pkgCache::MergePackageFile function is currently the only generator of -the cache file. It implements a conversion from the normal textual package -file into the cache file. - -

-The generator assumes any package declaration with a -Status: line is a 'Status of the package' type of package declaration. -A Package with a Target-Version field should also really have a status field. -The processing of a Target-Version field can create a place-holder Version -structure that is empty to refer to the specified version (See Version -for info on what a empty Version looks like). The Target-Version syntax -allows the specification of a specific version and a target distribution. - -

-Different section names on different versions is supported, but I -do not expect to use it. To simplify the GUI it will merely use the section -in the Package structure. This should be okay as I hope sections do not change -much. - -

-The generator goes through a number of post processing steps after producing -a disk file. It sorts all of the version lists to be in descending order -and then generates the reverse dependency lists for all of the packages. -ID numbers and count values are also generated in the post processing step. - -

-It is possible to extend many of the structures in the cache with extra data. -This is done by using the ID member. ID will be a unique number from 0 to -Header->??Count. For example - -struct MyPkgData; -MyPkgData *Data = new MyPkgData[Header->PackageCount]; -Data[Package->ID]->Item = 0; - -This provides a one way reference between package structures and user data. To -get a two way reference would require a member inside the MyPkgData structure. - -

-The generators use of free space pools tend to make the package file quite -large, and quite full of blank space. This could be fixed with sparse files. - - - -Future Directions - - -

-Some good directions to take the cache file is into a cache directory that -contains many associated caches that cache other important bits of -information. (/var/cache/apt, FHS2) - -

-Caching of the info/*.list is an excellent place to start, by generating all -the list files into a tree structure and reverse linking them to the package -structures in the main cache file major speed gains in dpkg might be achieved. - - - - -- cgit v1.2.3 From 52c41485092d6da77d2848a955609f22da50372c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 4 May 2010 12:43:08 +0200 Subject: * apt-pkg/pkgcache.h: - enhance the Groups ABI by providing a ID as the other structs does - check also the size of the Group struct then checking for the others --- apt-pkg/pkgcache.cc | 3 +++ apt-pkg/pkgcache.h | 10 +++++++--- apt-pkg/pkgcachegen.cc | 3 +-- debian/changelog | 3 +++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 1bbd74bd9..ba3c5cbf8 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -55,6 +55,7 @@ pkgCache::Header::Header() Dirty = false; HeaderSz = sizeof(pkgCache::Header); + GroupSz = sizeof(pkgCache::Group); PackageSz = sizeof(pkgCache::Package); PackageFileSz = sizeof(pkgCache::PackageFile); VersionSz = sizeof(pkgCache::Version); @@ -64,6 +65,7 @@ pkgCache::Header::Header() VerFileSz = sizeof(pkgCache::VerFile); DescFileSz = sizeof(pkgCache::DescFile); + GroupCount = 0; PackageCount = 0; VersionCount = 0; DescriptionCount = 0; @@ -90,6 +92,7 @@ pkgCache::Header::Header() bool pkgCache::Header::CheckSizes(Header &Against) const { if (HeaderSz == Against.HeaderSz && + GroupSz == Against.GroupSz && PackageSz == Against.PackageSz && PackageFileSz == Against.PackageFileSz && VersionSz == Against.VersionSz && diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index a2e63ff03..643f240b0 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -244,6 +244,7 @@ struct pkgCache::Header If any of the size values do not exactly match what the client expects then the client should refuse the load the file. */ unsigned short HeaderSz; + unsigned short GroupSz; unsigned short PackageSz; unsigned short PackageFileSz; unsigned short VersionSz; @@ -329,12 +330,15 @@ struct pkgCache::Group map_ptrloc Name; // StringItem // Linked List - /** Link to the first package which belongs to the group */ + /** \brief Link to the first package which belongs to the group */ map_ptrloc FirstPackage; // Package - /** Link to the last package which belongs to the group */ + /** \brief Link to the last package which belongs to the group */ map_ptrloc LastPackage; // Package - /** Link to the next Group */ + /** \brief Link to the next Group */ map_ptrloc Next; // Group + /** \brief unique sequel ID */ + unsigned int ID; + }; /*}}}*/ // Package structure /*{{{*/ diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 114c9d5ed..d96d3370f 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -356,8 +356,7 @@ bool pkgCacheGenerator::NewGroup(pkgCache::GrpIterator &Grp, const string &Name) Grp->Next = Cache.HeaderP->GrpHashTable[Hash]; Cache.HeaderP->GrpHashTable[Hash] = Group; - Cache.HeaderP->GroupCount++; - + Grp->ID = Cache.HeaderP->GroupCount++; return true; } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 76fc2550b..5885f9246 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,9 @@ apt (0.7.26~exp4) experimental; urgency=low use, extended_states and uri schemes. * doc/cache.sgml: - drop the file in favor of inplace documentation with doxygen + * apt-pkg/pkgcache.h: + - enhance the Groups ABI by providing a ID as the other structs does + - check also the size of the Group struct then checking for the others [ Jari Aalto ] * cmdline/apt-get.cc: -- cgit v1.2.3 From 173ae2a460b905b18911f42964fd38dbac2959d6 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 4 May 2010 12:54:52 +0200 Subject: use GroupCount for package names in stats and add a package struct line --- cmdline/apt-cache.cc | 4 +++- debian/changelog | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index b0034bf6d..b981e2fa7 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -242,7 +242,9 @@ bool DumpPackage(CommandLine &CmdL) bool Stats(CommandLine &Cmd) { pkgCache &Cache = *GCache; - cout << _("Total package names: ") << Cache.Head().PackageCount << " (" << + cout << _("Total package names: ") << Cache.Head().GroupCount << " (" << + SizeToStr(Cache.Head().GroupCount*Cache.Head().GroupSz) << ')' << endl + << _("Total package structures: ") << Cache.Head().PackageCount << " (" << SizeToStr(Cache.Head().PackageCount*Cache.Head().PackageSz) << ')' << endl; int Normal = 0; diff --git a/debian/changelog b/debian/changelog index 5885f9246..3fd3f0a33 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,7 @@ apt (0.7.26~exp4) experimental; urgency=low * cmdline/apt-cache.cc: - align Installed and Candidate Version in policy so they can be compared easier, thanks Ralf Gesellensetter for the pointer! (Closes: #578657) + - use GroupCount for package names in stats and add a package struct line * doc/apt.ent: - Add a note about APT_CONFIG in the -c description (Closes: #578267) * doc/po/de.po: -- cgit v1.2.3 From 61a07c57a8898f3888245493032784cd1c82e956 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 4 May 2010 13:34:34 +0200 Subject: fix compiler warning: reaching end of non-void method --- apt-pkg/acquire-item.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 1f253bb81..c035b9163 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1685,5 +1685,6 @@ string pkgAcqFile::Custom600Headers() { if (IsIndexFile) return "\nIndex-File: true"; + return ""; } /*}}}*/ -- cgit v1.2.3 From b81dbe40d48ce6fcf76a4df1eab6f9b0905962e2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 4 May 2010 13:45:36 +0200 Subject: make update-po --- doc/po/apt-doc.pot | 480 +++++++++++++++------------ doc/po/de.po | 565 ++++++++++++++++++------------- doc/po/es.po | 558 ++++++++++++++++++------------- doc/po/fr.po | 960 ++++++++++++++++++++++++++--------------------------- doc/po/it.po | 482 +++++++++++++++------------ doc/po/ja.po | 559 ++++++++++++++++++------------- doc/po/pl.po | 507 ++++++++++++++++------------ doc/po/pt.po | 559 ++++++++++++++++++------------- doc/po/pt_BR.po | 505 +++++++++++++++------------- po/apt-all.pot | 714 ++++++++++++++++++++------------------- po/ar.po | 817 ++++++++++++++++++++++++--------------------- po/ast.po | 831 +++++++++++++++++++++++++--------------------- po/bg.po | 838 +++++++++++++++++++++++++--------------------- po/bs.po | 816 ++++++++++++++++++++++++--------------------- po/ca.po | 830 ++++++++++++++++++++++++--------------------- po/cs.po | 829 ++++++++++++++++++++++++--------------------- po/cy.po | 832 +++++++++++++++++++++++++--------------------- po/da.po | 837 +++++++++++++++++++++++++--------------------- po/de.po | 834 +++++++++++++++++++++++++--------------------- po/dz.po | 827 ++++++++++++++++++++++++--------------------- po/el.po | 834 +++++++++++++++++++++++++--------------------- po/en_GB.po | 830 ++++++++++++++++++++++++--------------------- po/es.po | 835 +++++++++++++++++++++++++--------------------- po/eu.po | 830 ++++++++++++++++++++++++--------------------- po/fi.po | 831 +++++++++++++++++++++++++--------------------- po/fr.po | 846 +++++++++++++++++++++++++--------------------- po/gl.po | 828 ++++++++++++++++++++++++--------------------- po/hu.po | 824 ++++++++++++++++++++++++--------------------- po/it.po | 835 +++++++++++++++++++++++++--------------------- po/ja.po | 830 ++++++++++++++++++++++++--------------------- po/km.po | 825 ++++++++++++++++++++++++--------------------- po/ko.po | 833 +++++++++++++++++++++++++--------------------- po/ku.po | 826 ++++++++++++++++++++++++--------------------- po/lt.po | 828 ++++++++++++++++++++++++--------------------- po/mr.po | 826 ++++++++++++++++++++++++--------------------- po/nb.po | 833 +++++++++++++++++++++++++--------------------- po/ne.po | 825 ++++++++++++++++++++++++--------------------- po/nl.po | 835 +++++++++++++++++++++++++--------------------- po/nn.po | 827 ++++++++++++++++++++++++--------------------- po/pl.po | 835 +++++++++++++++++++++++++--------------------- po/pt.po | 831 +++++++++++++++++++++++++--------------------- po/pt_BR.po | 835 +++++++++++++++++++++++++--------------------- po/ro.po | 839 +++++++++++++++++++++++++--------------------- po/ru.po | 840 +++++++++++++++++++++++++--------------------- po/sk.po | 835 +++++++++++++++++++++++++--------------------- po/sl.po | 826 ++++++++++++++++++++++++--------------------- po/sv.po | 829 ++++++++++++++++++++++++--------------------- po/th.po | 826 ++++++++++++++++++++++++--------------------- po/tl.po | 827 ++++++++++++++++++++++++--------------------- po/uk.po | 830 ++++++++++++++++++++++++--------------------- po/vi.po | 829 ++++++++++++++++++++++++--------------------- po/zh_CN.po | 828 ++++++++++++++++++++++++--------------------- po/zh_TW.po | 826 ++++++++++++++++++++++++--------------------- 53 files changed, 22942 insertions(+), 18655 deletions(-) diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 85146d4f2..a95cc87e2 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-03-19 11:14+0100\n" +"POT-Creation-Date: 2010-05-04 13:41+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -588,7 +588,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:268 +#: apt.ent:270 #, no-wrap msgid "" " \n" @@ -597,14 +597,18 @@ msgid "" " Configuration File; Specify a configuration file to " "use. \n" " The program will read the default configuration file and then this \n" -" configuration file. See &apt-conf; for syntax information. \n" +" configuration file. If configuration settings need to be set before " +"the\n" +" default configuration files are parsed specify a file with the " +"APT_CONFIG\n" +" environment variable. See &apt-conf; for syntax information.\n" " \n" " \n" " \n" msgstr "" #. type: Plain text -#: apt.ent:280 +#: apt.ent:282 #, no-wrap msgid "" " \n" @@ -624,7 +628,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:291 +#: apt.ent:293 #, no-wrap msgid "" " diff --git a/doc/examples/configure-index b/doc/examples/configure-index index d168417d8..487c09acb 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -294,9 +294,8 @@ Dir "/" State "var/lib/apt/" { Lists "lists/"; - xstatus "xstatus"; - userstatus "status.user"; status "/var/lib/dpkg/status"; + extended_states "extended_states"; cdroms "cdroms.list"; }; -- cgit v1.2.3 From 8378913047031bd1433a5b17e9affc1e055a150e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 28 May 2010 19:04:53 +0200 Subject: * apt-pkg/depcache.cc: - do the autoremove mark process also for required packages to handle these illegally depending on lower priority packages (Closes: #583517) --- apt-pkg/depcache.cc | 7 +++++-- debian/changelog | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index bdb89b5ce..c29114a65 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1638,8 +1638,11 @@ bool pkgDepCache::MarkRequired(InRootSetFunc &userFunc) { if(!(PkgState[p->ID].Flags & Flag::Auto) || (p->Flags & Flag::Essential) || - userFunc.InRootSet(p)) - + userFunc.InRootSet(p) || + // be nice even then a required package violates the policy (#583517) + // and do the full mark process also for required packages + (p.CurrentVer().end() != true && + p.CurrentVer()->Priority == pkgCache::State::Required)) { // the package is installed (and set to keep) if(PkgState[p->ID].Keep() && !p.CurrentVer().end()) diff --git a/debian/changelog b/debian/changelog index 028452751..ce7ff48b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,11 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - forward manual-installed bit on package disappearance * apt-pkg/deb/debsystem.cc: - add better config item for extended_states file + * apt-pkg/depcache.cc: + - do the autoremove mark process also for required packages to handle + these illegally depending on lower priority packages (Closes: #583517) - -- David Kalnischkies Thu, 27 May 2010 17:34:51 +0200 + -- David Kalnischkies Fri, 28 May 2010 19:03:30 +0200 apt (0.7.26~exp5) experimental; urgency=low -- cgit v1.2.3 From 392a882ad8a299d55889e9c0fa581a266d6dd2c9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 28 May 2010 19:30:19 +0200 Subject: try harder to find the other pseudo versions for autoremove multiarch --- apt-pkg/depcache.cc | 7 ++----- debian/changelog | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index c29114a65..afec7ba83 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1719,10 +1719,6 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, // If the version belongs to a Multi-Arch all package // we will mark all others in this Group with this version also - // Beware: We compare versions here the lazy way: string comparision - // this is bad if multiple repositories provide different versions - // of the package with an identical version number - but even in this - // case the dependencies are likely the same. if (ver->MultiArch == pkgCache::Version::All && strcmp(ver.Arch(true), "all") == 0) { @@ -1734,7 +1730,8 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, for (VerIterator V = P.VersionList(); V.end() != true; ++V) { - if (strcmp(VerStr, V.VerStr()) != 0) + if (ver->Hash != V->Hash || + strcmp(VerStr, V.VerStr()) != 0) continue; MarkPackage(P, V, follow_recommends, follow_suggests); break; diff --git a/debian/changelog b/debian/changelog index ce7ff48b7..c1ee360f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low * apt-pkg/depcache.cc: - do the autoremove mark process also for required packages to handle these illegally depending on lower priority packages (Closes: #583517) + - try harder to find the other pseudo versions for autoremove multiarch -- David Kalnischkies Fri, 28 May 2010 19:03:30 +0200 -- cgit v1.2.3 From 3152f4aa4a97ad06ef1073aabe137f999f787ee1 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 28 May 2010 23:11:36 +0200 Subject: * apt-pkg/aptconfiguration.cc: - remove duplicate architectures in getArchitectures() --- apt-pkg/aptconfiguration.cc | 15 ++++++++- debian/changelog | 2 ++ test/libapt/getarchitectures_test.cc | 61 ++++++++++++++++++++++++++++++++++++ test/libapt/makefile | 5 +++ 4 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 test/libapt/getarchitectures_test.cc diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 2acf8dd9f..0c050d9dc 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -327,11 +327,24 @@ std::vector const Configuration::getArchitectures(bool const &Cache if (likely(Cached == true) && archs.empty() == false) return archs; - string const arch = _config->Find("APT::Architecture"); archs = _config->FindVector("APT::Architectures"); + string const arch = _config->Find("APT::Architecture"); + if (unlikely(arch.empty() == true)) + return archs; + if (archs.empty() == true || std::find(archs.begin(), archs.end(), arch) == archs.end()) archs.push_back(arch); + + // erase duplicates and empty strings + for (std::vector::reverse_iterator a = archs.rbegin(); + a != archs.rend(); ++a) { + if (a->empty() == true || std::find(a + 1, archs.rend(), *a) != archs.rend()) + archs.erase(a.base()-1); + if (a == archs.rend()) + break; + } + return archs; } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index c1ee360f0..66c41ef5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - do the autoremove mark process also for required packages to handle these illegally depending on lower priority packages (Closes: #583517) - try harder to find the other pseudo versions for autoremove multiarch + * apt-pkg/aptconfiguration.cc: + - remove duplicate architectures in getArchitectures() -- David Kalnischkies Fri, 28 May 2010 19:03:30 +0200 diff --git a/test/libapt/getarchitectures_test.cc b/test/libapt/getarchitectures_test.cc new file mode 100644 index 000000000..1500caeed --- /dev/null +++ b/test/libapt/getarchitectures_test.cc @@ -0,0 +1,61 @@ +#include +#include + +#include "assert.h" +#include +#include + +#include + +// simple helper to quickly output a vector of strings +void dumpVector(std::vector vec) { + for (std::vector::const_iterator v = vec.begin(); + v != vec.end(); v++) + std::cout << *v << std::endl; +} + +int main(int argc,char *argv[]) +{ + std::vector vec; + + _config->Set("APT::Architectures::1", "i386"); + _config->Set("APT::Architectures::2", "amd64"); + vec = APT::Configuration::getArchitectures(false); + equals(vec.size(), 2); + equals(vec[0], "i386"); + equals(vec[1], "amd64"); + + _config->Set("APT::Architecture", "i386"); + vec = APT::Configuration::getArchitectures(false); + equals(vec.size(), 2); + equals(vec[0], "i386"); + equals(vec[1], "amd64"); + + _config->Set("APT::Architectures::2", ""); + vec = APT::Configuration::getArchitectures(false); + equals(vec.size(), 1); + equals(vec[0], "i386"); + + _config->Set("APT::Architecture", "armel"); + vec = APT::Configuration::getArchitectures(false); + equals(vec.size(), 2); + equals(vec[0], "i386"); + equals(vec[1], "armel"); + + _config->Set("APT::Architectures::2", "amd64"); + _config->Set("APT::Architectures::3", "i386"); + _config->Set("APT::Architectures::4", "armel"); + _config->Set("APT::Architectures::5", "i386"); + _config->Set("APT::Architectures::6", "amd64"); + _config->Set("APT::Architectures::7", "armel"); + _config->Set("APT::Architectures::8", "armel"); + _config->Set("APT::Architectures::9", "amd64"); + _config->Set("APT::Architectures::10", "amd64"); + vec = APT::Configuration::getArchitectures(false); + equals(vec.size(), 3); + equals(vec[0], "i386"); + equals(vec[1], "amd64"); + equals(vec[2], "armel"); + + return 0; +} diff --git a/test/libapt/makefile b/test/libapt/makefile index 98bdb3348..ee3401b35 100644 --- a/test/libapt/makefile +++ b/test/libapt/makefile @@ -12,6 +12,11 @@ SLIBS = -lapt-pkg SOURCE = getlanguages_test.cc include $(PROGRAM_H) +PROGRAM = getArchitectures${BASENAME} +SLIBS = -lapt-pkg +SOURCE = getarchitectures_test.cc +include $(PROGRAM_H) + # Program for testing ParseDepends PROGRAM = ParseDepends${BASENAME} SLIBS = -lapt-pkg -- cgit v1.2.3 From 8fa7eefb8a320e8fa4a26c4718fa606d4d27a56f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 28 May 2010 23:40:08 +0200 Subject: create the bin-test directory automatic in the runner --- test/libapt/run-tests.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/test/libapt/run-tests.sh b/test/libapt/run-tests.sh index f9df1af5f..cb7769e4a 100755 --- a/test/libapt/run-tests.sh +++ b/test/libapt/run-tests.sh @@ -2,6 +2,7 @@ set -e echo "Compiling the tests ..." +test -d '../../build/obj/test/libapt/' || mkdir -p '../../build/obj/test/libapt/' make echo "Running all testcases ..." LDPATH=$(pwd)/../../build/bin -- cgit v1.2.3 From e1430400bf012ab7e29b00c78796a14ce9f97107 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 29 May 2010 12:04:51 +0200 Subject: * apt-pkg/indexrecords.{cc,h}: - add a constant Exists check for MetaKeys * apt-pkg/acquire-item.cc: - do not try PDiff if it is not listed in the Meta file --- apt-pkg/acquire-item.cc | 13 ++++++++----- apt-pkg/indexrecords.cc | 5 +++++ apt-pkg/indexrecords.h | 2 ++ debian/changelog | 6 +++++- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index c035b9163..9e29f8189 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1105,13 +1105,16 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify) /*{{{*/ return; } } - - // Queue Packages file (either diff or full packages files, depending - // on the users option) - if(_config->FindB("Acquire::PDiffs",true) == true) + + /* Queue Packages file (either diff or full packages files, depending + on the users option) - we also check if the PDiff Index file is listed + in the Meta-Index file. Ideal would be if pkgAcqDiffIndex would test this + instead, but passing the required info to it is to much hassle */ + if(_config->FindB("Acquire::PDiffs",true) == true && (verify == false || + MetaIndexParser->Exists(string((*Target)->MetaKey).append(".diff/Index")) == true)) new pkgAcqDiffIndex(Owner, (*Target)->URI, (*Target)->Description, (*Target)->ShortDesc, ExpectedIndexHash); - else + else new pkgAcqIndex(Owner, (*Target)->URI, (*Target)->Description, (*Target)->ShortDesc, ExpectedIndexHash); } diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc index 1fc27b1a1..9a9600531 100644 --- a/apt-pkg/indexrecords.cc +++ b/apt-pkg/indexrecords.cc @@ -31,6 +31,11 @@ const indexRecords::checkSum *indexRecords::Lookup(const string MetaKey) return Entries[MetaKey]; } +bool indexRecords::Exists(string const &MetaKey) const +{ + return Entries.count(MetaKey) == 1; +} + bool indexRecords::Load(const string Filename) /*{{{*/ { FileFd Fd(Filename, FileFd::ReadOnly); diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h index 468d2bd0f..2e3103b70 100644 --- a/apt-pkg/indexrecords.h +++ b/apt-pkg/indexrecords.h @@ -34,6 +34,8 @@ class indexRecords // Lookup function virtual const checkSum *Lookup(const string MetaKey); + /** \brief tests if a checksum for this file is available */ + bool Exists(string const &MetaKey) const; std::vector MetaKeys(); virtual bool Load(string Filename); diff --git a/debian/changelog b/debian/changelog index 66c41ef5f..1fa254b0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,12 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - try harder to find the other pseudo versions for autoremove multiarch * apt-pkg/aptconfiguration.cc: - remove duplicate architectures in getArchitectures() + * apt-pkg/indexrecords.{cc,h}: + - add a constant Exists check for MetaKeys + * apt-pkg/acquire-item.cc: + - do not try PDiff if it is not listed in the Meta file - -- David Kalnischkies Fri, 28 May 2010 19:03:30 +0200 + -- David Kalnischkies Sat, 29 May 2010 12:03:20 +0200 apt (0.7.26~exp5) experimental; urgency=low -- cgit v1.2.3 From b3fdb998016beb8bf3d8bedb3ad6218f9050eece Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 29 May 2010 15:44:47 +0200 Subject: * apt-pkg/cacheiterator.h: - let pkgCache::Iterator inherent std::iterator --- apt-pkg/cacheiterators.h | 4 +++- debian/changelog | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index e2ca74683..3d58f7ec0 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -29,10 +29,12 @@ /*}}}*/ #ifndef PKGLIB_CACHEITERATORS_H #define PKGLIB_CACHEITERATORS_H +#include // abstract Iterator template /*{{{*/ /* This template provides the very basic iterator methods we need to have for doing some walk-over-the-cache magic */ -template class pkgCache::Iterator { +template class pkgCache::Iterator : + public std::iterator { protected: Str *S; pkgCache *Owner; diff --git a/debian/changelog b/debian/changelog index 1fa254b0d..839c8c800 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,8 +16,10 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - add a constant Exists check for MetaKeys * apt-pkg/acquire-item.cc: - do not try PDiff if it is not listed in the Meta file + * apt-pkg/cacheiterator.h: + - let pkgCache::Iterator inherent std::iterator - -- David Kalnischkies Sat, 29 May 2010 12:03:20 +0200 + -- David Kalnischkies Sat, 29 May 2010 15:39:07 +0200 apt (0.7.26~exp5) experimental; urgency=low -- cgit v1.2.3 From 461e4a5e0d30549e5b9758ce816027d92747f00d Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 29 May 2010 19:02:32 +0200 Subject: * apt-pkg/depcache.cc: - correct "Dangerous iterator usage." pointed out by cppcheck --- apt-pkg/depcache.cc | 6 +++--- debian/changelog | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index afec7ba83..6c73b9cfd 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -806,7 +806,7 @@ void pkgDepCache::Update(OpProgress *Prog) a bit we increase with a kill, but we should do something more clever… */ while(recheck.empty() == false) for (std::set::const_iterator p = recheck.begin(); - p != recheck.end(); ++p) { + p != recheck.end();) { if (Prog != 0 && Done%20 == 0) Prog->Progress(Done); PkgIterator P = PkgIterator(*Cache, Cache->PkgP + *p); @@ -814,7 +814,7 @@ void pkgDepCache::Update(OpProgress *Prog) ++killed; ++Done; } - recheck.erase(p); + recheck.erase(p++); } /* Okay, we have killed a great amount of pseudopackages - @@ -849,7 +849,7 @@ void pkgDepCache::Update(OpProgress *Prog) unsigned long const G = *g; recheck.erase(g); if (unlikely(ReInstallPseudoForGroup(G, recheck) == false)) - _error->Warning(_("Internal error, group '%s' has no installable pseudo package"), GrpIterator(*Cache, Cache->GrpP + *g).Name()); + _error->Warning(_("Internal error, group '%s' has no installable pseudo package"), GrpIterator(*Cache, Cache->GrpP + G).Name()); } } diff --git a/debian/changelog b/debian/changelog index 839c8c800..e8c1f9596 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,8 +18,10 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - do not try PDiff if it is not listed in the Meta file * apt-pkg/cacheiterator.h: - let pkgCache::Iterator inherent std::iterator + * apt-pkg/depcache.cc: + - correct "Dangerous iterator usage." pointed out by cppcheck - -- David Kalnischkies Sat, 29 May 2010 15:39:07 +0200 + -- David Kalnischkies Sat, 29 May 2010 19:02:12 +0200 apt (0.7.26~exp5) experimental; urgency=low -- cgit v1.2.3 From f5cd2dbfc493127b18d9ea2b0bb258b736b91cd4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 29 May 2010 19:10:19 +0200 Subject: * ftparchive/writer.h: - add a virtual destructor to FTWScanner class (for cppcheck) --- debian/changelog | 4 +++- ftparchive/writer.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e8c1f9596..2755e7c5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,8 +20,10 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - let pkgCache::Iterator inherent std::iterator * apt-pkg/depcache.cc: - correct "Dangerous iterator usage." pointed out by cppcheck + * ftparchive/writer.h: + - add a virtual destructor to FTWScanner class (for cppcheck) - -- David Kalnischkies Sat, 29 May 2010 19:02:12 +0200 + -- David Kalnischkies Sat, 29 May 2010 19:09:05 +0200 apt (0.7.26~exp5) experimental; urgency=low diff --git a/ftparchive/writer.h b/ftparchive/writer.h index 3123a7f46..c08ddea85 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -72,6 +72,7 @@ class FTWScanner bool SetExts(string const &Vals); FTWScanner(string const &Arch = string()); + virtual ~FTWScanner(); }; class TranslationWriter -- cgit v1.2.3 From e1dbde8dd006ca0ed6b7a6c383af7bbc60014912 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 30 May 2010 07:57:32 +0200 Subject: * apt-pkg/packageset.h: - add a simple wrapper around std::set for packages with it --- apt-pkg/makefile | 3 ++- apt-pkg/packageset.h | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 2 ++ 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 apt-pkg/packageset.h diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 148ad581b..d4537859d 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -42,7 +42,8 @@ HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.h \ acquire.h acquire-worker.h acquire-item.h acquire-method.h \ clean.h srcrecords.h cachefile.h versionmatch.h policy.h \ pkgsystem.h indexfile.h metaindex.h indexrecords.h vendor.h \ - vendorlist.h cdrom.h indexcopy.h aptconfiguration.h + vendorlist.h cdrom.h indexcopy.h aptconfiguration.h \ + packageset.h # Source code for the debian specific components # In theory the deb headers do not need to be exported.. diff --git a/apt-pkg/packageset.h b/apt-pkg/packageset.h new file mode 100644 index 000000000..d80536942 --- /dev/null +++ b/apt-pkg/packageset.h @@ -0,0 +1,53 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/** \class APT::PackageSet + + Simple wrapper around a std::set to provide a similar interface to + a set of packages as to the complete set of all packages in the + pkgCache. +*/ + /*}}}*/ +#ifndef APT_PACKAGESET_H +#define APT_PACKAGESET_H +// Include Files /*{{{*/ +#include +#include + /*}}}*/ +namespace APT { +class PackageSet : public std::set { /*{{{*/ +public: /*{{{*/ + /** \brief smell like a pkgCache::PkgIterator */ + class const_iterator : public std::set::const_iterator { + public: + const_iterator(std::set::const_iterator x) : + std::set::const_iterator(x) {} + + inline const char *Name() const {return (*this)->Name(); } + inline std::string FullName(bool const &Pretty) const { return (*this)->FullName(Pretty); } + inline std::string FullName() const { return (*this)->FullName(); } + inline const char *Section() const {return (*this)->Section(); } + inline bool Purge() const {return (*this)->Purge(); } + inline const char *Arch() const {return (*this)->Arch(); } + inline pkgCache::GrpIterator Group() const { return (*this)->Group(); } + inline pkgCache::VerIterator VersionList() const { return (*this)->VersionList(); } + inline pkgCache::VerIterator CurrentVer() const { return (*this)->CurrentVer(); } + inline pkgCache::DepIterator RevDependsList() const { return (*this)->RevDependsList(); } + inline pkgCache::PrvIterator ProvidesList() const { return (*this)->ProvidesList(); } + inline pkgCache::PkgIterator::OkState State() const { return (*this)->State(); } + inline const char *CandVersion() const { return (*this)->CandVersion(); } + inline const char *CurVersion() const { return (*this)->CurVersion(); } + inline pkgCache *Cache() {return (*this)->Cache();}; + + friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, (*i)); } + + inline pkgCache::PkgIterator const * operator->() const { + return &**this; + }; + }; + // 103. set::iterator is required to be modifiable, but this allows modification of keys + typedef typename APT::PackageSet::const_iterator iterator; + /*}}}*/ +}; + /*}}}*/ +} +#endif diff --git a/debian/changelog b/debian/changelog index 2755e7c5f..6980e5fcf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - correct "Dangerous iterator usage." pointed out by cppcheck * ftparchive/writer.h: - add a virtual destructor to FTWScanner class (for cppcheck) + * apt-pkg/packageset.h: + - add a simple wrapper around std::set for packages with it -- David Kalnischkies Sat, 29 May 2010 19:09:05 +0200 -- cgit v1.2.3 From ffee1c2bed4accfe25b2ac9e9f0ab9a0ebae9b5b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 30 May 2010 23:12:41 +0200 Subject: move regex magic from apt-get to new FromRegEx method --- apt-pkg/cacheiterators.h | 2 +- apt-pkg/makefile | 2 +- apt-pkg/packageset.cc | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ apt-pkg/packageset.h | 24 ++++++++++++++++++- cmdline/apt-get.cc | 42 +++++++------------------------- debian/changelog | 1 + 6 files changed, 96 insertions(+), 37 deletions(-) create mode 100644 apt-pkg/packageset.cc diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 3d58f7ec0..ee852f594 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -66,7 +66,7 @@ template class pkgCache::Iterator : inline operator Str const *() const {return S == OwnerPointer() ? 0 : S;}; inline Str &operator *() {return *S;}; inline Str const &operator *() const {return *S;}; - inline pkgCache *Cache() {return Owner;}; + inline pkgCache *Cache() const {return Owner;}; // Mixed stuff inline void operator =(const Itr &B) {S = B.S; Owner = B.Owner;}; diff --git a/apt-pkg/makefile b/apt-pkg/makefile index d4537859d..968275c5c 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -35,7 +35,7 @@ SOURCE+= pkgcache.cc version.cc depcache.cc \ srcrecords.cc cachefile.cc versionmatch.cc policy.cc \ pkgsystem.cc indexfile.cc pkgcachegen.cc acquire-item.cc \ indexrecords.cc vendor.cc vendorlist.cc cdrom.cc indexcopy.cc \ - aptconfiguration.cc + aptconfiguration.cc packageset.cc HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.h \ orderlist.h sourcelist.h packagemanager.h tagfile.h \ init.h pkgcache.h version.h progress.h pkgrecords.h \ diff --git a/apt-pkg/packageset.cc b/apt-pkg/packageset.cc new file mode 100644 index 000000000..f452bc052 --- /dev/null +++ b/apt-pkg/packageset.cc @@ -0,0 +1,62 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/* ###################################################################### + + Simple wrapper around a std::set to provide a similar interface to + a set of packages as to the complete set of all packages in the + pkgCache. + + ##################################################################### */ + /*}}}*/ +// Include Files /*{{{*/ +#include +#include +#include + +#include + +#include + /*}}}*/ +namespace APT { +// FromRegEx - Return all packages in the cache matching a pattern /*{{{*/ +PackageSet PackageSet::FromRegEx(pkgCache &Cache, const char * const pattern, std::ostream &out) { + PackageSet pkgset; + + const char * I; + for (I = pattern; *I != 0; I++) + if (*I == '.' || *I == '?' || *I == '+' || *I == '*' || + *I == '|' || *I == '[' || *I == '^' || *I == '$') + break; + if (*I == 0) + return pkgset; + + regex_t Pattern; + int Res; + if ((Res = regcomp(&Pattern, pattern , REG_EXTENDED | REG_ICASE | REG_NOSUB)) != 0) { + char Error[300]; + regerror(Res, &Pattern, Error, sizeof(Error)); + _error->Error(_("Regex compilation error - %s"), Error); + return pkgset; + } + + for (pkgCache::GrpIterator Grp = Cache.GrpBegin(); Grp.end() == false; ++Grp) + { + if (regexec(&Pattern, Grp.Name(), 0, 0, 0) != 0) + continue; + pkgCache::PkgIterator Pkg = Grp.FindPkg("native"); + if (unlikely(Pkg.end() == true)) + // FIXME: Fallback to different architectures here? + continue; + + ioprintf(out, _("Note, selecting %s for regex '%s'\n"), + Pkg.Name(), pattern); + + pkgset.insert(Pkg); + } + + regfree(&Pattern); + + return pkgset; +} + /*}}}*/ +} diff --git a/apt-pkg/packageset.h b/apt-pkg/packageset.h index d80536942..cd1430a2a 100644 --- a/apt-pkg/packageset.h +++ b/apt-pkg/packageset.h @@ -10,7 +10,11 @@ #ifndef APT_PACKAGESET_H #define APT_PACKAGESET_H // Include Files /*{{{*/ +#include +#include +#include #include + #include /*}}}*/ namespace APT { @@ -22,6 +26,8 @@ public: /*{{{*/ const_iterator(std::set::const_iterator x) : std::set::const_iterator(x) {} + operator pkgCache::PkgIterator(void) { return **this; } + inline const char *Name() const {return (*this)->Name(); } inline std::string FullName(bool const &Pretty) const { return (*this)->FullName(Pretty); } inline std::string FullName() const { return (*this)->FullName(); } @@ -36,7 +42,8 @@ public: /*{{{*/ inline pkgCache::PkgIterator::OkState State() const { return (*this)->State(); } inline const char *CandVersion() const { return (*this)->CandVersion(); } inline const char *CurVersion() const { return (*this)->CurVersion(); } - inline pkgCache *Cache() {return (*this)->Cache();}; + inline pkgCache *Cache() const { return (*this)->Cache(); }; + inline unsigned long Index() const {return (*this)->Index();}; friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, (*i)); } @@ -46,6 +53,21 @@ public: /*{{{*/ }; // 103. set::iterator is required to be modifiable, but this allows modification of keys typedef typename APT::PackageSet::const_iterator iterator; + + /** \brief returns all packages in the cache whose name matchs a given pattern + + A simple helper responsible for executing a regular expression on all + package names in the cache. Optional it prints a a notice about the + packages chosen cause of the given package. + \param Cache the packages are in + \param pattern regular expression for package names + \param out stream to print the notice to */ + static APT::PackageSet FromRegEx(pkgCache &Cache, const char *pattern, std::ostream &out); + static APT::PackageSet FromRegEx(pkgCache &Cache, const char *pattern) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::PackageSet::FromRegEx(Cache, pattern, out); + } + /*}}}*/ }; /*}}}*/ diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 44235e358..1cffd6730 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -40,7 +40,8 @@ #include #include #include - +#include + #include #include @@ -1780,51 +1781,24 @@ bool DoInstall(CommandLine &CmdL) Packages++; if (Pkg.end() == true) { - // Check if the name is a regex - const char *I; - for (I = S; *I != 0; I++) - if (*I == '?' || *I == '*' || *I == '|' || - *I == '[' || *I == '^' || *I == '$') - break; - if (*I == 0) + APT::PackageSet pkgset = APT::PackageSet::FromRegEx(Cache, S, c1out); + if (pkgset.empty() == true) return _error->Error(_("Couldn't find package %s"),S); // Regexs must always be confirmed ExpectedInst += 1000; - - // Compile the regex pattern - regex_t Pattern; - int Res; - if ((Res = regcomp(&Pattern,S,REG_EXTENDED | REG_ICASE | - REG_NOSUB)) != 0) - { - char Error[300]; - regerror(Res,&Pattern,Error,sizeof(Error)); - return _error->Error(_("Regex compilation error - %s"),Error); - } - - // Run over the matches + bool Hit = false; - for (pkgCache::GrpIterator Grp = Cache->GrpBegin(); Grp.end() == false; ++Grp) + for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { - if (regexec(&Pattern,Grp.Name(),0,0,0) != 0) - continue; - Pkg = Grp.FindPkg("native"); - if (unlikely(Pkg.end() == true)) - continue; - - ioprintf(c1out,_("Note, selecting %s for regex '%s'\n"), - Pkg.Name(),S); - if (VerTag != 0) if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false) return false; - + Hit |= TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix, ExpectedInst,false); } - regfree(&Pattern); - + if (Hit == false) return _error->Error(_("Couldn't find package %s"),S); } diff --git a/debian/changelog b/debian/changelog index 6980e5fcf..023d513be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - add a virtual destructor to FTWScanner class (for cppcheck) * apt-pkg/packageset.h: - add a simple wrapper around std::set for packages with it + - move regex magic from apt-get to new FromRegEx method -- David Kalnischkies Sat, 29 May 2010 19:09:05 +0200 -- cgit v1.2.3 From 78c325968642255fd2325003f19729b617477666 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 31 May 2010 00:28:14 +0200 Subject: move cmdline parsing from apt-cache to new FromCommandLine method --- apt-pkg/packageset.cc | 42 ++++++++++++++++++++++++--- apt-pkg/packageset.h | 53 ++++++++++++++++++++++------------ cmdline/apt-cache.cc | 80 ++++++++++++++------------------------------------- debian/changelog | 1 + 4 files changed, 95 insertions(+), 81 deletions(-) diff --git a/apt-pkg/packageset.cc b/apt-pkg/packageset.cc index f452bc052..baa1c211b 100644 --- a/apt-pkg/packageset.cc +++ b/apt-pkg/packageset.cc @@ -9,12 +9,15 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ +#include #include #include #include #include +#include + #include /*}}}*/ namespace APT { @@ -44,18 +47,49 @@ PackageSet PackageSet::FromRegEx(pkgCache &Cache, const char * const pattern, st if (regexec(&Pattern, Grp.Name(), 0, 0, 0) != 0) continue; pkgCache::PkgIterator Pkg = Grp.FindPkg("native"); - if (unlikely(Pkg.end() == true)) - // FIXME: Fallback to different architectures here? - continue; + if (Pkg.end() == true) { + std::vector archs = APT::Configuration::getArchitectures(); + for (std::vector::const_iterator a = archs.begin(); + a != archs.end() || Pkg.end() != true; ++a) { + Pkg = Grp.FindPkg(*a); + } + if (Pkg.end() == true) + continue; + } ioprintf(out, _("Note, selecting %s for regex '%s'\n"), - Pkg.Name(), pattern); + Pkg.FullName(true).c_str(), pattern); pkgset.insert(Pkg); } regfree(&Pattern); + return pkgset; +} + /*}}}*/ +// FromCommandLine - Return all packages specified on commandline /*{{{*/ +PackageSet PackageSet::FromCommandLine(pkgCache &Cache, const char **cmdline, std::ostream &out) { + PackageSet pkgset; + for (const char **I = cmdline + 1; *I != 0; I++) { + pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); + if (Pkg.end() == true) { + std::vector archs = APT::Configuration::getArchitectures(); + for (std::vector::const_iterator a = archs.begin(); + a != archs.end() || Pkg.end() != true; ++a) { + Pkg = Cache.FindPkg(*I, *a); + } + if (Pkg.end() == true) { + PackageSet regex = FromRegEx(Cache, *I, out); + if (regex.empty() == true) + _error->Warning(_("Unable to locate package %s"),*I); + else + pkgset.insert(regex.begin(), regex.end()); + continue; + } + } + pkgset.insert(Pkg); + } return pkgset; } /*}}}*/ diff --git a/apt-pkg/packageset.h b/apt-pkg/packageset.h index cd1430a2a..0bd60c56b 100644 --- a/apt-pkg/packageset.h +++ b/apt-pkg/packageset.h @@ -28,27 +28,29 @@ public: /*{{{*/ operator pkgCache::PkgIterator(void) { return **this; } - inline const char *Name() const {return (*this)->Name(); } - inline std::string FullName(bool const &Pretty) const { return (*this)->FullName(Pretty); } - inline std::string FullName() const { return (*this)->FullName(); } - inline const char *Section() const {return (*this)->Section(); } - inline bool Purge() const {return (*this)->Purge(); } - inline const char *Arch() const {return (*this)->Arch(); } - inline pkgCache::GrpIterator Group() const { return (*this)->Group(); } - inline pkgCache::VerIterator VersionList() const { return (*this)->VersionList(); } - inline pkgCache::VerIterator CurrentVer() const { return (*this)->CurrentVer(); } - inline pkgCache::DepIterator RevDependsList() const { return (*this)->RevDependsList(); } - inline pkgCache::PrvIterator ProvidesList() const { return (*this)->ProvidesList(); } - inline pkgCache::PkgIterator::OkState State() const { return (*this)->State(); } - inline const char *CandVersion() const { return (*this)->CandVersion(); } - inline const char *CurVersion() const { return (*this)->CurVersion(); } - inline pkgCache *Cache() const { return (*this)->Cache(); }; - inline unsigned long Index() const {return (*this)->Index();}; + inline const char *Name() const {return (**this).Name(); } + inline std::string FullName(bool const &Pretty) const { return (**this).FullName(Pretty); } + inline std::string FullName() const { return (**this).FullName(); } + inline const char *Section() const {return (**this).Section(); } + inline bool Purge() const {return (**this).Purge(); } + inline const char *Arch() const {return (**this).Arch(); } + inline pkgCache::GrpIterator Group() const { return (**this).Group(); } + inline pkgCache::VerIterator VersionList() const { return (**this).VersionList(); } + inline pkgCache::VerIterator CurrentVer() const { return (**this).CurrentVer(); } + inline pkgCache::DepIterator RevDependsList() const { return (**this).RevDependsList(); } + inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); } + inline pkgCache::PkgIterator::OkState State() const { return (**this).State(); } + inline const char *CandVersion() const { return (**this).CandVersion(); } + inline const char *CurVersion() const { return (**this).CurVersion(); } + inline pkgCache *Cache() const { return (**this).Cache(); }; + inline unsigned long Index() const {return (**this).Index();}; + // we have only valid iterators here + inline bool end() const { return false; }; friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, (*i)); } - inline pkgCache::PkgIterator const * operator->() const { - return &**this; + inline pkgCache::Package const * operator->() const { + return &***this; }; }; // 103. set::iterator is required to be modifiable, but this allows modification of keys @@ -68,6 +70,21 @@ public: /*{{{*/ return APT::PackageSet::FromRegEx(Cache, pattern, out); } + /** \brief returns all packages specified on the commandline + + Get all package names from the commandline and executes regex's if needed. + No special package command is supported, just plain names. + \param Cache the packages are in + \param cmdline Command line the package names should be extracted from + \param out stream to print various notices to */ + static APT::PackageSet FromCommandLine(pkgCache &Cache, const char **cmdline, std::ostream &out); + static APT::PackageSet FromCommandLine(pkgCache &Cache, const char **cmdline) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::PackageSet::FromCommandLine(Cache, cmdline, out); + } + + + /*}}}*/ }; /*}}}*/ diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 10dbf44d2..95f185b4f 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -175,15 +176,10 @@ bool UnMet(CommandLine &CmdL) bool DumpPackage(CommandLine &CmdL) { pkgCache &Cache = *GCache; - for (const char **I = CmdL.FileList + 1; *I != 0; I++) - { - pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); - if (Pkg.end() == true) - { - _error->Warning(_("Unable to locate package %s"),*I); - continue; - } + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(Cache, CmdL.FileList); + for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) + { cout << "Package: " << Pkg.FullName(true) << endl; cout << "Versions: " << endl; for (pkgCache::VerIterator Cur = Pkg.VersionList(); Cur.end() != true; Cur++) @@ -545,18 +541,11 @@ bool Depends(CommandLine &CmdL) pkgCache &Cache = *GCache; SPtrArray Colours = new unsigned[Cache.Head().PackageCount]; memset(Colours,0,sizeof(*Colours)*Cache.Head().PackageCount); - - for (const char **I = CmdL.FileList + 1; *I != 0; I++) - { - pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); - if (Pkg.end() == true) - { - _error->Warning(_("Unable to locate package %s"),*I); - continue; - } + + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(Cache, CmdL.FileList); + for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) Colours[Pkg->ID] = 1; - } - + bool Recurse = _config->FindB("APT::Cache::RecurseDepends",false); bool Installed = _config->FindB("APT::Cache::Installed",false); bool Important = _config->FindB("APT::Cache::Important",false); @@ -639,18 +628,11 @@ bool RDepends(CommandLine &CmdL) pkgCache &Cache = *GCache; SPtrArray Colours = new unsigned[Cache.Head().PackageCount]; memset(Colours,0,sizeof(*Colours)*Cache.Head().PackageCount); - - for (const char **I = CmdL.FileList + 1; *I != 0; I++) - { - pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); - if (Pkg.end() == true) - { - _error->Warning(_("Unable to locate package %s"),*I); - continue; - } + + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(Cache, CmdL.FileList); + for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) Colours[Pkg->ID] = 1; - } - + bool Recurse = _config->FindB("APT::Cache::RecurseDepends",false); bool Installed = _config->FindB("APT::Cache::Installed",false); bool DidSomething; @@ -1440,23 +1422,9 @@ bool ShowPackage(CommandLine &CmdL) pkgCache &Cache = *GCache; pkgDepCache::Policy Plcy; - unsigned found = 0; - - for (const char **I = CmdL.FileList + 1; *I != 0; I++) + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(Cache, CmdL.FileList); + for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { - // FIXME: Handle the case in which pkgname name:arch is not found - pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); - if (Pkg.end() == true) - { - Pkg = Cache.FindPkg(*I, "any"); - if (Pkg.end() == true) { - _error->Warning(_("Unable to locate package %s"),*I); - continue; - } - } - - ++found; - // Find the proper version to use. if (_config->FindB("APT::Cache::AllVersions","true") == true) { @@ -1477,7 +1445,7 @@ bool ShowPackage(CommandLine &CmdL) } } - if (found > 0) + if (pkgset.empty() == false) return true; return _error->Error(_("No packages found")); } @@ -1622,15 +1590,10 @@ bool Policy(CommandLine &CmdL) (InstalledLessCandidate > 0 ? (InstalledLessCandidate) : 0) - 1; // Print out detailed information for each package - for (const char **I = CmdL.FileList + 1; *I != 0; I++) + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(Cache, CmdL.FileList); + for (APT::PackageSet::const_iterator I = pkgset.begin(); I != pkgset.end(); ++I) { - pkgCache::GrpIterator Grp = Cache.FindGrp(*I); - pkgCache::PkgIterator Pkg = Grp.FindPkg("any"); - if (Pkg.end() == true) - { - _error->Warning(_("Unable to locate package %s"),*I); - continue; - } + pkgCache::PkgIterator Pkg = I.Group().FindPkg("any"); for (; Pkg.end() != true; Pkg = Grp.NextPkg(Pkg)) { if (strcmp(Pkg.Arch(),"all") == 0) @@ -1708,10 +1671,9 @@ bool Madison(CommandLine &CmdL) if (_error->PendingError() == true) _error->Discard(); - for (const char **I = CmdL.FileList + 1; *I != 0; I++) + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(Cache, CmdL.FileList); + for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { - pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); - if (Pkg.end() == false) { for (pkgCache::VerIterator V = Pkg.VersionList(); V.end() == false; V++) @@ -1746,7 +1708,7 @@ bool Madison(CommandLine &CmdL) SrcRecs.Restart(); pkgSrcRecords::Parser *SrcParser; - while ((SrcParser = SrcRecs.Find(*I,false)) != 0) + while ((SrcParser = SrcRecs.Find(Pkg.Name(),false)) != 0) { // Maybe support Release info here too eventually cout << setw(10) << SrcParser->Package() << " | " diff --git a/debian/changelog b/debian/changelog index 023d513be..79768a779 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low * apt-pkg/packageset.h: - add a simple wrapper around std::set for packages with it - move regex magic from apt-get to new FromRegEx method + - move cmdline parsing from apt-cache to new FromCommandLine method -- David Kalnischkies Sat, 29 May 2010 19:09:05 +0200 -- cgit v1.2.3 From 4c265635a8417b857a3a8f537c74313d5533da9b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 31 May 2010 12:58:20 +0200 Subject: =?UTF-8?q?i=20managed=20to=20commit=20broken=20code=E2=80=A6=20wh?= =?UTF-8?q?ich=20(at=20least=20in=20my=20mind)=20worked=20yesterday.=20Str?= =?UTF-8?q?ange=E2=80=A6=20anyway=20only=20small=20fixes.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmdline/apt-cache.cc | 2 +- ftparchive/writer.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 95f185b4f..943a001a8 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1595,7 +1595,7 @@ bool Policy(CommandLine &CmdL) { pkgCache::PkgIterator Pkg = I.Group().FindPkg("any"); - for (; Pkg.end() != true; Pkg = Grp.NextPkg(Pkg)) { + for (; Pkg.end() != true; Pkg = I.Group().NextPkg(Pkg)) { if (strcmp(Pkg.Arch(),"all") == 0) continue; diff --git a/ftparchive/writer.h b/ftparchive/writer.h index c08ddea85..49d430c47 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -72,7 +72,7 @@ class FTWScanner bool SetExts(string const &Vals); FTWScanner(string const &Arch = string()); - virtual ~FTWScanner(); + virtual ~FTWScanner() {}; }; class TranslationWriter -- cgit v1.2.3 From 6e235c6640cdc6cb9a8c3eaa1e65a6141f463676 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 31 May 2010 14:16:44 +0200 Subject: improve the handling of regex together with the architecture modifier --- apt-pkg/packageset.cc | 35 +++++++++++++++++++++-------------- apt-pkg/packageset.h | 4 ++-- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/apt-pkg/packageset.cc b/apt-pkg/packageset.cc index baa1c211b..f296b7c45 100644 --- a/apt-pkg/packageset.cc +++ b/apt-pkg/packageset.cc @@ -22,20 +22,26 @@ /*}}}*/ namespace APT { // FromRegEx - Return all packages in the cache matching a pattern /*{{{*/ -PackageSet PackageSet::FromRegEx(pkgCache &Cache, const char * const pattern, std::ostream &out) { +PackageSet PackageSet::FromRegEx(pkgCache &Cache, std::string pattern, std::ostream &out) { PackageSet pkgset; + std::string arch = "native"; + static const char * const isregex = ".?+*|[^$"; - const char * I; - for (I = pattern; *I != 0; I++) - if (*I == '.' || *I == '?' || *I == '+' || *I == '*' || - *I == '|' || *I == '[' || *I == '^' || *I == '$') - break; - if (*I == 0) + if (pattern.find_first_of(isregex) == std::string::npos) return pkgset; + size_t archfound = pattern.find_last_of(':'); + if (archfound != std::string::npos) { + arch = pattern.substr(archfound+1); + if (arch.find_first_of(isregex) == std::string::npos) + pattern.erase(archfound); + else + arch = "native"; + } + regex_t Pattern; int Res; - if ((Res = regcomp(&Pattern, pattern , REG_EXTENDED | REG_ICASE | REG_NOSUB)) != 0) { + if ((Res = regcomp(&Pattern, pattern.c_str() , REG_EXTENDED | REG_ICASE | REG_NOSUB)) != 0) { char Error[300]; regerror(Res, &Pattern, Error, sizeof(Error)); _error->Error(_("Regex compilation error - %s"), Error); @@ -46,19 +52,20 @@ PackageSet PackageSet::FromRegEx(pkgCache &Cache, const char * const pattern, st { if (regexec(&Pattern, Grp.Name(), 0, 0, 0) != 0) continue; - pkgCache::PkgIterator Pkg = Grp.FindPkg("native"); + pkgCache::PkgIterator Pkg = Grp.FindPkg(arch); if (Pkg.end() == true) { - std::vector archs = APT::Configuration::getArchitectures(); - for (std::vector::const_iterator a = archs.begin(); - a != archs.end() || Pkg.end() != true; ++a) { - Pkg = Grp.FindPkg(*a); + if (archfound == std::string::npos) { + std::vector archs = APT::Configuration::getArchitectures(); + for (std::vector::const_iterator a = archs.begin(); + a != archs.end() && Pkg.end() != true; ++a) + Pkg = Grp.FindPkg(*a); } if (Pkg.end() == true) continue; } ioprintf(out, _("Note, selecting %s for regex '%s'\n"), - Pkg.FullName(true).c_str(), pattern); + Pkg.FullName(true).c_str(), pattern.c_str()); pkgset.insert(Pkg); } diff --git a/apt-pkg/packageset.h b/apt-pkg/packageset.h index 0bd60c56b..9f80d60ed 100644 --- a/apt-pkg/packageset.h +++ b/apt-pkg/packageset.h @@ -64,8 +64,8 @@ public: /*{{{*/ \param Cache the packages are in \param pattern regular expression for package names \param out stream to print the notice to */ - static APT::PackageSet FromRegEx(pkgCache &Cache, const char *pattern, std::ostream &out); - static APT::PackageSet FromRegEx(pkgCache &Cache, const char *pattern) { + static APT::PackageSet FromRegEx(pkgCache &Cache, std::string pattern, std::ostream &out); + static APT::PackageSet FromRegEx(pkgCache &Cache, std::string const &pattern) { std::ostream out (std::ofstream("/dev/null").rdbuf()); return APT::PackageSet::FromRegEx(Cache, pattern, out); } -- cgit v1.2.3 From 093e9f5d30f37164dd28d639fedfb059e105e43e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 31 May 2010 17:22:04 +0200 Subject: * apt-pkg/contrib/cmdline.cc: - fix segfault in SaveInConfig caused by writing over char[] sizes --- apt-pkg/contrib/cmndline.cc | 4 ++-- debian/changelog | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc index 0b16bf51a..5a9944096 100644 --- a/apt-pkg/contrib/cmndline.cc +++ b/apt-pkg/contrib/cmndline.cc @@ -360,11 +360,11 @@ bool CommandLine::DispatchArg(Dispatch *Map,bool NoMatch) than nothing after all. */ void CommandLine::SaveInConfig(unsigned int const &argc, char const * const * const argv) { - char cmdline[300]; + char cmdline[100 + argc * 50]; unsigned int length = 0; bool lastWasOption = false; bool closeQuote = false; - for (unsigned int i = 0; i < argc; ++i, ++length) + for (unsigned int i = 0; i < argc && length < sizeof(cmdline); ++i, ++length) { for (unsigned int j = 0; argv[i][j] != '\0' && length < sizeof(cmdline)-1; ++j, ++length) { diff --git a/debian/changelog b/debian/changelog index 79768a779..6341484f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,8 +26,10 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - add a simple wrapper around std::set for packages with it - move regex magic from apt-get to new FromRegEx method - move cmdline parsing from apt-cache to new FromCommandLine method + * apt-pkg/contrib/cmdline.cc: + - fix segfault in SaveInConfig caused by writing over char[] sizes - -- David Kalnischkies Sat, 29 May 2010 19:09:05 +0200 + -- David Kalnischkies Mon, 31 May 2010 17:21:00 +0200 apt (0.7.26~exp5) experimental; urgency=low -- cgit v1.2.3 From bd2fb30a8647293f80b085d0308e66bb9219e662 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 31 May 2010 20:00:16 +0200 Subject: * apt-pkg/pkgcache.cc: - get the best matching arch package from a group with FindPreferredPkg --- apt-pkg/cacheiterators.h | 5 +++++ apt-pkg/pkgcache.cc | 19 +++++++++++++++++++ debian/changelog | 4 +++- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index ee852f594..e5b23a818 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -104,6 +104,11 @@ class pkgCache::GrpIterator: public Iterator { inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;}; inline PkgIterator PackageList() const; PkgIterator FindPkg(string Arch = "any"); + /** \brief find the package with the "best" architecture + + The best architecture is either the "native" or the first + in the list of Architectures which is not an end-Pointer */ + PkgIterator FindPreferredPkg(); PkgIterator NextPkg(PkgIterator const &Pkg); // Constructors diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index a59a06d65..adaae9c89 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -340,6 +340,25 @@ pkgCache::PkgIterator pkgCache::GrpIterator::FindPkg(string Arch) { break; } + return PkgIterator(*Owner, 0); +} + /*}}}*/ +// GrpIterator::FindPreferredPkg - Locate the "best" package /*{{{*/ +// --------------------------------------------------------------------- +/* Returns an End-Pointer on error, pointer to the package otherwise */ +pkgCache::PkgIterator pkgCache::GrpIterator::FindPreferredPkg() { + pkgCache::PkgIterator Pkg = FindPkg("native"); + if (Pkg.end() == false) + return Pkg; + + std::vector const archs = APT::Configuration::getArchitectures(); + for (std::vector::const_iterator a = archs.begin(); + a != archs.end(); ++a) { + Pkg = FindPkg(*a); + if (Pkg.end() == false) + return Pkg; + } + return PkgIterator(*Owner, 0); } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 6341484f2..920003484 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,8 +28,10 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - move cmdline parsing from apt-cache to new FromCommandLine method * apt-pkg/contrib/cmdline.cc: - fix segfault in SaveInConfig caused by writing over char[] sizes + * apt-pkg/pkgcache.cc: + - get the best matching arch package from a group with FindPreferredPkg - -- David Kalnischkies Mon, 31 May 2010 17:21:00 +0200 + -- David Kalnischkies Mon, 31 May 2010 19:59:04 +0200 apt (0.7.26~exp5) experimental; urgency=low -- cgit v1.2.3 From d5cc17d6c2ba4e29e800e489d5f3b3cf4a405543 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 31 May 2010 20:02:41 +0200 Subject: * cmdline/apt-cache.cc: - make the search multiarch compatible by using GrpIterator instead --- cmdline/apt-cache.cc | 77 +++++++++++++++++++++++++++------------------------- debian/changelog | 4 ++- 2 files changed, 43 insertions(+), 38 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 943a001a8..d8e14617a 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1272,15 +1272,15 @@ struct ExDescFile bool Search(CommandLine &CmdL) { pkgCache &Cache = *GCache; - bool ShowFull = _config->FindB("APT::Cache::ShowFull",false); - bool NamesOnly = _config->FindB("APT::Cache::NamesOnly",false); - unsigned NumPatterns = CmdL.FileSize() -1; + bool const ShowFull = _config->FindB("APT::Cache::ShowFull",false); + bool const NamesOnly = _config->FindB("APT::Cache::NamesOnly",false); + unsigned int const NumPatterns = CmdL.FileSize() -1; pkgDepCache::Policy Plcy; // Make sure there is at least one argument if (NumPatterns < 1) - return _error->Error(_("You must give exactly one pattern")); + return _error->Error(_("You must give at least one search pattern")); // Compile the regex pattern regex_t *Patterns = new regex_t[NumPatterns]; @@ -1296,8 +1296,6 @@ bool Search(CommandLine &CmdL) } } - // Create the text record parser - pkgRecords Recs(Cache); if (_error->PendingError() == true) { for (unsigned I = 0; I != NumPatterns; I++) @@ -1305,70 +1303,75 @@ bool Search(CommandLine &CmdL) return false; } - ExDescFile *DFList = new ExDescFile[Cache.HeaderP->PackageCount+1]; - memset(DFList,0,sizeof(*DFList)*Cache.HeaderP->PackageCount+1); + ExDescFile *DFList = new ExDescFile[Cache.HeaderP->GroupCount+1]; + memset(DFList,0,sizeof(*DFList)*Cache.HeaderP->GroupCount+1); // Map versions that we want to write out onto the VerList array. - for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++) + for (pkgCache::GrpIterator G = Cache.GrpBegin(); G.end() == false; ++G) { - DFList[P->ID].NameMatch = NumPatterns != 0; + if (DFList[G->ID].NameMatch == true) + continue; + + DFList[G->ID].NameMatch = true; for (unsigned I = 0; I != NumPatterns; I++) { - if (regexec(&Patterns[I],P.Name(),0,0,0) == 0) - DFList[P->ID].NameMatch &= true; - else - DFList[P->ID].NameMatch = false; + if (regexec(&Patterns[I],G.Name(),0,0,0) == 0) + continue; + DFList[G->ID].NameMatch = false; + break; } // Doing names only, drop any that dont match.. - if (NamesOnly == true && DFList[P->ID].NameMatch == false) + if (NamesOnly == true && DFList[G->ID].NameMatch == false) continue; - // Find the proper version to use. + // Find the proper version to use + pkgCache::PkgIterator P = G.FindPreferredPkg(); + if (P.end() == true) + continue; pkgCache::VerIterator V = Plcy.GetCandidateVer(P); if (V.end() == false) - DFList[P->ID].Df = V.DescriptionList().FileList(); - } - - // Include all the packages that provide matching names too - for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++) - { - if (DFList[P->ID].NameMatch == false) + DFList[G->ID].Df = V.DescriptionList().FileList(); + + if (DFList[G->ID].NameMatch == false) continue; + // Include all the packages that provide matching names too for (pkgCache::PrvIterator Prv = P.ProvidesList() ; Prv.end() == false; Prv++) { pkgCache::VerIterator V = Plcy.GetCandidateVer(Prv.OwnerPkg()); - if (V.end() == false) - { - DFList[Prv.OwnerPkg()->ID].Df = V.DescriptionList().FileList(); - DFList[Prv.OwnerPkg()->ID].NameMatch = true; - } + if (V.end() == true) + continue; + + unsigned long id = Prv.OwnerPkg().Group()->ID; + DFList[id].Df = V.DescriptionList().FileList(); + DFList[id].NameMatch = true; } } - LocalitySort(&DFList->Df,Cache.HeaderP->PackageCount,sizeof(*DFList)); + LocalitySort(&DFList->Df,Cache.HeaderP->GroupCount,sizeof(*DFList)); + // Create the text record parser + pkgRecords Recs(Cache); // Iterate over all the version records and check them for (ExDescFile *J = DFList; J->Df != 0; J++) { pkgRecords::Parser &P = Recs.Lookup(pkgCache::DescFileIterator(Cache,J->Df)); - bool Match = true; - if (J->NameMatch == false) + if (J->NameMatch == false && NamesOnly == false) { - string LongDesc = P.LongDesc(); - Match = NumPatterns != 0; + string const LongDesc = P.LongDesc(); + J->NameMatch = true; for (unsigned I = 0; I != NumPatterns; I++) { if (regexec(&Patterns[I],LongDesc.c_str(),0,0,0) == 0) - Match &= true; - else - Match = false; + continue; + J->NameMatch = false; + break; } } - if (Match == true) + if (J->NameMatch == true) { if (ShowFull == true) { diff --git a/debian/changelog b/debian/changelog index 920003484..054088ec2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,8 +30,10 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - fix segfault in SaveInConfig caused by writing over char[] sizes * apt-pkg/pkgcache.cc: - get the best matching arch package from a group with FindPreferredPkg + * cmdline/apt-cache.cc: + - make the search multiarch compatible by using GrpIterator instead - -- David Kalnischkies Mon, 31 May 2010 19:59:04 +0200 + -- David Kalnischkies Mon, 31 May 2010 20:00:24 +0200 apt (0.7.26~exp5) experimental; urgency=low -- cgit v1.2.3 From 7959c5eda83bd6d69876942566cf47d74fc76530 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 31 May 2010 21:00:09 +0200 Subject: rename packageset into cacheset while it is not too late --- apt-pkg/cacheset.cc | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++ apt-pkg/cacheset.h | 96 ++++++++++++++++++++++++++++++++++++++++++++++ apt-pkg/makefile | 4 +- apt-pkg/packageset.cc | 103 -------------------------------------------------- apt-pkg/packageset.h | 92 -------------------------------------------- cmdline/apt-cache.cc | 2 +- cmdline/apt-get.cc | 2 +- debian/changelog | 2 +- 8 files changed, 204 insertions(+), 200 deletions(-) create mode 100644 apt-pkg/cacheset.cc create mode 100644 apt-pkg/cacheset.h delete mode 100644 apt-pkg/packageset.cc delete mode 100644 apt-pkg/packageset.h diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc new file mode 100644 index 000000000..b49b36539 --- /dev/null +++ b/apt-pkg/cacheset.cc @@ -0,0 +1,103 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/* ###################################################################### + + Simple wrapper around a std::set to provide a similar interface to + a set of cache structures as to the complete set of all structures + in the pkgCache. Currently only Package is supported. + + ##################################################################### */ + /*}}}*/ +// Include Files /*{{{*/ +#include +#include +#include +#include + +#include + +#include + +#include + /*}}}*/ +namespace APT { +// FromRegEx - Return all packages in the cache matching a pattern /*{{{*/ +PackageSet PackageSet::FromRegEx(pkgCache &Cache, std::string pattern, std::ostream &out) { + PackageSet pkgset; + std::string arch = "native"; + static const char * const isregex = ".?+*|[^$"; + + if (pattern.find_first_of(isregex) == std::string::npos) + return pkgset; + + size_t archfound = pattern.find_last_of(':'); + if (archfound != std::string::npos) { + arch = pattern.substr(archfound+1); + if (arch.find_first_of(isregex) == std::string::npos) + pattern.erase(archfound); + else + arch = "native"; + } + + regex_t Pattern; + int Res; + if ((Res = regcomp(&Pattern, pattern.c_str() , REG_EXTENDED | REG_ICASE | REG_NOSUB)) != 0) { + char Error[300]; + regerror(Res, &Pattern, Error, sizeof(Error)); + _error->Error(_("Regex compilation error - %s"), Error); + return pkgset; + } + + for (pkgCache::GrpIterator Grp = Cache.GrpBegin(); Grp.end() == false; ++Grp) + { + if (regexec(&Pattern, Grp.Name(), 0, 0, 0) != 0) + continue; + pkgCache::PkgIterator Pkg = Grp.FindPkg(arch); + if (Pkg.end() == true) { + if (archfound == std::string::npos) { + std::vector archs = APT::Configuration::getArchitectures(); + for (std::vector::const_iterator a = archs.begin(); + a != archs.end() && Pkg.end() != true; ++a) + Pkg = Grp.FindPkg(*a); + } + if (Pkg.end() == true) + continue; + } + + ioprintf(out, _("Note, selecting %s for regex '%s'\n"), + Pkg.FullName(true).c_str(), pattern.c_str()); + + pkgset.insert(Pkg); + } + + regfree(&Pattern); + + return pkgset; +} + /*}}}*/ +// FromCommandLine - Return all packages specified on commandline /*{{{*/ +PackageSet PackageSet::FromCommandLine(pkgCache &Cache, const char **cmdline, std::ostream &out) { + PackageSet pkgset; + for (const char **I = cmdline + 1; *I != 0; I++) { + pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); + if (Pkg.end() == true) { + std::vector archs = APT::Configuration::getArchitectures(); + for (std::vector::const_iterator a = archs.begin(); + a != archs.end() || Pkg.end() != true; ++a) { + Pkg = Cache.FindPkg(*I, *a); + } + if (Pkg.end() == true) { + PackageSet regex = FromRegEx(Cache, *I, out); + if (regex.empty() == true) + _error->Warning(_("Unable to locate package %s"),*I); + else + pkgset.insert(regex.begin(), regex.end()); + continue; + } + } + pkgset.insert(Pkg); + } + return pkgset; +} + /*}}}*/ +} diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h new file mode 100644 index 000000000..7c05face6 --- /dev/null +++ b/apt-pkg/cacheset.h @@ -0,0 +1,96 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/** \file cacheset.h + Wrappers around std::set to have set::iterators which behave + similar to the Iterators of the cache structures. + + Provides also a few helper methods which work with these sets */ + /*}}}*/ +#ifndef APT_CACHESET_H +#define APT_CACHESET_H +// Include Files /*{{{*/ +#include +#include +#include +#include + +#include + /*}}}*/ +namespace APT { +/** \class APT::PackageSet + + Simple wrapper around a std::set to provide a similar interface to + a set of packages as to the complete set of all packages in the + pkgCache. */ +class PackageSet : public std::set { /*{{{*/ +public: /*{{{*/ + /** \brief smell like a pkgCache::PkgIterator */ + class const_iterator : public std::set::const_iterator { + public: + const_iterator(std::set::const_iterator x) : + std::set::const_iterator(x) {} + + operator pkgCache::PkgIterator(void) { return **this; } + + inline const char *Name() const {return (**this).Name(); } + inline std::string FullName(bool const &Pretty) const { return (**this).FullName(Pretty); } + inline std::string FullName() const { return (**this).FullName(); } + inline const char *Section() const {return (**this).Section(); } + inline bool Purge() const {return (**this).Purge(); } + inline const char *Arch() const {return (**this).Arch(); } + inline pkgCache::GrpIterator Group() const { return (**this).Group(); } + inline pkgCache::VerIterator VersionList() const { return (**this).VersionList(); } + inline pkgCache::VerIterator CurrentVer() const { return (**this).CurrentVer(); } + inline pkgCache::DepIterator RevDependsList() const { return (**this).RevDependsList(); } + inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); } + inline pkgCache::PkgIterator::OkState State() const { return (**this).State(); } + inline const char *CandVersion() const { return (**this).CandVersion(); } + inline const char *CurVersion() const { return (**this).CurVersion(); } + inline pkgCache *Cache() const { return (**this).Cache(); }; + inline unsigned long Index() const {return (**this).Index();}; + // we have only valid iterators here + inline bool end() const { return false; }; + + friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, (*i)); } + + inline pkgCache::Package const * operator->() const { + return &***this; + }; + }; + // 103. set::iterator is required to be modifiable, but this allows modification of keys + typedef typename APT::PackageSet::const_iterator iterator; + + /** \brief returns all packages in the cache whose name matchs a given pattern + + A simple helper responsible for executing a regular expression on all + package names in the cache. Optional it prints a a notice about the + packages chosen cause of the given package. + \param Cache the packages are in + \param pattern regular expression for package names + \param out stream to print the notice to */ + static APT::PackageSet FromRegEx(pkgCache &Cache, std::string pattern, std::ostream &out); + static APT::PackageSet FromRegEx(pkgCache &Cache, std::string const &pattern) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::PackageSet::FromRegEx(Cache, pattern, out); + } + + /** \brief returns all packages specified on the commandline + + Get all package names from the commandline and executes regex's if needed. + No special package command is supported, just plain names. + \param Cache the packages are in + \param cmdline Command line the package names should be extracted from + \param out stream to print various notices to */ + static APT::PackageSet FromCommandLine(pkgCache &Cache, const char **cmdline, std::ostream &out); + static APT::PackageSet FromCommandLine(pkgCache &Cache, const char **cmdline) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::PackageSet::FromCommandLine(Cache, cmdline, out); + } + + + + /*}}}*/ +}; + /*}}}*/ +} +#endif diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 968275c5c..1a7078693 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -35,7 +35,7 @@ SOURCE+= pkgcache.cc version.cc depcache.cc \ srcrecords.cc cachefile.cc versionmatch.cc policy.cc \ pkgsystem.cc indexfile.cc pkgcachegen.cc acquire-item.cc \ indexrecords.cc vendor.cc vendorlist.cc cdrom.cc indexcopy.cc \ - aptconfiguration.cc packageset.cc + aptconfiguration.cc cacheset.cc HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.h \ orderlist.h sourcelist.h packagemanager.h tagfile.h \ init.h pkgcache.h version.h progress.h pkgrecords.h \ @@ -43,7 +43,7 @@ HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.h \ clean.h srcrecords.h cachefile.h versionmatch.h policy.h \ pkgsystem.h indexfile.h metaindex.h indexrecords.h vendor.h \ vendorlist.h cdrom.h indexcopy.h aptconfiguration.h \ - packageset.h + cacheset.h # Source code for the debian specific components # In theory the deb headers do not need to be exported.. diff --git a/apt-pkg/packageset.cc b/apt-pkg/packageset.cc deleted file mode 100644 index f296b7c45..000000000 --- a/apt-pkg/packageset.cc +++ /dev/null @@ -1,103 +0,0 @@ -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/ -/* ###################################################################### - - Simple wrapper around a std::set to provide a similar interface to - a set of packages as to the complete set of all packages in the - pkgCache. - - ##################################################################### */ - /*}}}*/ -// Include Files /*{{{*/ -#include -#include -#include -#include - -#include - -#include - -#include - /*}}}*/ -namespace APT { -// FromRegEx - Return all packages in the cache matching a pattern /*{{{*/ -PackageSet PackageSet::FromRegEx(pkgCache &Cache, std::string pattern, std::ostream &out) { - PackageSet pkgset; - std::string arch = "native"; - static const char * const isregex = ".?+*|[^$"; - - if (pattern.find_first_of(isregex) == std::string::npos) - return pkgset; - - size_t archfound = pattern.find_last_of(':'); - if (archfound != std::string::npos) { - arch = pattern.substr(archfound+1); - if (arch.find_first_of(isregex) == std::string::npos) - pattern.erase(archfound); - else - arch = "native"; - } - - regex_t Pattern; - int Res; - if ((Res = regcomp(&Pattern, pattern.c_str() , REG_EXTENDED | REG_ICASE | REG_NOSUB)) != 0) { - char Error[300]; - regerror(Res, &Pattern, Error, sizeof(Error)); - _error->Error(_("Regex compilation error - %s"), Error); - return pkgset; - } - - for (pkgCache::GrpIterator Grp = Cache.GrpBegin(); Grp.end() == false; ++Grp) - { - if (regexec(&Pattern, Grp.Name(), 0, 0, 0) != 0) - continue; - pkgCache::PkgIterator Pkg = Grp.FindPkg(arch); - if (Pkg.end() == true) { - if (archfound == std::string::npos) { - std::vector archs = APT::Configuration::getArchitectures(); - for (std::vector::const_iterator a = archs.begin(); - a != archs.end() && Pkg.end() != true; ++a) - Pkg = Grp.FindPkg(*a); - } - if (Pkg.end() == true) - continue; - } - - ioprintf(out, _("Note, selecting %s for regex '%s'\n"), - Pkg.FullName(true).c_str(), pattern.c_str()); - - pkgset.insert(Pkg); - } - - regfree(&Pattern); - - return pkgset; -} - /*}}}*/ -// FromCommandLine - Return all packages specified on commandline /*{{{*/ -PackageSet PackageSet::FromCommandLine(pkgCache &Cache, const char **cmdline, std::ostream &out) { - PackageSet pkgset; - for (const char **I = cmdline + 1; *I != 0; I++) { - pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); - if (Pkg.end() == true) { - std::vector archs = APT::Configuration::getArchitectures(); - for (std::vector::const_iterator a = archs.begin(); - a != archs.end() || Pkg.end() != true; ++a) { - Pkg = Cache.FindPkg(*I, *a); - } - if (Pkg.end() == true) { - PackageSet regex = FromRegEx(Cache, *I, out); - if (regex.empty() == true) - _error->Warning(_("Unable to locate package %s"),*I); - else - pkgset.insert(regex.begin(), regex.end()); - continue; - } - } - pkgset.insert(Pkg); - } - return pkgset; -} - /*}}}*/ -} diff --git a/apt-pkg/packageset.h b/apt-pkg/packageset.h deleted file mode 100644 index 9f80d60ed..000000000 --- a/apt-pkg/packageset.h +++ /dev/null @@ -1,92 +0,0 @@ -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/ -/** \class APT::PackageSet - - Simple wrapper around a std::set to provide a similar interface to - a set of packages as to the complete set of all packages in the - pkgCache. -*/ - /*}}}*/ -#ifndef APT_PACKAGESET_H -#define APT_PACKAGESET_H -// Include Files /*{{{*/ -#include -#include -#include -#include - -#include - /*}}}*/ -namespace APT { -class PackageSet : public std::set { /*{{{*/ -public: /*{{{*/ - /** \brief smell like a pkgCache::PkgIterator */ - class const_iterator : public std::set::const_iterator { - public: - const_iterator(std::set::const_iterator x) : - std::set::const_iterator(x) {} - - operator pkgCache::PkgIterator(void) { return **this; } - - inline const char *Name() const {return (**this).Name(); } - inline std::string FullName(bool const &Pretty) const { return (**this).FullName(Pretty); } - inline std::string FullName() const { return (**this).FullName(); } - inline const char *Section() const {return (**this).Section(); } - inline bool Purge() const {return (**this).Purge(); } - inline const char *Arch() const {return (**this).Arch(); } - inline pkgCache::GrpIterator Group() const { return (**this).Group(); } - inline pkgCache::VerIterator VersionList() const { return (**this).VersionList(); } - inline pkgCache::VerIterator CurrentVer() const { return (**this).CurrentVer(); } - inline pkgCache::DepIterator RevDependsList() const { return (**this).RevDependsList(); } - inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); } - inline pkgCache::PkgIterator::OkState State() const { return (**this).State(); } - inline const char *CandVersion() const { return (**this).CandVersion(); } - inline const char *CurVersion() const { return (**this).CurVersion(); } - inline pkgCache *Cache() const { return (**this).Cache(); }; - inline unsigned long Index() const {return (**this).Index();}; - // we have only valid iterators here - inline bool end() const { return false; }; - - friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, (*i)); } - - inline pkgCache::Package const * operator->() const { - return &***this; - }; - }; - // 103. set::iterator is required to be modifiable, but this allows modification of keys - typedef typename APT::PackageSet::const_iterator iterator; - - /** \brief returns all packages in the cache whose name matchs a given pattern - - A simple helper responsible for executing a regular expression on all - package names in the cache. Optional it prints a a notice about the - packages chosen cause of the given package. - \param Cache the packages are in - \param pattern regular expression for package names - \param out stream to print the notice to */ - static APT::PackageSet FromRegEx(pkgCache &Cache, std::string pattern, std::ostream &out); - static APT::PackageSet FromRegEx(pkgCache &Cache, std::string const &pattern) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::PackageSet::FromRegEx(Cache, pattern, out); - } - - /** \brief returns all packages specified on the commandline - - Get all package names from the commandline and executes regex's if needed. - No special package command is supported, just plain names. - \param Cache the packages are in - \param cmdline Command line the package names should be extracted from - \param out stream to print various notices to */ - static APT::PackageSet FromCommandLine(pkgCache &Cache, const char **cmdline, std::ostream &out); - static APT::PackageSet FromCommandLine(pkgCache &Cache, const char **cmdline) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::PackageSet::FromCommandLine(Cache, cmdline, out); - } - - - - /*}}}*/ -}; - /*}}}*/ -} -#endif diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index d8e14617a..891b10873 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 1cffd6730..9894747f4 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include diff --git a/debian/changelog b/debian/changelog index 054088ec2..6b9057ae3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,7 +22,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - correct "Dangerous iterator usage." pointed out by cppcheck * ftparchive/writer.h: - add a virtual destructor to FTWScanner class (for cppcheck) - * apt-pkg/packageset.h: + * apt-pkg/cacheset.h: - add a simple wrapper around std::set for packages with it - move regex magic from apt-get to new FromRegEx method - move cmdline parsing from apt-cache to new FromCommandLine method -- cgit v1.2.3 From d4489d4983d5b9840bb2882a088dd1f363a280b9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 31 May 2010 22:36:41 +0200 Subject: * apt-pkg/cacheset.{cc,h}: - add simple wrapper around std::set for cache structures --- apt-pkg/cacheiterators.h | 4 ++-- apt-pkg/cacheset.h | 49 +++++++++++++++++++++++++++++++++++++++++++++--- apt-pkg/pkgcache.cc | 2 +- debian/changelog | 6 +++--- 4 files changed, 52 insertions(+), 9 deletions(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index e5b23a818..f0b40dbb5 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -205,8 +205,8 @@ class pkgCache::VerIterator : public Iterator { inline PrvIterator ProvidesList() const; inline VerFileIterator FileList() const; bool Downloadable() const; - inline const char *PriorityType() {return Owner->Priority(S->Priority);}; - string RelStr(); + inline const char *PriorityType() const {return Owner->Priority(S->Priority);}; + string RelStr() const; bool Automatic() const; bool Pseudo() const; diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index 7c05face6..f0131bfed 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -17,12 +17,12 @@ #include /*}}}*/ namespace APT { +class PackageSet : public std::set { /*{{{*/ /** \class APT::PackageSet Simple wrapper around a std::set to provide a similar interface to a set of packages as to the complete set of all packages in the pkgCache. */ -class PackageSet : public std::set { /*{{{*/ public: /*{{{*/ /** \brief smell like a pkgCache::PkgIterator */ class const_iterator : public std::set::const_iterator { @@ -86,11 +86,54 @@ public: /*{{{*/ std::ostream out (std::ofstream("/dev/null").rdbuf()); return APT::PackageSet::FromCommandLine(Cache, cmdline, out); } + /*}}}*/ +}; /*}}}*/ +class VersionSet : public std::set { /*{{{*/ +/** \class APT::VersionSet + Simple wrapper around a std::set to provide a similar interface to + a set of versions as to the complete set of all versions in the + pkgCache. */ +public: /*{{{*/ + /** \brief smell like a pkgCache::VerIterator */ + class const_iterator : public std::set::const_iterator { + public: + const_iterator(std::set::const_iterator x) : + std::set::const_iterator(x) {} + operator pkgCache::VerIterator(void) { return **this; } + + inline pkgCache *Cache() const { return (**this).Cache(); }; + inline unsigned long Index() const {return (**this).Index();}; + // we have only valid iterators here + inline bool end() const { return false; }; + + inline pkgCache::Version const * operator->() const { + return &***this; + }; + + inline int CompareVer(const pkgCache::VerIterator &B) const { return (**this).CompareVer(B); }; + inline const char *VerStr() const { return (**this).VerStr(); }; + inline const char *Section() const { return (**this).Section(); }; + inline const char *Arch() const { return (**this).Arch(); }; + inline const char *Arch(bool const pseudo) const { return (**this).Arch(pseudo); }; + inline pkgCache::PkgIterator ParentPkg() const { return (**this).ParentPkg(); }; + inline pkgCache::DescIterator DescriptionList() const { return (**this).DescriptionList(); }; + inline pkgCache::DescIterator TranslatedDescription() const { return (**this).TranslatedDescription(); }; + inline pkgCache::DepIterator DependsList() const { return (**this).DependsList(); }; + inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); }; + inline pkgCache::VerFileIterator FileList() const { return (**this).FileList(); }; + inline bool Downloadable() const { return (**this).Downloadable(); }; + inline const char *PriorityType() const { return (**this).PriorityType(); }; + inline string RelStr() const { return (**this).RelStr(); }; + inline bool Automatic() const { return (**this).Automatic(); }; + inline bool Pseudo() const { return (**this).Pseudo(); }; + inline pkgCache::VerFileIterator NewestFile() const { return (**this).NewestFile(); }; + }; + // 103. set::iterator is required to be modifiable, but this allows modification of keys + typedef typename APT::VersionSet::const_iterator iterator; /*}}}*/ -}; - /*}}}*/ +}; /*}}}*/ } #endif diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index adaae9c89..30bb41470 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -742,7 +742,7 @@ pkgCache::VerFileIterator pkgCache::VerIterator::NewestFile() const // --------------------------------------------------------------------- /* This describes the version from a release-centric manner. The output is a list of Label:Version/Archive */ -string pkgCache::VerIterator::RelStr() +string pkgCache::VerIterator::RelStr() const { bool First = true; string Res; diff --git a/debian/changelog b/debian/changelog index 6b9057ae3..994be2bbc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,8 +22,8 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - correct "Dangerous iterator usage." pointed out by cppcheck * ftparchive/writer.h: - add a virtual destructor to FTWScanner class (for cppcheck) - * apt-pkg/cacheset.h: - - add a simple wrapper around std::set for packages with it + * apt-pkg/cacheset.{cc,h}: + - add simple wrapper around std::set for cache structures - move regex magic from apt-get to new FromRegEx method - move cmdline parsing from apt-cache to new FromCommandLine method * apt-pkg/contrib/cmdline.cc: @@ -33,7 +33,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low * cmdline/apt-cache.cc: - make the search multiarch compatible by using GrpIterator instead - -- David Kalnischkies Mon, 31 May 2010 20:00:24 +0200 + -- David Kalnischkies Mon, 31 May 2010 22:36:35 +0200 apt (0.7.26~exp5) experimental; urgency=low -- cgit v1.2.3 From 96db74ce38e9451609fe33f9e25f3f9d42b1fe22 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 Jun 2010 16:40:40 +0200 Subject: * apt-pkg/deb/dpkgpm.cc: - add missing include * methods/mirror.{cc,h}: - add SelectNextMirror() and InitMirrors() functions - read all mirrors into the AllMirrors vector --- apt-pkg/deb/dpkgpm.cc | 1 + methods/mirror.cc | 30 +++++++++++++++++++++++------- methods/mirror.h | 4 +++- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 18c731788..7e5171eda 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include diff --git a/methods/mirror.cc b/methods/mirror.cc index b3a956b95..0a0d07e6b 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -162,7 +162,21 @@ bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str) return res; } -bool MirrorMethod::SelectMirror() +bool MirrorMethod::SelectNextMirror() +{ + if (AllMirrors.size() < 1) + return false; + + Mirror = AllMirrors[0]; + AllMirrors.erase(AllMirrors.begin()); + if(Debug) + cerr << "using mirror: " << Mirror << endl; + + UsedMirror = Mirror; + return true; +} + +bool MirrorMethod::InitMirrors() { // if we do not have a MirrorFile, fallback if(!FileExists(MirrorFile)) @@ -179,11 +193,13 @@ bool MirrorMethod::SelectMirror() // get into sync issues (got indexfiles from mirror A, // but packages from mirror B - one might be out of date etc) ifstream in(MirrorFile.c_str()); - getline(in, Mirror); - if(Debug) - cerr << "Using mirror: " << Mirror << endl; - - UsedMirror = Mirror; + string s; + while (!in.eof()) + { + getline(in, s); + AllMirrors.push_back(s); + } + SelectNextMirror(); return true; } @@ -275,7 +291,7 @@ bool MirrorMethod::Fetch(FetchItem *Itm) } if(Mirror.empty()) { - if(!SelectMirror()) { + if(!InitMirrors()) { // no valid mirror selected, something went wrong downloading // from the master mirror site most likely and there is // no old mirror file availalbe diff --git a/methods/mirror.h b/methods/mirror.h index ed817806b..1b506dc87 100644 --- a/methods/mirror.h +++ b/methods/mirror.h @@ -26,6 +26,7 @@ class MirrorMethod : public HttpMethod // we simply transform between BaseUri and Mirror string BaseUri; // the original mirror://... url string Mirror; // the selected mirror uri (http://...) + vector AllMirrors; // all available mirrors string MirrorFile; // the file that contains the list of mirrors bool DownloadedMirrorFile; // already downloaded this session @@ -34,7 +35,8 @@ class MirrorMethod : public HttpMethod protected: bool DownloadMirrorFile(string uri); string GetMirrorFileName(string uri); - bool SelectMirror(); + bool InitMirrors(); + bool SelectNextMirror(); bool Clean(string dir); // we need to overwrite those to transform the url back -- cgit v1.2.3 From 483dfdd8aced593e966d221073c056c2e332584f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 Jun 2010 16:51:25 +0200 Subject: methods/mirror.cc: on fail try the next mirror --- methods/mirror.cc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/methods/mirror.cc b/methods/mirror.cc index 0a0d07e6b..b8bd6db73 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -197,7 +197,8 @@ bool MirrorMethod::InitMirrors() while (!in.eof()) { getline(in, s); - AllMirrors.push_back(s); + if (s.size() > 0) + AllMirrors.push_back(s); } SelectNextMirror(); return true; @@ -314,6 +315,15 @@ bool MirrorMethod::Fetch(FetchItem *Itm) void MirrorMethod::Fail(string Err,bool Transient) { + // try the next mirror on fail + string old_mirror = Mirror; + if (SelectNextMirror()) + { + Queue->Uri.replace(0, old_mirror.size(), Mirror); + return; + } + + // all mirrors failed, so bail out if(Queue->Uri.find("http://") != string::npos) Queue->Uri.replace(0,Mirror.size(), BaseUri); pkgAcqMethod::Fail(Err, Transient); -- cgit v1.2.3 From 0ded3ad3438666f833773895ef6318f84d2f849d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 Jun 2010 22:44:49 +0200 Subject: improve error message if mirror method fails --- methods/mirror.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/methods/mirror.cc b/methods/mirror.cc index b8bd6db73..b9fa55d87 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -25,6 +25,8 @@ using namespace std; +#include + #include "mirror.h" #include "http.h" #include "apti18n.h" @@ -164,16 +166,12 @@ bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str) bool MirrorMethod::SelectNextMirror() { - if (AllMirrors.size() < 1) - return false; - - Mirror = AllMirrors[0]; - AllMirrors.erase(AllMirrors.begin()); if(Debug) cerr << "using mirror: " << Mirror << endl; + Mirror = AllMirrors[0]; UsedMirror = Mirror; - return true; + return false; } bool MirrorMethod::InitMirrors() @@ -324,6 +322,10 @@ void MirrorMethod::Fail(string Err,bool Transient) } // all mirrors failed, so bail out + string s; + strprintf(s, _("[Mirror: %s]"), Mirror.c_str()); + SetIP(s); + if(Queue->Uri.find("http://") != string::npos) Queue->Uri.replace(0,Mirror.size(), BaseUri); pkgAcqMethod::Fail(Err, Transient); -- cgit v1.2.3 From 661f7b1c727aada703ffbb350d44759189a441fe Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 Jun 2010 22:47:49 +0200 Subject: methods/mirror.cc: remove Acquire::Mirror::RefreshInterval (not really useful) --- methods/mirror.cc | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/methods/mirror.cc b/methods/mirror.cc index b9fa55d87..4d767c9f3 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -128,28 +128,6 @@ bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str) if(Debug) clog << "MirrorMethod::DownloadMirrorFile(): " << endl; - // check the file, if it is not older than RefreshInterval just use it - // otherwise try to get a new one - if(FileExists(MirrorFile)) - { - struct stat buf; - time_t t,now,refresh; - if(stat(MirrorFile.c_str(), &buf) != 0) - return false; - t = std::max(buf.st_mtime, buf.st_ctime); - now = time(NULL); - refresh = 60*_config->FindI("Acquire::Mirror::RefreshInterval",360); - if(t + refresh > now) - { - if(Debug) - clog << "Mirror file is in RefreshInterval" << endl; - DownloadedMirrorFile = true; - return true; - } - if(Debug) - clog << "Mirror file " << MirrorFile << " older than " << refresh << "min, re-download it" << endl; - } - // not that great to use pkgAcquire here, but we do not have // any other way right now string fetch = BaseUri; -- cgit v1.2.3 From 0391542729e5e8a2ba9ae9b1d470f252e24eb296 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 Jun 2010 23:13:42 +0200 Subject: methods/mirrors.cc: make cycle through the mirrors work properly --- methods/mirror.cc | 55 ++++++++++++++++++++++++++++++++++++++++--------------- methods/mirror.h | 3 ++- 2 files changed, 42 insertions(+), 16 deletions(-) diff --git a/methods/mirror.cc b/methods/mirror.cc index 4d767c9f3..567522478 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -142,13 +142,44 @@ bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str) return res; } -bool MirrorMethod::SelectNextMirror() +/* convert a the Queue->Uri back to the mirror base uri and look + * at all mirrors we have for this, this is needed as queue->uri + * may point to different mirrors (if TryNextMirror() was run) + */ +void MirrorMethod::CurrentQueueUriToMirror() +{ + // already in mirror:// style so nothing to do + if(Queue->Uri.find("mirror://") == 0) + return; + + // find current mirror and select next one + for (int i=0; i < AllMirrors.size(); i++) + { + if (Queue->Uri.find(AllMirrors[i]) == 0) + { + Queue->Uri.replace(0, AllMirrors[i].size(), BaseUri); + return; + } + } + _error->Error("Internal error: Failed to convert %s back to %s", + Queue->Uri, BaseUri); +} + +bool MirrorMethod::TryNextMirror() { if(Debug) cerr << "using mirror: " << Mirror << endl; - Mirror = AllMirrors[0]; - UsedMirror = Mirror; + // find current mirror and select next one + for (int i=0; i < AllMirrors.size()-1; i++) + { + if (Queue->Uri.find(AllMirrors[i]) == 0) + { + Queue->Uri.replace(0, AllMirrors[i].size(), AllMirrors[i+1]); + return true; + } + } + return false; } @@ -176,7 +207,8 @@ bool MirrorMethod::InitMirrors() if (s.size() > 0) AllMirrors.push_back(s); } - SelectNextMirror(); + Mirror = AllMirrors[0]; + UsedMirror = Mirror; return true; } @@ -292,34 +324,27 @@ bool MirrorMethod::Fetch(FetchItem *Itm) void MirrorMethod::Fail(string Err,bool Transient) { // try the next mirror on fail - string old_mirror = Mirror; - if (SelectNextMirror()) - { - Queue->Uri.replace(0, old_mirror.size(), Mirror); + if (TryNextMirror()) return; - } // all mirrors failed, so bail out string s; strprintf(s, _("[Mirror: %s]"), Mirror.c_str()); SetIP(s); - if(Queue->Uri.find("http://") != string::npos) - Queue->Uri.replace(0,Mirror.size(), BaseUri); + CurrentQueueUriToMirror(); pkgAcqMethod::Fail(Err, Transient); } void MirrorMethod::URIStart(FetchResult &Res) { - if(Queue->Uri.find("http://") != string::npos) - Queue->Uri.replace(0,Mirror.size(), BaseUri); + CurrentQueueUriToMirror(); pkgAcqMethod::URIStart(Res); } void MirrorMethod::URIDone(FetchResult &Res,FetchResult *Alt) { - if(Queue->Uri.find("http://") != string::npos) - Queue->Uri.replace(0,Mirror.size(), BaseUri); + CurrentQueueUriToMirror(); pkgAcqMethod::URIDone(Res, Alt); } diff --git a/methods/mirror.h b/methods/mirror.h index 1b506dc87..0a3ea6e92 100644 --- a/methods/mirror.h +++ b/methods/mirror.h @@ -36,7 +36,8 @@ class MirrorMethod : public HttpMethod bool DownloadMirrorFile(string uri); string GetMirrorFileName(string uri); bool InitMirrors(); - bool SelectNextMirror(); + bool TryNextMirror(); + void CurrentQueueUriToMirror(); bool Clean(string dir); // we need to overwrite those to transform the url back -- cgit v1.2.3 From b86f642111954754dd9932ed2f28a9ea85035e87 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 Jun 2010 23:15:55 +0200 Subject: methods/mirror.cc: simplify uri.startswith() --- methods/mirror.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/methods/mirror.cc b/methods/mirror.cc index 567522478..cfc155f58 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -106,7 +106,7 @@ bool MirrorMethod::Clean(string Dir) for(I=list.begin(); I != list.end(); I++) { string uri = (*I)->GetURI(); - if(uri.substr(0,strlen("mirror://")) != string("mirror://")) + if(uri.find("mirror://") != 0) continue; string BaseUri = uri.substr(0,uri.size()-1); if (URItoFileName(BaseUri) == Dir->d_name) -- cgit v1.2.3 From 963b16dcebba149ae2c35bd255b34242923fbea0 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 Jun 2010 23:30:01 +0200 Subject: implement Fail-Ignore bool in FetchItem that tells the method that a failure of this item is ok and does not need to be tried on all mirrors --- apt-pkg/acquire-item.cc | 7 +++++++ apt-pkg/acquire-item.h | 1 + apt-pkg/acquire-method.cc | 1 + apt-pkg/acquire-method.h | 1 + methods/mirror.cc | 23 +++++++++++------------ 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index a959253bc..3cc2c8717 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -820,6 +820,13 @@ pkgAcqIndexTrans::pkgAcqIndexTrans(pkgAcquire *Owner, string URI,string URIDesc,string ShortDesc) : pkgAcqIndex(Owner, URI, URIDesc, ShortDesc, HashString(), "") { +} + /*}}}*/ +// AcqIndexTrans::Custom600Headers - Insert custom request headers /*{{{*/ +// --------------------------------------------------------------------- +string pkgAcqIndexTrans::Custom600Headers() +{ + return "\nFail-Ignore: true"; } /*}}}*/ // AcqIndexTrans::Failed - Silence failure messages for missing files /*{{{*/ diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index 06fcffc73..3ac8a19e2 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -573,6 +573,7 @@ class pkgAcqIndexTrans : public pkgAcqIndex public: virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf); + virtual string Custom600Headers(); /** \brief Create a pkgAcqIndexTrans. * diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index 3008c8d1a..6e021a445 100644 --- a/apt-pkg/acquire-method.cc +++ b/apt-pkg/acquire-method.cc @@ -381,6 +381,7 @@ int pkgAcqMethod::Run(bool Single) if (StrToTime(LookupTag(Message,"Last-Modified"),Tmp->LastModified) == false) Tmp->LastModified = 0; Tmp->IndexFile = StringToBool(LookupTag(Message,"Index-File"),false); + Tmp->FailIgnore = StringToBool(LookupTag(Message,"Fail-Ignore"),false); Tmp->Next = 0; // Append it to the list diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h index 99a4605b1..03851e823 100644 --- a/apt-pkg/acquire-method.h +++ b/apt-pkg/acquire-method.h @@ -37,6 +37,7 @@ class pkgAcqMethod string DestFile; time_t LastModified; bool IndexFile; + bool FailIgnore; }; struct FetchResult diff --git a/methods/mirror.cc b/methods/mirror.cc index cfc155f58..ea0fba438 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -162,24 +162,26 @@ void MirrorMethod::CurrentQueueUriToMirror() } } _error->Error("Internal error: Failed to convert %s back to %s", - Queue->Uri, BaseUri); + Queue->Uri.c_str(), BaseUri.c_str()); } bool MirrorMethod::TryNextMirror() { - if(Debug) - cerr << "using mirror: " << Mirror << endl; - // find current mirror and select next one for (int i=0; i < AllMirrors.size()-1; i++) { if (Queue->Uri.find(AllMirrors[i]) == 0) { Queue->Uri.replace(0, AllMirrors[i].size(), AllMirrors[i+1]); + if (Debug) + clog << "TryNextMirror: " << Queue->Uri << endl; return true; } } + if (Debug) + clog << "TryNextMirror could not find another mirror to try" << endl; + return false; } @@ -307,15 +309,12 @@ bool MirrorMethod::Fetch(FetchItem *Itm) return false; } } - if(Debug) - clog << "selected mirror: " << Mirror << endl; + if(Itm->Uri.find("mirror://") != string::npos) + Itm->Uri.replace(0,BaseUri.size(), Mirror); - for (FetchItem *I = Queue; I != 0; I = I->Next) - { - if(I->Uri.find("mirror://") != string::npos) - I->Uri.replace(0,BaseUri.size(), Mirror); - } + if(Debug) + clog << "Fetch: " << Itm->Uri << endl << endl; // now run the real fetcher return HttpMethod::Fetch(Itm); @@ -324,7 +323,7 @@ bool MirrorMethod::Fetch(FetchItem *Itm) void MirrorMethod::Fail(string Err,bool Transient) { // try the next mirror on fail - if (TryNextMirror()) + if (!Queue->FailIgnore && TryNextMirror()) return; // all mirrors failed, so bail out -- cgit v1.2.3 From 2ac9b90b7b3ebeea9a2580b6f317f1dfefc8c8fe Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 Jun 2010 23:57:00 +0200 Subject: methods/mirror.cc: debug improvements --- methods/mirror.cc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/methods/mirror.cc b/methods/mirror.cc index ea0fba438..b2b6b2ecf 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -301,7 +301,7 @@ bool MirrorMethod::Fetch(FetchItem *Itm) DownloadMirrorFile(Itm->Uri); } - if(Mirror.empty()) { + if(AllMirrors.empty()) { if(!InitMirrors()) { // no valid mirror selected, something went wrong downloading // from the master mirror site most likely and there is @@ -322,7 +322,14 @@ bool MirrorMethod::Fetch(FetchItem *Itm) void MirrorMethod::Fail(string Err,bool Transient) { - // try the next mirror on fail + // FIXME: TryNextMirror is not ideal for indexfile as we may + // run into auth issues + + if (Debug) + clog << "Failure to get " << Queue->Uri << endl; + + // try the next mirror on fail (if its not a expected failure, + // e.g. translations are ok to ignore) if (!Queue->FailIgnore && TryNextMirror()) return; -- cgit v1.2.3 From e2c66de5c5e63d8400efb0522c31fbe1ec225f93 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 3 Jun 2010 09:22:00 +0200 Subject: * apt-pkg/pkgcache.h: - switch {,Install-}Size to unsigned long long * apt-pkg/depcache.cc: - deal with long long, not with int to remove 2GB Limit (LP: #250909) --- apt-pkg/acquire-item.h | 4 ++-- apt-pkg/deb/deblistparser.cc | 5 ++--- apt-pkg/depcache.cc | 14 +++++++------- apt-pkg/pkgcache.h | 4 ++-- apt-pkg/tagfile.cc | 24 ++++++++++++++++++++++++ apt-pkg/tagfile.h | 1 + debian/changelog | 10 ++++++++++ 7 files changed, 48 insertions(+), 14 deletions(-) diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index b338b2a41..36fc53b92 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -112,10 +112,10 @@ class pkgAcquire::Item : public WeakPointable string ErrorText; /** \brief The size of the object to fetch. */ - unsigned long FileSize; + unsigned long long FileSize; /** \brief How much of the object was already fetched. */ - unsigned long PartialSize; + unsigned long long PartialSize; /** \brief If not \b NULL, contains the name of a subprocess that * is operating on this object (for instance, "gzip" or "gpgv"). diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 0551a5f7c..83c5b8d2e 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -133,10 +133,9 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver) } // Archive Size - Ver->Size = (unsigned)Section.FindI("Size"); - + Ver->Size = Section.FindULL("Size"); // Unpacked Size (in K) - Ver->InstalledSize = (unsigned)Section.FindI("Installed-Size"); + Ver->InstalledSize = Section.FindULL("Installed-Size"); Ver->InstalledSize *= 1024; // Priority diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 411ae5f62..6e0eeab5b 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -422,8 +422,8 @@ void pkgDepCache::AddSizes(const PkgIterator &Pkg,signed long Mult) // Compute the size data if (P.NewInstall() == true) { - iUsrSize += (signed)(Mult*P.InstVerIter(*this)->InstalledSize); - iDownloadSize += (signed)(Mult*P.InstVerIter(*this)->Size); + iUsrSize += (signed long long)(Mult*P.InstVerIter(*this)->InstalledSize); + iDownloadSize += (signed long long)(Mult*P.InstVerIter(*this)->Size); return; } @@ -432,9 +432,9 @@ void pkgDepCache::AddSizes(const PkgIterator &Pkg,signed long Mult) (P.InstallVer != (Version *)Pkg.CurrentVer() || (P.iFlags & ReInstall) == ReInstall) && P.InstallVer != 0) { - iUsrSize += (signed)(Mult*((signed)P.InstVerIter(*this)->InstalledSize - - (signed)Pkg.CurrentVer()->InstalledSize)); - iDownloadSize += (signed)(Mult*P.InstVerIter(*this)->Size); + iUsrSize += (signed long long)(Mult*((signed long long)P.InstVerIter(*this)->InstalledSize - + (signed long long)Pkg.CurrentVer()->InstalledSize)); + iDownloadSize += (signed long long)(Mult*P.InstVerIter(*this)->Size); return; } @@ -442,14 +442,14 @@ void pkgDepCache::AddSizes(const PkgIterator &Pkg,signed long Mult) if (Pkg.State() == pkgCache::PkgIterator::NeedsUnpack && P.Delete() == false) { - iDownloadSize += (signed)(Mult*P.InstVerIter(*this)->Size); + iDownloadSize += (signed long long)(Mult*P.InstVerIter(*this)->Size); return; } // Removing if (Pkg->CurrentVer != 0 && P.InstallVer == 0) { - iUsrSize -= (signed)(Mult*Pkg.CurrentVer()->InstalledSize); + iUsrSize -= (signed long long)(Mult*Pkg.CurrentVer()->InstalledSize); return; } } diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 643f240b0..426bb9f13 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -532,9 +532,9 @@ struct pkgCache::Version /** \brief archive size for this version For Debian this is the size of the .deb file. */ - map_ptrloc Size; // These are the .deb size + unsigned long long Size; // These are the .deb size /** \brief uncompressed size for this version */ - map_ptrloc InstalledSize; + unsigned long long InstalledSize; /** \brief characteristic value representing this version No two packages in existence should have the same VerStr diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index 0d4999ee7..1394d7e24 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -365,6 +365,30 @@ signed int pkgTagSection::FindI(const char *Tag,signed long Default) const return Result; } /*}}}*/ +// TagSection::FindULL - Find an unsigned long long integer /*{{{*/ +// --------------------------------------------------------------------- +/* */ +unsigned long long pkgTagSection::FindULL(const char *Tag, unsigned long long const &Default) const +{ + const char *Start; + const char *Stop; + if (Find(Tag,Start,Stop) == false) + return Default; + + // Copy it into a temp buffer so we can use strtoull + char S[100]; + if ((unsigned)(Stop - Start) >= sizeof(S)) + return Default; + strncpy(S,Start,Stop-Start); + S[Stop - Start] = 0; + + char *End; + unsigned long long Result = strtoull(S,&End,10); + if (S == End) + return Default; + return Result; +} + /*}}}*/ // TagSection::FindFlag - Locate a yes/no type flag /*{{{*/ // --------------------------------------------------------------------- /* The bits marked in Flag are masked on/off in Flags */ diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h index f63a51d07..6891c1d81 100644 --- a/apt-pkg/tagfile.h +++ b/apt-pkg/tagfile.h @@ -57,6 +57,7 @@ class pkgTagSection bool Find(const char *Tag,unsigned &Pos) const; string FindS(const char *Tag) const; signed int FindI(const char *Tag,signed long Default = 0) const ; + unsigned long long FindULL(const char *Tag, unsigned long long const &Default = 0) const; bool FindFlag(const char *Tag,unsigned long &Flags, unsigned long Flag) const; bool Scan(const char *Start,unsigned long MaxLength); diff --git a/debian/changelog b/debian/changelog index 3771ca415..e153027b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +apt (0.7.26~exp6) UNRELEASED; urgency=low + + [ David Kalnischkies ] + * apt-pkg/pkgcache.h: + - switch {,Install-}Size to unsigned long long + * apt-pkg/depcache.cc: + - deal with long long, not with int to remove 2GB Limit (LP: #250909) + + -- David Kalnischkies Thu, 03 Jun 2010 09:19:01 +0200 + apt (0.7.26~exp5) experimental; urgency=low [ David Kalnischkies ] -- cgit v1.2.3 From 81305a0b30cc12aa6d32081bbdcf930907ecfbbe Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 3 Jun 2010 09:50:06 +0200 Subject: deprecate AddSize with Multiplier as it is unused and switch to boolean instead to handle the sizes more gracefully. --- apt-pkg/depcache.cc | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++-- apt-pkg/depcache.h | 5 ++-- debian/changelog | 2 ++ 3 files changed, 76 insertions(+), 4 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 6e0eeab5b..786b20ec0 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -407,8 +407,11 @@ bool pkgDepCache::CheckDep(DepIterator Dep,int Type,PkgIterator &Res) /*}}}*/ // DepCache::AddSizes - Add the packages sizes to the counters /*{{{*/ // --------------------------------------------------------------------- -/* Call with Mult = -1 to preform the inverse opration */ -void pkgDepCache::AddSizes(const PkgIterator &Pkg,signed long Mult) +/* Call with Mult = -1 to preform the inverse opration + The Mult increases the complexity of the calulations here and is unused - + or do we really have a usecase for removing the size of a package two + times? So let us replace it with a simple bool and be done with it… */ +__deprecated void pkgDepCache::AddSizes(const PkgIterator &Pkg,signed long Mult) { StateCache &P = PkgState[Pkg->ID]; @@ -454,6 +457,72 @@ void pkgDepCache::AddSizes(const PkgIterator &Pkg,signed long Mult) } } /*}}}*/ +// DepCache::AddSizes - Add the packages sizes to the counters /*{{{*/ +// --------------------------------------------------------------------- +/* Call with Inverse = true to preform the inverse opration */ +void pkgDepCache::AddSizes(const PkgIterator &Pkg, bool const &Inverse) +{ + StateCache &P = PkgState[Pkg->ID]; + + if (Pkg->VersionList == 0) + return; + + if (Pkg.State() == pkgCache::PkgIterator::NeedsConfigure && + P.Keep() == true) + return; + + // Compute the size data + if (P.NewInstall() == true) + { + if (Inverse == false) { + iUsrSize += P.InstVerIter(*this)->InstalledSize; + iDownloadSize += P.InstVerIter(*this)->Size; + } else { + iUsrSize -= P.InstVerIter(*this)->InstalledSize; + iDownloadSize -= P.InstVerIter(*this)->Size; + } + return; + } + + // Upgrading + if (Pkg->CurrentVer != 0 && + (P.InstallVer != (Version *)Pkg.CurrentVer() || + (P.iFlags & ReInstall) == ReInstall) && P.InstallVer != 0) + { + if (Inverse == false) { + iUsrSize -= Pkg.CurrentVer()->InstalledSize; + iUsrSize += P.InstVerIter(*this)->InstalledSize; + iDownloadSize += P.InstVerIter(*this)->Size; + } else { + iUsrSize -= P.InstVerIter(*this)->InstalledSize; + iUsrSize += Pkg.CurrentVer()->InstalledSize; + iDownloadSize -= P.InstVerIter(*this)->Size; + } + return; + } + + // Reinstall + if (Pkg.State() == pkgCache::PkgIterator::NeedsUnpack && + P.Delete() == false) + { + if (Inverse == false) + iDownloadSize += P.InstVerIter(*this)->Size; + else + iDownloadSize -= P.InstVerIter(*this)->Size; + return; + } + + // Removing + if (Pkg->CurrentVer != 0 && P.InstallVer == 0) + { + if (Inverse == false) + iUsrSize -= Pkg.CurrentVer()->InstalledSize; + else + iUsrSize += Pkg.CurrentVer()->InstalledSize; + return; + } +} + /*}}}*/ // DepCache::AddStates - Add the package to the state counter /*{{{*/ // --------------------------------------------------------------------- /* This routine is tricky to use, you must make sure that it is never diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 3decc7a5f..d4258438f 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -321,8 +321,9 @@ class pkgDepCache : protected pkgCache::Namespace void Update(PkgIterator const &P); // Count manipulators - void AddSizes(const PkgIterator &Pkg,signed long Mult = 1); - inline void RemoveSizes(const PkgIterator &Pkg) {AddSizes(Pkg,-1);}; + void AddSizes(const PkgIterator &Pkg, bool const &Invert = false); + inline void RemoveSizes(const PkgIterator &Pkg) {AddSizes(Pkg, true);}; + void AddSizes(const PkgIterator &Pkg,signed long Mult) __deprecated; void AddStates(const PkgIterator &Pkg,int Add = 1); inline void RemoveStates(const PkgIterator &Pkg) {AddStates(Pkg,-1);}; diff --git a/debian/changelog b/debian/changelog index e153027b3..2be956752 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - switch {,Install-}Size to unsigned long long * apt-pkg/depcache.cc: - deal with long long, not with int to remove 2GB Limit (LP: #250909) + - deprecate AddSize with Multiplier as it is unused and switch to + boolean instead to handle the sizes more gracefully. -- David Kalnischkies Thu, 03 Jun 2010 09:19:01 +0200 -- cgit v1.2.3 From a3c4c81afe25377020470ff71c1362136437397c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 3 Jun 2010 10:45:58 +0200 Subject: * apt-pkg/depcache.cc: - switch i{Download,Usr}Size from double to (un)signed long long The biggest reason is that this saves a lot of float point operations we do in AddSizes() on integers. The only reason i see that this was a double is that it was 64bit long and can therefore store bigger values than int/long, but with the availablity of (un)signed long long we are now also at 64bit and can store sizes more than 8 Exabytes big - by the time this will be a limit the C/C++ Standard will have bigger types, hopefully. --- apt-pkg/acquire.cc | 12 ++++++------ apt-pkg/acquire.h | 6 +++--- apt-pkg/depcache.h | 12 +++++++----- debian/changelog | 1 + 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 832eaa02c..63825da93 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -506,9 +506,9 @@ bool pkgAcquire::Clean(string Dir) // Acquire::TotalNeeded - Number of bytes to fetch /*{{{*/ // --------------------------------------------------------------------- /* This is the total number of bytes needed */ -double pkgAcquire::TotalNeeded() +unsigned long long pkgAcquire::TotalNeeded() { - double Total = 0; + unsigned long long Total = 0; for (ItemCIterator I = ItemsBegin(); I != ItemsEnd(); I++) Total += (*I)->FileSize; return Total; @@ -517,9 +517,9 @@ double pkgAcquire::TotalNeeded() // Acquire::FetchNeeded - Number of bytes needed to get /*{{{*/ // --------------------------------------------------------------------- /* This is the number of bytes that is not local */ -double pkgAcquire::FetchNeeded() +unsigned long long pkgAcquire::FetchNeeded() { - double Total = 0; + unsigned long long Total = 0; for (ItemCIterator I = ItemsBegin(); I != ItemsEnd(); I++) if ((*I)->Local == false) Total += (*I)->FileSize; @@ -529,9 +529,9 @@ double pkgAcquire::FetchNeeded() // Acquire::PartialPresent - Number of partial bytes we already have /*{{{*/ // --------------------------------------------------------------------- /* This is the number of bytes that is not local */ -double pkgAcquire::PartialPresent() +unsigned long long pkgAcquire::PartialPresent() { - double Total = 0; + unsigned long long Total = 0; for (ItemCIterator I = ItemsBegin(); I != ItemsEnd(); I++) if ((*I)->Local == false) Total += (*I)->PartialSize; diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h index 8e2c21151..82be8b843 100644 --- a/apt-pkg/acquire.h +++ b/apt-pkg/acquire.h @@ -323,17 +323,17 @@ class pkgAcquire /** \return the total size in bytes of all the items included in * this download. */ - double TotalNeeded(); + unsigned long long TotalNeeded(); /** \return the size in bytes of all non-local items included in * this download. */ - double FetchNeeded(); + unsigned long long FetchNeeded(); /** \return the amount of data to be fetched that is already * present on the filesystem. */ - double PartialPresent(); + unsigned long long PartialPresent(); /** \brief Delayed constructor * diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index d4258438f..c6f245a80 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -286,9 +286,11 @@ class pkgDepCache : protected pkgCache::Namespace pkgCache *Cache; StateCache *PkgState; unsigned char *DepState; - - double iUsrSize; - double iDownloadSize; + + /** Stores the space changes after installation */ + signed long long iUsrSize; + /** Stores how much we need to download to get the packages */ + unsigned long long iDownloadSize; unsigned long iInstCount; unsigned long iDelCount; unsigned long iKeepCount; @@ -452,8 +454,8 @@ class pkgDepCache : protected pkgCache::Namespace bool writeStateFile(OpProgress *prog, bool InstalledOnly=true); // Size queries - inline double UsrSize() {return iUsrSize;}; - inline double DebSize() {return iDownloadSize;}; + inline signed long long UsrSize() {return iUsrSize;}; + inline unsigned long long DebSize() {return iDownloadSize;}; inline unsigned long DelCount() {return iDelCount;}; inline unsigned long KeepCount() {return iKeepCount;}; inline unsigned long InstCount() {return iInstCount;}; diff --git a/debian/changelog b/debian/changelog index 2be956752..97d6abe8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - deal with long long, not with int to remove 2GB Limit (LP: #250909) - deprecate AddSize with Multiplier as it is unused and switch to boolean instead to handle the sizes more gracefully. + - switch i{Download,Usr}Size from double to (un)signed long long -- David Kalnischkies Thu, 03 Jun 2010 09:19:01 +0200 -- cgit v1.2.3 From 3a882565a943644dcf7287c9673fb07f617fb851 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 3 Jun 2010 10:48:19 +0200 Subject: * cmdline/apt-get.cc: - use unsigned long long instead of double to store values it gets --- cmdline/apt-get.cc | 12 ++++++------ debian/changelog | 4 +++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 44235e358..661ca6147 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -837,9 +837,9 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, return false; // Display statistics - double FetchBytes = Fetcher.FetchNeeded(); - double FetchPBytes = Fetcher.PartialPresent(); - double DebBytes = Fetcher.TotalNeeded(); + unsigned long long FetchBytes = Fetcher.FetchNeeded(); + unsigned long long FetchPBytes = Fetcher.PartialPresent(); + unsigned long long DebBytes = Fetcher.TotalNeeded(); if (DebBytes != Cache->DebSize()) { c0out << DebBytes << ',' << Cache->DebSize() << endl; @@ -2362,9 +2362,9 @@ bool DoSource(CommandLine &CmdL) } // Display statistics - double FetchBytes = Fetcher.FetchNeeded(); - double FetchPBytes = Fetcher.PartialPresent(); - double DebBytes = Fetcher.TotalNeeded(); + unsigned long long FetchBytes = Fetcher.FetchNeeded(); + unsigned long long FetchPBytes = Fetcher.PartialPresent(); + unsigned long long DebBytes = Fetcher.TotalNeeded(); // Check for enough free space struct statvfs Buf; diff --git a/debian/changelog b/debian/changelog index 97d6abe8e..cad4bf990 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,10 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - deprecate AddSize with Multiplier as it is unused and switch to boolean instead to handle the sizes more gracefully. - switch i{Download,Usr}Size from double to (un)signed long long + * cmdline/apt-get.cc: + - use unsigned long long instead of double to store values it gets - -- David Kalnischkies Thu, 03 Jun 2010 09:19:01 +0200 + -- David Kalnischkies Thu, 03 Jun 2010 10:46:46 +0200 apt (0.7.26~exp5) experimental; urgency=low -- cgit v1.2.3 From 2e5f4e45f593535e2c88181ff7a9e2d32a5e60f9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 4 Jun 2010 14:43:03 +0200 Subject: * apt-pkg/cachefile.{cc,h}: - split Open() into submethods to be able to build only parts - make the OpProgress optional in the Cache buildprocess --- apt-pkg/cachefile.cc | 50 ++++++++++++++++++++++++++++++++------------- apt-pkg/cachefile.h | 15 ++++++++------ apt-pkg/deb/debindexfile.cc | 18 ++++++++-------- apt-pkg/deb/debindexfile.h | 6 +++--- apt-pkg/indexfile.h | 8 ++++++-- apt-pkg/pkgcachegen.cc | 45 +++++++++++++++++++++++++--------------- apt-pkg/pkgcachegen.h | 10 +++++++-- debian/changelog | 3 +++ 8 files changed, 103 insertions(+), 52 deletions(-) diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc index 790312dc8..b0f8bc424 100644 --- a/apt-pkg/cachefile.cc +++ b/apt-pkg/cachefile.cc @@ -46,7 +46,7 @@ pkgCacheFile::~pkgCacheFile() // CacheFile::BuildCaches - Open and build the cache files /*{{{*/ // --------------------------------------------------------------------- /* */ -bool pkgCacheFile::BuildCaches(OpProgress &Progress,bool WithLock) +bool pkgCacheFile::BuildCaches(OpProgress *Progress, bool WithLock) { const bool ErrorWasEmpty = _error->empty(); if (WithLock == true) @@ -65,8 +65,9 @@ bool pkgCacheFile::BuildCaches(OpProgress &Progress,bool WithLock) return _error->Error(_("The list of sources could not be read.")); // Read the caches - bool Res = pkgMakeStatusCache(List,Progress,&Map,!WithLock); - Progress.Done(); + bool Res = pkgCacheGenerator::MakeStatusCache(List,Progress,&Map,!WithLock); + if (Progress != NULL) + Progress->Done(); if (Res == false) return _error->Error(_("The package lists or status file could not be parsed or opened.")); @@ -80,29 +81,50 @@ bool pkgCacheFile::BuildCaches(OpProgress &Progress,bool WithLock) return true; } /*}}}*/ -// CacheFile::Open - Open the cache files, creating if necessary /*{{{*/ +// CacheFile::BuildPolicy - Open and build all relevant preferences /*{{{*/ // --------------------------------------------------------------------- /* */ -bool pkgCacheFile::Open(OpProgress &Progress,bool WithLock) +bool pkgCacheFile::BuildPolicy(OpProgress *Progress) { - if (BuildCaches(Progress,WithLock) == false) - return false; - - // The policy engine Policy = new pkgPolicy(Cache); if (_error->PendingError() == true) return false; if (ReadPinFile(*Policy) == false || ReadPinDir(*Policy) == false) return false; - - // Create the dependency cache + + return true; +} + /*}}}*/ +// CacheFile::BuildDepCache - Open and build the dependency cache /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool pkgCacheFile::BuildDepCache(OpProgress *Progress) +{ DCache = new pkgDepCache(Cache,Policy); if (_error->PendingError() == true) return false; - - DCache->Init(&Progress); - Progress.Done(); + + DCache->Init(Progress); + return true; +} + /*}}}*/ +// CacheFile::Open - Open the cache files, creating if necessary /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool pkgCacheFile::Open(OpProgress *Progress, bool WithLock) +{ + if (BuildCaches(Progress,WithLock) == false) + return false; + + if (BuildPolicy(Progress) == false) + return false; + + if (BuildDepCache(Progress) == false) + return false; + + if (Progress != NULL) + Progress->Done(); if (_error->PendingError() == true) return false; diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h index 3b057951c..b75a7dbe4 100644 --- a/apt-pkg/cachefile.h +++ b/apt-pkg/cachefile.h @@ -30,11 +30,10 @@ class pkgCacheFile MMap *Map; pkgCache *Cache; pkgDepCache *DCache; - + pkgPolicy *Policy; + public: - pkgPolicy *Policy; - // We look pretty much exactly like a pointer to a dep cache inline operator pkgCache &() {return *Cache;}; inline operator pkgCache *() {return Cache;}; @@ -45,12 +44,16 @@ class pkgCacheFile inline pkgDepCache::StateCache &operator [](pkgCache::PkgIterator const &I) {return (*DCache)[I];}; inline unsigned char &operator [](pkgCache::DepIterator const &I) {return (*DCache)[I];}; - bool BuildCaches(OpProgress &Progress,bool WithLock = true); - bool Open(OpProgress &Progress,bool WithLock = true); + bool BuildCaches(OpProgress *Progress = NULL,bool WithLock = true); + __deprecated bool BuildCaches(OpProgress &Progress,bool const &WithLock = true) { return BuildCaches(&Progress, WithLock); }; + bool BuildPolicy(OpProgress *Progress = NULL); + bool BuildDepCache(OpProgress *Progress = NULL); + bool Open(OpProgress *Progress = NULL, bool WithLock = true); + __deprecated bool Open(OpProgress &Progress,bool const &WithLock = true) { return Open(&Progress, WithLock); }; void Close(); pkgCacheFile(); - ~pkgCacheFile(); + virtual ~pkgCacheFile(); }; #endif diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index b89429d86..6d9e99497 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -262,15 +262,15 @@ unsigned long debPackagesIndex::Size() const // PackagesIndex::Merge - Load the index file into a cache /*{{{*/ // --------------------------------------------------------------------- /* */ -bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const +bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const { string PackageFile = IndexFile("Packages"); FileFd Pkg(PackageFile,FileFd::ReadOnly); debListParser Parser(&Pkg, Architecture); if (_error->PendingError() == true) return _error->Error("Problem opening %s",PackageFile.c_str()); - - Prog.SubProgress(0,Info("Packages")); + if (Prog != NULL) + Prog->SubProgress(0,Info("Packages")); ::URI Tmp(URI); if (Gen.SelectFile(PackageFile,Tmp.Host,*this) == false) return _error->Error("Problem with SelectFile %s",PackageFile.c_str()); @@ -445,7 +445,7 @@ unsigned long debTranslationsIndex::Size() const // TranslationsIndex::Merge - Load the index file into a cache /*{{{*/ // --------------------------------------------------------------------- /* */ -bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const +bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const { // Check the translation file, if in use string TranslationFile = IndexFile(Language); @@ -456,7 +456,8 @@ bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const if (_error->PendingError() == true) return false; - Prog.SubProgress(0, Info(TranslationFile.c_str())); + if (Prog != NULL) + Prog->SubProgress(0, Info(TranslationFile.c_str())); if (Gen.SelectFile(TranslationFile,string(),*this) == false) return _error->Error("Problem with SelectFile %s",TranslationFile.c_str()); @@ -529,7 +530,7 @@ unsigned long debStatusIndex::Size() const // StatusIndex::Merge - Load the index file into a cache /*{{{*/ // --------------------------------------------------------------------- /* */ -bool debStatusIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const +bool debStatusIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const { FileFd Pkg(File,FileFd::ReadOnly); if (_error->PendingError() == true) @@ -537,8 +538,9 @@ bool debStatusIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const debListParser Parser(&Pkg); if (_error->PendingError() == true) return false; - - Prog.SubProgress(0,File); + + if (Prog != NULL) + Prog->SubProgress(0,File); if (Gen.SelectFile(File,string(),*this,pkgCache::Flag::NotSource) == false) return _error->Error("Problem with SelectFile %s",File.c_str()); diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h index 766e8b214..b5085992d 100644 --- a/apt-pkg/deb/debindexfile.h +++ b/apt-pkg/deb/debindexfile.h @@ -35,7 +35,7 @@ class debStatusIndex : public pkgIndexFile virtual bool Exists() const; virtual bool HasPackages() const {return true;}; virtual unsigned long Size() const; - virtual bool Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const; + virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const; virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const; debStatusIndex(string File); @@ -67,7 +67,7 @@ class debPackagesIndex : public pkgIndexFile virtual bool Exists() const; virtual bool HasPackages() const {return true;}; virtual unsigned long Size() const; - virtual bool Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const; + virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const; virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const; debPackagesIndex(string const &URI, string const &Dist, string const &Section, @@ -99,7 +99,7 @@ class debTranslationsIndex : public pkgIndexFile virtual bool Exists() const; virtual bool HasPackages() const; virtual unsigned long Size() const; - virtual bool Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const; + virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const; virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const; debTranslationsIndex(string URI,string Dist,string Section, char const * const Language); diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h index 3cc501629..2b5ae6342 100644 --- a/apt-pkg/indexfile.h +++ b/apt-pkg/indexfile.h @@ -74,8 +74,12 @@ class pkgIndexFile virtual bool Exists() const = 0; virtual bool HasPackages() const = 0; virtual unsigned long Size() const = 0; - virtual bool Merge(pkgCacheGenerator &/*Gen*/,OpProgress &/*Prog*/) const {return false;}; - virtual bool MergeFileProvides(pkgCacheGenerator &/*Gen*/,OpProgress &/*Prog*/) const {return true;}; + virtual bool Merge(pkgCacheGenerator &/*Gen*/,OpProgress* /*Prog*/) const { return false; }; + __deprecated virtual bool Merge(pkgCacheGenerator &Gen, OpProgress &Prog) const + { return Merge(Gen, &Prog); }; + virtual bool MergeFileProvides(pkgCacheGenerator &/*Gen*/,OpProgress* /*Prog*/) const {return true;}; + __deprecated virtual bool MergeFileProvides(pkgCacheGenerator &Gen, OpProgress &Prog) const + {return MergeFileProvides(Gen, &Prog);}; virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const; static bool TranslationsAvailable(); diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index d96d3370f..5649cd6f8 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -526,7 +526,7 @@ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc, // CacheGenerator::FinishCache - do various finish operations /*{{{*/ // --------------------------------------------------------------------- /* This prepares the Cache for delivery */ -bool pkgCacheGenerator::FinishCache(OpProgress &Progress) +bool pkgCacheGenerator::FinishCache(OpProgress *Progress) { // FIXME: add progress reporting for this operation // Do we have different architectures in your groups ? @@ -923,7 +923,7 @@ static unsigned long ComputeSize(FileIterator Start,FileIterator End) // --------------------------------------------------------------------- /* */ static bool BuildCache(pkgCacheGenerator &Gen, - OpProgress &Progress, + OpProgress *Progress, unsigned long &CurrentSize,unsigned long TotalSize, FileIterator Start, FileIterator End) { @@ -944,7 +944,8 @@ static bool BuildCache(pkgCacheGenerator &Gen, } unsigned long Size = (*I)->Size(); - Progress.OverallProgress(CurrentSize,TotalSize,Size,_("Reading package lists")); + if (Progress != NULL) + Progress->OverallProgress(CurrentSize,TotalSize,Size,_("Reading package lists")); CurrentSize += Size; if ((*I)->Merge(Gen,Progress) == false) @@ -953,13 +954,15 @@ static bool BuildCache(pkgCacheGenerator &Gen, if (Gen.HasFileDeps() == true) { - Progress.Done(); + if (Progress != NULL) + Progress->Done(); TotalSize = ComputeSize(Start, End); CurrentSize = 0; for (I = Start; I != End; I++) { unsigned long Size = (*I)->Size(); - Progress.OverallProgress(CurrentSize,TotalSize,Size,_("Collecting File Provides")); + if (Progress != NULL) + Progress->OverallProgress(CurrentSize,TotalSize,Size,_("Collecting File Provides")); CurrentSize += Size; if ((*I)->MergeFileProvides(Gen,Progress) == false) return false; @@ -969,7 +972,7 @@ static bool BuildCache(pkgCacheGenerator &Gen, return true; } /*}}}*/ -// MakeStatusCache - Construct the status cache /*{{{*/ +// CacheGenerator::MakeStatusCache - Construct the status cache /*{{{*/ // --------------------------------------------------------------------- /* This makes sure that the status cache (the cache that has all index files from the sources list and all local ones) is ready @@ -977,7 +980,10 @@ static bool BuildCache(pkgCacheGenerator &Gen, the cache will be stored there. This is pretty much mandetory if you are using AllowMem. AllowMem lets the function be run as non-root where it builds the cache 'fast' into a memory buffer. */ -bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, +__deprecated bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, + MMap **OutMap, bool AllowMem) + { return pkgCacheGenerator::MakeStatusCache(List, &Progress, OutMap, AllowMem); } +bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress, MMap **OutMap,bool AllowMem) { bool const Debug = _config->FindB("Debug::pkgCacheGen", false); @@ -1028,13 +1034,15 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, if (Writeable == false && AllowMem == false && CacheFile.empty() == false) return _error->Error(_("Unable to write to %s"),flNotFile(CacheFile).c_str()); - - Progress.OverallProgress(0,1,1,_("Reading package lists")); - + + if (Progress != NULL) + Progress->OverallProgress(0,1,1,_("Reading package lists")); + // Cache is OK, Fin. if (CheckValidity(CacheFile,Files.begin(),Files.end(),OutMap) == true) { - Progress.OverallProgress(1,1,1,_("Reading package lists")); + if (Progress != NULL) + Progress->OverallProgress(1,1,1,_("Reading package lists")); if (Debug == true) std::clog << "pkgcache.bin is valid - no need to build anything" << std::endl; return true; @@ -1084,7 +1092,7 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, TotalSize = ComputeSize(Files.begin()+EndOfSource,Files.end()); // Build the status cache - pkgCacheGenerator Gen(Map.Get(),&Progress); + pkgCacheGenerator Gen(Map.Get(),Progress); if (_error->PendingError() == true) return false; if (BuildCache(Gen,Progress,CurrentSize,TotalSize, @@ -1101,7 +1109,7 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, TotalSize = ComputeSize(Files.begin(),Files.end()); // Build the source cache - pkgCacheGenerator Gen(Map.Get(),&Progress); + pkgCacheGenerator Gen(Map.Get(),Progress); if (_error->PendingError() == true) return false; if (BuildCache(Gen,Progress,CurrentSize,TotalSize, @@ -1160,10 +1168,12 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, return true; } /*}}}*/ -// MakeOnlyStatusCache - Build a cache with just the status files /*{{{*/ +// CacheGenerator::MakeOnlyStatusCache - Build only a status files cache/*{{{*/ // --------------------------------------------------------------------- /* */ -bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap) +__deprecated bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap) + { return pkgCacheGenerator::MakeOnlyStatusCache(&Progress, OutMap); } +bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap) { unsigned long MapSize = _config->FindI("APT::Cache-Limit",20*1024*1024); vector Files; @@ -1178,8 +1188,9 @@ bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap) TotalSize = ComputeSize(Files.begin()+EndOfSource,Files.end()); // Build the status cache - Progress.OverallProgress(0,1,1,_("Reading package lists")); - pkgCacheGenerator Gen(Map.Get(),&Progress); + if (Progress != NULL) + Progress->OverallProgress(0,1,1,_("Reading package lists")); + pkgCacheGenerator Gen(Map.Get(),Progress); if (_error->PendingError() == true) return false; if (BuildCache(Gen,Progress,CurrentSize,TotalSize, diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 46d0cd893..ff0941e0c 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -76,7 +76,11 @@ class pkgCacheGenerator /*{{{*/ bool HasFileDeps() {return FoundFileDeps;}; bool MergeFileProvides(ListParser &List); - bool FinishCache(OpProgress &Progress); + bool FinishCache(OpProgress *Progress); + + static bool MakeStatusCache(pkgSourceList &List,OpProgress *Progress, + MMap **OutMap = 0,bool AllowMem = false); + static bool MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap); pkgCacheGenerator(DynamicMMap *Map,OpProgress *Progress); ~pkgCacheGenerator(); @@ -134,10 +138,12 @@ class pkgCacheGenerator::ListParser virtual ~ListParser() {}; }; /*}}}*/ + bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, MMap **OutMap = 0,bool AllowMem = false); bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap); + #ifdef APT_COMPATIBILITY #if APT_COMPATIBILITY != 986 #warning "Using APT_COMPATIBILITY" @@ -145,7 +151,7 @@ bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap); MMap *pkgMakeStatusCacheMem(pkgSourceList &List,OpProgress &Progress) { MMap *Map = 0; - if (pkgMakeStatusCache(List,Progress,&Map,true) == false) + if (pkgCacheGenerator::MakeStatusCache(List,&Progress,&Map,true) == false) return 0; return Map; } diff --git a/debian/changelog b/debian/changelog index 994be2bbc..097916d1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,9 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - get the best matching arch package from a group with FindPreferredPkg * cmdline/apt-cache.cc: - make the search multiarch compatible by using GrpIterator instead + * apt-pkg/cachefile.{cc,h}: + - split Open() into submethods to be able to build only parts + - make the OpProgress optional in the Cache buildprocess -- David Kalnischkies Mon, 31 May 2010 22:36:35 +0200 -- cgit v1.2.3 From ea4b220b1b17b270fc1a05e454439c32589548b7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 4 Jun 2010 14:51:21 +0200 Subject: Switch away from the now deprecated methods for Cache building --- apt-inst/deb/dpkgdb.cc | 2 +- cmdline/apt-extracttemplates.cc | 3 +-- cmdline/apt-get.cc | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc index e51e4f8b3..a75cf59ca 100644 --- a/apt-inst/deb/dpkgdb.cc +++ b/apt-inst/deb/dpkgdb.cc @@ -142,7 +142,7 @@ bool debDpkgDB::ReadyPkgCache(OpProgress &Progress) CacheMap = 0; } - if (pkgMakeOnlyStatusCache(Progress,&CacheMap) == false) + if (pkgCacheGenerator::MakeOnlyStatusCache(&Progress,&CacheMap) == false) return false; Cache->DropProgress(); diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc index 21ef1a050..07bc0c25d 100644 --- a/cmdline/apt-extracttemplates.cc +++ b/cmdline/apt-extracttemplates.cc @@ -296,8 +296,7 @@ bool Go(CommandLine &CmdL) MMap *Map = 0; pkgSourceList List; List.ReadMainList(); - OpProgress Prog; - pkgMakeStatusCache(List,Prog,&Map,true); + pkgCacheGenerator::MakeStatusCache(List,NULL,&Map,true); if (Map == 0) return false; DebFile::Cache = new pkgCache(Map); diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 9894747f4..c70dd56ac 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -91,14 +91,14 @@ class CacheFile : public pkgCacheFile bool BuildCaches(bool WithLock = true) { OpTextProgress Prog(*_config); - if (pkgCacheFile::BuildCaches(Prog,WithLock) == false) + if (pkgCacheFile::BuildCaches(&Prog,WithLock) == false) return false; return true; } bool Open(bool WithLock = true) { OpTextProgress Prog(*_config); - if (pkgCacheFile::Open(Prog,WithLock) == false) + if (pkgCacheFile::Open(&Prog,WithLock) == false) return false; Sort(); -- cgit v1.2.3 From 3f8621c5effb167a51944b86334867e2fe8fedb3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 4 Jun 2010 22:58:57 +0200 Subject: store also the SourceList we use internally for export --- apt-pkg/cachefile.cc | 58 +++++++++++++++++++++++++++++++++++++++++----------- apt-pkg/cachefile.h | 15 +++++++++++++- debian/changelog | 1 + 3 files changed, 61 insertions(+), 13 deletions(-) diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc index b0f8bc424..01598386c 100644 --- a/apt-pkg/cachefile.cc +++ b/apt-pkg/cachefile.cc @@ -27,7 +27,8 @@ // CacheFile::CacheFile - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -pkgCacheFile::pkgCacheFile() : Map(0), Cache(0), DCache(0), Policy(0) +pkgCacheFile::pkgCacheFile() : Map(NULL), Cache(NULL), DCache(NULL), + Policy(NULL), SrcList(NULL) { } /*}}}*/ @@ -38,16 +39,30 @@ pkgCacheFile::~pkgCacheFile() { delete DCache; delete Policy; + delete SrcList; delete Cache; delete Map; _system->UnLock(true); -} +} /*}}}*/ // CacheFile::BuildCaches - Open and build the cache files /*{{{*/ // --------------------------------------------------------------------- /* */ bool pkgCacheFile::BuildCaches(OpProgress *Progress, bool WithLock) { + if (Cache != NULL) + return true; + + if (_config->FindB("pkgCacheFile::Generate", true) == false) + { + Map = new MMap(*new FileFd(_config->FindFile("Dir::Cache::pkgcache"), + FileFd::ReadOnly),MMap::Public|MMap::ReadOnly); + Cache = new pkgCache(Map); + if (_error->PendingError() == true) + return false; + return true; + } + const bool ErrorWasEmpty = _error->empty(); if (WithLock == true) if (_system->Lock() == false) @@ -58,14 +73,11 @@ bool pkgCacheFile::BuildCaches(OpProgress *Progress, bool WithLock) if (_error->PendingError() == true) return false; - - // Read the source list - pkgSourceList List; - if (List.ReadMainList() == false) - return _error->Error(_("The list of sources could not be read.")); + + BuildSourceList(Progress); // Read the caches - bool Res = pkgCacheGenerator::MakeStatusCache(List,Progress,&Map,!WithLock); + bool Res = pkgCacheGenerator::MakeStatusCache(*SrcList,Progress,&Map,!WithLock); if (Progress != NULL) Progress->Done(); if (Res == false) @@ -81,11 +93,28 @@ bool pkgCacheFile::BuildCaches(OpProgress *Progress, bool WithLock) return true; } /*}}}*/ +// CacheFile::BuildSourceList - Open and build all relevant sources.list/*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool pkgCacheFile::BuildSourceList(OpProgress *Progress) +{ + if (SrcList != NULL) + return true; + + SrcList = new pkgSourceList(); + if (SrcList->ReadMainList() == false) + return _error->Error(_("The list of sources could not be read.")); + return true; +} + /*}}}*/ // CacheFile::BuildPolicy - Open and build all relevant preferences /*{{{*/ // --------------------------------------------------------------------- /* */ bool pkgCacheFile::BuildPolicy(OpProgress *Progress) { + if (Policy != NULL) + return true; + Policy = new pkgPolicy(Cache); if (_error->PendingError() == true) return false; @@ -101,6 +130,9 @@ bool pkgCacheFile::BuildPolicy(OpProgress *Progress) /* */ bool pkgCacheFile::BuildDepCache(OpProgress *Progress) { + if (DCache != NULL) + return true; + DCache = new pkgDepCache(Cache,Policy); if (_error->PendingError() == true) return false; @@ -139,12 +171,14 @@ void pkgCacheFile::Close() delete DCache; delete Policy; delete Cache; + delete SrcList; delete Map; _system->UnLock(true); - Map = 0; - DCache = 0; - Policy = 0; - Cache = 0; + Map = NULL; + DCache = NULL; + Policy = NULL; + Cache = NULL; + SrcList = NULL; } /*}}}*/ diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h index b75a7dbe4..1647aff8e 100644 --- a/apt-pkg/cachefile.h +++ b/apt-pkg/cachefile.h @@ -23,6 +23,7 @@ #include class pkgPolicy; +class pkgSourceList; class pkgCacheFile { protected: @@ -31,6 +32,7 @@ class pkgCacheFile pkgCache *Cache; pkgDepCache *DCache; pkgPolicy *Policy; + pkgSourceList *SrcList; public: @@ -39,6 +41,10 @@ class pkgCacheFile inline operator pkgCache *() {return Cache;}; inline operator pkgDepCache &() {return *DCache;}; inline operator pkgDepCache *() {return DCache;}; + inline operator pkgPolicy &() {return *Policy;}; + inline operator pkgPolicy *() {return Policy;}; + inline operator pkgSourceList &() {return *SrcList;}; + inline operator pkgSourceList *() {return SrcList;}; inline pkgDepCache *operator ->() {return DCache;}; inline pkgDepCache &operator *() {return *DCache;}; inline pkgDepCache::StateCache &operator [](pkgCache::PkgIterator const &I) {return (*DCache)[I];}; @@ -46,12 +52,19 @@ class pkgCacheFile bool BuildCaches(OpProgress *Progress = NULL,bool WithLock = true); __deprecated bool BuildCaches(OpProgress &Progress,bool const &WithLock = true) { return BuildCaches(&Progress, WithLock); }; + bool BuildSourceList(OpProgress *Progress = NULL); bool BuildPolicy(OpProgress *Progress = NULL); bool BuildDepCache(OpProgress *Progress = NULL); bool Open(OpProgress *Progress = NULL, bool WithLock = true); + inline bool ReadOnlyOpen(OpProgress *Progress = NULL) { return Open(Progress, false); }; __deprecated bool Open(OpProgress &Progress,bool const &WithLock = true) { return Open(&Progress, WithLock); }; void Close(); - + + inline pkgCache* GetPkgCache() { BuildCaches(NULL, false); return Cache; }; + inline pkgDepCache* GetDepCache() { BuildDepCache(); return DCache; }; + inline pkgPolicy* GetPolicy() { BuildPolicy(); return Policy; }; + inline pkgSourceList* GetSourceList() { BuildSourceList(); return SrcList; }; + pkgCacheFile(); virtual ~pkgCacheFile(); }; diff --git a/debian/changelog b/debian/changelog index 097916d1e..9001e91a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low * apt-pkg/cachefile.{cc,h}: - split Open() into submethods to be able to build only parts - make the OpProgress optional in the Cache buildprocess + - store also the SourceList we use internally for export -- David Kalnischkies Mon, 31 May 2010 22:36:35 +0200 -- cgit v1.2.3 From 856d3b06a6eb6a7f455294c69fc13604e099fd56 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 5 Jun 2010 09:20:29 +0200 Subject: Add a method to get a VersionSet from the Commandline and refactor the existing methods a bit to reuse them easier intern --- apt-pkg/cacheset.cc | 140 +++++++++++++++++++++++++++++++++++++++++++++------- apt-pkg/cacheset.h | 74 +++++++++++++++++++++++++-- 2 files changed, 191 insertions(+), 23 deletions(-) diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index b49b36539..7372c909e 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -13,6 +13,7 @@ #include #include #include +#include #include @@ -22,7 +23,7 @@ /*}}}*/ namespace APT { // FromRegEx - Return all packages in the cache matching a pattern /*{{{*/ -PackageSet PackageSet::FromRegEx(pkgCache &Cache, std::string pattern, std::ostream &out) { +PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, std::ostream &out) { PackageSet pkgset; std::string arch = "native"; static const char * const isregex = ".?+*|[^$"; @@ -48,7 +49,7 @@ PackageSet PackageSet::FromRegEx(pkgCache &Cache, std::string pattern, std::ostr return pkgset; } - for (pkgCache::GrpIterator Grp = Cache.GrpBegin(); Grp.end() == false; ++Grp) + for (pkgCache::GrpIterator Grp = Cache.GetPkgCache()->GrpBegin(); Grp.end() == false; ++Grp) { if (regexec(&Pattern, Grp.Name(), 0, 0, 0) != 0) continue; @@ -76,28 +77,129 @@ PackageSet PackageSet::FromRegEx(pkgCache &Cache, std::string pattern, std::ostr } /*}}}*/ // FromCommandLine - Return all packages specified on commandline /*{{{*/ -PackageSet PackageSet::FromCommandLine(pkgCache &Cache, const char **cmdline, std::ostream &out) { +PackageSet PackageSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, std::ostream &out) { PackageSet pkgset; for (const char **I = cmdline + 1; *I != 0; I++) { - pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); - if (Pkg.end() == true) { - std::vector archs = APT::Configuration::getArchitectures(); - for (std::vector::const_iterator a = archs.begin(); - a != archs.end() || Pkg.end() != true; ++a) { - Pkg = Cache.FindPkg(*I, *a); - } - if (Pkg.end() == true) { - PackageSet regex = FromRegEx(Cache, *I, out); - if (regex.empty() == true) - _error->Warning(_("Unable to locate package %s"),*I); - else - pkgset.insert(regex.begin(), regex.end()); - continue; + PackageSet pset = FromString(Cache, *I, out); + pkgset.insert(pset.begin(), pset.end()); + } + return pkgset; +} + /*}}}*/ +// FromString - Return all packages matching a specific string /*{{{*/ +PackageSet PackageSet::FromString(pkgCacheFile &Cache, const char * const str, std::ostream &out) { + pkgCache::GrpIterator Grp = Cache.GetPkgCache()->FindGrp(str); + if (Grp.end() == false) { + pkgCache::PkgIterator Pkg = Grp.FindPreferredPkg(); + PackageSet pkgset; + pkgset.insert(Pkg); + return pkgset; + } + PackageSet regex = FromRegEx(Cache, str, out); + if (regex.empty() == true) + _error->Warning(_("Unable to locate package %s"), str); + return regex; +} + /*}}}*/ +// FromCommandLine - Return all versions specified on commandline /*{{{*/ +APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, + APT::VersionSet::Version const &fallback, std::ostream &out) { + VersionSet verset; + for (const char **I = cmdline + 1; *I != 0; I++) { + std::string pkg = *I; + std::string ver; + bool verIsRel = false; + size_t const vertag = pkg.find_last_of("/="); + if (vertag != string::npos) { + ver = pkg.substr(vertag+1); + verIsRel = (pkg[vertag] == '/'); + pkg.erase(vertag); + } + PackageSet pkgset = PackageSet::FromString(Cache, pkg.c_str(), out); + for (PackageSet::const_iterator P = pkgset.begin(); + P != pkgset.end(); ++P) { + if (vertag != string::npos) { + pkgVersionMatch Match(ver, (verIsRel == true ? pkgVersionMatch::Release : + pkgVersionMatch::Version)); + pkgCache::VerIterator V = Match.Find(P); + if (V.end() == true) { + if (verIsRel == true) + _error->Error(_("Release '%s' for '%s' was not found"), + ver.c_str(), P.FullName(true).c_str()); + else + _error->Error(_("Version '%s' for '%s' was not found"), + ver.c_str(), P.FullName(true).c_str()); + continue; + } + if (strcmp(ver.c_str(), V.VerStr()) != 0) + ioprintf(out, _("Selected version %s (%s) for %s\n"), + V.VerStr(), V.RelStr().c_str(), P.FullName(true).c_str()); + verset.insert(V); + } else { + pkgCache::VerIterator V; + switch(fallback) { + case VersionSet::ALL: + for (V = P.VersionList(); V.end() != true; ++V) + verset.insert(V); + break; + case VersionSet::CANDANDINST: + verset.insert(getInstalledVer(Cache, P)); + verset.insert(getCandidateVer(Cache, P)); + break; + case VersionSet::CANDIDATE: + verset.insert(getCandidateVer(Cache, P)); + break; + case VersionSet::INSTALLED: + verset.insert(getInstalledVer(Cache, P)); + break; + case VersionSet::CANDINST: + V = getCandidateVer(Cache, P, true); + if (V.end() == true) + V = getInstalledVer(Cache, P, true); + if (V.end() == false) + verset.insert(V); + else + _error->Error(_("Can't select installed nor candidate version from package %s as it has neither of them"), P.FullName(true).c_str()); + break; + case VersionSet::INSTCAND: + V = getInstalledVer(Cache, P, true); + if (V.end() == true) + V = getCandidateVer(Cache, P, true); + if (V.end() == false) + verset.insert(V); + else + _error->Error(_("Can't select installed nor candidate version from package %s as it has neither of them"), P.FullName(true).c_str()); + break; + case VersionSet::NEWEST: + if (P->VersionList != 0) + verset.insert(P.VersionList()); + else + _error->Error(_("Can't select newest version from package %s as it is purely virtual"), P.FullName(true).c_str()); + break; + } } } - pkgset.insert(Pkg); } - return pkgset; + return verset; +} + /*}}}*/ +// getCandidateVer - Returns the candidate version of the given package /*{{{*/ +pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg, bool const &AllowError) { + if (unlikely(Cache.BuildDepCache() == false)) + return pkgCache::VerIterator(*Cache); + pkgCache::VerIterator Cand = Cache[Pkg].InstVerIter(Cache); + if (AllowError == false && Cand.end() == true) + _error->Error(_("Can't select candidate version from package %s as it has no candidate"), Pkg.FullName(true).c_str()); + return Cand; +} + /*}}}*/ +// getInstalledVer - Returns the installed version of the given package /*{{{*/ +pkgCache::VerIterator VersionSet::getInstalledVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg, bool const &AllowError) { + if (AllowError == false && Pkg->CurrentVer == 0) + _error->Error(_("Can't select installed version from package %s as it is not installed"), Pkg.FullName(true).c_str()); + return Pkg.CurrentVer(); } /*}}}*/ } diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index f0131bfed..708531b4a 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -14,6 +14,7 @@ #include #include +#include #include /*}}}*/ namespace APT { @@ -68,12 +69,23 @@ public: /*{{{*/ \param Cache the packages are in \param pattern regular expression for package names \param out stream to print the notice to */ - static APT::PackageSet FromRegEx(pkgCache &Cache, std::string pattern, std::ostream &out); - static APT::PackageSet FromRegEx(pkgCache &Cache, std::string const &pattern) { + static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string pattern, std::ostream &out); + static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string const &pattern) { std::ostream out (std::ofstream("/dev/null").rdbuf()); return APT::PackageSet::FromRegEx(Cache, pattern, out); } + /** \brief returns all packages specified by a string + + \param Cache the packages are in + \param string String the package name(s) should be extracted from + \param out stream to print various notices to */ + static APT::PackageSet FromString(pkgCacheFile &Cache, const char * const string, std::ostream &out); + static APT::PackageSet FromString(pkgCacheFile &Cache, const char * const string) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::PackageSet::FromString(Cache, string, out); + } + /** \brief returns all packages specified on the commandline Get all package names from the commandline and executes regex's if needed. @@ -81,8 +93,8 @@ public: /*{{{*/ \param Cache the packages are in \param cmdline Command line the package names should be extracted from \param out stream to print various notices to */ - static APT::PackageSet FromCommandLine(pkgCache &Cache, const char **cmdline, std::ostream &out); - static APT::PackageSet FromCommandLine(pkgCache &Cache, const char **cmdline) { + static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, std::ostream &out); + static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { std::ostream out (std::ofstream("/dev/null").rdbuf()); return APT::PackageSet::FromCommandLine(Cache, cmdline, out); } @@ -133,6 +145,60 @@ public: /*{{{*/ // 103. set::iterator is required to be modifiable, but this allows modification of keys typedef typename APT::VersionSet::const_iterator iterator; + /** \brief specifies which version(s) will be returned if non is given */ + enum Version { + /** All versions */ + ALL, + /** Candidate and installed version */ + CANDANDINST, + /** Candidate version */ + CANDIDATE, + /** Installed version */ + INSTALLED, + /** Candidate or if non installed version */ + CANDINST, + /** Installed or if non candidate version */ + INSTCAND, + /** Newest version */ + NEWEST + }; + + /** \brief returns all versions specified on the commandline + + Get all versions from the commandline, uses given default version if + non specifically requested and executes regex's if needed on names. + \param Cache the packages and versions are in + \param cmdline Command line the versions should be extracted from + \param out stream to print various notices to */ + static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, + APT::VersionSet::Version const &fallback, std::ostream &out); + static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, + APT::VersionSet::Version const &fallback) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::VersionSet::FromCommandLine(Cache, cmdline, fallback, out); + } + static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { + return APT::VersionSet::FromCommandLine(Cache, cmdline, CANDINST); + } + /*}}}*/ +protected: /*{{{*/ + + /** \brief returns the candidate version of the package + + \param Cache to be used to query for information + \param Pkg we want the candidate version from this package + \param AllowError add an error to the stack if not */ + static pkgCache::VerIterator getCandidateVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg, bool const &AllowError = false); + + /** \brief returns the installed version of the package + + \param Cache to be used to query for information + \param Pkg we want the installed version from this package + \param AllowError add an error to the stack if not */ + static pkgCache::VerIterator getInstalledVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg, bool const &AllowError = false); + /*}}}*/ }; /*}}}*/ } -- cgit v1.2.3 From d9eb210edda5515ca467eb234dd58b60d43c4513 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 5 Jun 2010 10:04:48 +0200 Subject: use pkgCacheFile and the new CacheSets all over the place --- cmdline/apt-cache.cc | 399 +++++++++++++++++++++++++-------------------------- debian/changelog | 1 + 2 files changed, 195 insertions(+), 205 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 891b10873..227fda4be 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -46,9 +46,6 @@ using namespace std; -pkgCache *GCache = 0; -pkgSourceList *SrcList = 0; - // LocalitySort - Sort a version list by package file locality /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -86,10 +83,13 @@ void LocalitySort(pkgCache::DescFile **begin, /* */ bool UnMet(CommandLine &CmdL) { - pkgCache &Cache = *GCache; - bool Important = _config->FindB("APT::Cache::Important",false); - - for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++) + bool const Important = _config->FindB("APT::Cache::Important",false); + + pkgCacheFile CacheFile; + if (unlikely(CacheFile.GetPkgCache() == NULL)) + return false; + + for (pkgCache::PkgIterator P = CacheFile.GetPkgCache()->PkgBegin(); P.end() == false; P++) { for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; V++) { @@ -174,9 +174,9 @@ bool UnMet(CommandLine &CmdL) // --------------------------------------------------------------------- /* */ bool DumpPackage(CommandLine &CmdL) -{ - pkgCache &Cache = *GCache; - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(Cache, CmdL.FileList); +{ + pkgCacheFile CacheFile; + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList); for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { @@ -239,18 +239,22 @@ bool DumpPackage(CommandLine &CmdL) /* */ bool Stats(CommandLine &Cmd) { - pkgCache &Cache = *GCache; - cout << _("Total package names: ") << Cache.Head().GroupCount << " (" << - SizeToStr(Cache.Head().GroupCount*Cache.Head().GroupSz) << ')' << endl - << _("Total package structures: ") << Cache.Head().PackageCount << " (" << - SizeToStr(Cache.Head().PackageCount*Cache.Head().PackageSz) << ')' << endl; + pkgCacheFile CacheFile; + pkgCache *Cache = CacheFile.GetPkgCache(); + if (unlikely(Cache == NULL)) + return false; + + cout << _("Total package names: ") << Cache->Head().GroupCount << " (" << + SizeToStr(Cache->Head().GroupCount*Cache->Head().GroupSz) << ')' << endl + << _("Total package structures: ") << Cache->Head().PackageCount << " (" << + SizeToStr(Cache->Head().PackageCount*Cache->Head().PackageSz) << ')' << endl; int Normal = 0; int Virtual = 0; int NVirt = 0; int DVirt = 0; int Missing = 0; - pkgCache::PkgIterator I = Cache.PkgBegin(); + pkgCache::PkgIterator I = Cache->PkgBegin(); for (;I.end() != true; I++) { if (I->VersionList != 0 && I->ProvidesList == 0) @@ -288,33 +292,33 @@ bool Stats(CommandLine &Cmd) cout << _(" Mixed virtual packages: ") << NVirt << endl; cout << _(" Missing: ") << Missing << endl; - cout << _("Total distinct versions: ") << Cache.Head().VersionCount << " (" << - SizeToStr(Cache.Head().VersionCount*Cache.Head().VersionSz) << ')' << endl; - cout << _("Total distinct descriptions: ") << Cache.Head().DescriptionCount << " (" << - SizeToStr(Cache.Head().DescriptionCount*Cache.Head().DescriptionSz) << ')' << endl; - cout << _("Total dependencies: ") << Cache.Head().DependsCount << " (" << - SizeToStr(Cache.Head().DependsCount*Cache.Head().DependencySz) << ')' << endl; + cout << _("Total distinct versions: ") << Cache->Head().VersionCount << " (" << + SizeToStr(Cache->Head().VersionCount*Cache->Head().VersionSz) << ')' << endl; + cout << _("Total distinct descriptions: ") << Cache->Head().DescriptionCount << " (" << + SizeToStr(Cache->Head().DescriptionCount*Cache->Head().DescriptionSz) << ')' << endl; + cout << _("Total dependencies: ") << Cache->Head().DependsCount << " (" << + SizeToStr(Cache->Head().DependsCount*Cache->Head().DependencySz) << ')' << endl; - cout << _("Total ver/file relations: ") << Cache.Head().VerFileCount << " (" << - SizeToStr(Cache.Head().VerFileCount*Cache.Head().VerFileSz) << ')' << endl; - cout << _("Total Desc/File relations: ") << Cache.Head().DescFileCount << " (" << - SizeToStr(Cache.Head().DescFileCount*Cache.Head().DescFileSz) << ')' << endl; - cout << _("Total Provides mappings: ") << Cache.Head().ProvidesCount << " (" << - SizeToStr(Cache.Head().ProvidesCount*Cache.Head().ProvidesSz) << ')' << endl; + cout << _("Total ver/file relations: ") << Cache->Head().VerFileCount << " (" << + SizeToStr(Cache->Head().VerFileCount*Cache->Head().VerFileSz) << ')' << endl; + cout << _("Total Desc/File relations: ") << Cache->Head().DescFileCount << " (" << + SizeToStr(Cache->Head().DescFileCount*Cache->Head().DescFileSz) << ')' << endl; + cout << _("Total Provides mappings: ") << Cache->Head().ProvidesCount << " (" << + SizeToStr(Cache->Head().ProvidesCount*Cache->Head().ProvidesSz) << ')' << endl; // String list stats unsigned long Size = 0; unsigned long Count = 0; - for (pkgCache::StringItem *I = Cache.StringItemP + Cache.Head().StringList; - I!= Cache.StringItemP; I = Cache.StringItemP + I->NextItem) + for (pkgCache::StringItem *I = Cache->StringItemP + Cache->Head().StringList; + I!= Cache->StringItemP; I = Cache->StringItemP + I->NextItem) { Count++; - Size += strlen(Cache.StrP + I->String) + 1; + Size += strlen(Cache->StrP + I->String) + 1; } cout << _("Total globbed strings: ") << Count << " (" << SizeToStr(Size) << ')' << endl; unsigned long DepVerSize = 0; - for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++) + for (pkgCache::PkgIterator P = Cache->PkgBegin(); P.end() == false; P++) { for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; V++) { @@ -329,15 +333,15 @@ bool Stats(CommandLine &Cmd) unsigned long Slack = 0; for (int I = 0; I != 7; I++) - Slack += Cache.Head().Pools[I].ItemSize*Cache.Head().Pools[I].Count; + Slack += Cache->Head().Pools[I].ItemSize*Cache->Head().Pools[I].Count; cout << _("Total slack space: ") << SizeToStr(Slack) << endl; unsigned long Total = 0; - Total = Slack + Size + Cache.Head().DependsCount*Cache.Head().DependencySz + - Cache.Head().VersionCount*Cache.Head().VersionSz + - Cache.Head().PackageCount*Cache.Head().PackageSz + - Cache.Head().VerFileCount*Cache.Head().VerFileSz + - Cache.Head().ProvidesCount*Cache.Head().ProvidesSz; + Total = Slack + Size + Cache->Head().DependsCount*Cache->Head().DependencySz + + Cache->Head().VersionCount*Cache->Head().VersionSz + + Cache->Head().PackageCount*Cache->Head().PackageSz + + Cache->Head().VerFileCount*Cache->Head().VerFileSz + + Cache->Head().ProvidesCount*Cache->Head().ProvidesSz; cout << _("Total space accounted for: ") << SizeToStr(Total) << endl; return true; @@ -348,10 +352,14 @@ bool Stats(CommandLine &Cmd) /* This is worthless except fer debugging things */ bool Dump(CommandLine &Cmd) { - pkgCache &Cache = *GCache; - cout << "Using Versioning System: " << Cache.VS->Label << endl; + pkgCacheFile CacheFile; + pkgCache *Cache = CacheFile.GetPkgCache(); + if (unlikely(Cache == NULL)) + return false; + + cout << "Using Versioning System: " << Cache->VS->Label << endl; - for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++) + for (pkgCache::PkgIterator P = Cache->PkgBegin(); P.end() == false; P++) { cout << "Package: " << P.FullName(true) << endl; for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; V++) @@ -370,7 +378,7 @@ bool Dump(CommandLine &Cmd) } } - for (pkgCache::PkgFileIterator F = Cache.FileBegin(); F.end() == false; F++) + for (pkgCache::PkgFileIterator F = Cache->FileBegin(); F.end() == false; F++) { cout << "File: " << F.FileName() << endl; cout << " Type: " << F.IndexType() << endl; @@ -396,18 +404,17 @@ bool Dump(CommandLine &Cmd) make this run really fast, perhaps I went a little overboard.. */ bool DumpAvail(CommandLine &Cmd) { - pkgCache &Cache = *GCache; - - pkgPolicy Plcy(&Cache); - if (ReadPinFile(Plcy) == false || ReadPinDir(Plcy) == false) + pkgCacheFile CacheFile; + pkgCache *Cache = CacheFile.GetPkgCache(); + if (unlikely(Cache == NULL || CacheFile.BuildPolicy() == false)) return false; - - unsigned long Count = Cache.HeaderP->PackageCount+1; + + unsigned long Count = Cache->HeaderP->PackageCount+1; pkgCache::VerFile **VFList = new pkgCache::VerFile *[Count]; memset(VFList,0,sizeof(*VFList)*Count); // Map versions that we want to write out onto the VerList array. - for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++) + for (pkgCache::PkgIterator P = Cache->PkgBegin(); P.end() == false; P++) { if (P->VersionList == 0) continue; @@ -415,7 +422,7 @@ bool DumpAvail(CommandLine &Cmd) /* Find the proper version to use. If the policy says there are no possible selections we return the installed version, if available.. This prevents dselect from making it obsolete. */ - pkgCache::VerIterator V = Plcy.GetCandidateVer(P); + pkgCache::VerIterator V = CacheFile.GetPolicy()->GetCandidateVer(P); if (V.end() == true) { if (P->CurrentVer == 0) @@ -460,10 +467,10 @@ bool DumpAvail(CommandLine &Cmd) LocalitySort(VFList,Count,sizeof(*VFList)); // Iterate over all the package files and write them out. - char *Buffer = new char[Cache.HeaderP->MaxVerFileSize+10]; + char *Buffer = new char[Cache->HeaderP->MaxVerFileSize+10]; for (pkgCache::VerFile **J = VFList; *J != 0;) { - pkgCache::PkgFileIterator File(Cache,(*J)->File + Cache.PkgFileP); + pkgCache::PkgFileIterator File(*Cache,(*J)->File + Cache->PkgFileP); if (File.IsOk() == false) { _error->Error(_("Package file %s is out of sync."),File.FileName()); @@ -482,7 +489,7 @@ bool DumpAvail(CommandLine &Cmd) unsigned long Pos = 0; for (; *J != 0; J++) { - if ((*J)->File + Cache.PkgFileP != File) + if ((*J)->File + Cache->PkgFileP != File) break; const pkgCache::VerFile &VF = **J; @@ -538,11 +545,15 @@ bool DumpAvail(CommandLine &Cmd) /* */ bool Depends(CommandLine &CmdL) { - pkgCache &Cache = *GCache; - SPtrArray Colours = new unsigned[Cache.Head().PackageCount]; - memset(Colours,0,sizeof(*Colours)*Cache.Head().PackageCount); + pkgCacheFile CacheFile; + pkgCache *Cache = CacheFile.GetPkgCache(); + if (unlikely(Cache == NULL)) + return false; - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(Cache, CmdL.FileList); + SPtrArray Colours = new unsigned[Cache->Head().PackageCount]; + memset(Colours,0,sizeof(*Colours)*Cache->Head().PackageCount); + + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList); for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) Colours[Pkg->ID] = 1; @@ -553,7 +564,7 @@ bool Depends(CommandLine &CmdL) do { DidSomething = false; - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) + for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) { if (Colours[Pkg->ID] != 1) continue; @@ -600,11 +611,11 @@ bool Depends(CommandLine &CmdL) // Display all solutions SPtrArray List = D.AllTargets(); - pkgPrioSortList(Cache,List); + pkgPrioSortList(*Cache,List); for (pkgCache::Version **I = List; *I != 0; I++) { - pkgCache::VerIterator V(Cache,*I); - if (V != Cache.VerP + V.ParentPkg()->VersionList || + pkgCache::VerIterator V(*Cache,*I); + if (V != Cache->VerP + V.ParentPkg()->VersionList || V->ParentPkg == D->Package) continue; cout << " " << V.ParentPkg().FullName(true) << endl; @@ -625,11 +636,15 @@ bool Depends(CommandLine &CmdL) /* */ bool RDepends(CommandLine &CmdL) { - pkgCache &Cache = *GCache; - SPtrArray Colours = new unsigned[Cache.Head().PackageCount]; - memset(Colours,0,sizeof(*Colours)*Cache.Head().PackageCount); + pkgCacheFile CacheFile; + pkgCache *Cache = CacheFile.GetPkgCache(); + if (unlikely(Cache == NULL)) + return false; - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(Cache, CmdL.FileList); + SPtrArray Colours = new unsigned[Cache->Head().PackageCount]; + memset(Colours,0,sizeof(*Colours)*Cache->Head().PackageCount); + + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList); for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) Colours[Pkg->ID] = 1; @@ -639,7 +654,7 @@ bool RDepends(CommandLine &CmdL) do { DidSomething = false; - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) + for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) { if (Colours[Pkg->ID] != 1) continue; @@ -681,11 +696,11 @@ bool RDepends(CommandLine &CmdL) // Display all solutions SPtrArray List = D.AllTargets(); - pkgPrioSortList(Cache,List); + pkgPrioSortList(*Cache,List); for (pkgCache::Version **I = List; *I != 0; I++) { - pkgCache::VerIterator V(Cache,*I); - if (V != Cache.VerP + V.ParentPkg()->VersionList || + pkgCache::VerIterator V(*Cache,*I); + if (V != Cache->VerP + V.ParentPkg()->VersionList || V->ParentPkg == D->Package) continue; cout << " " << V.ParentPkg().FullName(true) << endl; @@ -707,7 +722,11 @@ bool RDepends(CommandLine &CmdL) bool XVcg(CommandLine &CmdL) { - pkgCache &Cache = *GCache; + pkgCacheFile CacheFile; + pkgCache *Cache = CacheFile.GetPkgCache(); + if (unlikely(Cache == NULL)) + return false; + bool GivenOnly = _config->FindB("APT::Cache::GivenOnly",false); /* Normal packages are boxes @@ -724,21 +743,21 @@ bool XVcg(CommandLine &CmdL) 0 = None */ enum States {None=0, ToShow, ToShowNR, DoneNR, Done}; enum TheFlags {ForceNR=(1<<0)}; - unsigned char *Show = new unsigned char[Cache.Head().PackageCount]; - unsigned char *Flags = new unsigned char[Cache.Head().PackageCount]; - unsigned char *ShapeMap = new unsigned char[Cache.Head().PackageCount]; + unsigned char *Show = new unsigned char[Cache->Head().PackageCount]; + unsigned char *Flags = new unsigned char[Cache->Head().PackageCount]; + unsigned char *ShapeMap = new unsigned char[Cache->Head().PackageCount]; // Show everything if no arguments given if (CmdL.FileList[1] == 0) - for (unsigned long I = 0; I != Cache.Head().PackageCount; I++) + for (unsigned long I = 0; I != Cache->Head().PackageCount; I++) Show[I] = ToShow; else - for (unsigned long I = 0; I != Cache.Head().PackageCount; I++) + for (unsigned long I = 0; I != Cache->Head().PackageCount; I++) Show[I] = None; - memset(Flags,0,sizeof(*Flags)*Cache.Head().PackageCount); + memset(Flags,0,sizeof(*Flags)*Cache->Head().PackageCount); // Map the shapes - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) + for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) { if (Pkg->VersionList == 0) { @@ -777,7 +796,7 @@ bool XVcg(CommandLine &CmdL) } // Locate the package - pkgCache::PkgIterator Pkg = Cache.FindPkg(P); + pkgCache::PkgIterator Pkg = Cache->FindPkg(P); if (Pkg.end() == true) { _error->Warning(_("Unable to locate package %s"),*I); @@ -798,7 +817,7 @@ bool XVcg(CommandLine &CmdL) while (Act == true) { Act = false; - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) + for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) { // See we need to show this package if (Show[Pkg->ID] == None || Show[Pkg->ID] >= DoneNR) @@ -833,7 +852,7 @@ bool XVcg(CommandLine &CmdL) for (pkgCache::VerIterator I = DPkg.VersionList(); I.end() == false && Hit == false; I++) { - if (Cache.VS->CheckDep(I.VerStr(),D->CompareOp,D.TargetVer()) == true) + if (Cache->VS->CheckDep(I.VerStr(),D->CompareOp,D.TargetVer()) == true) Hit = true; } @@ -841,7 +860,7 @@ bool XVcg(CommandLine &CmdL) for (pkgCache::PrvIterator I = DPkg.ProvidesList(); I.end() == false && Hit == false; I++) { - if (Cache.VS->CheckDep(I.ProvideVersion(),D->CompareOp,D.TargetVer()) == false) + if (Cache->VS->CheckDep(I.ProvideVersion(),D->CompareOp,D.TargetVer()) == false) Hit = true; } @@ -902,7 +921,7 @@ bool XVcg(CommandLine &CmdL) /* Draw the box colours after the fact since we can not tell what colour they should be until everything is finished drawing */ - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) + for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) { if (Show[Pkg->ID] < DoneNR) continue; @@ -931,7 +950,11 @@ bool XVcg(CommandLine &CmdL) http://www.research.att.com/sw/tools/graphviz/ */ bool Dotty(CommandLine &CmdL) { - pkgCache &Cache = *GCache; + pkgCacheFile CacheFile; + pkgCache *Cache = CacheFile.GetPkgCache(); + if (unlikely(Cache == NULL)) + return false; + bool GivenOnly = _config->FindB("APT::Cache::GivenOnly",false); /* Normal packages are boxes @@ -948,21 +971,21 @@ bool Dotty(CommandLine &CmdL) 0 = None */ enum States {None=0, ToShow, ToShowNR, DoneNR, Done}; enum TheFlags {ForceNR=(1<<0)}; - unsigned char *Show = new unsigned char[Cache.Head().PackageCount]; - unsigned char *Flags = new unsigned char[Cache.Head().PackageCount]; - unsigned char *ShapeMap = new unsigned char[Cache.Head().PackageCount]; + unsigned char *Show = new unsigned char[Cache->Head().PackageCount]; + unsigned char *Flags = new unsigned char[Cache->Head().PackageCount]; + unsigned char *ShapeMap = new unsigned char[Cache->Head().PackageCount]; // Show everything if no arguments given if (CmdL.FileList[1] == 0) - for (unsigned long I = 0; I != Cache.Head().PackageCount; I++) + for (unsigned long I = 0; I != Cache->Head().PackageCount; I++) Show[I] = ToShow; else - for (unsigned long I = 0; I != Cache.Head().PackageCount; I++) + for (unsigned long I = 0; I != Cache->Head().PackageCount; I++) Show[I] = None; - memset(Flags,0,sizeof(*Flags)*Cache.Head().PackageCount); + memset(Flags,0,sizeof(*Flags)*Cache->Head().PackageCount); // Map the shapes - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) + for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) { if (Pkg->VersionList == 0) { @@ -1001,7 +1024,7 @@ bool Dotty(CommandLine &CmdL) } // Locate the package - pkgCache::PkgIterator Pkg = Cache.FindPkg(P); + pkgCache::PkgIterator Pkg = Cache->FindPkg(P); if (Pkg.end() == true) { _error->Warning(_("Unable to locate package %s"),*I); @@ -1022,7 +1045,7 @@ bool Dotty(CommandLine &CmdL) while (Act == true) { Act = false; - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) + for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) { // See we need to show this package if (Show[Pkg->ID] == None || Show[Pkg->ID] >= DoneNR) @@ -1055,7 +1078,7 @@ bool Dotty(CommandLine &CmdL) for (pkgCache::VerIterator I = DPkg.VersionList(); I.end() == false && Hit == false; I++) { - if (Cache.VS->CheckDep(I.VerStr(),D->CompareOp,D.TargetVer()) == true) + if (Cache->VS->CheckDep(I.VerStr(),D->CompareOp,D.TargetVer()) == true) Hit = true; } @@ -1063,7 +1086,7 @@ bool Dotty(CommandLine &CmdL) for (pkgCache::PrvIterator I = DPkg.ProvidesList(); I.end() == false && Hit == false; I++) { - if (Cache.VS->CheckDep(I.ProvideVersion(),D->CompareOp,D.TargetVer()) == false) + if (Cache->VS->CheckDep(I.ProvideVersion(),D->CompareOp,D.TargetVer()) == false) Hit = true; } @@ -1117,7 +1140,7 @@ bool Dotty(CommandLine &CmdL) /* Draw the box colours after the fact since we can not tell what colour they should be until everything is finished drawing */ - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) + for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) { if (Show[Pkg->ID] < DoneNR) continue; @@ -1191,8 +1214,12 @@ bool DoAdd(CommandLine &CmdL) // --------------------------------------------------------------------- /* This displays the package record from the proper package index file. It is not used by DumpAvail for performance reasons. */ -bool DisplayRecord(pkgCache::VerIterator V) +bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V) { + pkgCache *Cache = CacheFile.GetPkgCache(); + if (unlikely(Cache == NULL)) + return false; + // Find an appropriate file pkgCache::VerFileIterator Vf = V.FileList(); for (; Vf.end() == false; Vf++) @@ -1211,7 +1238,7 @@ bool DisplayRecord(pkgCache::VerIterator V) return false; // Read the record - unsigned char *Buffer = new unsigned char[GCache->HeaderP->MaxVerFileSize+1]; + unsigned char *Buffer = new unsigned char[Cache->HeaderP->MaxVerFileSize+1]; Buffer[V.FileList()->Size] = '\n'; if (PkgF.Seek(V.FileList()->Offset) == false || PkgF.Read(Buffer,V.FileList()->Size) == false) @@ -1231,7 +1258,7 @@ bool DisplayRecord(pkgCache::VerIterator V) } // Show the right description - pkgRecords Recs(*GCache); + pkgRecords Recs(*Cache); pkgCache::DescIterator Desc = V.TranslatedDescription(); pkgRecords::Parser &P = Recs.Lookup(Desc.FileList()); cout << "Description" << ( (strcmp(Desc.LanguageCode(),"") != 0) ? "-" : "" ) << Desc.LanguageCode() << ": " << P.LongDesc(); @@ -1271,13 +1298,16 @@ struct ExDescFile /* This searches the package names and package descriptions for a pattern */ bool Search(CommandLine &CmdL) { - pkgCache &Cache = *GCache; bool const ShowFull = _config->FindB("APT::Cache::ShowFull",false); bool const NamesOnly = _config->FindB("APT::Cache::NamesOnly",false); unsigned int const NumPatterns = CmdL.FileSize() -1; - pkgDepCache::Policy Plcy; - + pkgCacheFile CacheFile; + pkgCache *Cache = CacheFile.GetPkgCache(); + pkgDepCache::Policy *Plcy = CacheFile.GetPolicy(); + if (unlikely(Cache == NULL || Plcy == NULL)) + return false; + // Make sure there is at least one argument if (NumPatterns < 1) return _error->Error(_("You must give at least one search pattern")); @@ -1303,11 +1333,11 @@ bool Search(CommandLine &CmdL) return false; } - ExDescFile *DFList = new ExDescFile[Cache.HeaderP->GroupCount+1]; - memset(DFList,0,sizeof(*DFList)*Cache.HeaderP->GroupCount+1); + ExDescFile *DFList = new ExDescFile[Cache->HeaderP->GroupCount+1]; + memset(DFList,0,sizeof(*DFList)*Cache->HeaderP->GroupCount+1); // Map versions that we want to write out onto the VerList array. - for (pkgCache::GrpIterator G = Cache.GrpBegin(); G.end() == false; ++G) + for (pkgCache::GrpIterator G = Cache->GrpBegin(); G.end() == false; ++G) { if (DFList[G->ID].NameMatch == true) continue; @@ -1329,7 +1359,7 @@ bool Search(CommandLine &CmdL) pkgCache::PkgIterator P = G.FindPreferredPkg(); if (P.end() == true) continue; - pkgCache::VerIterator V = Plcy.GetCandidateVer(P); + pkgCache::VerIterator V = Plcy->GetCandidateVer(P); if (V.end() == false) DFList[G->ID].Df = V.DescriptionList().FileList(); @@ -1339,7 +1369,7 @@ bool Search(CommandLine &CmdL) // Include all the packages that provide matching names too for (pkgCache::PrvIterator Prv = P.ProvidesList() ; Prv.end() == false; Prv++) { - pkgCache::VerIterator V = Plcy.GetCandidateVer(Prv.OwnerPkg()); + pkgCache::VerIterator V = Plcy->GetCandidateVer(Prv.OwnerPkg()); if (V.end() == true) continue; @@ -1349,14 +1379,14 @@ bool Search(CommandLine &CmdL) } } - LocalitySort(&DFList->Df,Cache.HeaderP->GroupCount,sizeof(*DFList)); + LocalitySort(&DFList->Df,Cache->HeaderP->GroupCount,sizeof(*DFList)); // Create the text record parser - pkgRecords Recs(Cache); + pkgRecords Recs(*Cache); // Iterate over all the version records and check them for (ExDescFile *J = DFList; J->Df != 0; J++) { - pkgRecords::Parser &P = Recs.Lookup(pkgCache::DescFileIterator(Cache,J->Df)); + pkgRecords::Parser &P = Recs.Lookup(pkgCache::DescFileIterator(*Cache,J->Df)); if (J->NameMatch == false && NamesOnly == false) { @@ -1398,15 +1428,17 @@ bool Search(CommandLine &CmdL) /* show automatically installed packages (sorted) */ bool ShowAuto(CommandLine &CmdL) { - OpProgress op; - pkgDepCache DepCache(GCache); - DepCache.Init(&op); + pkgCacheFile CacheFile; + pkgCache *Cache = CacheFile.GetPkgCache(); + pkgDepCache *DepCache = CacheFile.GetDepCache(); + if (unlikely(Cache == NULL || DepCache == NULL)) + return false; std::vector packages; - packages.reserve(GCache->HeaderP->PackageCount / 3); + packages.reserve(Cache->HeaderP->PackageCount / 3); - for (pkgCache::PkgIterator P = GCache->PkgBegin(); P.end() == false; P++) - if (DepCache[P].Flags & pkgCache::Flag::Auto) + for (pkgCache::PkgIterator P = Cache->PkgBegin(); P.end() == false; P++) + if ((*DepCache)[P].Flags & pkgCache::Flag::Auto) packages.push_back(P.Name()); std::sort(packages.begin(), packages.end()); @@ -1421,34 +1453,16 @@ bool ShowAuto(CommandLine &CmdL) // --------------------------------------------------------------------- /* */ bool ShowPackage(CommandLine &CmdL) -{ - pkgCache &Cache = *GCache; - pkgDepCache::Policy Plcy; - - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(Cache, CmdL.FileList); - for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) - { - // Find the proper version to use. - if (_config->FindB("APT::Cache::AllVersions","true") == true) - { - pkgCache::VerIterator V; - for (V = Pkg.VersionList(); V.end() == false; V++) - { - if (DisplayRecord(V) == false) - return false; - } - } - else - { - pkgCache::VerIterator V = Plcy.GetCandidateVer(Pkg); - if (V.end() == true || V.FileList().end() == true) - continue; - if (DisplayRecord(V) == false) - return false; - } - } - - if (pkgset.empty() == false) +{ + pkgCacheFile CacheFile; + APT::VersionSet::Version const select = _config->FindB("APT::Cache::AllVersions", true) ? + APT::VersionSet::ALL : APT::VersionSet::INSTALLED; + APT::VersionSet const verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList, select); + for (APT::VersionSet::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver) + if (DisplayRecord(CacheFile, Ver) == false) + return false; + + if (verset.empty() == false) return true; return _error->Error(_("No packages found")); } @@ -1458,8 +1472,10 @@ bool ShowPackage(CommandLine &CmdL) /* This does a prefix match on the first argument */ bool ShowPkgNames(CommandLine &CmdL) { - pkgCache &Cache = *GCache; - pkgCache::GrpIterator I = Cache.GrpBegin(); + pkgCacheFile CacheFile; + if (unlikely(CacheFile.BuildCaches(NULL, false) == false)) + return false; + pkgCache::GrpIterator I = CacheFile.GetPkgCache()->GrpBegin(); bool const All = _config->FindB("APT::Cache::AllNames","false"); if (CmdL.FileList[1] != 0) @@ -1495,11 +1511,13 @@ bool ShowPkgNames(CommandLine &CmdL) /* */ bool ShowSrcPackage(CommandLine &CmdL) { - pkgSourceList List; - List.ReadMainList(); - + pkgCacheFile CacheFile; + pkgSourceList *List = CacheFile.GetSourceList(); + if (unlikely(List == NULL)) + return false; + // Create the text record parsers - pkgSrcRecords SrcRecs(List); + pkgSrcRecords SrcRecs(*List); if (_error->PendingError() == true) return false; @@ -1530,19 +1548,18 @@ bool ShowSrcPackage(CommandLine &CmdL) /* */ bool Policy(CommandLine &CmdL) { - if (SrcList == 0) - return _error->Error("Generate must be enabled for this function"); - - pkgCache &Cache = *GCache; - pkgPolicy Plcy(&Cache); - if (ReadPinFile(Plcy) == false || ReadPinDir(Plcy) == false) + pkgCacheFile CacheFile; + pkgCache *Cache = CacheFile.GetPkgCache(); + pkgPolicy *Plcy = CacheFile.GetPolicy(); + pkgSourceList *SrcList = CacheFile.GetSourceList(); + if (unlikely(Cache == NULL || Plcy == NULL || SrcList == NULL)) return false; - + // Print out all of the package files if (CmdL.FileList[1] == 0) { cout << _("Package files:") << endl; - for (pkgCache::PkgFileIterator F = Cache.FileBegin(); F.end() == false; F++) + for (pkgCache::PkgFileIterator F = Cache->FileBegin(); F.end() == false; F++) { // Locate the associated index files so we can derive a description pkgIndexFile *Indx; @@ -1551,7 +1568,7 @@ bool Policy(CommandLine &CmdL) return _error->Error(_("Cache is out of sync, can't x-ref a package file")); printf("%4i %s\n", - Plcy.GetPriority(F),Indx->Describe(true).c_str()); + Plcy->GetPriority(F),Indx->Describe(true).c_str()); // Print the reference information for the package string Str = F.RelStr(); @@ -1563,16 +1580,16 @@ bool Policy(CommandLine &CmdL) // Show any packages have explicit pins cout << _("Pinned packages:") << endl; - pkgCache::PkgIterator I = Cache.PkgBegin(); + pkgCache::PkgIterator I = Cache->PkgBegin(); for (;I.end() != true; I++) { - if (Plcy.GetPriority(I) == 0) + if (Plcy->GetPriority(I) == 0) continue; // Print the package name and the version we are forcing to cout << " " << I.FullName(true) << " -> "; - pkgCache::VerIterator V = Plcy.GetMatch(I); + pkgCache::VerIterator V = Plcy->GetMatch(I); if (V.end() == true) cout << _("(not found)") << endl; else @@ -1593,7 +1610,7 @@ bool Policy(CommandLine &CmdL) (InstalledLessCandidate > 0 ? (InstalledLessCandidate) : 0) - 1; // Print out detailed information for each package - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(Cache, CmdL.FileList); + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList); for (APT::PackageSet::const_iterator I = pkgset.begin(); I != pkgset.end(); ++I) { pkgCache::PkgIterator Pkg = I.Group().FindPkg("any"); @@ -1613,17 +1630,17 @@ bool Policy(CommandLine &CmdL) // Candidate Version cout << msgCandidate << OutputInDepth(deepCandidate, " "); - pkgCache::VerIterator V = Plcy.GetCandidateVer(Pkg); + pkgCache::VerIterator V = Plcy->GetCandidateVer(Pkg); if (V.end() == true) cout << _("(none)") << endl; else cout << V.VerStr() << endl; // Pinned version - if (Plcy.GetPriority(Pkg) != 0) + if (Plcy->GetPriority(Pkg) != 0) { cout << _(" Package pin: "); - V = Plcy.GetMatch(Pkg); + V = Plcy->GetMatch(Pkg); if (V.end() == true) cout << _("(not found)") << endl; else @@ -1638,7 +1655,7 @@ bool Policy(CommandLine &CmdL) cout << " *** " << V.VerStr(); else cout << " " << V.VerStr(); - cout << " " << Plcy.GetPriority(Pkg) << endl; + cout << " " << Plcy->GetPriority(Pkg) << endl; for (pkgCache::VerFileIterator VF = V.FileList(); VF.end() == false; VF++) { // Locate the associated index files so we can derive a description @@ -1646,7 +1663,7 @@ bool Policy(CommandLine &CmdL) if (SrcList->FindIndex(VF.File(),Indx) == false && _system->FindIndex(VF.File(),Indx) == false) return _error->Error(_("Cache is out of sync, can't x-ref a package file")); - printf(" %4i %s\n",Plcy.GetPriority(VF.File()), + printf(" %4i %s\n",Plcy->GetPriority(VF.File()), Indx->Describe(true).c_str()); } } @@ -1661,12 +1678,11 @@ bool Policy(CommandLine &CmdL) /* */ bool Madison(CommandLine &CmdL) { - if (SrcList == 0) - return _error->Error("Generate must be enabled for this function"); - - SrcList->ReadMainList(); + pkgCacheFile CacheFile; + pkgSourceList *SrcList = CacheFile.GetSourceList(); - pkgCache &Cache = *GCache; + if (SrcList == 0) + return false; // Create the src text record parsers and ignore errors about missing // deb-src lines that are generated from pkgSrcRecords::pkgSrcRecords @@ -1674,7 +1690,7 @@ bool Madison(CommandLine &CmdL) if (_error->PendingError() == true) _error->Discard(); - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(Cache, CmdL.FileList); + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList); for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { if (Pkg.end() == false) @@ -1729,11 +1745,9 @@ bool Madison(CommandLine &CmdL) bool GenCaches(CommandLine &Cmd) { OpTextProgress Progress(*_config); - - pkgSourceList List; - if (List.ReadMainList() == false) - return false; - return pkgMakeStatusCache(List,Progress); + + pkgCacheFile CacheFile; + return CacheFile.BuildCaches(&Progress, true); } /*}}}*/ // ShowHelp - Show a help screen /*{{{*/ @@ -1865,35 +1879,10 @@ int main(int argc,const char *argv[]) /*{{{*/ if (isatty(STDOUT_FILENO) && _config->FindI("quiet",0) < 1) _config->Set("quiet","1"); +// if (_config->FindB("APT::Cache::Generate",true) == false) if (CmdL.DispatchArg(CmdsA,false) == false && _error->PendingError() == false) - { - MMap *Map = 0; - if (_config->FindB("APT::Cache::Generate",true) == false) - { - Map = new MMap(*new FileFd(_config->FindFile("Dir::Cache::pkgcache"), - FileFd::ReadOnly),MMap::Public|MMap::ReadOnly); - } - else - { - // Open the cache file - SrcList = new pkgSourceList; - SrcList->ReadMainList(); + CmdL.DispatchArg(CmdsB); - // Generate it and map it - OpProgress Prog; - pkgMakeStatusCache(*SrcList,Prog,&Map,true); - } - - if (_error->PendingError() == false) - { - pkgCache Cache(Map); - GCache = &Cache; - if (_error->PendingError() == false) - CmdL.DispatchArg(CmdsB); - } - delete Map; - } - // Print any errors or warnings found during parsing if (_error->empty() == false) { diff --git a/debian/changelog b/debian/changelog index 9001e91a7..d935d06d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - get the best matching arch package from a group with FindPreferredPkg * cmdline/apt-cache.cc: - make the search multiarch compatible by using GrpIterator instead + - use pkgCacheFile and the new CacheSets all over the place * apt-pkg/cachefile.{cc,h}: - split Open() into submethods to be able to build only parts - make the OpProgress optional in the Cache buildprocess -- cgit v1.2.3 From 0588779fb2139b70f369ccac20fcc0f3a3e9ed47 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 5 Jun 2010 10:17:10 +0200 Subject: Add a option to apt-cache policy to additionally init the DepCache before starting to get the package informations. This is useful e.g. for debugging the MultiArchKiller. --- cmdline/apt-cache.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 227fda4be..b0e705108 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1555,6 +1555,12 @@ bool Policy(CommandLine &CmdL) if (unlikely(Cache == NULL || Plcy == NULL || SrcList == NULL)) return false; + /* Should the MultiArchKiller be run to see which pseudo packages for an + arch all package are currently installed? Activating it gives a speed + penality for no real gain beside enhanced debugging, so in general no. */ + if (_config->FindB("APT::Cache::Policy::DepCache", false) == true) + CacheFile.GetDepCache(); + // Print out all of the package files if (CmdL.FileList[1] == 0) { -- cgit v1.2.3 From f44a05ff641523ab8eae84166e9b1a9dcf1b366f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 5 Jun 2010 12:54:30 +0200 Subject: add --target-release option (Closes: #115520) --- cmdline/apt-cache.cc | 2 ++ debian/changelog | 1 + 2 files changed, 3 insertions(+) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index b0e705108..005721ddf 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1831,6 +1831,8 @@ int main(int argc,const char *argv[]) /*{{{*/ {'n',"names-only","APT::Cache::NamesOnly",0}, {0,"all-names","APT::Cache::AllNames",0}, {0,"recurse","APT::Cache::RecurseDepends",0}, + {'t',"target-release","APT::Default-Release",CommandLine::HasArg}, + {'t',"default-release","APT::Default-Release",CommandLine::HasArg}, {'c',"config-file",0,CommandLine::ConfigFile}, {'o',"option",0,CommandLine::ArbItem}, {0,"installed","APT::Cache::Installed",0}, diff --git a/debian/changelog b/debian/changelog index d935d06d7..acdc1795f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low * cmdline/apt-cache.cc: - make the search multiarch compatible by using GrpIterator instead - use pkgCacheFile and the new CacheSets all over the place + - add --target-release option (Closes: #115520) * apt-pkg/cachefile.{cc,h}: - split Open() into submethods to be able to build only parts - make the OpProgress optional in the Cache buildprocess -- cgit v1.2.3 From 9f1f17ccd4f84c23410ae62911c85f5836c3b503 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 5 Jun 2010 13:09:18 +0200 Subject: Don't increase the commandline parameter in the library but in the application to be really generic. --- apt-pkg/cacheset.cc | 4 ++-- cmdline/apt-cache.cc | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index 7372c909e..5dbd1a4df 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -79,7 +79,7 @@ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, std:: // FromCommandLine - Return all packages specified on commandline /*{{{*/ PackageSet PackageSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, std::ostream &out) { PackageSet pkgset; - for (const char **I = cmdline + 1; *I != 0; I++) { + for (const char **I = cmdline; *I != 0; ++I) { PackageSet pset = FromString(Cache, *I, out); pkgset.insert(pset.begin(), pset.end()); } @@ -105,7 +105,7 @@ PackageSet PackageSet::FromString(pkgCacheFile &Cache, const char * const str, s APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, APT::VersionSet::Version const &fallback, std::ostream &out) { VersionSet verset; - for (const char **I = cmdline + 1; *I != 0; I++) { + for (const char **I = cmdline; *I != 0; ++I) { std::string pkg = *I; std::string ver; bool verIsRel = false; diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 005721ddf..e3876d5e0 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -176,7 +176,7 @@ bool UnMet(CommandLine &CmdL) bool DumpPackage(CommandLine &CmdL) { pkgCacheFile CacheFile; - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList); + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1); for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { @@ -553,7 +553,7 @@ bool Depends(CommandLine &CmdL) SPtrArray Colours = new unsigned[Cache->Head().PackageCount]; memset(Colours,0,sizeof(*Colours)*Cache->Head().PackageCount); - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList); + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1); for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) Colours[Pkg->ID] = 1; @@ -644,7 +644,7 @@ bool RDepends(CommandLine &CmdL) SPtrArray Colours = new unsigned[Cache->Head().PackageCount]; memset(Colours,0,sizeof(*Colours)*Cache->Head().PackageCount); - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList); + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1); for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) Colours[Pkg->ID] = 1; @@ -1457,7 +1457,7 @@ bool ShowPackage(CommandLine &CmdL) pkgCacheFile CacheFile; APT::VersionSet::Version const select = _config->FindB("APT::Cache::AllVersions", true) ? APT::VersionSet::ALL : APT::VersionSet::INSTALLED; - APT::VersionSet const verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList, select); + APT::VersionSet const verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1, select); for (APT::VersionSet::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver) if (DisplayRecord(CacheFile, Ver) == false) return false; @@ -1616,7 +1616,7 @@ bool Policy(CommandLine &CmdL) (InstalledLessCandidate > 0 ? (InstalledLessCandidate) : 0) - 1; // Print out detailed information for each package - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList); + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1); for (APT::PackageSet::const_iterator I = pkgset.begin(); I != pkgset.end(); ++I) { pkgCache::PkgIterator Pkg = I.Group().FindPkg("any"); @@ -1696,7 +1696,7 @@ bool Madison(CommandLine &CmdL) if (_error->PendingError() == true) _error->Discard(); - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList); + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1); for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { if (Pkg.end() == false) -- cgit v1.2.3 From c45f2d1995a58c7a5a8616c6fbf9f95ee4ccfd49 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 5 Jun 2010 13:38:17 +0200 Subject: do not insert end() Iterators into the CacheSet even if requested --- apt-pkg/cacheset.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index 708531b4a..b65e053e6 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -61,6 +61,9 @@ public: /*{{{*/ // 103. set::iterator is required to be modifiable, but this allows modification of keys typedef typename APT::PackageSet::const_iterator iterator; + using std::set::insert; + inline void insert(pkgCache::PkgIterator const &P) { if (P.end() == false) std::set::insert(P); }; + /** \brief returns all packages in the cache whose name matchs a given pattern A simple helper responsible for executing a regular expression on all @@ -145,6 +148,9 @@ public: /*{{{*/ // 103. set::iterator is required to be modifiable, but this allows modification of keys typedef typename APT::VersionSet::const_iterator iterator; + using std::set::insert; + inline void insert(pkgCache::VerIterator const &V) { if (V.end() == false) std::set::insert(V); }; + /** \brief specifies which version(s) will be returned if non is given */ enum Version { /** All versions */ -- cgit v1.2.3 From 292f5b8770a0f10d8a19204dc4a914437d861662 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 5 Jun 2010 13:42:04 +0200 Subject: apt-cache show --no-all-versions should issues the Candidate --- cmdline/apt-cache.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index e3876d5e0..b782c70af 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1456,7 +1456,7 @@ bool ShowPackage(CommandLine &CmdL) { pkgCacheFile CacheFile; APT::VersionSet::Version const select = _config->FindB("APT::Cache::AllVersions", true) ? - APT::VersionSet::ALL : APT::VersionSet::INSTALLED; + APT::VersionSet::ALL : APT::VersionSet::CANDIDATE; APT::VersionSet const verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1, select); for (APT::VersionSet::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver) if (DisplayRecord(CacheFile, Ver) == false) -- cgit v1.2.3 From fe870febbfc1145d4a2a6b86985b0253419d52a8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 5 Jun 2010 15:47:16 +0200 Subject: handle :arch modifier in PackageSet::FromString correctly --- apt-pkg/cacheset.cc | 26 ++++++++++++++++++++------ apt-pkg/cacheset.h | 4 ++-- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index 5dbd1a4df..8fcffaf9a 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -87,17 +87,31 @@ PackageSet PackageSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline } /*}}}*/ // FromString - Return all packages matching a specific string /*{{{*/ -PackageSet PackageSet::FromString(pkgCacheFile &Cache, const char * const str, std::ostream &out) { - pkgCache::GrpIterator Grp = Cache.GetPkgCache()->FindGrp(str); - if (Grp.end() == false) { - pkgCache::PkgIterator Pkg = Grp.FindPreferredPkg(); +PackageSet PackageSet::FromString(pkgCacheFile &Cache, std::string const &str, std::ostream &out) { + std::string pkg = str; + size_t archfound = pkg.find_last_of(':'); + std::string arch; + if (archfound != std::string::npos) { + arch = pkg.substr(archfound+1); + pkg.erase(archfound); + } + + pkgCache::PkgIterator Pkg; + if (arch.empty() == true) { + pkgCache::GrpIterator Grp = Cache.GetPkgCache()->FindGrp(pkg); + if (Grp.end() == false) + Pkg = Grp.FindPreferredPkg(); + } else + Pkg = Cache.GetPkgCache()->FindPkg(pkg, arch); + + if (Pkg.end() == false) { PackageSet pkgset; pkgset.insert(Pkg); return pkgset; } PackageSet regex = FromRegEx(Cache, str, out); if (regex.empty() == true) - _error->Warning(_("Unable to locate package %s"), str); + _error->Warning(_("Unable to locate package %s"), str.c_str()); return regex; } /*}}}*/ @@ -188,7 +202,7 @@ pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg, bool const &AllowError) { if (unlikely(Cache.BuildDepCache() == false)) return pkgCache::VerIterator(*Cache); - pkgCache::VerIterator Cand = Cache[Pkg].InstVerIter(Cache); + pkgCache::VerIterator Cand = Cache[Pkg].CandidateVerIter(Cache); if (AllowError == false && Cand.end() == true) _error->Error(_("Can't select candidate version from package %s as it has no candidate"), Pkg.FullName(true).c_str()); return Cand; diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index b65e053e6..4f7be4caa 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -83,8 +83,8 @@ public: /*{{{*/ \param Cache the packages are in \param string String the package name(s) should be extracted from \param out stream to print various notices to */ - static APT::PackageSet FromString(pkgCacheFile &Cache, const char * const string, std::ostream &out); - static APT::PackageSet FromString(pkgCacheFile &Cache, const char * const string) { + static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string, std::ostream &out); + static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string) { std::ostream out (std::ofstream("/dev/null").rdbuf()); return APT::PackageSet::FromString(Cache, string, out); } -- cgit v1.2.3 From 88edd59bb5ff29d1f55612b2ab216a72b9a9898e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 5 Jun 2010 16:45:19 +0200 Subject: enhance the changelog a bit --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index acdc1795f..5590f20ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - do the autoremove mark process also for required packages to handle these illegally depending on lower priority packages (Closes: #583517) - try harder to find the other pseudo versions for autoremove multiarch + - correct "Dangerous iterator usage" pointed out by cppcheck * apt-pkg/aptconfiguration.cc: - remove duplicate architectures in getArchitectures() * apt-pkg/indexrecords.{cc,h}: @@ -18,8 +19,6 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - do not try PDiff if it is not listed in the Meta file * apt-pkg/cacheiterator.h: - let pkgCache::Iterator inherent std::iterator - * apt-pkg/depcache.cc: - - correct "Dangerous iterator usage." pointed out by cppcheck * ftparchive/writer.h: - add a virtual destructor to FTWScanner class (for cppcheck) * apt-pkg/cacheset.{cc,h}: @@ -34,12 +33,13 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - make the search multiarch compatible by using GrpIterator instead - use pkgCacheFile and the new CacheSets all over the place - add --target-release option (Closes: #115520) + - accept pkg/release and pkg=version in show and co. (Closes: #236270) * apt-pkg/cachefile.{cc,h}: - split Open() into submethods to be able to build only parts - make the OpProgress optional in the Cache buildprocess - store also the SourceList we use internally for export - -- David Kalnischkies Mon, 31 May 2010 22:36:35 +0200 + -- David Kalnischkies Sat, 05 Jun 2010 14:39:58 +0200 apt (0.7.26~exp5) experimental; urgency=low -- cgit v1.2.3 From 6ebaae9a5d794ce69d17e419c109fc185925541c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 5 Jun 2010 16:59:45 +0200 Subject: accept package versions in the unmet command --- cmdline/apt-cache.cc | 57 +++++++++++++++++++++++++++++++--------------------- debian/changelog | 1 + 2 files changed, 35 insertions(+), 23 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index b782c70af..ef074280e 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -81,18 +81,8 @@ void LocalitySort(pkgCache::DescFile **begin, // UnMet - Show unmet dependencies /*{{{*/ // --------------------------------------------------------------------- /* */ -bool UnMet(CommandLine &CmdL) +bool ShowUnMet(pkgCache::VerIterator const &V, bool const &Important) { - bool const Important = _config->FindB("APT::Cache::Important",false); - - pkgCacheFile CacheFile; - if (unlikely(CacheFile.GetPkgCache() == NULL)) - return false; - - for (pkgCache::PkgIterator P = CacheFile.GetPkgCache()->PkgBegin(); P.end() == false; P++) - { - for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; V++) - { bool Header = false; for (pkgCache::DepIterator D = V.DependsList(); D.end() == false;) { @@ -100,20 +90,19 @@ bool UnMet(CommandLine &CmdL) pkgCache::DepIterator Start; pkgCache::DepIterator End; D.GlobOr(Start,End); - - // Skip conflicts and replaces - if (End->Type != pkgCache::Dep::PreDepends && - End->Type != pkgCache::Dep::Depends && - End->Type != pkgCache::Dep::Suggests && - End->Type != pkgCache::Dep::Recommends) - continue; // Important deps only if (Important == true) if (End->Type != pkgCache::Dep::PreDepends && End->Type != pkgCache::Dep::Depends) continue; - + + // Skip conflicts and replaces + if (End->Type == pkgCache::Dep::DpkgBreaks || + End->Type == pkgCache::Dep::Replaces || + End->Type == pkgCache::Dep::Conflicts) + continue; + // Verify the or group bool OK = false; pkgCache::DepIterator RealStart = Start; @@ -142,7 +131,7 @@ bool UnMet(CommandLine &CmdL) // Oops, it failed.. if (Header == false) ioprintf(cout,_("Package %s version %s has an unmet dep:\n"), - P.FullName(true).c_str(),V.VerStr()); + V.ParentPkg().FullName(true).c_str(),V.VerStr()); Header = true; // Print out the dep type @@ -164,9 +153,31 @@ bool UnMet(CommandLine &CmdL) while (1); cout << endl; - } - } - } + } + return true; +} +bool UnMet(CommandLine &CmdL) +{ + bool const Important = _config->FindB("APT::Cache::Important",false); + + pkgCacheFile CacheFile; + if (unlikely(CacheFile.GetPkgCache() == NULL)) + return false; + + if (CmdL.FileSize() <= 1) + { + for (pkgCache::PkgIterator P = CacheFile.GetPkgCache()->PkgBegin(); P.end() == false; P++) + for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; ++V) + if (ShowUnMet(V, Important) == false) + return false; + } + else + { + APT::VersionSet verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1); + for (APT::VersionSet::iterator V = verset.begin(); V != verset.end(); ++V) + if (ShowUnMet(V, Important) == false) + return false; + } return true; } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 5590f20ff..6c9faf119 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - use pkgCacheFile and the new CacheSets all over the place - add --target-release option (Closes: #115520) - accept pkg/release and pkg=version in show and co. (Closes: #236270) + - accept package versions in the unmet command * apt-pkg/cachefile.{cc,h}: - split Open() into submethods to be able to build only parts - make the OpProgress optional in the Cache buildprocess -- cgit v1.2.3 From 84910ad5090b8cffc81d7942497ca09cc5d93244 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 5 Jun 2010 18:00:00 +0200 Subject: support special release-modifier 'installed' and 'candidate' --- apt-pkg/cacheset.cc | 126 ++++++++++++++++++++++++++++++++-------------------- apt-pkg/cacheset.h | 5 +++ debian/changelog | 1 + 3 files changed, 83 insertions(+), 49 deletions(-) diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index 8fcffaf9a..c0b06ba32 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -132,10 +132,19 @@ APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cm PackageSet pkgset = PackageSet::FromString(Cache, pkg.c_str(), out); for (PackageSet::const_iterator P = pkgset.begin(); P != pkgset.end(); ++P) { - if (vertag != string::npos) { + if (vertag == string::npos) { + AddSelectedVersion(Cache, verset, P, fallback); + continue; + } + pkgCache::VerIterator V; + if (ver == "installed") + V = getInstalledVer(Cache, P); + else if (ver == "candidate") + V = getCandidateVer(Cache, P); + else { pkgVersionMatch Match(ver, (verIsRel == true ? pkgVersionMatch::Release : - pkgVersionMatch::Version)); - pkgCache::VerIterator V = Match.Find(P); + pkgVersionMatch::Version)); + V = Match.Find(P); if (V.end() == true) { if (verIsRel == true) _error->Error(_("Release '%s' for '%s' was not found"), @@ -145,58 +154,77 @@ APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cm ver.c_str(), P.FullName(true).c_str()); continue; } - if (strcmp(ver.c_str(), V.VerStr()) != 0) - ioprintf(out, _("Selected version %s (%s) for %s\n"), - V.VerStr(), V.RelStr().c_str(), P.FullName(true).c_str()); - verset.insert(V); - } else { - pkgCache::VerIterator V; - switch(fallback) { - case VersionSet::ALL: - for (V = P.VersionList(); V.end() != true; ++V) - verset.insert(V); - break; - case VersionSet::CANDANDINST: - verset.insert(getInstalledVer(Cache, P)); - verset.insert(getCandidateVer(Cache, P)); - break; - case VersionSet::CANDIDATE: - verset.insert(getCandidateVer(Cache, P)); - break; - case VersionSet::INSTALLED: - verset.insert(getInstalledVer(Cache, P)); - break; - case VersionSet::CANDINST: - V = getCandidateVer(Cache, P, true); - if (V.end() == true) - V = getInstalledVer(Cache, P, true); - if (V.end() == false) - verset.insert(V); - else - _error->Error(_("Can't select installed nor candidate version from package %s as it has neither of them"), P.FullName(true).c_str()); - break; - case VersionSet::INSTCAND: - V = getInstalledVer(Cache, P, true); - if (V.end() == true) - V = getCandidateVer(Cache, P, true); - if (V.end() == false) - verset.insert(V); - else - _error->Error(_("Can't select installed nor candidate version from package %s as it has neither of them"), P.FullName(true).c_str()); - break; - case VersionSet::NEWEST: - if (P->VersionList != 0) - verset.insert(P.VersionList()); - else - _error->Error(_("Can't select newest version from package %s as it is purely virtual"), P.FullName(true).c_str()); - break; - } } + if (V.end() == true) + continue; + if (ver == V.VerStr()) + ioprintf(out, _("Selected version '%s' (%s) for '%s'\n"), + V.VerStr(), V.RelStr().c_str(), P.FullName(true).c_str()); + verset.insert(V); } } return verset; } /*}}}*/ +// AddSelectedVersion - add version from package based on fallback /*{{{*/ +bool VersionSet::AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, + pkgCache::PkgIterator const &P, VersionSet::Version const &fallback, + bool const &AllowError) { + pkgCache::VerIterator V; + switch(fallback) { + case VersionSet::ALL: + if (P->VersionList != 0) + for (V = P.VersionList(); V.end() != true; ++V) + verset.insert(V); + else if (AllowError == false) + return _error->Error(_("Can't select versions from package '%s' as it purely virtual"), P.FullName(true).c_str()); + else + return false; + break; + case VersionSet::CANDANDINST: + verset.insert(getInstalledVer(Cache, P, AllowError)); + verset.insert(getCandidateVer(Cache, P, AllowError)); + break; + case VersionSet::CANDIDATE: + verset.insert(getCandidateVer(Cache, P, AllowError)); + break; + case VersionSet::INSTALLED: + verset.insert(getInstalledVer(Cache, P, AllowError)); + break; + case VersionSet::CANDINST: + V = getCandidateVer(Cache, P, true); + if (V.end() == true) + V = getInstalledVer(Cache, P, true); + if (V.end() == false) + verset.insert(V); + else if (AllowError == false) + return _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), P.FullName(true).c_str()); + else + return false; + break; + case VersionSet::INSTCAND: + V = getInstalledVer(Cache, P, true); + if (V.end() == true) + V = getCandidateVer(Cache, P, true); + if (V.end() == false) + verset.insert(V); + else if (AllowError == false) + return _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), P.FullName(true).c_str()); + else + return false; + break; + case VersionSet::NEWEST: + if (P->VersionList != 0) + verset.insert(P.VersionList()); + else if (AllowError == false) + return _error->Error(_("Can't select newest version from package '%s' as it is purely virtual"), P.FullName(true).c_str()); + else + return false; + break; + } + return true; +} + /*}}}*/ // getCandidateVer - Returns the candidate version of the given package /*{{{*/ pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg, bool const &AllowError) { diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index 4f7be4caa..0f3a87a3d 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -205,6 +205,11 @@ protected: /*{{{*/ static pkgCache::VerIterator getInstalledVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg, bool const &AllowError = false); + + static bool AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, + pkgCache::PkgIterator const &P, VersionSet::Version const &fallback, + bool const &AllowError = false); + /*}}}*/ }; /*}}}*/ } diff --git a/debian/changelog b/debian/changelog index 6c9faf119..21093b056 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - add simple wrapper around std::set for cache structures - move regex magic from apt-get to new FromRegEx method - move cmdline parsing from apt-cache to new FromCommandLine method + - support special release-modifier 'installed' and 'candidate' * apt-pkg/contrib/cmdline.cc: - fix segfault in SaveInConfig caused by writing over char[] sizes * apt-pkg/pkgcache.cc: -- cgit v1.2.3 From 07c279d93f0b61e96c9caf8139accd0289feab56 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 5 Jun 2010 19:14:32 +0200 Subject: do not fail if an unrelated error is pending in DisplayRecord() --- cmdline/apt-cache.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index ef074280e..de4288c5a 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1243,11 +1243,11 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V) pkgCache::PkgFileIterator I = Vf.File(); if (I.IsOk() == false) return _error->Error(_("Package file %s is out of sync."),I.FileName()); - - FileFd PkgF(I.FileName(),FileFd::ReadOnly); - if (_error->PendingError() == true) + + FileFd PkgF; + if (PkgF.Open(I.FileName(), FileFd::ReadOnly) == false) return false; - + // Read the record unsigned char *Buffer = new unsigned char[Cache->HeaderP->MaxVerFileSize+1]; Buffer[V.FileList()->Size] = '\n'; -- cgit v1.2.3 From 9cc83a6fbc089ccf9cb8d52ee9f380cf5df62d5c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 6 Jun 2010 21:41:27 +0200 Subject: add a GroupedFromCommandLine method to the PackageSet to split the packages on the commandline into groups based on modifiers --- apt-pkg/cacheset.cc | 33 +++++++++++++++++++++++++++++++++ apt-pkg/cacheset.h | 23 +++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index c0b06ba32..43ade4b4e 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -76,6 +76,39 @@ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, std:: return pkgset; } /*}}}*/ +// GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ +std::map PackageSet::GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list const &mods, + unsigned short const &fallback, std::ostream &out) { + std::map pkgsets; + for (const char **I = cmdline; *I != 0; ++I) { + unsigned short modID = fallback; + std::string str = *I; + for (std::list::const_iterator mod = mods.begin(); + mod != mods.end(); ++mod) { + size_t const alength = strlen(mod->Alias); + switch(mod->Pos) { + case PackageSet::Modifier::POSTFIX: + if (str.compare(str.length() - alength, alength, + mod->Alias, 0, alength) != 0) + continue; + str.erase(str.length() - alength); + modID = mod->ID; + break; + case PackageSet::Modifier::PREFIX: + continue; + case PackageSet::Modifier::NONE: + continue; + } + break; + } + PackageSet pset = PackageSet::FromString(Cache, str, out); + pkgsets[modID].insert(pset.begin(), pset.end()); + } + return pkgsets; +} + /*}}}*/ // FromCommandLine - Return all packages specified on commandline /*{{{*/ PackageSet PackageSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, std::ostream &out) { PackageSet pkgset; diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index 0f3a87a3d..c9d121083 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -11,6 +11,8 @@ // Include Files /*{{{*/ #include #include +#include +#include #include #include @@ -101,6 +103,27 @@ public: /*{{{*/ std::ostream out (std::ofstream("/dev/null").rdbuf()); return APT::PackageSet::FromCommandLine(Cache, cmdline, out); } + + struct Modifier { + enum Position { NONE, PREFIX, POSTFIX }; + unsigned short ID; + const char * const Alias; + Position Pos; + Modifier (unsigned short const &id, const char * const alias, Position const &pos) : ID(id), Alias(alias), Pos(pos) {}; + }; + + static std::map GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list const &mods, + unsigned short const &fallback, std::ostream &out); + static std::map GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list const &mods, + unsigned short const &fallback) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::PackageSet::GroupedFromCommandLine(Cache, cmdline, + mods, fallback, out); + } /*}}}*/ }; /*}}}*/ class VersionSet : public std::set { /*{{{*/ -- cgit v1.2.3 From 3c9772456931842dee211444086c15dd2e5f9a29 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 6 Jun 2010 21:49:28 +0200 Subject: use the GroupedFromCommandLine() method in the dotty and xvcg command to get all the funky features in less lines --- cmdline/apt-cache.cc | 84 ++++++++++++++++++---------------------------------- 1 file changed, 28 insertions(+), 56 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index de4288c5a..7cb95b3f8 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -787,38 +787,24 @@ bool XVcg(CommandLine &CmdL) ShapeMap[Pkg->ID] = 3; } } - + // Load the list of packages from the command line into the show list - for (const char **I = CmdL.FileList + 1; *I != 0; I++) + std::list mods; + mods.push_back(APT::PackageSet::Modifier(0, ",", APT::PackageSet::Modifier::POSTFIX)); + mods.push_back(APT::PackageSet::Modifier(1, "^", APT::PackageSet::Modifier::POSTFIX)); + std::map pkgsets = + APT::PackageSet::GroupedFromCommandLine(CacheFile, CmdL.FileList + 1, mods, 0); + + for (APT::PackageSet::const_iterator Pkg = pkgsets[0].begin(); + Pkg != pkgsets[0].end(); ++Pkg) + Show[Pkg->ID] = ToShow; + for (APT::PackageSet::const_iterator Pkg = pkgsets[1].begin(); + Pkg != pkgsets[1].end(); ++Pkg) { - // Process per-package flags - string P = *I; - bool Force = false; - if (P.length() > 3) - { - if (P.end()[-1] == '^') - { - Force = true; - P.erase(P.end()-1); - } - - if (P.end()[-1] == ',') - P.erase(P.end()-1); - } - - // Locate the package - pkgCache::PkgIterator Pkg = Cache->FindPkg(P); - if (Pkg.end() == true) - { - _error->Warning(_("Unable to locate package %s"),*I); - continue; - } Show[Pkg->ID] = ToShow; - - if (Force == true) - Flags[Pkg->ID] |= ForceNR; + Flags[Pkg->ID] |= ForceNR; } - + // Little header cout << "graph: { title: \"packages\"" << endl << "xmax: 700 ymax: 700 x: 30 y: 30" << endl << @@ -1015,38 +1001,24 @@ bool Dotty(CommandLine &CmdL) ShapeMap[Pkg->ID] = 3; } } - + // Load the list of packages from the command line into the show list - for (const char **I = CmdL.FileList + 1; *I != 0; I++) + std::list mods; + mods.push_back(APT::PackageSet::Modifier(0, ",", APT::PackageSet::Modifier::POSTFIX)); + mods.push_back(APT::PackageSet::Modifier(1, "^", APT::PackageSet::Modifier::POSTFIX)); + std::map pkgsets = + APT::PackageSet::GroupedFromCommandLine(CacheFile, CmdL.FileList + 1, mods, 0); + + for (APT::PackageSet::const_iterator Pkg = pkgsets[0].begin(); + Pkg != pkgsets[0].end(); ++Pkg) + Show[Pkg->ID] = ToShow; + for (APT::PackageSet::const_iterator Pkg = pkgsets[1].begin(); + Pkg != pkgsets[1].end(); ++Pkg) { - // Process per-package flags - string P = *I; - bool Force = false; - if (P.length() > 3) - { - if (P.end()[-1] == '^') - { - Force = true; - P.erase(P.end()-1); - } - - if (P.end()[-1] == ',') - P.erase(P.end()-1); - } - - // Locate the package - pkgCache::PkgIterator Pkg = Cache->FindPkg(P); - if (Pkg.end() == true) - { - _error->Warning(_("Unable to locate package %s"),*I); - continue; - } Show[Pkg->ID] = ToShow; - - if (Force == true) - Flags[Pkg->ID] |= ForceNR; + Flags[Pkg->ID] |= ForceNR; } - + // Little header printf("digraph packages {\n"); printf("concentrate=true;\n"); -- cgit v1.2.3 From 1ddb859611d2e0f3d9ea12085001810f689e8c99 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 8 Jun 2010 19:27:49 +0200 Subject: * apt-pkg/indexrecords.cc: - backport forgotten Valid-Until patch from the obsolete experimental branch to prevent replay attacks better, thanks to Thomas Viehmann for the initial patch! (Closes: #499897) --- apt-pkg/acquire-item.cc | 12 ++++++- apt-pkg/indexrecords.cc | 38 ++++++++++++++++++++-- apt-pkg/indexrecords.h | 4 +++ debian/changelog | 4 +++ test/pre-upload-check.py | 14 ++++++++ .../sources.list.all-validuntil-broken | 1 + 6 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 test/testsources.list/sources.list.all-validuntil-broken diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index c035b9163..4a846804e 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -33,6 +33,7 @@ #include #include #include +#include /*}}}*/ using namespace std; @@ -1177,6 +1178,15 @@ bool pkgAcqMetaIndex::VerifyVendor(string Message) /*{{{*/ Transformed = ""; } + if (_config->FindB("Acquire::Check-Valid-Until", true)) { + if (MetaIndexParser->GetValidUntil() > 0 && + time(NULL) > MetaIndexParser->GetValidUntil()) { + return _error->Error(_("Release file expired, ignoring %s (valid until %s)"), + RealURI.c_str(), + TimeRFC1123(MetaIndexParser->GetValidUntil()).c_str()); + } + } + if (_config->FindB("Debug::pkgAcquire::Auth", false)) { std::cerr << "Got Codename: " << MetaIndexParser->GetDist() << std::endl; @@ -1194,7 +1204,7 @@ bool pkgAcqMetaIndex::VerifyVendor(string Message) /*{{{*/ // return false; if (!Transformed.empty()) { - _error->Warning("Conflicting distribution: %s (expected %s but got %s)", + _error->Warning(_("Conflicting distribution: %s (expected %s but got %s)"), Desc.Description.c_str(), Transformed.c_str(), MetaIndexParser->GetDist().c_str()); diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc index 1fc27b1a1..24ed02ba5 100644 --- a/apt-pkg/indexrecords.cc +++ b/apt-pkg/indexrecords.cc @@ -7,8 +7,11 @@ #include #include #include +#include #include #include +#include + /*}}}*/ string indexRecords::GetDist() const { @@ -26,6 +29,11 @@ string indexRecords::GetExpectedDist() const return this->ExpectedDist; } +time_t indexRecords::GetValidUntil() const +{ + return this->ValidUntil; +} + const indexRecords::checkSum *indexRecords::Lookup(const string MetaKey) { return Entries[MetaKey]; @@ -82,7 +90,33 @@ bool indexRecords::Load(const string Filename) /*{{{*/ return false; } - string Strdate = Section.FindS("Date"); // FIXME: verify this somehow? + string Label = Section.FindS("Label"); + string StrDate = Section.FindS("Date"); + string StrValidUntil = Section.FindS("Valid-Until"); + + // if we have a Valid-Until header, use it + if (!StrValidUntil.empty()) + { + // set ValidUntil based on the information in the Release file + if(!StrToTime(StrValidUntil, ValidUntil)) + { + ErrorText = _(("Invalid 'Valid-Until' entry in Release file " + Filename).c_str()); + return false; + } + } else { + // if we don't have a valid-until string, check if we have a default + if (!Label.empty()) + { + int MaxAge = _config->FindI(string("apt::acquire::max-default-age::"+Label).c_str(),0); + if(MaxAge > 0 && !StrToTime(StrDate, ValidUntil)) + { + ErrorText = _(("Invalid 'Date' entry in Release file " + Filename).c_str()); + return false; + } + ValidUntil += 24*60*60*MaxAge; + } + } + return true; } /*}}}*/ @@ -160,6 +194,6 @@ indexRecords::indexRecords() } indexRecords::indexRecords(const string ExpectedDist) : - ExpectedDist(ExpectedDist) + ExpectedDist(ExpectedDist), ValidUntil(0) { } diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h index 468d2bd0f..500cf23c4 100644 --- a/apt-pkg/indexrecords.h +++ b/apt-pkg/indexrecords.h @@ -12,6 +12,7 @@ #include #include +#include class indexRecords { @@ -25,6 +26,8 @@ class indexRecords string Dist; string Suite; string ExpectedDist; + time_t ValidUntil; + std::map Entries; public: @@ -38,6 +41,7 @@ class indexRecords virtual bool Load(string Filename); string GetDist() const; + time_t GetValidUntil() const; virtual bool CheckDist(const string MaybeDist) const; string GetExpectedDist() const; virtual ~indexRecords(){}; diff --git a/debian/changelog b/debian/changelog index 3771ca415..d8fb57757 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ apt (0.7.26~exp5) experimental; urgency=low [ David Kalnischkies ] + * apt-pkg/indexrecords.cc: + - backport forgotten Valid-Until patch from the obsolete experimental + branch to prevent replay attacks better, thanks to Thomas Viehmann + for the initial patch! (Closes: #499897) * cmdline/apt-get.cc: - rerun dpkg-source in source if --fix-broken is given (Closes: #576752) - don't suggest held packages as they are installed (Closes: #578135) diff --git a/test/pre-upload-check.py b/test/pre-upload-check.py index 268b3d672..e2dfecbd3 100755 --- a/test/pre-upload-check.py +++ b/test/pre-upload-check.py @@ -95,6 +95,20 @@ class testAuthentication(unittest.TestCase): self.assert_(len(glob.glob("/var/lib/apt/lists/partial/*")) == 0, "partial/ dir has leftover files: %s" % glob.glob("/var/lib/apt/lists/partial/*")) + def testValid(self): + for f in glob.glob("testsources.list/sources.list*validuntil*"): + self._cleanup() + (prefix, testtype, result) = f.split("-") + expected_res = self._expectedRes(result) + cmd = ["update"] + res = call([self.apt,"-o","Dir::Etc::sourcelist=./%s" % f]+cmd+apt_args, + stdout=stdout, stderr=stderr) + self.assert_(res == expected_res, + "test '%s' failed (got %s expected %s" % (f,res,expected_res)) + if expected_res == 0: + self.assert_(len(glob.glob("/var/lib/apt/lists/partial/*")) == 0, + "partial/ dir has leftover files: %s" % glob.glob("/var/lib/apt/lists/partial/*")) + class testLocalRepositories(unittest.TestCase): " test local repository regressions " diff --git a/test/testsources.list/sources.list.all-validuntil-broken b/test/testsources.list/sources.list.all-validuntil-broken new file mode 100644 index 000000000..bab59bb81 --- /dev/null +++ b/test/testsources.list/sources.list.all-validuntil-broken @@ -0,0 +1 @@ +deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/all-validuntil-broken/ / -- cgit v1.2.3 From cd8cf88f0e64e222e9fdcbf86e6cbbe09306040e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 8 Jun 2010 22:46:42 +0200 Subject: * apt-pkg/contrib/strutl.cc: - split StrToTime() into HTTP1.1 and FTP date parser methods and use strptime() instead of some selfmade scanf mangling --- apt-pkg/contrib/strutl.cc | 36 ++++++++++++++++++++++++++++++++++++ apt-pkg/contrib/strutl.h | 4 +++- debian/changelog | 3 +++ 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index c7d63ce8a..96e8143ec 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -855,6 +855,42 @@ static time_t timegm(struct tm *t) } #endif /*}}}*/ +// FullDateToTime - Converts a HTTP1.1 full date strings into a time_t /*{{{*/ +// --------------------------------------------------------------------- +/* tries to parses a full date as specified in RFC2616 Section 3.3.1 + with one exception: All timezones (%Z) are accepted but the protocol + says that it MUST be GMT, but this one is equal to UTC which we will + encounter from time to time (e.g. in Release files) so we accept all + here and just assume it is GMT (or UTC) later on */ +bool RFC1123StrToTime(const char* const str,time_t &time) +{ + struct tm Tm; + // Sun, 06 Nov 1994 08:49:37 GMT ; RFC 822, updated by RFC 1123 + if (strptime(str, "%a, %d %b %Y %H:%M:%S %Z", &Tm) == NULL && + // Sunday, 06-Nov-94 08:49:37 GMT ; RFC 850, obsoleted by RFC 1036 + strptime(str, "%A, %d-%b-%y %H:%M:%S %Z", &Tm) == NULL && + // Sun Nov 6 08:49:37 1994 ; ANSI C's asctime() format + strptime(str, "%a %b %d %H:%M:%S %Y", &Tm) == NULL) + return false; + + time = timegm(&Tm); + return true; +} + /*}}}*/ +// FTPMDTMStrToTime - Converts a ftp modification date into a time_t /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool FTPMDTMStrToTime(const char* const str,time_t &time) +{ + struct tm Tm; + // MDTM includes no whitespaces but recommend and ignored by strptime + if (strptime(str, "%Y %m %d %H %M %S", &Tm) == NULL) + return false; + + time = timegm(&Tm); + return true; +} + /*}}}*/ // StrToTime - Converts a string into a time_t /*{{{*/ // --------------------------------------------------------------------- /* This handles all 3 populare time formats including RFC 1123, RFC 1036 diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index e509145f9..b5de0802e 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -45,7 +45,9 @@ string Base64Encode(const string &Str); string OutputInDepth(const unsigned long Depth, const char* Separator=" "); string URItoFileName(const string &URI); string TimeRFC1123(time_t Date); -bool StrToTime(const string &Val,time_t &Result); +bool RFC1123StrToTime(const char* const str,time_t &time) __attrib_const; +bool FTPMDTMStrToTime(const char* const str,time_t &time) __attrib_const; +__deprecated bool StrToTime(const string &Val,time_t &Result); string LookupTag(const string &Message,const char *Tag,const char *Default = 0); int StringToBool(const string &Text,int Default = -1); bool ReadMessages(int Fd, vector &List); diff --git a/debian/changelog b/debian/changelog index d8fb57757..2a40d084e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,6 +44,9 @@ apt (0.7.26~exp5) experimental; urgency=low - add 'disappear' to the known processing states, thanks Jonathan Nieder * apt-pkg/packagemanager.h: - export info about disappeared packages with GetDisappearedPackages() + * apt-pkg/contrib/strutl.cc: + - split StrToTime() into HTTP1.1 and FTP date parser methods and + use strptime() instead of some selfmade scanf mangling [ Michael Vogt ] * methods/http.{cc,h}: -- cgit v1.2.3 From 0323317c08c0b08bf0ba1ac37a37a8de333cdb40 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 8 Jun 2010 22:55:42 +0200 Subject: enhance the Valid-Until code a bit by using the correct RFC1123StrToTime method and allow for better translations of the error messages --- apt-pkg/acquire-item.cc | 16 +++++++++------- apt-pkg/indexrecords.cc | 24 ++++++++++++------------ 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 4a846804e..ac84c2e5e 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1178,13 +1178,15 @@ bool pkgAcqMetaIndex::VerifyVendor(string Message) /*{{{*/ Transformed = ""; } - if (_config->FindB("Acquire::Check-Valid-Until", true)) { - if (MetaIndexParser->GetValidUntil() > 0 && - time(NULL) > MetaIndexParser->GetValidUntil()) { - return _error->Error(_("Release file expired, ignoring %s (valid until %s)"), - RealURI.c_str(), - TimeRFC1123(MetaIndexParser->GetValidUntil()).c_str()); - } + if (_config->FindB("Acquire::Check-Valid-Until", true) == true && + MetaIndexParser->GetValidUntil() > 0) { + time_t const invalid_since = time(NULL) - MetaIndexParser->GetValidUntil(); + if (invalid_since > 0) + // TRANSLATOR: The first %s is the URL of the bad Release file, the second is + // the time since then the file is invalid - formated in the same way as in + // the download progress display (e.g. 7d 3h 42min 1s) + return _error->Error(_("Release file expired, ignoring %s (invalid since %s)"), + RealURI.c_str(), TimeToStr(invalid_since).c_str()); } if (_config->FindB("Debug::pkgAcquire::Auth", false)) diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc index 24ed02ba5..1312e6818 100644 --- a/apt-pkg/indexrecords.cc +++ b/apt-pkg/indexrecords.cc @@ -91,30 +91,30 @@ bool indexRecords::Load(const string Filename) /*{{{*/ } string Label = Section.FindS("Label"); - string StrDate = Section.FindS("Date"); + string StrDate = Section.FindS("Date"); string StrValidUntil = Section.FindS("Valid-Until"); // if we have a Valid-Until header, use it - if (!StrValidUntil.empty()) + if (StrValidUntil.empty() == false) { // set ValidUntil based on the information in the Release file - if(!StrToTime(StrValidUntil, ValidUntil)) + if(RFC1123StrToTime(StrValidUntil.c_str(), ValidUntil) == false) { - ErrorText = _(("Invalid 'Valid-Until' entry in Release file " + Filename).c_str()); + strprintf(ErrorText, _("Invalid 'Valid-Until' entry in Release file %s"), Filename.c_str()); return false; } } else { // if we don't have a valid-until string, check if we have a default - if (!Label.empty()) + int MaxAge = _config->FindI("APT::Acquire::Max-Default-Age", 0); + if (Label.empty() == true) + MaxAge = _config->FindI(string("APT::Acquire::Max-Default-Age::"+Label).c_str(), MaxAge); + + if(MaxAge > 0 && RFC1123StrToTime(StrDate.c_str(), ValidUntil) == false) { - int MaxAge = _config->FindI(string("apt::acquire::max-default-age::"+Label).c_str(),0); - if(MaxAge > 0 && !StrToTime(StrDate, ValidUntil)) - { - ErrorText = _(("Invalid 'Date' entry in Release file " + Filename).c_str()); - return false; - } - ValidUntil += 24*60*60*MaxAge; + strprintf(ErrorText, _("Invalid 'Date' entry in Release file %s"), Filename.c_str()); + return false; } + ValidUntil += 24*60*60*MaxAge; } return true; -- cgit v1.2.3 From bbde96a611f39f5040b332dae1515207db341743 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 8 Jun 2010 23:38:34 +0200 Subject: use the Valid-Until header from the Release file but if the user provides a setting in the configuration prefer the date which is earlier. --- apt-pkg/indexrecords.cc | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc index 1312e6818..cdc2897bf 100644 --- a/apt-pkg/indexrecords.cc +++ b/apt-pkg/indexrecords.cc @@ -88,34 +88,39 @@ bool indexRecords::Load(const string Filename) /*{{{*/ { strprintf(ErrorText, _("No Hash entry in Release file %s"), Filename.c_str()); return false; - } + } string Label = Section.FindS("Label"); string StrDate = Section.FindS("Date"); string StrValidUntil = Section.FindS("Valid-Until"); - // if we have a Valid-Until header, use it + // if we have a Valid-Until header in the Release file, use it as default if (StrValidUntil.empty() == false) { - // set ValidUntil based on the information in the Release file if(RFC1123StrToTime(StrValidUntil.c_str(), ValidUntil) == false) { strprintf(ErrorText, _("Invalid 'Valid-Until' entry in Release file %s"), Filename.c_str()); return false; } - } else { - // if we don't have a valid-until string, check if we have a default - int MaxAge = _config->FindI("APT::Acquire::Max-Default-Age", 0); - if (Label.empty() == true) - MaxAge = _config->FindI(string("APT::Acquire::Max-Default-Age::"+Label).c_str(), MaxAge); + } + // get the user settings for this archive and use what expires earlier + int MaxAge = _config->FindI("APT::Acquire::Max-Default-Age", 0); + if (Label.empty() == true) + MaxAge = _config->FindI(string("APT::Acquire::Max-Default-Age::" + Label).c_str(), MaxAge); - if(MaxAge > 0 && RFC1123StrToTime(StrDate.c_str(), ValidUntil) == false) - { - strprintf(ErrorText, _("Invalid 'Date' entry in Release file %s"), Filename.c_str()); - return false; - } - ValidUntil += 24*60*60*MaxAge; + if(MaxAge == 0) // No user settings, use the one from the Release file + return true; + + time_t date; + if (RFC1123StrToTime(StrDate.c_str(), date) == false) + { + strprintf(ErrorText, _("Invalid 'Date' entry in Release file %s"), Filename.c_str()); + return false; } + date += 24*60*60*MaxAge; + + if (ValidUntil == 0 || ValidUntil > date) + ValidUntil = date; return true; } -- cgit v1.2.3 From c99e48ec26e693d9aa4a2a9f868284f7aa49784d Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Jun 2010 00:12:14 +0200 Subject: * ftparchive/writer.cc: - add ValidTime option to generate a Valid-Until header in Release file --- debian/changelog | 2 ++ doc/apt-ftparchive.1.xml | 3 ++- ftparchive/writer.cc | 10 ++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2a40d084e..fa0e667e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,8 @@ apt (0.7.26~exp5) experimental; urgency=low * apt-pkg/contrib/strutl.cc: - split StrToTime() into HTTP1.1 and FTP date parser methods and use strptime() instead of some selfmade scanf mangling + * ftparchive/writer.cc: + - add ValidTime option to generate a Valid-Until header in Release file [ Michael Vogt ] * methods/http.{cc,h}: diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index a3ac45bd3..549aa6a34 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -122,7 +122,8 @@ e.g. APT::FTPArchive::Release::Origin. The supported fields are: Origin, Label, Suite, Version, Codename, Date, - Architectures, Components, Description. + Valid-Until, Architectures, + Components, Description. diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 6cda29b21..650eec57c 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -924,6 +924,15 @@ ReleaseWriter::ReleaseWriter(string const &DB) datestr[0] = '\0'; } + time_t const validuntil = now + _config->FindI("APT::FTPArchive::Release::ValidTime", 0); + char validstr[128]; + if (now == validuntil || + strftime(validstr, sizeof(validstr), "%a, %d %b %Y %H:%M:%S UTC", + gmtime(&validuntil)) == 0) + { + datestr[0] = '\0'; + } + map Fields; Fields["Origin"] = ""; Fields["Label"] = ""; @@ -931,6 +940,7 @@ ReleaseWriter::ReleaseWriter(string const &DB) Fields["Version"] = ""; Fields["Codename"] = ""; Fields["Date"] = datestr; + Fields["Valid-Until"] = validstr; Fields["Architectures"] = ""; Fields["Components"] = ""; Fields["Description"] = ""; -- cgit v1.2.3 From 550891457ff63db01b57d9057a5fe447a165e10c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Jun 2010 00:27:22 +0200 Subject: use the portable timegm shown in his manpage instead of a strange looking code copycat from wget --- apt-pkg/contrib/strutl.cc | 36 ++++++++++++++++-------------------- debian/changelog | 2 ++ 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 96e8143ec..160450366 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -827,31 +827,27 @@ static int MonthConv(char *Month) } } /*}}}*/ -// timegm - Internal timegm function if gnu is not available /*{{{*/ +// timegm - Internal timegm if the gnu version is not available /*{{{*/ // --------------------------------------------------------------------- -/* Ripped this evil little function from wget - I prefer the use of - GNU timegm if possible as this technique will have interesting problems - with leap seconds, timezones and other. - - Converts struct tm to time_t, assuming the data in tm is UTC rather +/* Converts struct tm to time_t, assuming the data in tm is UTC rather than local timezone (mktime assumes the latter). - - Contributed by Roger Beeman , with the help of - Mark Baushke and the rest of the Gurus at CISCO. */ - -/* Turned it into an autoconf check, because GNU is not the only thing which - can provide timegm. -- 2002-09-22, Joel Baker */ -#ifndef HAVE_TIMEGM // Now with autoconf! + This function is a nonstandard GNU extension that is also present on + the BSDs and maybe other systems. For others we follow the advice of + the manpage of timegm and use his portable replacement. */ +#ifndef HAVE_TIMEGM static time_t timegm(struct tm *t) { - time_t tl, tb; - - tl = mktime (t); - if (tl == -1) - return -1; - tb = mktime (gmtime (&tl)); - return (tl <= tb ? (tl + (tl - tb)) : (tl - (tb - tl))); + char *tz = getenv("TZ"); + setenv("TZ", "", 1); + tzset(); + time_t ret = mktime(t); + if (tz) + setenv("TZ", tz, 1); + else + unsetenv("TZ"); + tzset(); + return ret; } #endif /*}}}*/ diff --git a/debian/changelog b/debian/changelog index fa0e667e7..049999230 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,8 @@ apt (0.7.26~exp5) experimental; urgency=low * apt-pkg/contrib/strutl.cc: - split StrToTime() into HTTP1.1 and FTP date parser methods and use strptime() instead of some selfmade scanf mangling + - use the portable timegm shown in his manpage instead of a strange + looking code copycat from wget * ftparchive/writer.cc: - add ValidTime option to generate a Valid-Until header in Release file -- cgit v1.2.3 From 96cc64a521957d63704de72ed95f1c839698c53c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Jun 2010 00:53:44 +0200 Subject: move the users away from the deprecated StrToTime() method --- apt-pkg/acquire-method.cc | 2 +- apt-pkg/contrib/strutl.h | 4 ++-- methods/ftp.cc | 3 +-- methods/http.cc | 2 +- methods/rsh.cc | 3 +-- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index fe066741c..b82dceecb 100644 --- a/apt-pkg/acquire-method.cc +++ b/apt-pkg/acquire-method.cc @@ -373,7 +373,7 @@ int pkgAcqMethod::Run(bool Single) Tmp->Uri = LookupTag(Message,"URI"); Tmp->DestFile = LookupTag(Message,"FileName"); - if (StrToTime(LookupTag(Message,"Last-Modified"),Tmp->LastModified) == false) + if (RFC1123StrToTime(LookupTag(Message,"Last-Modified").c_str(),Tmp->LastModified) == false) Tmp->LastModified = 0; Tmp->IndexFile = StringToBool(LookupTag(Message,"Index-File"),false); Tmp->Next = 0; diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index b5de0802e..a457ff047 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -45,8 +45,8 @@ string Base64Encode(const string &Str); string OutputInDepth(const unsigned long Depth, const char* Separator=" "); string URItoFileName(const string &URI); string TimeRFC1123(time_t Date); -bool RFC1123StrToTime(const char* const str,time_t &time) __attrib_const; -bool FTPMDTMStrToTime(const char* const str,time_t &time) __attrib_const; +bool RFC1123StrToTime(const char* const str,time_t &time) __must_check; +bool FTPMDTMStrToTime(const char* const str,time_t &time) __must_check; __deprecated bool StrToTime(const string &Val,time_t &Result); string LookupTag(const string &Message,const char *Tag,const char *Default = 0); int StringToBool(const string &Text,int Default = -1); diff --git a/methods/ftp.cc b/methods/ftp.cc index 3e1725823..97248f900 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -661,8 +661,7 @@ bool FTPConn::ModTime(const char *Path, time_t &Time) return true; // Parse it - StrToTime(Msg,Time); - return true; + return FTPMDTMStrToTime(Msg.c_str(), Time); } /*}}}*/ // FTPConn::CreateDataFd - Get a data connection /*{{{*/ diff --git a/methods/http.cc b/methods/http.cc index d43dd14c8..5fdc62696 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -631,7 +631,7 @@ bool ServerState::HeaderLine(string Line) if (stringcasecmp(Tag,"Last-Modified:") == 0) { - if (StrToTime(Val,Date) == false) + if (RFC1123StrToTime(Val.c_str(), Date) == false) return _error->Error(_("Unknown date format")); return true; } diff --git a/methods/rsh.cc b/methods/rsh.cc index f0ccfc42d..97b4ef151 100644 --- a/methods/rsh.cc +++ b/methods/rsh.cc @@ -278,8 +278,7 @@ bool RSHConn::ModTime(const char *Path, time_t &Time) return false; // Parse it - StrToTime(Msg,Time); - return true; + return FTPMDTMStrToTime(Msg.c_str(), Time); } /*}}}*/ // RSHConn::Get - Get a file /*{{{*/ -- cgit v1.2.3 From b02fffa64833e1f8e2617669d89de0a6d0882747 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Jun 2010 10:46:35 +0200 Subject: rename the options, document them and reorder the changelog a bit --- apt-pkg/indexrecords.cc | 4 ++-- debian/changelog | 24 ++++++++++++++++-------- doc/apt.conf.5.xml | 24 ++++++++++++++++++++++++ doc/examples/configure-index | 4 ++++ 4 files changed, 46 insertions(+), 10 deletions(-) diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc index cdc2897bf..3bde7437d 100644 --- a/apt-pkg/indexrecords.cc +++ b/apt-pkg/indexrecords.cc @@ -104,9 +104,9 @@ bool indexRecords::Load(const string Filename) /*{{{*/ } } // get the user settings for this archive and use what expires earlier - int MaxAge = _config->FindI("APT::Acquire::Max-Default-Age", 0); + int MaxAge = _config->FindI("Acquire::Max-ValidTime", 0); if (Label.empty() == true) - MaxAge = _config->FindI(string("APT::Acquire::Max-Default-Age::" + Label).c_str(), MaxAge); + MaxAge = _config->FindI(string("Acquire::Max-ValidTime::" + Label).c_str(), MaxAge); if(MaxAge == 0) // No user settings, use the one from the Release file return true; diff --git a/debian/changelog b/debian/changelog index 049999230..c3f7a3e25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,25 @@ -apt (0.7.26~exp5) experimental; urgency=low +apt (0.7.26~exp6) UNRELEASED; urgency=low [ David Kalnischkies ] + * doc/apt.conf.5.xml: + - document the new Valid-Until related options * apt-pkg/indexrecords.cc: - backport forgotten Valid-Until patch from the obsolete experimental branch to prevent replay attacks better, thanks to Thomas Viehmann for the initial patch! (Closes: #499897) + * apt-pkg/contrib/strutl.cc: + - split StrToTime() into HTTP1.1 and FTP date parser methods and + use strptime() instead of some self-made scanf mangling + - use the portable timegm shown in his manpage instead of a strange + looking code copycat from wget + * ftparchive/writer.cc: + - add ValidTime option to generate a Valid-Until header in Release file + + -- David Kalnischkies Wed, 09 Jun 2010 10:43:58 +0200 + +apt (0.7.26~exp5) experimental; urgency=low + + [ David Kalnischkies ] * cmdline/apt-get.cc: - rerun dpkg-source in source if --fix-broken is given (Closes: #576752) - don't suggest held packages as they are installed (Closes: #578135) @@ -44,13 +59,6 @@ apt (0.7.26~exp5) experimental; urgency=low - add 'disappear' to the known processing states, thanks Jonathan Nieder * apt-pkg/packagemanager.h: - export info about disappeared packages with GetDisappearedPackages() - * apt-pkg/contrib/strutl.cc: - - split StrToTime() into HTTP1.1 and FTP date parser methods and - use strptime() instead of some selfmade scanf mangling - - use the portable timegm shown in his manpage instead of a strange - looking code copycat from wget - * ftparchive/writer.cc: - - add ValidTime option to generate a Valid-Until header in Release file [ Michael Vogt ] * methods/http.{cc,h}: diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index fe005e0f1..0cf4bb663 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -230,6 +230,30 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; and the URI handlers. + Check-Valid-Until + Security related option defaulting to true as an + expiring validation for a Release file prevents longtime replay attacks + and can e.g. also help users to identify no longer updated mirrors - + but the feature depends on the correctness of the time on the user system. + Archive maintainers are encouraged to create Release files with the + Valid-Until header, but if they don't or a stricter value + is volitional the following Max-ValidTime option can be used. + + + + Max-ValidTime + Seconds the Release file should be considered valid after + it was created. The default is "for ever" (0) if the Release file of the + archive doesn't include a Valid-Until header. + If it does then this date is the default. The date from the Release file or + the date specified by the creation time of the Release file + (Date header) plus the seconds specified with this + options are used to check if the validation of a file has expired by using + the earlier date of the two. Archive specific settings can be made by + appending the label of the archive to the option name. + + + PDiffs Try to download deltas called PDiffs for Packages or Sources files instead of downloading whole ones. True diff --git a/doc/examples/configure-index b/doc/examples/configure-index index d168417d8..127feb9e9 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -176,6 +176,10 @@ Acquire PDiffs::SizeLimit "50"; // don't use diffs if size of all patches excess // 50% of the size of the original file + Check-Valid-Until "true"; + Max-ValidTime "864000"; // 10 days + Max-ValidTime::Debian-Security "604800"; // 7 days, label specific configuration + // HTTP method configuration http { -- cgit v1.2.3 From ba74b79fb5c74d916f9bfe1b314e8107a9e7eab4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 9 Jun 2010 13:03:41 +0200 Subject: debian/rules: remove two more leftovers fromthe ubuntu merge --- debian/rules | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian/rules b/debian/rules index 4c6795910..0ac45f851 100755 --- a/debian/rules +++ b/debian/rules @@ -215,8 +215,6 @@ apt: build build-doc debian/shlibs.local cp debian/bugscript debian/$@/usr/share/bug/apt/script cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt - cp share/ubuntu-archive.gpg debian/$@/usr/share/$@ - sed 's/^_//' share/apt-auth-failure.note > debian/$@/usr/share/$@/apt-auth-failure.note cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove # copy lintian override -- cgit v1.2.3 From a3a03f5d7436c870edac9c0eb92e85e1fcaf6bca Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Wed, 9 Jun 2010 14:08:20 +0200 Subject: * apt-pkg/contrib/fileutl.{h,cc}: - Add support for transparent reading of gzipped files. - Link against zlib (in apt-pkg/makefile) and add zlib build dependency. --- apt-pkg/contrib/fileutl.cc | 47 ++++++++++++++++++++++++++++++++++++++++------ apt-pkg/contrib/fileutl.h | 9 ++++++--- apt-pkg/makefile | 2 +- debian/changelog | 6 ++++++ debian/control | 2 +- 5 files changed, 55 insertions(+), 11 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index da32983f1..11a9e7f7b 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -11,6 +11,7 @@ Most of this source is placed in the Public Domain, do with it what you will It was originally written by Jason Gunthorpe . + FileFd gzip support added by Martin Pitt The exception is RunScripts() it is under the GPLv2 @@ -603,6 +604,13 @@ bool FileFd::Open(string FileName,OpenMode Mode, unsigned long Perms) { case ReadOnly: iFd = open(FileName.c_str(),O_RDONLY); + if (iFd > 0 && FileName.compare(FileName.size()-3, 3, ".gz") == 0) { + gz = gzdopen (iFd, "r"); + if (gz == NULL) { + close (iFd); + iFd = -1; + } + } break; case WriteEmpty: @@ -658,7 +666,10 @@ bool FileFd::Read(void *To,unsigned long Size,unsigned long *Actual) do { - Res = read(iFd,To,Size); + if (gz != NULL) + Res = gzread(gz,To,Size); + else + Res = read(iFd,To,Size); if (Res < 0 && errno == EINTR) continue; if (Res < 0) @@ -697,7 +708,10 @@ bool FileFd::Write(const void *From,unsigned long Size) errno = 0; do { - Res = write(iFd,From,Size); + if (gz != NULL) + Res = gzwrite(gz,From,Size); + else + Res = write(iFd,From,Size); if (Res < 0 && errno == EINTR) continue; if (Res < 0) @@ -723,7 +737,12 @@ bool FileFd::Write(const void *From,unsigned long Size) /* */ bool FileFd::Seek(unsigned long To) { - if (lseek(iFd,To,SEEK_SET) != (signed)To) + int res; + if (gz) + res = gzseek(gz,To,SEEK_SET); + else + res = lseek(iFd,To,SEEK_SET); + if (res != (signed)To) { Flags |= Fail; return _error->Error("Unable to seek to %lu",To); @@ -737,7 +756,12 @@ bool FileFd::Seek(unsigned long To) /* */ bool FileFd::Skip(unsigned long Over) { - if (lseek(iFd,Over,SEEK_CUR) < 0) + int res; + if (gz) + res = gzseek(gz,Over,SEEK_CUR); + else + res = lseek(iFd,Over,SEEK_CUR); + if (res < 0) { Flags |= Fail; return _error->Error("Unable to seek ahead %lu",Over); @@ -751,6 +775,11 @@ bool FileFd::Skip(unsigned long Over) /* */ bool FileFd::Truncate(unsigned long To) { + if (gz) + { + Flags |= Fail; + return _error->Error("Truncating gzipped files is not implemented (%s)", FileName.c_str()); + } if (ftruncate(iFd,To) != 0) { Flags |= Fail; @@ -765,7 +794,11 @@ bool FileFd::Truncate(unsigned long To) /* */ unsigned long FileFd::Tell() { - off_t Res = lseek(iFd,0,SEEK_CUR); + off_t Res; + if (gz) + Res = gztell(gz); + else + Res = lseek(iFd,0,SEEK_CUR); if (Res == (off_t)-1) _error->Errno("lseek","Failed to determine the current file position"); return Res; @@ -776,6 +809,7 @@ unsigned long FileFd::Tell() /* */ unsigned long FileFd::Size() { + //TODO: For gz, do we need the actual file size here or the uncompressed length? struct stat Buf; if (fstat(iFd,&Buf) != 0) return _error->Errno("fstat","Unable to determine the file size"); @@ -789,9 +823,10 @@ bool FileFd::Close() { bool Res = true; if ((Flags & AutoClose) == AutoClose) - if (iFd >= 0 && close(iFd) != 0) + if ((gz != NULL && gzclose(gz) != 0) || (gz == NULL && iFd > 0 && close(iFd) != 0)) Res &= _error->Errno("close",_("Problem closing the file")); iFd = -1; + gz = NULL; if ((Flags & Fail) == Fail && (Flags & DelOnFail) == DelOnFail && FileName.empty() == false) diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 85a94898c..9925bbed4 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -25,6 +25,8 @@ #include #include +#include + using std::string; class FileFd @@ -36,6 +38,7 @@ class FileFd HitEof = (1<<3)}; unsigned long Flags; string FileName; + gzFile gz; public: enum OpenMode {ReadOnly,WriteEmpty,WriteExists,WriteAny,WriteTemp}; @@ -69,12 +72,12 @@ class FileFd inline string &Name() {return FileName;}; FileFd(string FileName,OpenMode Mode,unsigned long Perms = 0666) : iFd(-1), - Flags(0) + Flags(0), gz(NULL) { Open(FileName,Mode,Perms); }; - FileFd(int Fd = -1) : iFd(Fd), Flags(AutoClose) {}; - FileFd(int Fd,bool) : iFd(Fd), Flags(0) {}; + FileFd(int Fd = -1) : iFd(Fd), Flags(AutoClose), gz(NULL) {}; + FileFd(int Fd,bool) : iFd(Fd), Flags(0), gz(NULL) {}; virtual ~FileFd(); }; diff --git a/apt-pkg/makefile b/apt-pkg/makefile index bdd49c089..4cf07f3a8 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -14,7 +14,7 @@ include ../buildlib/libversion.mak LIBRARY=apt-pkg MAJOR=$(LIBAPTPKG_MAJOR) MINOR=$(LIBAPTPKG_RELEASE) -SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil -ldl +SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil -ldl -lz APT_DOMAIN:=libapt-pkg$(LIBAPTPKG_MAJOR) # Source code for the contributed non-core things diff --git a/debian/changelog b/debian/changelog index bc3da3679..2fba94d7c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low + [ Christian Perrier ] * Slovak translation update. Closes: #581159 * Italian translation update. Closes: #581742 + [ Martin Pitt ] + * apt-pkg/contrib/fileutl.{h,cc}: + - Add support for transparent reading of gzipped files. + - Link against zlib (in apt-pkg/makefile) and add zlib build dependency. + -- Christian Perrier Tue, 11 May 2010 19:52:00 +0200 apt (0.7.26~exp4) unstable; urgency=low diff --git a/debian/control b/debian/control index 0c6f6b16d..58916a2b9 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Luca Bruno , Julian Andres Klode Standards-Version: 3.8.4 -Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev +Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Package: apt -- cgit v1.2.3 From ec7a129eeb1611ec097bc99a148d6d3a3dccf044 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Wed, 9 Jun 2010 14:09:42 +0200 Subject: * apt-pkg/deb/debindexfile.cc: - If we do not find uncompressed package/source/translation indexes, look for gzip compressed ones. --- apt-pkg/deb/debindexfile.cc | 22 +++++++++++++++++++--- debian/changelog | 3 +++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 7379ca997..e87c21f13 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -106,8 +106,14 @@ string debSourcesIndex::Info(const char *Type) const /* */ inline string debSourcesIndex::IndexFile(const char *Type) const { - return URItoFileName(IndexURI(Type)); + string s = URItoFileName(IndexURI(Type)); + string sgzip = s + ".gz"; + if (!FileExists(s) && FileExists(sgzip)) + return sgzip; + else + return s; } + string debSourcesIndex::IndexURI(const char *Type) const { string Res; @@ -213,7 +219,12 @@ string debPackagesIndex::Info(const char *Type) const /* */ inline string debPackagesIndex::IndexFile(const char *Type) const { - return _config->FindDir("Dir::State::lists") + URItoFileName(IndexURI(Type)); + string s =_config->FindDir("Dir::State::lists") + URItoFileName(IndexURI(Type)); + string sgzip = s + ".gz"; + if (!FileExists(s) && FileExists(sgzip)) + return sgzip; + else + return s; } string debPackagesIndex::IndexURI(const char *Type) const { @@ -340,7 +351,12 @@ debTranslationsIndex::debTranslationsIndex(string URI,string Dist,string Section /* */ inline string debTranslationsIndex::IndexFile(const char *Type) const { - return _config->FindDir("Dir::State::lists") + URItoFileName(IndexURI(Type)); + string s =_config->FindDir("Dir::State::lists") + URItoFileName(IndexURI(Type)); + string sgzip = s + ".gz"; + if (!FileExists(s) && FileExists(sgzip)) + return sgzip; + else + return s; } string debTranslationsIndex::IndexURI(const char *Type) const { diff --git a/debian/changelog b/debian/changelog index 2fba94d7c..80c504b99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low * apt-pkg/contrib/fileutl.{h,cc}: - Add support for transparent reading of gzipped files. - Link against zlib (in apt-pkg/makefile) and add zlib build dependency. + * apt-pkg/deb/debindexfile.cc: + - If we do not find uncompressed package/source/translation indexes, look + for gzip compressed ones. -- Christian Perrier Tue, 11 May 2010 19:52:00 +0200 -- cgit v1.2.3 From 6d052eba8cc67245b21d333ece2e76efb22f82db Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Jun 2010 14:18:56 +0200 Subject: remove the "typename" from the const_iterators as gcc-4.4 doesn't like them and gcc-4.5 does the right thing (TM) with and without them --- apt-pkg/cacheset.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index c9d121083..668d8039e 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -61,7 +61,7 @@ public: /*{{{*/ }; }; // 103. set::iterator is required to be modifiable, but this allows modification of keys - typedef typename APT::PackageSet::const_iterator iterator; + typedef APT::PackageSet::const_iterator iterator; using std::set::insert; inline void insert(pkgCache::PkgIterator const &P) { if (P.end() == false) std::set::insert(P); }; @@ -169,7 +169,7 @@ public: /*{{{*/ inline pkgCache::VerFileIterator NewestFile() const { return (**this).NewestFile(); }; }; // 103. set::iterator is required to be modifiable, but this allows modification of keys - typedef typename APT::VersionSet::const_iterator iterator; + typedef APT::VersionSet::const_iterator iterator; using std::set::insert; inline void insert(pkgCache::VerIterator const &V) { if (V.end() == false) std::set::insert(V); }; -- cgit v1.2.3 From 9ee8287e5ea8a993fbb4c5beb8fe8bbddadfa7a0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Jun 2010 14:20:27 +0200 Subject: * apt-pkg/policy.cc: - get the candidate right for a not-installed pseudo package if his non-pseudo friend is installed --- apt-pkg/policy.cc | 32 +++++++++++++++++++++----------- apt-pkg/policy.h | 4 ++-- debian/changelog | 5 ++++- 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index 922efb0dd..a3286391b 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -115,7 +115,7 @@ bool pkgPolicy::InitDefaults() // --------------------------------------------------------------------- /* Evaluate the package pins and the default list to deteremine what the best package is. */ -pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg) +pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator const &Pkg) { // Look for a package pin and evaluate it. signed Max = GetPriority(Pkg); @@ -147,6 +147,16 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg) */ for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; Ver++) { + /* Lets see if this version is the installed version */ + bool instVer = (Pkg.CurrentVer() == Ver); + if (Ver.Pseudo() == true && instVer == false) + { + pkgCache::PkgIterator const allPkg = Ver.ParentPkg().Group().FindPkg("all"); + if (allPkg->CurrentVer != 0 && allPkg.CurrentVer()->Hash == Ver->Hash && + strcmp(allPkg.CurVersion(), Ver.VerStr()) == 0) + instVer = true; + } + for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false; VF++) { /* If this is the status file, and the current version is not the @@ -155,9 +165,9 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg) out bogus entries that may be due to config-file states, or other. */ if ((VF.File()->Flags & pkgCache::Flag::NotSource) == pkgCache::Flag::NotSource && - Pkg.CurrentVer() != Ver) + instVer == false) continue; - + signed Prio = PFPriority[VF.File()->ID]; if (Prio > Max) { @@ -171,7 +181,7 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg) } } - if (Pkg.CurrentVer() == Ver && Max < 1000) + if (instVer == true && Max < 1000) { /* Elevate our current selection (or the status file itself) to the Pseudo-status priority. */ @@ -189,6 +199,7 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg) // will always be a candidate (Closes: #512318) if (!Pref.IsGood() && MaxAlt > 0) Pref = PrefAlt; + return Pref; } /*}}}*/ @@ -238,15 +249,14 @@ void pkgPolicy::CreatePin(pkgVersionMatch::MatchType Type,string Name, // Policy::GetMatch - Get the matching version for a package pin /*{{{*/ // --------------------------------------------------------------------- /* */ -pkgCache::VerIterator pkgPolicy::GetMatch(pkgCache::PkgIterator Pkg) +pkgCache::VerIterator pkgPolicy::GetMatch(pkgCache::PkgIterator const &Pkg) { const Pin &PPkg = Pins[Pkg->ID]; - if (PPkg.Type != pkgVersionMatch::None) - { - pkgVersionMatch Match(PPkg.Data,PPkg.Type); - return Match.Find(Pkg); - } - return pkgCache::VerIterator(*Pkg.Cache()); + if (PPkg.Type == pkgVersionMatch::None) + return pkgCache::VerIterator(*Pkg.Cache()); + + pkgVersionMatch Match(PPkg.Data,PPkg.Type); + return Match.Find(Pkg); } /*}}}*/ // Policy::GetPriority - Get the priority of the package pin /*{{{*/ diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h index 4894682fa..28cb3ccbb 100644 --- a/apt-pkg/policy.h +++ b/apt-pkg/policy.h @@ -72,10 +72,10 @@ class pkgPolicy : public pkgDepCache::Policy inline signed short GetPriority(pkgCache::PkgFileIterator const &File) {return PFPriority[File->ID];}; signed short GetPriority(pkgCache::PkgIterator const &Pkg); - pkgCache::VerIterator GetMatch(pkgCache::PkgIterator Pkg); + pkgCache::VerIterator GetMatch(pkgCache::PkgIterator const &Pkg); // Things for the cache interface. - virtual pkgCache::VerIterator GetCandidateVer(pkgCache::PkgIterator Pkg); + virtual pkgCache::VerIterator GetCandidateVer(pkgCache::PkgIterator const &Pkg); virtual bool IsImportantDep(pkgCache::DepIterator Dep) {return pkgDepCache::Policy::IsImportantDep(Dep);}; bool InitDefaults(); diff --git a/debian/changelog b/debian/changelog index 9135d523b..8d67582e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -81,8 +81,11 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low looking code copycat from wget * ftparchive/writer.cc: - add ValidTime option to generate a Valid-Until header in Release file + * apt-pkg/policy.cc: + - get the candidate right for a not-installed pseudo package if + his non-pseudo friend is installed - -- David Kalnischkies Wed, 09 Jun 2010 10:52:31 +0200 + -- David Kalnischkies Wed, 09 Jun 2010 14:20:19 +0200 apt (0.7.26~exp5) experimental; urgency=low -- cgit v1.2.3 From 51561c4de75e84c2b2d037eb57387d3d3c2aa494 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Jun 2010 17:13:40 +0200 Subject: fix compiler warning in the new mirror code --- methods/http.h | 2 +- methods/mirror.cc | 27 ++++++++++++++++----------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/methods/http.h b/methods/http.h index d0677bdaa..0bc019e77 100644 --- a/methods/http.h +++ b/methods/http.h @@ -13,7 +13,7 @@ #define MAXLEN 360 - +#include using std::cout; using std::endl; diff --git a/methods/mirror.cc b/methods/mirror.cc index b2b6b2ecf..e8873d97b 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -153,11 +153,12 @@ void MirrorMethod::CurrentQueueUriToMirror() return; // find current mirror and select next one - for (int i=0; i < AllMirrors.size(); i++) + for (vector::const_iterator mirror = AllMirrors.begin(); + mirror != AllMirrors.end(); ++mirror) { - if (Queue->Uri.find(AllMirrors[i]) == 0) + if (Queue->Uri.find(*mirror) == 0) { - Queue->Uri.replace(0, AllMirrors[i].size(), BaseUri); + Queue->Uri.replace(0, mirror->length(), BaseUri); return; } } @@ -168,15 +169,19 @@ void MirrorMethod::CurrentQueueUriToMirror() bool MirrorMethod::TryNextMirror() { // find current mirror and select next one - for (int i=0; i < AllMirrors.size()-1; i++) + for (vector::const_iterator mirror = AllMirrors.begin(); + mirror != AllMirrors.end(); ++mirror) { - if (Queue->Uri.find(AllMirrors[i]) == 0) - { - Queue->Uri.replace(0, AllMirrors[i].size(), AllMirrors[i+1]); - if (Debug) - clog << "TryNextMirror: " << Queue->Uri << endl; - return true; - } + if (Queue->Uri.find(*mirror) != 0) + continue; + + vector::const_iterator nextmirror = mirror + 1; + if (nextmirror != AllMirrors.end()) + break; + Queue->Uri.replace(0, mirror->length(), *nextmirror); + if (Debug) + clog << "TryNextMirror: " << Queue->Uri << endl; + return true; } if (Debug) -- cgit v1.2.3 From a319c4eeae62511d1cb58986742491d3e224bf20 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Jun 2010 17:19:40 +0200 Subject: * apt-pkg/indexcopy.cc: - move the gpg codecopy to a new method and use it also in methods/gpgv.cc --- apt-pkg/indexcopy.cc | 109 +++++++++++++++++++++++++++++++++------------------ apt-pkg/indexcopy.h | 3 ++ debian/changelog | 4 +- methods/gpgv.cc | 47 +++------------------- 4 files changed, 82 insertions(+), 81 deletions(-) diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 53eb11172..47eaefc5c 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -590,66 +590,39 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector &SigList, indexRecords *MetaIndex = new indexRecords; string prefix = *I; + string const releasegpg = *I+"Release.gpg"; + string const release = *I+"Release"; + // a Release.gpg without a Release should never happen - if(!FileExists(*I+"Release")) + if(FileExists(release) == false) { delete MetaIndex; continue; } - - // verify the gpg signature of "Release" - // gpg --verify "*I+Release.gpg", "*I+Release" - const char *Args[400]; - unsigned int i = 0; - - string gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); - string pubringpath = _config->Find("Apt::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg"); - string releasegpg = *I+"Release.gpg"; - string release = *I+"Release"; - - Args[i++] = gpgvpath.c_str(); - Args[i++] = "--keyring"; - Args[i++] = pubringpath.c_str(); - Configuration::Item const *Opts; - Opts = _config->Tree("Acquire::gpgv::Options"); - if (Opts != 0) - { - Opts = Opts->Child; - for (; Opts != 0; Opts = Opts->Next) - { - if (Opts->Value.empty() == true) - continue; - Args[i++] = Opts->Value.c_str(); - if(i >= 390) { - _error->Error("Argument list from Acquire::gpgv::Options too long. Exiting."); - return false; - } - } - } - - Args[i++] = releasegpg.c_str(); - Args[i++] = release.c_str(); - Args[i++] = NULL; - pid_t pid = ExecFork(); if(pid < 0) { _error->Error("Fork failed"); return false; } if(pid == 0) { - execvp(gpgvpath.c_str(), (char**)Args); + string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); + std::vector Args = GetGPGVCommandLine(); + Args.push_back(releasegpg.c_str()); + Args.push_back(release.c_str()); + Args.push_back(NULL); + execvp(gpgvpath.c_str(), (char**) &Args[0]); } if(!ExecWait(pid, "gpgv")) { _error->Warning("Signature verification failed for: %s", - string(*I+"Release.gpg").c_str()); + releasegpg.c_str()); // something went wrong, don't copy the Release.gpg // FIXME: delete any existing gpg file? continue; } // Open the Release file and add it to the MetaIndex - if(!MetaIndex->Load(*I+"Release")) + if(!MetaIndex->Load(release)) { _error->Error("%s",MetaIndex->ErrorText.c_str()); return false; @@ -679,6 +652,64 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector &SigList, return true; } /*}}}*/ +// SigVerify::GetGPGVCommandLine - returns the command needed for verify/*{{{*/ +// --------------------------------------------------------------------- +/* Generating the commandline for calling gpgv is somehow complicated as + we need to add multiple keyrings and user supplied options. Also, as + the cdrom code currently can not use the gpgv method we have two places + these need to be done - so the place for this method is wrong but better + than code duplication… */ +std::vector SigVerify::GetGPGVCommandLine() +{ + string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); + // FIXME: remove support for deprecated APT::GPGV setting + string const trustedFile = _config->FindFile("Dir::Etc::Trusted", + _config->Find("APT::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg").c_str()); + string const trustedPath = _config->FindDir("Dir::Etc::TrustedParts", "/etc/apt/trusted.gpg.d"); + + if (_config->FindB("Debug::Acquire::gpgv", false) == true) + { + std::clog << "gpgv path: " << gpgvpath << std::endl; + std::clog << "Keyring file: " << trustedFile << std::endl; + std::clog << "Keyring path: " << trustedPath << std::endl; + } + + std::vector keyrings = GetListOfFilesInDir(trustedPath, "gpg", false); + if (FileExists(trustedFile) == true) + keyrings.push_back(trustedFile); + + std::vector Args; + Args.reserve(30); + + if (keyrings.empty() == true) + return Args; + + Args.push_back(gpgvpath.c_str()); + Args.push_back("--ignore-time-conflict"); + + for (vector::const_iterator K = keyrings.begin(); + K != keyrings.end(); ++K) + { + Args.push_back("--keyring"); + Args.push_back(K->c_str()); + } + + Configuration::Item const *Opts; + Opts = _config->Tree("Acquire::gpgv::Options"); + if (Opts != 0) + { + Opts = Opts->Child; + for (; Opts != 0; Opts = Opts->Next) + { + if (Opts->Value.empty() == true) + continue; + Args.push_back(Opts->Value.c_str()); + } + } + + return Args; +} + /*}}}*/ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/ vector &List, pkgCdromStatus *log) { diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h index 9e5ad4e43..ee6557a3d 100644 --- a/apt-pkg/indexcopy.h +++ b/apt-pkg/indexcopy.h @@ -89,6 +89,9 @@ class SigVerify /*{{{*/ public: bool CopyAndVerify(string CDROM,string Name,vector &SigList, vector PkgList,vector SrcList); + + /** \brief generates the command to verify a file with gpgv */ + static std::vector GetGPGVCommandLine(); }; /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 8d67582e4..a83d4c52a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -84,8 +84,10 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low * apt-pkg/policy.cc: - get the candidate right for a not-installed pseudo package if his non-pseudo friend is installed + * apt-pkg/indexcopy.cc: + - move the gpg codecopy to a new method and use it also in methods/gpgv.cc - -- David Kalnischkies Wed, 09 Jun 2010 14:20:19 +0200 + -- David Kalnischkies Wed, 09 Jun 2010 17:18:26 +0200 apt (0.7.26~exp5) experimental; urgency=low diff --git a/methods/gpgv.cc b/methods/gpgv.cc index a149d67dd..5f5f23f7d 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -2,6 +2,7 @@ #include #include #include +#include #include #include @@ -58,26 +59,14 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, int fd[2]; FILE *pipein; int status; - string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); - // FIXME: remove support for deprecated APT::GPGV setting - string const trustedFile = _config->FindFile("Dir::Etc::Trusted", - _config->Find("APT::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg").c_str()); - string const trustedPath = _config->FindDir("Dir::Etc::TrustedParts", "/etc/apt/trusted.gpg.d"); - if (Debug == true) - { - std::clog << "gpgv path: " << gpgvpath << std::endl; - std::clog << "Keyring file: " << trustedFile << std::endl; - std::clog << "Keyring path: " << trustedPath << std::endl; - } - vector keyrings = GetListOfFilesInDir(trustedPath, "gpg", false); - if (FileExists(trustedFile) == true) - keyrings.push_back(trustedFile); - - if (keyrings.empty() == true) + string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); + std::vector Args = SigVerify::GetGPGVCommandLine(); + if (Args.empty() == true) { // TRANSLATOR: %s is the trusted keyring parts directory - ioprintf(ret, _("No keyring installed in %s."), trustedPath.c_str()); + ioprintf(ret, _("No keyring installed in %s."), + _config->FindDir("Dir::Etc::TrustedParts", "/etc/apt/trusted.gpg.d").c_str()); return ret.str(); } @@ -89,32 +78,8 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, return string("Couldn't spawn new process") + strerror(errno); else if (pid == 0) { - std::vector Args; - Args.reserve(30); - - Args.push_back(gpgvpath.c_str()); Args.push_back("--status-fd"); Args.push_back("3"); - Args.push_back("--ignore-time-conflict"); - for (vector::const_iterator K = keyrings.begin(); - K != keyrings.end(); ++K) - { - Args.push_back("--keyring"); - Args.push_back(K->c_str()); - } - - Configuration::Item const *Opts; - Opts = _config->Tree("Acquire::gpgv::Options"); - if (Opts != 0) - { - Opts = Opts->Child; - for (; Opts != 0; Opts = Opts->Next) - { - if (Opts->Value.empty() == true) - continue; - Args.push_back(Opts->Value.c_str()); - } - } Args.push_back(file); Args.push_back(outfile); Args.push_back(NULL); -- cgit v1.2.3 From 24d7b6267ef3e475a153d4e2c4bcb30e1d14e671 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Jun 2010 18:23:23 +0200 Subject: be sure that the RFC1123StrToTime method is run in a LANG=C environment --- apt-pkg/contrib/strutl.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 160450366..ace74cb37 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -861,12 +861,16 @@ static time_t timegm(struct tm *t) bool RFC1123StrToTime(const char* const str,time_t &time) { struct tm Tm; + setlocale (LC_ALL,"C"); + bool const invalid = // Sun, 06 Nov 1994 08:49:37 GMT ; RFC 822, updated by RFC 1123 - if (strptime(str, "%a, %d %b %Y %H:%M:%S %Z", &Tm) == NULL && + (strptime(str, "%a, %d %b %Y %H:%M:%S %Z", &Tm) == NULL && // Sunday, 06-Nov-94 08:49:37 GMT ; RFC 850, obsoleted by RFC 1036 strptime(str, "%A, %d-%b-%y %H:%M:%S %Z", &Tm) == NULL && // Sun Nov 6 08:49:37 1994 ; ANSI C's asctime() format - strptime(str, "%a %b %d %H:%M:%S %Y", &Tm) == NULL) + strptime(str, "%a %b %d %H:%M:%S %Y", &Tm) == NULL); + setlocale (LC_ALL,""); + if (invalid == true) return false; time = timegm(&Tm); -- cgit v1.2.3 From c91d9a630bfe95f152d574a0ca420fde2afc6b2c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Jun 2010 21:15:52 +0200 Subject: sent Last-Modified header also for Translation files --- apt-pkg/acquire-item.cc | 13 ++++++++++--- debian/changelog | 3 ++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 4d9a152ab..58754a5c0 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -140,7 +140,8 @@ void pkgAcquire::Item::Rename(string From,string To) } } /*}}}*/ - +// Acquire::Item::ReportMirrorFailure /*{{{*/ +// --------------------------------------------------------------------- void pkgAcquire::Item::ReportMirrorFailure(string FailCode) { // we only act if a mirror was used at all @@ -182,7 +183,7 @@ void pkgAcquire::Item::ReportMirrorFailure(string FailCode) _config->Find("Methods::Mirror::ProblemReporting").c_str()); } } - + /*}}}*/ // AcqDiffIndex::AcqDiffIndex - Constructor /*{{{*/ // --------------------------------------------------------------------- /* Get the DiffIndex file first and see if there are patches availabe @@ -835,7 +836,13 @@ pkgAcqIndexTrans::pkgAcqIndexTrans(pkgAcquire *Owner, // --------------------------------------------------------------------- string pkgAcqIndexTrans::Custom600Headers() { - return "\nFail-Ignore: true"; + string Final = _config->FindDir("Dir::State::lists"); + Final += URItoFileName(RealURI); + + struct stat Buf; + if (stat(Final.c_str(),&Buf) != 0) + return "\nFail-Ignore: true"; + return "\nFail-Ignore: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime); } /*}}}*/ // AcqIndexTrans::Failed - Silence failure messages for missing files /*{{{*/ diff --git a/debian/changelog b/debian/changelog index a83d4c52a..42fe916c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - add a constant Exists check for MetaKeys * apt-pkg/acquire-item.cc: - do not try PDiff if it is not listed in the Meta file + - sent Last-Modified header also for Translation files * apt-pkg/cacheiterator.h: - let pkgCache::Iterator inherent std::iterator * ftparchive/writer.h: @@ -87,7 +88,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low * apt-pkg/indexcopy.cc: - move the gpg codecopy to a new method and use it also in methods/gpgv.cc - -- David Kalnischkies Wed, 09 Jun 2010 17:18:26 +0200 + -- David Kalnischkies Wed, 09 Jun 2010 21:15:46 +0200 apt (0.7.26~exp5) experimental; urgency=low -- cgit v1.2.3 From cf440facb498fa0ec70148723b13d6d019758c0e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Jun 2010 23:20:26 +0200 Subject: enhance the split out of the gpgv commandline mangling by splitting out the call completely --- apt-pkg/indexcopy.cc | 62 +++++++++++++++++++++++++++++++++++++++++----------- apt-pkg/indexcopy.h | 10 +++++++-- methods/gpgv.cc | 51 +++++++++--------------------------------- 3 files changed, 67 insertions(+), 56 deletions(-) diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 47eaefc5c..621c18716 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -27,6 +27,8 @@ #include #include #include +#include +#include #include /*}}}*/ @@ -605,14 +607,9 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector &SigList, _error->Error("Fork failed"); return false; } - if(pid == 0) { - string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); - std::vector Args = GetGPGVCommandLine(); - Args.push_back(releasegpg.c_str()); - Args.push_back(release.c_str()); - Args.push_back(NULL); - execvp(gpgvpath.c_str(), (char**) &Args[0]); - } + if(pid == 0) + RunGPGV(release, releasegpg); + if(!ExecWait(pid, "gpgv")) { _error->Warning("Signature verification failed for: %s", releasegpg.c_str()); @@ -652,14 +649,15 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector &SigList, return true; } /*}}}*/ -// SigVerify::GetGPGVCommandLine - returns the command needed for verify/*{{{*/ +// SigVerify::RunGPGV - returns the command needed for verify /*{{{*/ // --------------------------------------------------------------------- /* Generating the commandline for calling gpgv is somehow complicated as we need to add multiple keyrings and user supplied options. Also, as the cdrom code currently can not use the gpgv method we have two places these need to be done - so the place for this method is wrong but better than code duplication… */ -std::vector SigVerify::GetGPGVCommandLine() +bool SigVerify::RunGPGV(std::string const &File, std::string const &FileGPG, + int const &statusfd, int fd[2]) { string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); // FIXME: remove support for deprecated APT::GPGV setting @@ -667,7 +665,9 @@ std::vector SigVerify::GetGPGVCommandLine() _config->Find("APT::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg").c_str()); string const trustedPath = _config->FindDir("Dir::Etc::TrustedParts", "/etc/apt/trusted.gpg.d"); - if (_config->FindB("Debug::Acquire::gpgv", false) == true) + bool const Debug = _config->FindB("Debug::Acquire::gpgv", false); + + if (Debug == true) { std::clog << "gpgv path: " << gpgvpath << std::endl; std::clog << "Keyring file: " << trustedFile << std::endl; @@ -682,11 +682,19 @@ std::vector SigVerify::GetGPGVCommandLine() Args.reserve(30); if (keyrings.empty() == true) - return Args; + return false; Args.push_back(gpgvpath.c_str()); Args.push_back("--ignore-time-conflict"); + if (statusfd != -1) + { + Args.push_back("--status-fd"); + char fd[10]; + snprintf(fd, sizeof(fd), "%i", statusfd); + Args.push_back(fd); + } + for (vector::const_iterator K = keyrings.begin(); K != keyrings.end(); ++K) { @@ -707,7 +715,35 @@ std::vector SigVerify::GetGPGVCommandLine() } } - return Args; + Args.push_back(FileGPG.c_str()); + Args.push_back(File.c_str()); + Args.push_back(NULL); + + if (Debug == true) + { + std::clog << "Preparing to exec: " << gpgvpath; + for (std::vector::const_iterator a = Args.begin(); *a != NULL; ++a) + std::clog << " " << *a; + std::clog << std::endl; + } + + if (statusfd != -1) + { + int const nullfd = open("/dev/null", O_RDONLY); + close(fd[0]); + // Redirect output to /dev/null; we read from the status fd + dup2(nullfd, STDOUT_FILENO); + dup2(nullfd, STDERR_FILENO); + // Redirect the pipe to the status fd (3) + dup2(fd[1], statusfd); + + putenv((char *)"LANG="); + putenv((char *)"LC_ALL="); + putenv((char *)"LC_MESSAGES="); + } + + execvp(gpgvpath.c_str(), (char **) &Args[0]); + return true; } /*}}}*/ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/ diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h index ee6557a3d..6fcd3b8ce 100644 --- a/apt-pkg/indexcopy.h +++ b/apt-pkg/indexcopy.h @@ -90,8 +90,14 @@ class SigVerify /*{{{*/ bool CopyAndVerify(string CDROM,string Name,vector &SigList, vector PkgList,vector SrcList); - /** \brief generates the command to verify a file with gpgv */ - static std::vector GetGPGVCommandLine(); + /** \brief generates and run the command to verify a file with gpgv */ + static bool RunGPGV(std::string const &File, std::string const &FileOut, + int const &statusfd, int fd[2]); + inline static bool RunGPGV(std::string const &File, std::string const &FileOut, + int const &statusfd = -1) { + int fd[2]; + return RunGPGV(File, FileOut, statusfd, fd); + }; }; /*}}}*/ diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 5f5f23f7d..018e4f622 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -55,61 +55,29 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, if (Debug == true) std::clog << "inside VerifyGetSigners" << std::endl; - pid_t pid; int fd[2]; - FILE *pipein; - int status; - - string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); - std::vector Args = SigVerify::GetGPGVCommandLine(); - if (Args.empty() == true) - { - // TRANSLATOR: %s is the trusted keyring parts directory - ioprintf(ret, _("No keyring installed in %s."), - _config->FindDir("Dir::Etc::TrustedParts", "/etc/apt/trusted.gpg.d").c_str()); - return ret.str(); - } if (pipe(fd) < 0) return "Couldn't create pipe"; - pid = fork(); + pid_t pid = fork(); if (pid < 0) return string("Couldn't spawn new process") + strerror(errno); else if (pid == 0) { - Args.push_back("--status-fd"); - Args.push_back("3"); - Args.push_back(file); - Args.push_back(outfile); - Args.push_back(NULL); - - if (Debug == true) + if (SigVerify::RunGPGV(outfile, file, 3, fd) == false) { - std::clog << "Preparing to exec: " << gpgvpath; - for(std::vector::const_iterator a = Args.begin();*a != NULL; ++a) - std::clog << " " << *a; - std::clog << std::endl; + // TRANSLATOR: %s is the trusted keyring parts directory + ioprintf(ret, _("No keyring installed in %s."), + _config->FindDir("Dir::Etc::TrustedParts", "/etc/apt/trusted.gpg.d").c_str()); + return ret.str(); } - int const nullfd = open("/dev/null", O_RDONLY); - close(fd[0]); - // Redirect output to /dev/null; we read from the status fd - dup2(nullfd, STDOUT_FILENO); - dup2(nullfd, STDERR_FILENO); - // Redirect the pipe to the status fd (3) - dup2(fd[1], 3); - - putenv((char *)"LANG="); - putenv((char *)"LC_ALL="); - putenv((char *)"LC_MESSAGES="); - execvp(gpgvpath.c_str(), (char **) &Args[0]); - exit(111); } close(fd[1]); - pipein = fdopen(fd[0], "r"); - + FILE *pipein = fdopen(fd[0], "r"); + // Loop over the output of gpgv, and check the signatures. size_t buffersize = 64; char *buffer = (char *) malloc(buffersize); @@ -182,6 +150,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, } fclose(pipein); + int status; waitpid(pid, &status, 0); if (Debug == true) { @@ -200,7 +169,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, } else if (WEXITSTATUS(status) == 111) { - ioprintf(ret, _("Could not execute '%s' to verify signature (is gpgv installed?)"), gpgvpath.c_str()); + ioprintf(ret, _("Could not execute 'gpgv' to verify signature (is gpgv installed?)")); return ret.str(); } else -- cgit v1.2.3 From 6f466ddbf2d9cb34b88df1738bb1115a66f46536 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 10 Jun 2010 02:04:03 +0200 Subject: readd the autoremove protection for the kfreebsd-image as it was lost in Michaels merge with the ubuntu branch --- debian/apt.conf.autoremove | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove index 2f00b9f8b..b3f4a3edd 100644 --- a/debian/apt.conf.autoremove +++ b/debian/apt.conf.autoremove @@ -1,9 +1,11 @@ APT { - NeverAutoRemove + NeverAutoRemove { - "^linux-firmware$"; - "^linux-image.*"; + "^firmware-linux.*"; + "^linux-firmware$"; + "^linux-image.*"; + "^kfreebsd-image.*"; "^linux-restricted-modules.*"; "^linux-ubuntu-modules-.*"; }; @@ -11,13 +13,12 @@ APT Never-MarkAuto-Sections { "metapackages"; - "restricted/metapackages"; - "universe/metapackages"; - "multiverse/metapackages"; + "restricted/metapackages"; + "universe/metapackages"; + "multiverse/metapackages"; "oldlibs"; - "restricted/oldlibs"; - "universe/oldlibs"; - "multiverse/oldlibs"; - + "restricted/oldlibs"; + "universe/oldlibs"; + "multiverse/oldlibs"; }; }; -- cgit v1.2.3 From 97f4026d93a85838439263d30146c3ad25fef474 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 10 Jun 2010 10:03:14 +0200 Subject: correct a minor spelling mistake in the changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 42fe916c5..f9638b78f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low that use round robin DNS) - support Original-Maintainer in RewritePackageOrder - enable cdrom autodetection via libudev by default - - show messsage about Vcs in use when apt-get source is run for + - show message about Vcs in use when apt-get source is run for packages maintained in a Vcs - better support transitional packages with mark auto-installed. when the transitional package is in "oldlibs" the new package -- cgit v1.2.3 From a8ef7efd6df81d4fb9e52419695f10df9fe76cda Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 10 Jun 2010 13:09:23 +0200 Subject: * apt-pkg/cacheset.cc: - get the candidate either from an already built depcache or use the policy which is a bit faster than depcache generation --- apt-pkg/cachefile.h | 8 ++++++-- apt-pkg/cacheset.cc | 11 ++++++++--- debian/changelog | 8 ++++++++ 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h index 1647aff8e..c68f06ed8 100644 --- a/apt-pkg/cachefile.h +++ b/apt-pkg/cachefile.h @@ -20,10 +20,9 @@ #include #include +#include #include -class pkgPolicy; -class pkgSourceList; class pkgCacheFile { protected: @@ -65,6 +64,11 @@ class pkgCacheFile inline pkgPolicy* GetPolicy() { BuildPolicy(); return Policy; }; inline pkgSourceList* GetSourceList() { BuildSourceList(); return SrcList; }; + inline bool IsPkgCacheBuilt() const { return (Cache != NULL); }; + inline bool IsDepCacheBuilt() const { return (DCache != NULL); }; + inline bool IsPolicyBuilt() const { return (Policy != NULL); }; + inline bool IsSrcListBuilt() const { return (SrcList != NULL); }; + pkgCacheFile(); virtual ~pkgCacheFile(); }; diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index 43ade4b4e..e91b56997 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -261,9 +261,14 @@ bool VersionSet::AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, // getCandidateVer - Returns the candidate version of the given package /*{{{*/ pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg, bool const &AllowError) { - if (unlikely(Cache.BuildDepCache() == false)) - return pkgCache::VerIterator(*Cache); - pkgCache::VerIterator Cand = Cache[Pkg].CandidateVerIter(Cache); + pkgCache::VerIterator Cand; + if (Cache.IsDepCacheBuilt() == true) + Cand = Cache[Pkg].CandidateVerIter(Cache); + else { + if (unlikely(Cache.BuildPolicy() == false)) + return pkgCache::VerIterator(*Cache); + Cand = Cache.GetPolicy()->GetCandidateVer(Pkg); + } if (AllowError == false && Cand.end() == true) _error->Error(_("Can't select candidate version from package %s as it has no candidate"), Pkg.FullName(true).c_str()); return Cand; diff --git a/debian/changelog b/debian/changelog index f9638b78f..8470a0d85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.26~exp7) UNRELEASED; urgency=low + + * apt-pkg/cacheset.cc: + - get the candidate either from an already built depcache + or use the policy which is a bit faster than depcache generation + + -- David Kalnischkies Thu, 10 Jun 2010 13:04:47 +0200 + apt (0.7.26~exp6) UNRELEASED; urgency=low [ Michael Vogt ] -- cgit v1.2.3 From 01606def78105c9d64f12c89e387d37ed46925b6 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 10 Jun 2010 13:20:27 +0200 Subject: * apt-pkg/acquire-item.cc: - If the Acquire::GzipIndexes option is true and we download a gzipped index file, keep it as it is (and rename to .gz) instead of uncompressing it. --- apt-pkg/acquire-item.cc | 20 +++++++++++++++++++- debian/changelog | 4 ++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 6d4336425..eab34e26c 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -620,6 +620,8 @@ string pkgAcqIndex::Custom600Headers() { string Final = _config->FindDir("Dir::State::lists"); Final += URItoFileName(RealURI); + if (_config->FindB("Acquire::GzipIndexes",false)) + Final += ".gz"; struct stat Buf; if (stat(Final.c_str(),&Buf) != 0) @@ -714,6 +716,23 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash, Erase = false; Complete = true; + string compExt = flExtension(flNotDir(URI(Desc.URI).Path)); + + // If we enable compressed indexes and already have gzip, keep it + if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz") { + string FinalFile = _config->FindDir("Dir::State::lists"); + FinalFile += URItoFileName(RealURI) + ".gz"; + //if(Debug) + // std::clog << "pkgAcqIndex: keeping gzipped " << FinalFile << endl; + Rename(DestFile,FinalFile); + chmod(FinalFile.c_str(),0644); + + // Update DestFile for .gz suffix so that the clean operation keeps it + DestFile = _config->FindDir("Dir::State::lists") + "partial/"; + DestFile += URItoFileName(RealURI) + ".gz"; + return; + } + // Handle the unzipd case string FileName = LookupTag(Message,"Alt-Filename"); if (FileName.empty() == false) @@ -746,7 +765,6 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash, else Local = true; - string compExt = flExtension(flNotDir(URI(Desc.URI).Path)); string decompProg; // get the binary name for your used compression type diff --git a/debian/changelog b/debian/changelog index 80c504b99..4122a728e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,10 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low * apt-pkg/deb/debindexfile.cc: - If we do not find uncompressed package/source/translation indexes, look for gzip compressed ones. + * apt-pkg/acquire-item.cc: + - If the Acquire::GzipIndexes option is true and we download a gzipped + index file, keep it as it is (and rename to .gz) instead of + uncompressing it. -- Christian Perrier Tue, 11 May 2010 19:52:00 +0200 -- cgit v1.2.3 From 6617de4d12e2bae1a463af2a6631dd2f109da7be Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 10 Jun 2010 14:23:24 +0200 Subject: mention abi break in changelog --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4122a728e..7facf6f80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low * apt-pkg/contrib/fileutl.{h,cc}: - Add support for transparent reading of gzipped files. - Link against zlib (in apt-pkg/makefile) and add zlib build dependency. + - [ABI BREAK] This introduces a new protected member of FileFD and changes + the behaviour of FileFd for reading gzipped files. * apt-pkg/deb/debindexfile.cc: - If we do not find uncompressed package/source/translation indexes, look for gzip compressed ones. -- cgit v1.2.3 From 2b968050ca6e650e76bb2205190be45a3ef28723 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 10 Jun 2010 14:35:23 +0200 Subject: releasing version 0.7.26~exp6 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index cfb7c814f..6b40ae94d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -88,7 +88,7 @@ apt (0.7.26~exp6) experimental; urgency=low * apt-pkg/indexcopy.cc: - move the gpg codecopy to a new method and use it also in methods/gpgv.cc - -- David Kalnischkies Wed, 09 Jun 2010 21:15:46 +0200 + -- Michael Vogt Thu, 10 Jun 2010 14:02:22 +0200 apt (0.7.26~exp5) experimental; urgency=low -- cgit v1.2.3 From c0ba35fc916d2adf0ba1fbd8cca62a83ce83d789 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 10 Jun 2010 15:10:38 +0200 Subject: * apt-pkg/orderlist.cc: - untouched packages are never missing * apt-pkg/packagemanager.cc: - packages that are not touched doesn't need to be unpacked --- apt-pkg/orderlist.cc | 3 ++- apt-pkg/packagemanager.cc | 3 ++- debian/changelog | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index 7c950292a..55f9cb9cc 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -117,7 +117,8 @@ bool pkgOrderList::IsMissing(PkgIterator Pkg) return false; // Skip Packages that need configure only. - if (Pkg.State() == pkgCache::PkgIterator::NeedsConfigure && + if ((Pkg.State() == pkgCache::PkgIterator::NeedsConfigure || + Pkg.State() == pkgCache::PkgIterator::NeedsNothing) && Cache[Pkg].Keep() == true) return false; diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index eef79cccd..49776aac7 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -602,7 +602,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg) // configured we don't need to unpack it again… PkgIterator const P = Pkg.Group().FindPkg("all"); if (List->IsFlag(P,pkgOrderList::UnPacked) != true && - List->IsFlag(P,pkgOrderList::Configured) != true) { + List->IsFlag(P,pkgOrderList::Configured) != true && + P.State() != pkgCache::PkgIterator::NeedsNothing) { if (SmartUnPack(P) == false) return false; } diff --git a/debian/changelog b/debian/changelog index 8470a0d85..edea3400a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ apt (0.7.26~exp7) UNRELEASED; urgency=low * apt-pkg/cacheset.cc: - get the candidate either from an already built depcache or use the policy which is a bit faster than depcache generation + * apt-pkg/orderlist.cc: + - untouched packages are never missing + * apt-pkg/packagemanager.cc: + - packages that are not touched doesn't need to be unpacked -- David Kalnischkies Thu, 10 Jun 2010 13:04:47 +0200 -- cgit v1.2.3 From 31e1187be48846395cb3b57f0e9a731261a1484c Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 10 Jun 2010 15:19:10 +0200 Subject: * Add test/test-indexes.sh: - Test behaviour of index retrieval and usage, in particular with uncompressed and gzip compressed indexes. --- debian/changelog | 3 ++ test/test-indexes.sh | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+) create mode 100755 test/test-indexes.sh diff --git a/debian/changelog b/debian/changelog index 7facf6f80..bd328fd08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,9 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low - If the Acquire::GzipIndexes option is true and we download a gzipped index file, keep it as it is (and rename to .gz) instead of uncompressing it. + * Add test/test-indexes.sh: + - Test behaviour of index retrieval and usage, in particular with + uncompressed and gzip compressed indexes. -- Christian Perrier Tue, 11 May 2010 19:52:00 +0200 diff --git a/test/test-indexes.sh b/test/test-indexes.sh new file mode 100755 index 000000000..d3f5e7cd3 --- /dev/null +++ b/test/test-indexes.sh @@ -0,0 +1,106 @@ +#!/bin/sh -e + +# Test behaviour of index retrieval and usage, in particular with uncompressed +# and gzip compressed indexes. +# Author: Martin Pitt +# (C) 2010 Canonical Ltd. + +BUILDDIR=$(readlink -f $(dirname $0)/../build) + +TEST_SOURCE="deb http://ftp.debian.org/debian unstable contrib" +TEST_SOURCE_KEYID=55BE302B +GPG_KEYSERVER=gpg-keyserver.de +# should be a small package with dependencies satisfiable in TEST_SOURCE, i. e. +# ideally no depends at all +TEST_PKG="python-psyco-doc" + +export LD_LIBRARY_PATH=$BUILDDIR/bin + +OPTS="-o RootDir=. -o Dir::Bin::Methods=$BUILDDIR/bin/methods -o Debug::NoLocking=true" +DEBUG="" +#DEBUG="-o Debug::pkgCacheGen=true" +#DEBUG="-o Debug::pkgAcquire=true" +APT_GET="$BUILDDIR/bin/apt-get $OPTS $DEBUG" +APT_CACHE="$BUILDDIR/bin/apt-cache $OPTS $DEBUG" + +[ -x "$BUILDDIR/bin/apt-get" ] || { + echo "please build the tree first" >&2 + exit 1 +} + +echo "---- building sandbox----" +WORKDIR=$(mktemp -d) +trap "cd /; rm -rf $WORKDIR" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM +cd $WORKDIR + +rm -fr etc var +rm -f home +ln -s /home home +mkdir -p etc/apt/preferences.d etc/apt/trusted.gpg.d var/cache/apt/archives/partial var/lib/apt/lists/partial var/lib/dpkg +cp /etc/apt/trusted.gpg etc/apt +touch var/lib/dpkg/status +echo "$TEST_SOURCE" > etc/apt/sources.list + +# get keyring +gpg --no-options --no-default-keyring --secret-keyring etc/apt/secring.gpg --trustdb-name etc/apt/trustdb.gpg --keyring etc/apt/trusted.gpg --primary-keyring etc/apt/trusted.gpg --keyserver $GPG_KEYSERVER --recv-keys $TEST_SOURCE_KEYID + +echo "---- uncompressed update ----" +$APT_GET update +test -e var/lib/apt/lists/*_Packages +! test -e var/lib/apt/lists/*_Packages.gz + +echo "---- uncompressed cache ----" +$APT_CACHE show $TEST_PKG | grep -q ^Version: +# again (with cache) +$APT_CACHE show $TEST_PKG | grep -q ^Version: +rm var/cache/apt/*.bin +$APT_CACHE policy $TEST_PKG | grep -q '500 http://' +# again (with cache) +$APT_CACHE policy $TEST_PKG | grep -q '500 http://' + +echo "---- uncompressed install ----" +$APT_GET install -d $TEST_PKG +test -e var/cache/apt/archives/$TEST_PKG*.deb +$APT_GET clean +! test -e var/cache/apt/archives/$TEST_PKG*.deb + +echo "----- uncompressed update with preexisting indexes, no pdiff ----" +$APT_GET -o Acquire::PDiffs=false update +test -e var/lib/apt/lists/*_Packages +! test -e var/lib/apt/lists/*_Packages.gz + +echo "----- uncompressed update with preexisting indexes, with pdiff ----" +$APT_GET -o Acquire::PDiffs=true update +test -e var/lib/apt/lists/*_Packages +! test -e var/lib/apt/lists/*_Packages.gz + +echo "----- compressed update ----" +find var/lib/apt/lists/ -type f | xargs -r rm +$APT_GET -o Acquire::GzipIndexes=true update +! test -e var/lib/apt/lists/*_Packages +test -e var/lib/apt/lists/*_Packages.gz + +echo "---- compressed cache ----" +$APT_CACHE show $TEST_PKG | grep -q ^Version: +# again (with cache) +$APT_CACHE show $TEST_PKG | grep -q ^Version: +rm var/cache/apt/*.bin +$APT_CACHE policy $TEST_PKG | grep -q '500 http://' +# again (with cache) +$APT_CACHE policy $TEST_PKG | grep -q '500 http://' + +echo "---- compressed install ----" +$APT_GET install -d $TEST_PKG +! test -e var/cache/apt/archives/$TEST_PKG*.deb + +echo "----- compressed update with preexisting indexes, no pdiff ----" +$APT_GET -o Acquire::PDiffs=false -o Acquire::GzipIndexes=true update +! test -e var/lib/apt/lists/*_Packages +test -e var/lib/apt/lists/*_Packages.gz + +echo "----- compressed update with preexisting indexes, with pdiff ----" +$APT_GET -o Acquire::PDiffs=true -o Acquire::GzipIndexes=true update +! test -e var/lib/apt/lists/*_Packages +test -e var/lib/apt/lists/*_Packages.gz + +echo "---- ALL TESTS PASSED ----" -- cgit v1.2.3 From 6b2f7a60c3d7d22d1d6b0e300ef526d48ff20048 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 10 Jun 2010 16:15:57 +0200 Subject: * apt-pkg/cachefile.h: - make pkgPolicy public again, libapt-pkg-perl (and probably others) get unhappy without that --- apt-pkg/cachefile.h | 2 +- debian/changelog | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h index 1647aff8e..63bc3de47 100644 --- a/apt-pkg/cachefile.h +++ b/apt-pkg/cachefile.h @@ -31,10 +31,10 @@ class pkgCacheFile MMap *Map; pkgCache *Cache; pkgDepCache *DCache; - pkgPolicy *Policy; pkgSourceList *SrcList; public: + pkgPolicy *Policy; // We look pretty much exactly like a pointer to a dep cache inline operator pkgCache &() {return *Cache;}; diff --git a/debian/changelog b/debian/changelog index 6b40ae94d..d29705d24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.26~exp7) experimental; urgency=low + + * apt-pkg/cachefile.h: + - make pkgPolicy public again, libapt-pkg-perl (and probably + others) get unhappy without that + + -- Michael Vogt Thu, 10 Jun 2010 15:33:24 +0200 + apt (0.7.26~exp6) experimental; urgency=low [ Michael Vogt ] -- cgit v1.2.3 From 98ac10fad90f622b67a8cda3cffc041885c2e054 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 11 Jun 2010 08:51:01 +0200 Subject: * debian/control: - remove intltool's dependency as it is an ubuntu artefact --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9367c1743..f2a18d397 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low - untouched packages are never missing * apt-pkg/packagemanager.cc: - packages that are not touched doesn't need to be unpacked + * debian/control: + - remove intltool's dependency as it is an ubuntu artefact -- David Kalnischkies Thu, 10 Jun 2010 16:36:58 +0200 diff --git a/debian/control b/debian/control index 9ac0d582e..4f41c130b 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Luca Bruno , Julian Andres Klode Standards-Version: 3.8.4 -Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen, intltool +Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen Build-Conflicts: autoconf2.13, automake1.4 Package: apt -- cgit v1.2.3 From fdd739c74dcf266a7cb2f3688ea11afec4055f2c Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Fri, 11 Jun 2010 10:01:27 +0200 Subject: * debian/rules: - Make DEB_BUILD_OPTIONS=noopt actually work by passing the right CXXFLAGS. --- debian/changelog | 3 +++ debian/rules | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bd328fd08..483fff9c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low * Italian translation update. Closes: #581742 [ Martin Pitt ] + * debian/rules: + - Make DEB_BUILD_OPTIONS=noopt actually work by passing the right + CXXFLAGS. * apt-pkg/contrib/fileutl.{h,cc}: - Add support for transparent reading of gzipped files. - Link against zlib (in apt-pkg/makefile) and add zlib build dependency. diff --git a/debian/rules b/debian/rules index 7677708b2..450f3e0f6 100755 --- a/debian/rules +++ b/debian/rules @@ -108,7 +108,7 @@ build/configure-stamp: configure dh_testdir -mkdir build cp COPYING debian/copyright - cd build && CXXFLAGS="$(confcxxflags)" ../configure $(confflags) + cd build && CXXFLAGS="$(CXXFLAGS)" ../configure $(confflags) touch $@ build/build-stamp: build/configure-stamp -- cgit v1.2.3 From bb109d0b14218cde4fccc45856cf67e5513c0cc9 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Fri, 11 Jun 2010 10:43:43 +0200 Subject: Fix compressed index retrieval for current timestamps Fix a thinko in r1973, which did the Acquire::GzipIndexes test ealier than the IMS-Hit test. This led to rename errors. --- apt-pkg/acquire-item.cc | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index eab34e26c..83fb5328b 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -716,23 +716,6 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash, Erase = false; Complete = true; - string compExt = flExtension(flNotDir(URI(Desc.URI).Path)); - - // If we enable compressed indexes and already have gzip, keep it - if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz") { - string FinalFile = _config->FindDir("Dir::State::lists"); - FinalFile += URItoFileName(RealURI) + ".gz"; - //if(Debug) - // std::clog << "pkgAcqIndex: keeping gzipped " << FinalFile << endl; - Rename(DestFile,FinalFile); - chmod(FinalFile.c_str(),0644); - - // Update DestFile for .gz suffix so that the clean operation keeps it - DestFile = _config->FindDir("Dir::State::lists") + "partial/"; - DestFile += URItoFileName(RealURI) + ".gz"; - return; - } - // Handle the unzipd case string FileName = LookupTag(Message,"Alt-Filename"); if (FileName.empty() == false) @@ -765,8 +748,24 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash, else Local = true; + string compExt = flExtension(flNotDir(URI(Desc.URI).Path)); string decompProg; + // If we enable compressed indexes and already have gzip, keep it + if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz") { + string FinalFile = _config->FindDir("Dir::State::lists"); + FinalFile += URItoFileName(RealURI) + ".gz"; + //if(Debug) + // std::clog << "pkgAcqIndex: keeping gzipped " << FinalFile << endl; + Rename(DestFile,FinalFile); + chmod(FinalFile.c_str(),0644); + + // Update DestFile for .gz suffix so that the clean operation keeps it + DestFile = _config->FindDir("Dir::State::lists") + "partial/"; + DestFile += URItoFileName(RealURI) + ".gz"; + return; + } + // get the binary name for your used compression type decompProg = _config->Find(string("Acquire::CompressionTypes::").append(compExt),""); if(decompProg.empty() == false); -- cgit v1.2.3 From c8c6e61bb039136410a95dac716129d371d14d19 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Fri, 11 Jun 2010 10:56:56 +0200 Subject: * doc/apt.conf.5.xml: - Document the new Acquire::GzipIndexes option. --- debian/changelog | 2 ++ doc/apt.conf.5.xml | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 483fff9c3..85e80bb90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low - If the Acquire::GzipIndexes option is true and we download a gzipped index file, keep it as it is (and rename to .gz) instead of uncompressing it. + * doc/apt.conf.5.xml: + - Document the new Acquire::GzipIndexes option. * Add test/test-indexes.sh: - Test behaviour of index retrieval and usage, in particular with uncompressed and gzip compressed indexes. diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index c13ad4867..410489a73 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -411,6 +411,15 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; really prefer uncompressed files to support the usage of local mirrors. + GzipIndexes + + When downloading gzip compressed indexes (Packages, Sources, or + Translations), keep them gzip compressed locally instead of unpacking + them. This saves quite a lot of disk space at the expense of more CPU + requirements when building the local package caches. False by default. + + + Languages The Languages subsection controls which Translation files are downloaded and in which order APT tries to display the Description-Translations. APT will try to display the first -- cgit v1.2.3 From de2c243cd22b3bad3c27a5f3f7a35f0698cf07f1 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Fri, 11 Jun 2010 11:04:12 +0200 Subject: * doc/po/apt-doc.pot, doc/po/de.po: - German translation of new Acquire::GzipIndexes option. --- debian/changelog | 2 + doc/po/apt-doc.pot | 254 ++++++++++++++++++++++++++------------------------- doc/po/de.po | 259 ++++++++++++++++++++++++++++------------------------- 3 files changed, 275 insertions(+), 240 deletions(-) diff --git a/debian/changelog b/debian/changelog index 85e80bb90..7caa401fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low uncompressing it. * doc/apt.conf.5.xml: - Document the new Acquire::GzipIndexes option. + * doc/po/apt-doc.pot, doc/po/de.po: + - German translation of new Acquire::GzipIndexes option. * Add test/test-indexes.sh: - Test behaviour of index retrieval and usage, in particular with uncompressed and gzip compressed indexes. diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index f3b50640c..6b9240d4f 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-02-18 20:53+0100\n" +"POT-Creation-Date: 2010-06-11 10:56+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1284,7 +1284,7 @@ msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 +#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:511 apt.conf.5.xml:533 msgid "options" msgstr "" @@ -1482,7 +1482,7 @@ msgid "&apt-commonoptions;" msgstr "" #. type: Content of: -#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1035 apt_preferences.5.xml:630 +#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1044 apt_preferences.5.xml:630 msgid "Files" msgstr "" @@ -1492,7 +1492,7 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637 sources.list.5.xml:233 +#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1050 apt_preferences.5.xml:637 sources.list.5.xml:233 msgid "See Also" msgstr "" @@ -2806,7 +2806,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477 sources.list.5.xml:193 +#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1038 apt_preferences.5.xml:477 sources.list.5.xml:193 msgid "Examples" msgstr "" @@ -5043,11 +5043,25 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:414 +msgid "GzipIndexes" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:416 +msgid "" +"When downloading <literal>gzip</literal> compressed indexes (Packages, " +"Sources, or Translations), keep them gzip compressed locally instead of " +"unpacking them. This saves quite a lot of disk space at the expense of more " +"CPU requirements when building the local package caches. False by default." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:423 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:415 +#: apt.conf.5.xml:424 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the " @@ -5060,13 +5074,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:431 +#: apt.conf.5.xml:440 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:421 +#: apt.conf.5.xml:430 msgid "" "The default list includes \"environment\" and " "\"en\". \"<literal>environment</literal>\" has a special meaning here: It " @@ -5097,12 +5111,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:438 +#: apt.conf.5.xml:447 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:440 +#: apt.conf.5.xml:449 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -5114,7 +5128,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:447 +#: apt.conf.5.xml:456 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -5127,7 +5141,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:456 +#: apt.conf.5.xml:465 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -5137,7 +5151,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:462 +#: apt.conf.5.xml:471 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -5145,7 +5159,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:466 +#: apt.conf.5.xml:475 msgid "" "Binary programs are pointed to by " "<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies " @@ -5157,7 +5171,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:474 +#: apt.conf.5.xml:483 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -5170,12 +5184,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:487 +#: apt.conf.5.xml:496 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:489 +#: apt.conf.5.xml:498 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -5183,12 +5197,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:493 +#: apt.conf.5.xml:502 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:494 +#: apt.conf.5.xml:503 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -5199,50 +5213,50 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:503 +#: apt.conf.5.xml:512 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:507 +#: apt.conf.5.xml:516 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:508 +#: apt.conf.5.xml:517 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:512 +#: apt.conf.5.xml:521 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:513 +#: apt.conf.5.xml:522 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:528 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:520 +#: apt.conf.5.xml:529 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:525 +#: apt.conf.5.xml:534 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -5250,17 +5264,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:530 +#: apt.conf.5.xml:539 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:530 +#: apt.conf.5.xml:539 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:531 +#: apt.conf.5.xml:540 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5269,12 +5283,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:537 +#: apt.conf.5.xml:546 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:547 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5284,7 +5298,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:544 +#: apt.conf.5.xml:553 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -5295,36 +5309,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:560 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:561 msgid "" "APT chdirs to this directory before invoking dpkg, the default is " "<filename>/</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:556 +#: apt.conf.5.xml:565 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:557 +#: apt.conf.5.xml:566 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:562 +#: apt.conf.5.xml:571 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:563 +#: apt.conf.5.xml:572 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@ -5339,7 +5353,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:587 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -5349,7 +5363,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:572 +#: apt.conf.5.xml:581 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -5363,12 +5377,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:584 +#: apt.conf.5.xml:593 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:585 +#: apt.conf.5.xml:594 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -5380,12 +5394,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:592 +#: apt.conf.5.xml:601 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:593 +#: apt.conf.5.xml:602 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -5402,12 +5416,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:603 +#: apt.conf.5.xml:612 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:604 +#: apt.conf.5.xml:613 msgid "" "If this option is set apt will call <command>dpkg --configure " "--pending</command> to let dpkg handle all required configurations and " @@ -5419,12 +5433,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:610 +#: apt.conf.5.xml:619 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:611 +#: apt.conf.5.xml:620 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -5434,12 +5448,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:616 +#: apt.conf.5.xml:625 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:617 +#: apt.conf.5.xml:626 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by " @@ -5451,12 +5465,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:624 +#: apt.conf.5.xml:633 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:632 +#: apt.conf.5.xml:641 #, no-wrap msgid "" "OrderList::Score {\n" @@ -5468,7 +5482,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:625 +#: apt.conf.5.xml:634 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -5482,12 +5496,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:645 +#: apt.conf.5.xml:654 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:646 +#: apt.conf.5.xml:655 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5496,12 +5510,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:663 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:665 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5512,7 +5526,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:667 +#: apt.conf.5.xml:676 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, " @@ -5520,7 +5534,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:675 +#: apt.conf.5.xml:684 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s " @@ -5528,7 +5542,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:684 +#: apt.conf.5.xml:693 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -5538,110 +5552,110 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:692 +#: apt.conf.5.xml:701 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:702 +#: apt.conf.5.xml:711 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:716 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:711 +#: apt.conf.5.xml:720 msgid "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:718 +#: apt.conf.5.xml:727 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:731 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:738 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:742 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:749 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:753 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:760 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:755 +#: apt.conf.5.xml:764 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:762 +#: apt.conf.5.xml:771 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:766 +#: apt.conf.5.xml:775 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:773 +#: apt.conf.5.xml:782 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:776 +#: apt.conf.5.xml:785 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:783 +#: apt.conf.5.xml:792 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:786 +#: apt.conf.5.xml:795 msgid "" "Output each cryptographic hash that is generated by the " "<literal>apt</literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:802 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:796 +#: apt.conf.5.xml:805 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -5649,92 +5663,92 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:813 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:807 +#: apt.conf.5.xml:816 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:824 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:819 +#: apt.conf.5.xml:828 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:826 +#: apt.conf.5.xml:835 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:829 +#: apt.conf.5.xml:838 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:836 +#: apt.conf.5.xml:845 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:839 +#: apt.conf.5.xml:848 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:847 +#: apt.conf.5.xml:856 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:860 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:867 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:871 msgid "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:869 +#: apt.conf.5.xml:878 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:873 +#: apt.conf.5.xml:882 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:880 +#: apt.conf.5.xml:889 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:883 +#: apt.conf.5.xml:892 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial " @@ -5744,12 +5758,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:903 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:897 +#: apt.conf.5.xml:906 msgid "" "Generate debug messages describing which package is marked as " "keep/install/remove while the ProblemResolver does his work. Each addition " @@ -5767,90 +5781,90 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:916 +#: apt.conf.5.xml:925 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:919 +#: apt.conf.5.xml:928 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:926 +#: apt.conf.5.xml:935 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:929 +#: apt.conf.5.xml:938 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:937 +#: apt.conf.5.xml:946 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:940 +#: apt.conf.5.xml:949 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:947 +#: apt.conf.5.xml:956 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:951 +#: apt.conf.5.xml:960 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:959 +#: apt.conf.5.xml:968 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:963 +#: apt.conf.5.xml:972 msgid "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:970 +#: apt.conf.5.xml:979 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:974 +#: apt.conf.5.xml:983 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:980 +#: apt.conf.5.xml:989 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:984 +#: apt.conf.5.xml:993 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:992 +#: apt.conf.5.xml:1001 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1004 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5858,32 +5872,32 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1003 +#: apt.conf.5.xml:1012 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1007 +#: apt.conf.5.xml:1016 msgid "" "Print information about the vendors read from " "<filename>/etc/apt/vendors.list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1030 +#: apt.conf.5.xml:1039 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1037 +#: apt.conf.5.xml:1046 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1042 +#: apt.conf.5.xml:1051 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" diff --git a/doc/po/de.po b/doc/po/de.po index 99d56bed3..92d9092d2 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.7.24\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2010-02-18 20:53+0100\n" +"POT-Creation-Date: 2010-06-11 10:56+0300\n" "PO-Revision-Date: 2009-12-31 17:41+GMT\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -1751,7 +1751,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 #: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 -#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:511 apt.conf.5.xml:533 msgid "options" msgstr "Optionen" @@ -1994,7 +1994,7 @@ msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1035 apt_preferences.5.xml:630 +#: apt.conf.5.xml:1044 apt_preferences.5.xml:630 msgid "Files" msgstr "Dateien" @@ -2007,7 +2007,7 @@ msgstr "&file-sourceslist; &file-statelists;" #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1050 apt_preferences.5.xml:637 #: sources.list.5.xml:233 msgid "See Also" msgstr "Siehe auch" @@ -3717,7 +3717,7 @@ msgstr "" "Dateien mit <command>apt-ftparchive</command> zu erstellen." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477 +#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1038 apt_preferences.5.xml:477 #: sources.list.5.xml:193 msgid "Examples" msgstr "Beispiele" @@ -6811,11 +6811,30 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:414 +msgid "GzipIndexes" +msgstr "GzipIndexes" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:416 +msgid "" +"When downloading <literal>gzip</literal> compressed indexes (Packages, " +"Sources, or Translations), keep them gzip compressed locally instead of " +"unpacking them. This saves quite a lot of disk space at the expense of more " +"CPU requirements when building the local package caches. False by default." +msgstr "" +"Wenn <literal>gzip</literal>-komprimierte Indizes heruntergeladen werden " +"(Packages, Sources, oder Translations), speichere sie lokal mit " +"gzip-Komprimierung. Dies spart eine Menge Festplattenplatz, aber benötigt " +"mehr CPU-Ressourcen bei der Erstellung des lokalen Paket-Caches. " +"Vorgabe ist False." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:423 msgid "Languages" msgstr "Sprachen" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:415 +#: apt.conf.5.xml:424 #, fuzzy #| msgid "" #| "The Languages subsection controls which <filename>Translation</filename> " @@ -6847,13 +6866,13 @@ msgstr "" "hier unmögliche Werte einsetzen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:431 +#: apt.conf.5.xml:440 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:421 +#: apt.conf.5.xml:430 #, fuzzy #| msgid "" #| "The default list includes \"environment\" and \"en\". " @@ -6925,12 +6944,12 @@ msgstr "" "id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:438 +#: apt.conf.5.xml:447 msgid "Directories" msgstr "Verzeichnisse" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:440 +#: apt.conf.5.xml:449 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -6950,7 +6969,7 @@ msgstr "" "filename> oder <filename>./</filename> beginnen." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:447 +#: apt.conf.5.xml:456 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -6973,7 +6992,7 @@ msgstr "" "<literal>Dir::Cache</literal> enthalten." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:456 +#: apt.conf.5.xml:465 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -6988,7 +7007,7 @@ msgstr "" "Konfigurationsdatei erfolgt)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:462 +#: apt.conf.5.xml:471 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -7000,7 +7019,7 @@ msgstr "" "geladen." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:466 +#: apt.conf.5.xml:475 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -7018,7 +7037,7 @@ msgstr "" "Programms an." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:474 +#: apt.conf.5.xml:483 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -7038,12 +7057,12 @@ msgstr "" "<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:487 +#: apt.conf.5.xml:496 msgid "APT in DSelect" msgstr "APT in DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:489 +#: apt.conf.5.xml:498 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -7054,12 +7073,12 @@ msgstr "" "<literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:493 +#: apt.conf.5.xml:502 msgid "Clean" msgstr "Clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:494 +#: apt.conf.5.xml:503 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -7077,7 +7096,7 @@ msgstr "" "vor dem Herunterladen neuer Pakete durch." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:503 +#: apt.conf.5.xml:512 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@ -7086,12 +7105,12 @@ msgstr "" "übermittelt, wenn es für die Installationsphase durchlaufen wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:507 +#: apt.conf.5.xml:516 msgid "Updateoptions" msgstr "Updateoptions" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:508 +#: apt.conf.5.xml:517 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@ -7100,12 +7119,12 @@ msgstr "" "übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:512 +#: apt.conf.5.xml:521 msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:513 +#: apt.conf.5.xml:522 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -7114,12 +7133,12 @@ msgstr "" "nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:528 msgid "How APT calls dpkg" msgstr "Wie APT Dpkg aufruft" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:520 +#: apt.conf.5.xml:529 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -7128,7 +7147,7 @@ msgstr "" "stehen im Abschnitt <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:525 +#: apt.conf.5.xml:534 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -7139,17 +7158,17 @@ msgstr "" "jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:530 +#: apt.conf.5.xml:539 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:530 +#: apt.conf.5.xml:539 msgid "Post-Invoke" msgstr "Post-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:531 +#: apt.conf.5.xml:540 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -7163,12 +7182,12 @@ msgstr "" "APT abgebrochen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:537 +#: apt.conf.5.xml:546 msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:547 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -7185,7 +7204,7 @@ msgstr "" "pro Zeile." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:544 +#: apt.conf.5.xml:553 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -7201,12 +7220,12 @@ msgstr "" "literal> gegeben wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:560 msgid "Run-Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:561 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@ -7215,12 +7234,12 @@ msgstr "" "die Vorgabe ist <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:556 +#: apt.conf.5.xml:565 msgid "Build-options" msgstr "Build-options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:557 +#: apt.conf.5.xml:566 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@ -7230,12 +7249,12 @@ msgstr "" "Programme werden erstellt." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:562 +#: apt.conf.5.xml:571 msgid "dpkg trigger usage (and related options)" msgstr "Dpkd-Trigger-Benutzung (und zugehöriger Optionen)" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:563 +#: apt.conf.5.xml:572 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@ -7261,7 +7280,7 @@ msgstr "" "Status 100% stehen, während es aktuell alle Pakete konfiguriert." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:587 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -7275,7 +7294,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:572 +#: apt.conf.5.xml:581 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -7300,12 +7319,12 @@ msgstr "" "wäre <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:584 +#: apt.conf.5.xml:593 msgid "DPkg::NoTriggers" msgstr "DPkg::NoTriggers" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:585 +#: apt.conf.5.xml:594 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -7326,12 +7345,12 @@ msgstr "" "außerdem an die »unpack«- und »remove«-Aufrufe anhängen." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:592 +#: apt.conf.5.xml:601 msgid "PackageManager::Configure" msgstr "PackageManager::Configure" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:593 +#: apt.conf.5.xml:602 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -7360,12 +7379,12 @@ msgstr "" "mehr startbar sein könnte." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:603 +#: apt.conf.5.xml:612 msgid "DPkg::ConfigurePending" msgstr "DPkg::ConfigurePending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:604 +#: apt.conf.5.xml:613 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -7384,12 +7403,12 @@ msgstr "" "deaktivieren." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:610 +#: apt.conf.5.xml:619 msgid "DPkg::TriggersPending" msgstr "DPkg::TriggersPending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:611 +#: apt.conf.5.xml:620 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -7405,12 +7424,12 @@ msgstr "" "benötigt werden." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:616 +#: apt.conf.5.xml:625 msgid "PackageManager::UnpackAll" msgstr "PackageManager::UnpackAll" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:617 +#: apt.conf.5.xml:626 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -7429,12 +7448,12 @@ msgstr "" "und weitere Verbesserungen benötigt, bevor sie wirklich nützlich wird." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:624 +#: apt.conf.5.xml:633 msgid "OrderList::Score::Immediate" msgstr "OrderList::Score::Immediate" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:632 +#: apt.conf.5.xml:641 #, no-wrap msgid "" "OrderList::Score {\n" @@ -7452,7 +7471,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:625 +#: apt.conf.5.xml:634 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -7476,12 +7495,12 @@ msgstr "" "mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:645 +#: apt.conf.5.xml:654 msgid "Periodic and Archives options" msgstr "Periodische- und Archivoptionen" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:646 +#: apt.conf.5.xml:655 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -7495,12 +7514,12 @@ msgstr "" "Dokumentation dieser Optionen zu erhalten." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:663 msgid "Debug options" msgstr "Fehlersuchoptionen" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:665 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -7518,7 +7537,7 @@ msgstr "" "könnten es sein:" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:667 +#: apt.conf.5.xml:676 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -7529,7 +7548,7 @@ msgstr "" "getroffenen Entscheidungen ein." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:675 +#: apt.conf.5.xml:684 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -7540,7 +7559,7 @@ msgstr "" "<literal>apt-get -s install</literal>) als nicht root-Anwender auszuführen." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:684 +#: apt.conf.5.xml:693 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -7552,7 +7571,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:692 +#: apt.conf.5.xml:701 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." @@ -7561,17 +7580,17 @@ msgstr "" "Daten in CD-ROM-IDs aus." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:702 +#: apt.conf.5.xml:711 msgid "A full list of debugging options to apt follows." msgstr "Eine vollständige Liste der Fehlersuchoptionen von APT folgt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:716 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:711 +#: apt.conf.5.xml:720 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@ -7579,48 +7598,48 @@ msgstr "" "literal>-Quellen beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:718 +#: apt.conf.5.xml:727 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:731 msgid "Print information related to downloading packages using FTP." msgstr "" "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per FTP " "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:738 msgid "<literal>Debug::Acquire::http</literal>" msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:742 msgid "Print information related to downloading packages using HTTP." msgstr "" "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTP " "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:749 msgid "<literal>Debug::Acquire::https</literal>" msgstr "<literal>Debug::Acquire::https</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:753 msgid "Print information related to downloading packages using HTTPS." msgstr "" "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTPS " "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:760 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "<literal>Debug::Acquire::gpgv</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:755 +#: apt.conf.5.xml:764 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -7629,12 +7648,12 @@ msgstr "" "mittels <literal>gpg</literal> beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:762 +#: apt.conf.5.xml:771 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:766 +#: apt.conf.5.xml:775 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -7643,23 +7662,23 @@ msgstr "" "CD-ROMs gespeichert sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:773 +#: apt.conf.5.xml:782 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:776 +#: apt.conf.5.xml:785 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" "Beschreibt den Prozess der Auflösung von Bauabhängigkeiten in &apt-get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:783 +#: apt.conf.5.xml:792 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:786 +#: apt.conf.5.xml:795 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -7668,12 +7687,12 @@ msgstr "" "Bibliotheken generiert wurde." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:802 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:796 +#: apt.conf.5.xml:805 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -7684,12 +7703,12 @@ msgstr "" "ID für eine CD-ROM generiert wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:813 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:807 +#: apt.conf.5.xml:816 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." @@ -7699,24 +7718,24 @@ msgstr "" "gleichen Zeit laufen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:824 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:819 +#: apt.conf.5.xml:828 msgid "Log when items are added to or removed from the global download queue." msgstr "" "Protokollieren, wenn Elemente aus der globalen Warteschlange zum " "Herunterladen hinzugefügt oder entfernt werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:826 +#: apt.conf.5.xml:835 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "<literal>Debug::pkgAcquire::Auth</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:829 +#: apt.conf.5.xml:838 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -7725,12 +7744,12 @@ msgstr "" "und kryptografischen Signaturen von heruntergeladenen Dateien beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:836 +#: apt.conf.5.xml:845 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:839 +#: apt.conf.5.xml:848 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -7739,12 +7758,12 @@ msgstr "" "und Fehler, die die Paketindexlisten-Diffs betreffen, ausgeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:847 +#: apt.conf.5.xml:856 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "<literal>Debug::pkgAcquire::RRed</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:860 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -7754,12 +7773,12 @@ msgstr "" "werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:867 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:871 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@ -7767,12 +7786,12 @@ msgstr "" "durchführen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:869 +#: apt.conf.5.xml:878 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:873 +#: apt.conf.5.xml:882 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -7782,12 +7801,12 @@ msgstr "" "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:880 +#: apt.conf.5.xml:889 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:883 +#: apt.conf.5.xml:892 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7803,12 +7822,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:903 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "<literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:897 +#: apt.conf.5.xml:906 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7840,23 +7859,23 @@ msgstr "" "erscheint." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:916 +#: apt.conf.5.xml:925 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:919 +#: apt.conf.5.xml:928 msgid "Dump the default configuration to standard error on startup." msgstr "" "Die Vorgabekonfiguration beim Start auf der Standardfehlerausgabe ausgeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:926 +#: apt.conf.5.xml:935 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:929 +#: apt.conf.5.xml:938 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -7866,12 +7885,12 @@ msgstr "" "sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:937 +#: apt.conf.5.xml:946 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:940 +#: apt.conf.5.xml:949 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -7880,12 +7899,12 @@ msgstr "" "alle während deren Auswertung gefundenen Fehler ausgeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:947 +#: apt.conf.5.xml:956 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:951 +#: apt.conf.5.xml:960 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -7895,12 +7914,12 @@ msgstr "" "soll." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:959 +#: apt.conf.5.xml:968 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:963 +#: apt.conf.5.xml:972 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" @@ -7908,22 +7927,22 @@ msgstr "" "von &dpkg; ausgeführt werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:970 +#: apt.conf.5.xml:979 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:974 +#: apt.conf.5.xml:983 msgid "Output the priority of each package list on startup." msgstr "Die Priorität jeder Paketliste beim Start ausgeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:980 +#: apt.conf.5.xml:989 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:984 +#: apt.conf.5.xml:993 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -7933,12 +7952,12 @@ msgstr "" "aufgetreten ist)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:992 +#: apt.conf.5.xml:1001 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1004 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -7950,12 +7969,12 @@ msgstr "" "beschrieben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1003 +#: apt.conf.5.xml:1012 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1007 +#: apt.conf.5.xml:1016 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7964,7 +7983,7 @@ msgstr "" "gelesenen Anbieter ausgeben." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1030 +#: apt.conf.5.xml:1039 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7973,13 +7992,13 @@ msgstr "" "möglichen Optionen zeigen." #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1037 +#: apt.conf.5.xml:1046 msgid "&file-aptconf;" msgstr "&file-aptconf;" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1042 +#: apt.conf.5.xml:1051 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." -- cgit v1.2.3 From bcc27ad808016b27bba7d7d137098df6abf766c3 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Fri, 11 Jun 2010 11:16:22 +0200 Subject: * configure.in: - Check for zlib library and headers. --- configure.in | 4 ++++ debian/changelog | 2 ++ 2 files changed, 6 insertions(+) diff --git a/configure.in b/configure.in index 82785a9dd..015b142ea 100644 --- a/configure.in +++ b/configure.in @@ -83,6 +83,10 @@ AC_CHECK_LIB(curl, curl_easy_init, AC_SUBST(BDBLIB) +AC_CHECK_LIB(z, gzopen, + [AC_CHECK_HEADER(zlib.h, [], AC_MSG_ERROR([failed: zlib.h not found]))], + AC_MSG_ERROR([failed: Need libz])) + dnl Converts the ARCH to be something singular for this general CPU family dnl This is often the dpkg architecture string. dnl First check against the full canonical canoncial-system-type in $target diff --git a/debian/changelog b/debian/changelog index 7caa401fc..9f9e09727 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low - Link against zlib (in apt-pkg/makefile) and add zlib build dependency. - [ABI BREAK] This introduces a new protected member of FileFD and changes the behaviour of FileFd for reading gzipped files. + * configure.in: + - Check for zlib library and headers. * apt-pkg/deb/debindexfile.cc: - If we do not find uncompressed package/source/translation indexes, look for gzip compressed ones. -- cgit v1.2.3 From 35454fa94aae83cf60042284dc82fac579aa84cd Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Fri, 11 Jun 2010 12:34:26 +0200 Subject: changelog: clarify abi break, it's not external --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9f9e09727..017e774ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,8 +11,8 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low * apt-pkg/contrib/fileutl.{h,cc}: - Add support for transparent reading of gzipped files. - Link against zlib (in apt-pkg/makefile) and add zlib build dependency. - - [ABI BREAK] This introduces a new protected member of FileFD and changes - the behaviour of FileFd for reading gzipped files. + - [Weak internal ABI BREAK] This changes the behaviour of FileFd for + reading gzipped files. * configure.in: - Check for zlib library and headers. * apt-pkg/deb/debindexfile.cc: -- cgit v1.2.3 From f4782b42840c1f86c40a59690698ccf6920e990a Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Fri, 11 Jun 2010 18:22:48 +0200 Subject: test-indexes.sh: Add source related tests, which uncovers two regressions --- test/test-indexes.sh | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/test/test-indexes.sh b/test/test-indexes.sh index d3f5e7cd3..e82633022 100755 --- a/test/test-indexes.sh +++ b/test/test-indexes.sh @@ -7,7 +7,7 @@ BUILDDIR=$(readlink -f $(dirname $0)/../build) -TEST_SOURCE="deb http://ftp.debian.org/debian unstable contrib" +TEST_SOURCE="http://ftp.debian.org/debian unstable contrib" TEST_SOURCE_KEYID=55BE302B GPG_KEYSERVER=gpg-keyserver.de # should be a small package with dependencies satisfiable in TEST_SOURCE, i. e. @@ -39,7 +39,8 @@ ln -s /home home mkdir -p etc/apt/preferences.d etc/apt/trusted.gpg.d var/cache/apt/archives/partial var/lib/apt/lists/partial var/lib/dpkg cp /etc/apt/trusted.gpg etc/apt touch var/lib/dpkg/status -echo "$TEST_SOURCE" > etc/apt/sources.list +echo "deb $TEST_SOURCE" > etc/apt/sources.list +echo "deb-src $TEST_SOURCE" >> etc/apt/sources.list # get keyring gpg --no-options --no-default-keyring --secret-keyring etc/apt/secring.gpg --trustdb-name etc/apt/trustdb.gpg --keyring etc/apt/trusted.gpg --primary-keyring etc/apt/trusted.gpg --keyserver $GPG_KEYSERVER --recv-keys $TEST_SOURCE_KEYID @@ -47,7 +48,9 @@ gpg --no-options --no-default-keyring --secret-keyring etc/apt/secring.gpg --tru echo "---- uncompressed update ----" $APT_GET update test -e var/lib/apt/lists/*_Packages +test -e var/lib/apt/lists/*_Sources ! test -e var/lib/apt/lists/*_Packages.gz +! test -e var/lib/apt/lists/*_Sources.gz echo "---- uncompressed cache ----" $APT_CACHE show $TEST_PKG | grep -q ^Version: @@ -58,27 +61,45 @@ $APT_CACHE policy $TEST_PKG | grep -q '500 http://' # again (with cache) $APT_CACHE policy $TEST_PKG | grep -q '500 http://' +TEST_SRC=`$APT_CACHE show $TEST_PKG | grep ^Source: | awk '{print $2}'` +rm var/cache/apt/*.bin +$APT_CACHE showsrc $TEST_SRC | grep -q ^Binary: +# again (with cache) +$APT_CACHE showsrc $TEST_SRC | grep -q ^Binary: + echo "---- uncompressed install ----" $APT_GET install -d $TEST_PKG test -e var/cache/apt/archives/$TEST_PKG*.deb $APT_GET clean ! test -e var/cache/apt/archives/$TEST_PKG*.deb +echo "---- uncompressed get source ----" +$APT_GET source $TEST_PKG +test -f $TEST_SRC_*.dsc +test -d $TEST_SRC-* +rm -r $TEST_SRC* + echo "----- uncompressed update with preexisting indexes, no pdiff ----" $APT_GET -o Acquire::PDiffs=false update test -e var/lib/apt/lists/*_Packages +test -e var/lib/apt/lists/*_Sources ! test -e var/lib/apt/lists/*_Packages.gz +! test -e var/lib/apt/lists/*_Sources.gz echo "----- uncompressed update with preexisting indexes, with pdiff ----" $APT_GET -o Acquire::PDiffs=true update test -e var/lib/apt/lists/*_Packages +test -e var/lib/apt/lists/*_Sources ! test -e var/lib/apt/lists/*_Packages.gz +! test -e var/lib/apt/lists/*_Sources.gz echo "----- compressed update ----" find var/lib/apt/lists/ -type f | xargs -r rm $APT_GET -o Acquire::GzipIndexes=true update ! test -e var/lib/apt/lists/*_Packages +! test -e var/lib/apt/lists/*_Sources test -e var/lib/apt/lists/*_Packages.gz +test -e var/lib/apt/lists/*_Sources.gz echo "---- compressed cache ----" $APT_CACHE show $TEST_PKG | grep -q ^Version: @@ -89,18 +110,34 @@ $APT_CACHE policy $TEST_PKG | grep -q '500 http://' # again (with cache) $APT_CACHE policy $TEST_PKG | grep -q '500 http://' +TEST_SRC=`$APT_CACHE show $TEST_PKG | grep ^Source: | awk '{print $2}'` +rm var/cache/apt/*.bin +$APT_CACHE showsrc $TEST_SRC | grep -q ^Binary: +# again (with cache) +$APT_CACHE showsrc $TEST_SRC | grep -q ^Binary: + echo "---- compressed install ----" $APT_GET install -d $TEST_PKG ! test -e var/cache/apt/archives/$TEST_PKG*.deb +echo "---- compressed get source ----" +$APT_GET source $TEST_PKG +test -f $TEST_SRC_*.dsc +test -d $TEST_SRC-* +rm -r $TEST_SRC* + echo "----- compressed update with preexisting indexes, no pdiff ----" $APT_GET -o Acquire::PDiffs=false -o Acquire::GzipIndexes=true update ! test -e var/lib/apt/lists/*_Packages +! test -e var/lib/apt/lists/*_Sources test -e var/lib/apt/lists/*_Packages.gz +test -e var/lib/apt/lists/*_Sources.gz echo "----- compressed update with preexisting indexes, with pdiff ----" $APT_GET -o Acquire::PDiffs=true -o Acquire::GzipIndexes=true update ! test -e var/lib/apt/lists/*_Packages +! test -e var/lib/apt/lists/*_Sources test -e var/lib/apt/lists/*_Packages.gz +test -e var/lib/apt/lists/*_Sources.gz echo "---- ALL TESTS PASSED ----" -- cgit v1.2.3 From b26e2415ee2d4f611966488954f8d4f30fcf827c Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Fri, 11 Jun 2010 18:59:06 +0200 Subject: * apt-pkg/acquire-item.cc: - Fix return value of pkgAcqFile::Custom600Headers() in the non-index case, to avoid returning NULL and causing crashers in callers. This also fixes a compiler warning. --- apt-pkg/acquire-item.cc | 2 ++ debian/changelog | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 83fb5328b..bcfe6a98a 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1688,5 +1688,7 @@ string pkgAcqFile::Custom600Headers() { if (IsIndexFile) return "\nIndex-File: true"; + else + return ""; } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 017e774ba..380060aa6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,10 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low * Add test/test-indexes.sh: - Test behaviour of index retrieval and usage, in particular with uncompressed and gzip compressed indexes. + * apt-pkg/acquire-item.cc: + - Fix return value of pkgAcqFile::Custom600Headers() in the non-index + case, to avoid returning NULL and causing crashers in callers. This also + fixes a compiler warning. -- Christian Perrier <bubulle@debian.org> Tue, 11 May 2010 19:52:00 +0200 -- cgit v1.2.3 From 94e8c9d4df70d2532e1640dfe2700dd63a094a4f Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Fri, 11 Jun 2010 19:23:08 +0200 Subject: apt-pkg/deb/debindexfile.cc: Fix one more place to check for gzipped indexes, to work with apt-get source as well --- apt-pkg/deb/debindexfile.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index e87c21f13..9832329c0 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -63,9 +63,13 @@ string debSourcesIndex::SourceInfo(pkgSrcRecords::Parser const &Record, /* */ pkgSrcRecords::Parser *debSourcesIndex::CreateSrcParser() const { - string SourcesURI = URItoFileName(IndexURI("Sources")); - return new debSrcRecordParser(_config->FindDir("Dir::State::lists") + - SourcesURI,this); + string SourcesURI = _config->FindDir("Dir::State::lists") + + URItoFileName(IndexURI("Sources")); + string SourcesURIgzip = SourcesURI + ".gz"; + if (!FileExists(SourcesURI) && FileExists(SourcesURIgzip)) + SourcesURI = SourcesURIgzip; + + return new debSrcRecordParser(SourcesURI,this); } /*}}}*/ // SourcesIndex::Describe - Give a descriptive path to the index /*{{{*/ -- cgit v1.2.3 From 8d48388ebfb69ab21a50d068275d2f6b7abffb87 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Tue, 15 Jun 2010 13:17:33 +0200 Subject: test/test-indexes.sh: Stop hardcoding archive gpg key ID, get it from first failed apt-get update output --- test/test-indexes.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/test/test-indexes.sh b/test/test-indexes.sh index e82633022..58b9cff72 100755 --- a/test/test-indexes.sh +++ b/test/test-indexes.sh @@ -8,7 +8,6 @@ BUILDDIR=$(readlink -f $(dirname $0)/../build) TEST_SOURCE="http://ftp.debian.org/debian unstable contrib" -TEST_SOURCE_KEYID=55BE302B GPG_KEYSERVER=gpg-keyserver.de # should be a small package with dependencies satisfiable in TEST_SOURCE, i. e. # ideally no depends at all @@ -42,11 +41,15 @@ touch var/lib/dpkg/status echo "deb $TEST_SOURCE" > etc/apt/sources.list echo "deb-src $TEST_SOURCE" >> etc/apt/sources.list -# get keyring -gpg --no-options --no-default-keyring --secret-keyring etc/apt/secring.gpg --trustdb-name etc/apt/trustdb.gpg --keyring etc/apt/trusted.gpg --primary-keyring etc/apt/trusted.gpg --keyserver $GPG_KEYSERVER --recv-keys $TEST_SOURCE_KEYID - echo "---- uncompressed update ----" +# first attempt should fail, no trusted GPG key +out=$($APT_GET update 2>&1) +echo "$out" | grep -q NO_PUBKEY +key=$(echo "$out" | sed -n '/NO_PUBKEY/ { s/^.*NO_PUBKEY \([[:alnum:]]\+\)$/\1/; p}') +# get keyring +gpg --no-options --no-default-keyring --secret-keyring etc/apt/secring.gpg --trustdb-name etc/apt/trustdb.gpg --keyring etc/apt/trusted.gpg --primary-keyring etc/apt/trusted.gpg --keyserver $GPG_KEYSERVER --recv-keys $key $APT_GET update + test -e var/lib/apt/lists/*_Packages test -e var/lib/apt/lists/*_Sources ! test -e var/lib/apt/lists/*_Packages.gz -- cgit v1.2.3 From 55c59998a046e8d60b5bf51772bd7db5cd43ca7c Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 15 Jun 2010 20:29:50 +0200 Subject: Add a GroupedFromCommandLine for the VersionSet similar to the one for PackageSet and refactor the existing VersionSet methods to simplify that. --- apt-pkg/cacheset.cc | 123 +++++++++++++++++++++++++++++++++++----------------- apt-pkg/cacheset.h | 35 +++++++++++++++ 2 files changed, 119 insertions(+), 39 deletions(-) diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index e91b56997..fde52168a 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -91,7 +91,7 @@ std::map<unsigned short, PackageSet> PackageSet::GroupedFromCommandLine( switch(mod->Pos) { case PackageSet::Modifier::POSTFIX: if (str.compare(str.length() - alength, alength, - mod->Alias, 0, alength) != 0) + mod->Alias, 0, alength) != 0) continue; str.erase(str.length() - alength); modID = mod->ID; @@ -148,53 +148,98 @@ PackageSet PackageSet::FromString(pkgCacheFile &Cache, std::string const &str, s return regex; } /*}}}*/ +// GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ +std::map<unsigned short, VersionSet> VersionSet::GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list<VersionSet::Modifier> const &mods, + unsigned short const &fallback, std::ostream &out) { + std::map<unsigned short, VersionSet> versets; + for (const char **I = cmdline; *I != 0; ++I) { + unsigned short modID = fallback; + VersionSet::Version select = VersionSet::NEWEST; + std::string str = *I; + for (std::list<VersionSet::Modifier>::const_iterator mod = mods.begin(); + mod != mods.end(); ++mod) { + if (modID == fallback && mod->ID == fallback) + select = mod->SelectVersion; + size_t const alength = strlen(mod->Alias); + switch(mod->Pos) { + case VersionSet::Modifier::POSTFIX: + if (str.compare(str.length() - alength, alength, + mod->Alias, 0, alength) != 0) + continue; + str.erase(str.length() - alength); + modID = mod->ID; + select = mod->SelectVersion; + break; + case VersionSet::Modifier::PREFIX: + continue; + case VersionSet::Modifier::NONE: + continue; + } + break; + } + VersionSet vset = VersionSet::FromString(Cache, str, select , out); + versets[modID].insert(vset.begin(), vset.end()); + } + return versets; +} + /*}}}*/ // FromCommandLine - Return all versions specified on commandline /*{{{*/ APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, APT::VersionSet::Version const &fallback, std::ostream &out) { VersionSet verset; for (const char **I = cmdline; *I != 0; ++I) { - std::string pkg = *I; - std::string ver; - bool verIsRel = false; - size_t const vertag = pkg.find_last_of("/="); - if (vertag != string::npos) { - ver = pkg.substr(vertag+1); - verIsRel = (pkg[vertag] == '/'); - pkg.erase(vertag); + VersionSet vset = VersionSet::FromString(Cache, *I, fallback, out); + verset.insert(vset.begin(), vset.end()); + } + return verset; +} + /*}}}*/ +// FromString - Returns all versions spedcified by a string /*{{{*/ +APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, + APT::VersionSet::Version const &fallback, std::ostream &out) { + std::string ver; + bool verIsRel = false; + size_t const vertag = pkg.find_last_of("/="); + if (vertag != string::npos) { + ver = pkg.substr(vertag+1); + verIsRel = (pkg[vertag] == '/'); + pkg.erase(vertag); + } + PackageSet pkgset = PackageSet::FromString(Cache, pkg.c_str(), out); + VersionSet verset; + for (PackageSet::const_iterator P = pkgset.begin(); + P != pkgset.end(); ++P) { + if (vertag == string::npos) { + AddSelectedVersion(Cache, verset, P, fallback); + continue; } - PackageSet pkgset = PackageSet::FromString(Cache, pkg.c_str(), out); - for (PackageSet::const_iterator P = pkgset.begin(); - P != pkgset.end(); ++P) { - if (vertag == string::npos) { - AddSelectedVersion(Cache, verset, P, fallback); + pkgCache::VerIterator V; + if (ver == "installed") + V = getInstalledVer(Cache, P); + else if (ver == "candidate") + V = getCandidateVer(Cache, P); + else { + pkgVersionMatch Match(ver, (verIsRel == true ? pkgVersionMatch::Release : + pkgVersionMatch::Version)); + V = Match.Find(P); + if (V.end() == true) { + if (verIsRel == true) + _error->Error(_("Release '%s' for '%s' was not found"), + ver.c_str(), P.FullName(true).c_str()); + else + _error->Error(_("Version '%s' for '%s' was not found"), + ver.c_str(), P.FullName(true).c_str()); continue; } - pkgCache::VerIterator V; - if (ver == "installed") - V = getInstalledVer(Cache, P); - else if (ver == "candidate") - V = getCandidateVer(Cache, P); - else { - pkgVersionMatch Match(ver, (verIsRel == true ? pkgVersionMatch::Release : - pkgVersionMatch::Version)); - V = Match.Find(P); - if (V.end() == true) { - if (verIsRel == true) - _error->Error(_("Release '%s' for '%s' was not found"), - ver.c_str(), P.FullName(true).c_str()); - else - _error->Error(_("Version '%s' for '%s' was not found"), - ver.c_str(), P.FullName(true).c_str()); - continue; - } - } - if (V.end() == true) - continue; - if (ver == V.VerStr()) - ioprintf(out, _("Selected version '%s' (%s) for '%s'\n"), - V.VerStr(), V.RelStr().c_str(), P.FullName(true).c_str()); - verset.insert(V); } + if (V.end() == true) + continue; + if (ver == V.VerStr()) + ioprintf(out, _("Selected version '%s' (%s) for '%s'\n"), + V.VerStr(), V.RelStr().c_str(), P.FullName(true).c_str()); + verset.insert(V); } return verset; } diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index 668d8039e..2bc268380 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -209,6 +209,41 @@ public: /*{{{*/ static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { return APT::VersionSet::FromCommandLine(Cache, cmdline, CANDINST); } + + static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, + APT::VersionSet::Version const &fallback, std::ostream &out); + static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, + APT::VersionSet::Version const &fallback) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::VersionSet::FromString(Cache, pkg, fallback, out); + } + static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg) { + return APT::VersionSet::FromString(Cache, pkg, CANDINST); + } + + struct Modifier { + enum Position { NONE, PREFIX, POSTFIX }; + unsigned short ID; + const char * const Alias; + Position Pos; + VersionSet::Version SelectVersion; + Modifier (unsigned short const &id, const char * const alias, Position const &pos, + VersionSet::Version const &select) : ID(id), Alias(alias), Pos(pos), + SelectVersion(select) {}; + }; + + static std::map<unsigned short, VersionSet> GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list<VersionSet::Modifier> const &mods, + unsigned short const &fallback, std::ostream &out); + static std::map<unsigned short, VersionSet> GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list<VersionSet::Modifier> const &mods, + unsigned short const &fallback) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::VersionSet::GroupedFromCommandLine(Cache, cmdline, + mods, fallback, out); + } /*}}}*/ protected: /*{{{*/ -- cgit v1.2.3 From d8276801a1c84582a85ed9ea1f2eb4e66e052e6b Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 15 Jun 2010 20:46:09 +0200 Subject: * cmdline/cacheset.cc: - doesn't include it in the library for now as it is too volatile --- apt-pkg/cacheset.cc | 330 ---------------------------------------------------- apt-pkg/cacheset.h | 274 ------------------------------------------- apt-pkg/makefile | 5 +- cmdline/cacheset.cc | 330 ++++++++++++++++++++++++++++++++++++++++++++++++++++ cmdline/cacheset.h | 274 +++++++++++++++++++++++++++++++++++++++++++ cmdline/makefile | 4 +- debian/changelog | 3 +- 7 files changed, 610 insertions(+), 610 deletions(-) delete mode 100644 apt-pkg/cacheset.cc delete mode 100644 apt-pkg/cacheset.h create mode 100644 cmdline/cacheset.cc create mode 100644 cmdline/cacheset.h diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc deleted file mode 100644 index fde52168a..000000000 --- a/apt-pkg/cacheset.cc +++ /dev/null @@ -1,330 +0,0 @@ -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/ -/* ###################################################################### - - Simple wrapper around a std::set to provide a similar interface to - a set of cache structures as to the complete set of all structures - in the pkgCache. Currently only Package is supported. - - ##################################################################### */ - /*}}}*/ -// Include Files /*{{{*/ -#include <apt-pkg/aptconfiguration.h> -#include <apt-pkg/error.h> -#include <apt-pkg/cacheset.h> -#include <apt-pkg/strutl.h> -#include <apt-pkg/versionmatch.h> - -#include <apti18n.h> - -#include <vector> - -#include <regex.h> - /*}}}*/ -namespace APT { -// FromRegEx - Return all packages in the cache matching a pattern /*{{{*/ -PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, std::ostream &out) { - PackageSet pkgset; - std::string arch = "native"; - static const char * const isregex = ".?+*|[^$"; - - if (pattern.find_first_of(isregex) == std::string::npos) - return pkgset; - - size_t archfound = pattern.find_last_of(':'); - if (archfound != std::string::npos) { - arch = pattern.substr(archfound+1); - if (arch.find_first_of(isregex) == std::string::npos) - pattern.erase(archfound); - else - arch = "native"; - } - - regex_t Pattern; - int Res; - if ((Res = regcomp(&Pattern, pattern.c_str() , REG_EXTENDED | REG_ICASE | REG_NOSUB)) != 0) { - char Error[300]; - regerror(Res, &Pattern, Error, sizeof(Error)); - _error->Error(_("Regex compilation error - %s"), Error); - return pkgset; - } - - for (pkgCache::GrpIterator Grp = Cache.GetPkgCache()->GrpBegin(); Grp.end() == false; ++Grp) - { - if (regexec(&Pattern, Grp.Name(), 0, 0, 0) != 0) - continue; - pkgCache::PkgIterator Pkg = Grp.FindPkg(arch); - if (Pkg.end() == true) { - if (archfound == std::string::npos) { - std::vector<std::string> archs = APT::Configuration::getArchitectures(); - for (std::vector<std::string>::const_iterator a = archs.begin(); - a != archs.end() && Pkg.end() != true; ++a) - Pkg = Grp.FindPkg(*a); - } - if (Pkg.end() == true) - continue; - } - - ioprintf(out, _("Note, selecting %s for regex '%s'\n"), - Pkg.FullName(true).c_str(), pattern.c_str()); - - pkgset.insert(Pkg); - } - - regfree(&Pattern); - - return pkgset; -} - /*}}}*/ -// GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ -std::map<unsigned short, PackageSet> PackageSet::GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list<PackageSet::Modifier> const &mods, - unsigned short const &fallback, std::ostream &out) { - std::map<unsigned short, PackageSet> pkgsets; - for (const char **I = cmdline; *I != 0; ++I) { - unsigned short modID = fallback; - std::string str = *I; - for (std::list<PackageSet::Modifier>::const_iterator mod = mods.begin(); - mod != mods.end(); ++mod) { - size_t const alength = strlen(mod->Alias); - switch(mod->Pos) { - case PackageSet::Modifier::POSTFIX: - if (str.compare(str.length() - alength, alength, - mod->Alias, 0, alength) != 0) - continue; - str.erase(str.length() - alength); - modID = mod->ID; - break; - case PackageSet::Modifier::PREFIX: - continue; - case PackageSet::Modifier::NONE: - continue; - } - break; - } - PackageSet pset = PackageSet::FromString(Cache, str, out); - pkgsets[modID].insert(pset.begin(), pset.end()); - } - return pkgsets; -} - /*}}}*/ -// FromCommandLine - Return all packages specified on commandline /*{{{*/ -PackageSet PackageSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, std::ostream &out) { - PackageSet pkgset; - for (const char **I = cmdline; *I != 0; ++I) { - PackageSet pset = FromString(Cache, *I, out); - pkgset.insert(pset.begin(), pset.end()); - } - return pkgset; -} - /*}}}*/ -// FromString - Return all packages matching a specific string /*{{{*/ -PackageSet PackageSet::FromString(pkgCacheFile &Cache, std::string const &str, std::ostream &out) { - std::string pkg = str; - size_t archfound = pkg.find_last_of(':'); - std::string arch; - if (archfound != std::string::npos) { - arch = pkg.substr(archfound+1); - pkg.erase(archfound); - } - - pkgCache::PkgIterator Pkg; - if (arch.empty() == true) { - pkgCache::GrpIterator Grp = Cache.GetPkgCache()->FindGrp(pkg); - if (Grp.end() == false) - Pkg = Grp.FindPreferredPkg(); - } else - Pkg = Cache.GetPkgCache()->FindPkg(pkg, arch); - - if (Pkg.end() == false) { - PackageSet pkgset; - pkgset.insert(Pkg); - return pkgset; - } - PackageSet regex = FromRegEx(Cache, str, out); - if (regex.empty() == true) - _error->Warning(_("Unable to locate package %s"), str.c_str()); - return regex; -} - /*}}}*/ -// GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ -std::map<unsigned short, VersionSet> VersionSet::GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list<VersionSet::Modifier> const &mods, - unsigned short const &fallback, std::ostream &out) { - std::map<unsigned short, VersionSet> versets; - for (const char **I = cmdline; *I != 0; ++I) { - unsigned short modID = fallback; - VersionSet::Version select = VersionSet::NEWEST; - std::string str = *I; - for (std::list<VersionSet::Modifier>::const_iterator mod = mods.begin(); - mod != mods.end(); ++mod) { - if (modID == fallback && mod->ID == fallback) - select = mod->SelectVersion; - size_t const alength = strlen(mod->Alias); - switch(mod->Pos) { - case VersionSet::Modifier::POSTFIX: - if (str.compare(str.length() - alength, alength, - mod->Alias, 0, alength) != 0) - continue; - str.erase(str.length() - alength); - modID = mod->ID; - select = mod->SelectVersion; - break; - case VersionSet::Modifier::PREFIX: - continue; - case VersionSet::Modifier::NONE: - continue; - } - break; - } - VersionSet vset = VersionSet::FromString(Cache, str, select , out); - versets[modID].insert(vset.begin(), vset.end()); - } - return versets; -} - /*}}}*/ -// FromCommandLine - Return all versions specified on commandline /*{{{*/ -APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, - APT::VersionSet::Version const &fallback, std::ostream &out) { - VersionSet verset; - for (const char **I = cmdline; *I != 0; ++I) { - VersionSet vset = VersionSet::FromString(Cache, *I, fallback, out); - verset.insert(vset.begin(), vset.end()); - } - return verset; -} - /*}}}*/ -// FromString - Returns all versions spedcified by a string /*{{{*/ -APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, - APT::VersionSet::Version const &fallback, std::ostream &out) { - std::string ver; - bool verIsRel = false; - size_t const vertag = pkg.find_last_of("/="); - if (vertag != string::npos) { - ver = pkg.substr(vertag+1); - verIsRel = (pkg[vertag] == '/'); - pkg.erase(vertag); - } - PackageSet pkgset = PackageSet::FromString(Cache, pkg.c_str(), out); - VersionSet verset; - for (PackageSet::const_iterator P = pkgset.begin(); - P != pkgset.end(); ++P) { - if (vertag == string::npos) { - AddSelectedVersion(Cache, verset, P, fallback); - continue; - } - pkgCache::VerIterator V; - if (ver == "installed") - V = getInstalledVer(Cache, P); - else if (ver == "candidate") - V = getCandidateVer(Cache, P); - else { - pkgVersionMatch Match(ver, (verIsRel == true ? pkgVersionMatch::Release : - pkgVersionMatch::Version)); - V = Match.Find(P); - if (V.end() == true) { - if (verIsRel == true) - _error->Error(_("Release '%s' for '%s' was not found"), - ver.c_str(), P.FullName(true).c_str()); - else - _error->Error(_("Version '%s' for '%s' was not found"), - ver.c_str(), P.FullName(true).c_str()); - continue; - } - } - if (V.end() == true) - continue; - if (ver == V.VerStr()) - ioprintf(out, _("Selected version '%s' (%s) for '%s'\n"), - V.VerStr(), V.RelStr().c_str(), P.FullName(true).c_str()); - verset.insert(V); - } - return verset; -} - /*}}}*/ -// AddSelectedVersion - add version from package based on fallback /*{{{*/ -bool VersionSet::AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, - pkgCache::PkgIterator const &P, VersionSet::Version const &fallback, - bool const &AllowError) { - pkgCache::VerIterator V; - switch(fallback) { - case VersionSet::ALL: - if (P->VersionList != 0) - for (V = P.VersionList(); V.end() != true; ++V) - verset.insert(V); - else if (AllowError == false) - return _error->Error(_("Can't select versions from package '%s' as it purely virtual"), P.FullName(true).c_str()); - else - return false; - break; - case VersionSet::CANDANDINST: - verset.insert(getInstalledVer(Cache, P, AllowError)); - verset.insert(getCandidateVer(Cache, P, AllowError)); - break; - case VersionSet::CANDIDATE: - verset.insert(getCandidateVer(Cache, P, AllowError)); - break; - case VersionSet::INSTALLED: - verset.insert(getInstalledVer(Cache, P, AllowError)); - break; - case VersionSet::CANDINST: - V = getCandidateVer(Cache, P, true); - if (V.end() == true) - V = getInstalledVer(Cache, P, true); - if (V.end() == false) - verset.insert(V); - else if (AllowError == false) - return _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), P.FullName(true).c_str()); - else - return false; - break; - case VersionSet::INSTCAND: - V = getInstalledVer(Cache, P, true); - if (V.end() == true) - V = getCandidateVer(Cache, P, true); - if (V.end() == false) - verset.insert(V); - else if (AllowError == false) - return _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), P.FullName(true).c_str()); - else - return false; - break; - case VersionSet::NEWEST: - if (P->VersionList != 0) - verset.insert(P.VersionList()); - else if (AllowError == false) - return _error->Error(_("Can't select newest version from package '%s' as it is purely virtual"), P.FullName(true).c_str()); - else - return false; - break; - } - return true; -} - /*}}}*/ -// getCandidateVer - Returns the candidate version of the given package /*{{{*/ -pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg, bool const &AllowError) { - pkgCache::VerIterator Cand; - if (Cache.IsDepCacheBuilt() == true) - Cand = Cache[Pkg].CandidateVerIter(Cache); - else { - if (unlikely(Cache.BuildPolicy() == false)) - return pkgCache::VerIterator(*Cache); - Cand = Cache.GetPolicy()->GetCandidateVer(Pkg); - } - if (AllowError == false && Cand.end() == true) - _error->Error(_("Can't select candidate version from package %s as it has no candidate"), Pkg.FullName(true).c_str()); - return Cand; -} - /*}}}*/ -// getInstalledVer - Returns the installed version of the given package /*{{{*/ -pkgCache::VerIterator VersionSet::getInstalledVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg, bool const &AllowError) { - if (AllowError == false && Pkg->CurrentVer == 0) - _error->Error(_("Can't select installed version from package %s as it is not installed"), Pkg.FullName(true).c_str()); - return Pkg.CurrentVer(); -} - /*}}}*/ -} diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h deleted file mode 100644 index 2bc268380..000000000 --- a/apt-pkg/cacheset.h +++ /dev/null @@ -1,274 +0,0 @@ -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/ -/** \file cacheset.h - Wrappers around std::set to have set::iterators which behave - similar to the Iterators of the cache structures. - - Provides also a few helper methods which work with these sets */ - /*}}}*/ -#ifndef APT_CACHESET_H -#define APT_CACHESET_H -// Include Files /*{{{*/ -#include <iostream> -#include <fstream> -#include <list> -#include <map> -#include <set> -#include <string> - -#include <apt-pkg/cachefile.h> -#include <apt-pkg/pkgcache.h> - /*}}}*/ -namespace APT { -class PackageSet : public std::set<pkgCache::PkgIterator> { /*{{{*/ -/** \class APT::PackageSet - - Simple wrapper around a std::set to provide a similar interface to - a set of packages as to the complete set of all packages in the - pkgCache. */ -public: /*{{{*/ - /** \brief smell like a pkgCache::PkgIterator */ - class const_iterator : public std::set<pkgCache::PkgIterator>::const_iterator { - public: - const_iterator(std::set<pkgCache::PkgIterator>::const_iterator x) : - std::set<pkgCache::PkgIterator>::const_iterator(x) {} - - operator pkgCache::PkgIterator(void) { return **this; } - - inline const char *Name() const {return (**this).Name(); } - inline std::string FullName(bool const &Pretty) const { return (**this).FullName(Pretty); } - inline std::string FullName() const { return (**this).FullName(); } - inline const char *Section() const {return (**this).Section(); } - inline bool Purge() const {return (**this).Purge(); } - inline const char *Arch() const {return (**this).Arch(); } - inline pkgCache::GrpIterator Group() const { return (**this).Group(); } - inline pkgCache::VerIterator VersionList() const { return (**this).VersionList(); } - inline pkgCache::VerIterator CurrentVer() const { return (**this).CurrentVer(); } - inline pkgCache::DepIterator RevDependsList() const { return (**this).RevDependsList(); } - inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); } - inline pkgCache::PkgIterator::OkState State() const { return (**this).State(); } - inline const char *CandVersion() const { return (**this).CandVersion(); } - inline const char *CurVersion() const { return (**this).CurVersion(); } - inline pkgCache *Cache() const { return (**this).Cache(); }; - inline unsigned long Index() const {return (**this).Index();}; - // we have only valid iterators here - inline bool end() const { return false; }; - - friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, (*i)); } - - inline pkgCache::Package const * operator->() const { - return &***this; - }; - }; - // 103. set::iterator is required to be modifiable, but this allows modification of keys - typedef APT::PackageSet::const_iterator iterator; - - using std::set<pkgCache::PkgIterator>::insert; - inline void insert(pkgCache::PkgIterator const &P) { if (P.end() == false) std::set<pkgCache::PkgIterator>::insert(P); }; - - /** \brief returns all packages in the cache whose name matchs a given pattern - - A simple helper responsible for executing a regular expression on all - package names in the cache. Optional it prints a a notice about the - packages chosen cause of the given package. - \param Cache the packages are in - \param pattern regular expression for package names - \param out stream to print the notice to */ - static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string pattern, std::ostream &out); - static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string const &pattern) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::PackageSet::FromRegEx(Cache, pattern, out); - } - - /** \brief returns all packages specified by a string - - \param Cache the packages are in - \param string String the package name(s) should be extracted from - \param out stream to print various notices to */ - static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string, std::ostream &out); - static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::PackageSet::FromString(Cache, string, out); - } - - /** \brief returns all packages specified on the commandline - - Get all package names from the commandline and executes regex's if needed. - No special package command is supported, just plain names. - \param Cache the packages are in - \param cmdline Command line the package names should be extracted from - \param out stream to print various notices to */ - static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, std::ostream &out); - static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::PackageSet::FromCommandLine(Cache, cmdline, out); - } - - struct Modifier { - enum Position { NONE, PREFIX, POSTFIX }; - unsigned short ID; - const char * const Alias; - Position Pos; - Modifier (unsigned short const &id, const char * const alias, Position const &pos) : ID(id), Alias(alias), Pos(pos) {}; - }; - - static std::map<unsigned short, PackageSet> GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list<PackageSet::Modifier> const &mods, - unsigned short const &fallback, std::ostream &out); - static std::map<unsigned short, PackageSet> GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list<PackageSet::Modifier> const &mods, - unsigned short const &fallback) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::PackageSet::GroupedFromCommandLine(Cache, cmdline, - mods, fallback, out); - } - /*}}}*/ -}; /*}}}*/ -class VersionSet : public std::set<pkgCache::VerIterator> { /*{{{*/ -/** \class APT::VersionSet - - Simple wrapper around a std::set to provide a similar interface to - a set of versions as to the complete set of all versions in the - pkgCache. */ -public: /*{{{*/ - /** \brief smell like a pkgCache::VerIterator */ - class const_iterator : public std::set<pkgCache::VerIterator>::const_iterator { - public: - const_iterator(std::set<pkgCache::VerIterator>::const_iterator x) : - std::set<pkgCache::VerIterator>::const_iterator(x) {} - - operator pkgCache::VerIterator(void) { return **this; } - - inline pkgCache *Cache() const { return (**this).Cache(); }; - inline unsigned long Index() const {return (**this).Index();}; - // we have only valid iterators here - inline bool end() const { return false; }; - - inline pkgCache::Version const * operator->() const { - return &***this; - }; - - inline int CompareVer(const pkgCache::VerIterator &B) const { return (**this).CompareVer(B); }; - inline const char *VerStr() const { return (**this).VerStr(); }; - inline const char *Section() const { return (**this).Section(); }; - inline const char *Arch() const { return (**this).Arch(); }; - inline const char *Arch(bool const pseudo) const { return (**this).Arch(pseudo); }; - inline pkgCache::PkgIterator ParentPkg() const { return (**this).ParentPkg(); }; - inline pkgCache::DescIterator DescriptionList() const { return (**this).DescriptionList(); }; - inline pkgCache::DescIterator TranslatedDescription() const { return (**this).TranslatedDescription(); }; - inline pkgCache::DepIterator DependsList() const { return (**this).DependsList(); }; - inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); }; - inline pkgCache::VerFileIterator FileList() const { return (**this).FileList(); }; - inline bool Downloadable() const { return (**this).Downloadable(); }; - inline const char *PriorityType() const { return (**this).PriorityType(); }; - inline string RelStr() const { return (**this).RelStr(); }; - inline bool Automatic() const { return (**this).Automatic(); }; - inline bool Pseudo() const { return (**this).Pseudo(); }; - inline pkgCache::VerFileIterator NewestFile() const { return (**this).NewestFile(); }; - }; - // 103. set::iterator is required to be modifiable, but this allows modification of keys - typedef APT::VersionSet::const_iterator iterator; - - using std::set<pkgCache::VerIterator>::insert; - inline void insert(pkgCache::VerIterator const &V) { if (V.end() == false) std::set<pkgCache::VerIterator>::insert(V); }; - - /** \brief specifies which version(s) will be returned if non is given */ - enum Version { - /** All versions */ - ALL, - /** Candidate and installed version */ - CANDANDINST, - /** Candidate version */ - CANDIDATE, - /** Installed version */ - INSTALLED, - /** Candidate or if non installed version */ - CANDINST, - /** Installed or if non candidate version */ - INSTCAND, - /** Newest version */ - NEWEST - }; - - /** \brief returns all versions specified on the commandline - - Get all versions from the commandline, uses given default version if - non specifically requested and executes regex's if needed on names. - \param Cache the packages and versions are in - \param cmdline Command line the versions should be extracted from - \param out stream to print various notices to */ - static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, - APT::VersionSet::Version const &fallback, std::ostream &out); - static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, - APT::VersionSet::Version const &fallback) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::VersionSet::FromCommandLine(Cache, cmdline, fallback, out); - } - static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { - return APT::VersionSet::FromCommandLine(Cache, cmdline, CANDINST); - } - - static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, - APT::VersionSet::Version const &fallback, std::ostream &out); - static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, - APT::VersionSet::Version const &fallback) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::VersionSet::FromString(Cache, pkg, fallback, out); - } - static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg) { - return APT::VersionSet::FromString(Cache, pkg, CANDINST); - } - - struct Modifier { - enum Position { NONE, PREFIX, POSTFIX }; - unsigned short ID; - const char * const Alias; - Position Pos; - VersionSet::Version SelectVersion; - Modifier (unsigned short const &id, const char * const alias, Position const &pos, - VersionSet::Version const &select) : ID(id), Alias(alias), Pos(pos), - SelectVersion(select) {}; - }; - - static std::map<unsigned short, VersionSet> GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list<VersionSet::Modifier> const &mods, - unsigned short const &fallback, std::ostream &out); - static std::map<unsigned short, VersionSet> GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list<VersionSet::Modifier> const &mods, - unsigned short const &fallback) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::VersionSet::GroupedFromCommandLine(Cache, cmdline, - mods, fallback, out); - } - /*}}}*/ -protected: /*{{{*/ - - /** \brief returns the candidate version of the package - - \param Cache to be used to query for information - \param Pkg we want the candidate version from this package - \param AllowError add an error to the stack if not */ - static pkgCache::VerIterator getCandidateVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg, bool const &AllowError = false); - - /** \brief returns the installed version of the package - - \param Cache to be used to query for information - \param Pkg we want the installed version from this package - \param AllowError add an error to the stack if not */ - static pkgCache::VerIterator getInstalledVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg, bool const &AllowError = false); - - - static bool AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, - pkgCache::PkgIterator const &P, VersionSet::Version const &fallback, - bool const &AllowError = false); - - /*}}}*/ -}; /*}}}*/ -} -#endif diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 1a7078693..a5be462ce 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -35,15 +35,14 @@ SOURCE+= pkgcache.cc version.cc depcache.cc \ srcrecords.cc cachefile.cc versionmatch.cc policy.cc \ pkgsystem.cc indexfile.cc pkgcachegen.cc acquire-item.cc \ indexrecords.cc vendor.cc vendorlist.cc cdrom.cc indexcopy.cc \ - aptconfiguration.cc cacheset.cc + aptconfiguration.cc HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.h \ orderlist.h sourcelist.h packagemanager.h tagfile.h \ init.h pkgcache.h version.h progress.h pkgrecords.h \ acquire.h acquire-worker.h acquire-item.h acquire-method.h \ clean.h srcrecords.h cachefile.h versionmatch.h policy.h \ pkgsystem.h indexfile.h metaindex.h indexrecords.h vendor.h \ - vendorlist.h cdrom.h indexcopy.h aptconfiguration.h \ - cacheset.h + vendorlist.h cdrom.h indexcopy.h aptconfiguration.h # Source code for the debian specific components # In theory the deb headers do not need to be exported.. diff --git a/cmdline/cacheset.cc b/cmdline/cacheset.cc new file mode 100644 index 000000000..fde52168a --- /dev/null +++ b/cmdline/cacheset.cc @@ -0,0 +1,330 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/* ###################################################################### + + Simple wrapper around a std::set to provide a similar interface to + a set of cache structures as to the complete set of all structures + in the pkgCache. Currently only Package is supported. + + ##################################################################### */ + /*}}}*/ +// Include Files /*{{{*/ +#include <apt-pkg/aptconfiguration.h> +#include <apt-pkg/error.h> +#include <apt-pkg/cacheset.h> +#include <apt-pkg/strutl.h> +#include <apt-pkg/versionmatch.h> + +#include <apti18n.h> + +#include <vector> + +#include <regex.h> + /*}}}*/ +namespace APT { +// FromRegEx - Return all packages in the cache matching a pattern /*{{{*/ +PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, std::ostream &out) { + PackageSet pkgset; + std::string arch = "native"; + static const char * const isregex = ".?+*|[^$"; + + if (pattern.find_first_of(isregex) == std::string::npos) + return pkgset; + + size_t archfound = pattern.find_last_of(':'); + if (archfound != std::string::npos) { + arch = pattern.substr(archfound+1); + if (arch.find_first_of(isregex) == std::string::npos) + pattern.erase(archfound); + else + arch = "native"; + } + + regex_t Pattern; + int Res; + if ((Res = regcomp(&Pattern, pattern.c_str() , REG_EXTENDED | REG_ICASE | REG_NOSUB)) != 0) { + char Error[300]; + regerror(Res, &Pattern, Error, sizeof(Error)); + _error->Error(_("Regex compilation error - %s"), Error); + return pkgset; + } + + for (pkgCache::GrpIterator Grp = Cache.GetPkgCache()->GrpBegin(); Grp.end() == false; ++Grp) + { + if (regexec(&Pattern, Grp.Name(), 0, 0, 0) != 0) + continue; + pkgCache::PkgIterator Pkg = Grp.FindPkg(arch); + if (Pkg.end() == true) { + if (archfound == std::string::npos) { + std::vector<std::string> archs = APT::Configuration::getArchitectures(); + for (std::vector<std::string>::const_iterator a = archs.begin(); + a != archs.end() && Pkg.end() != true; ++a) + Pkg = Grp.FindPkg(*a); + } + if (Pkg.end() == true) + continue; + } + + ioprintf(out, _("Note, selecting %s for regex '%s'\n"), + Pkg.FullName(true).c_str(), pattern.c_str()); + + pkgset.insert(Pkg); + } + + regfree(&Pattern); + + return pkgset; +} + /*}}}*/ +// GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ +std::map<unsigned short, PackageSet> PackageSet::GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list<PackageSet::Modifier> const &mods, + unsigned short const &fallback, std::ostream &out) { + std::map<unsigned short, PackageSet> pkgsets; + for (const char **I = cmdline; *I != 0; ++I) { + unsigned short modID = fallback; + std::string str = *I; + for (std::list<PackageSet::Modifier>::const_iterator mod = mods.begin(); + mod != mods.end(); ++mod) { + size_t const alength = strlen(mod->Alias); + switch(mod->Pos) { + case PackageSet::Modifier::POSTFIX: + if (str.compare(str.length() - alength, alength, + mod->Alias, 0, alength) != 0) + continue; + str.erase(str.length() - alength); + modID = mod->ID; + break; + case PackageSet::Modifier::PREFIX: + continue; + case PackageSet::Modifier::NONE: + continue; + } + break; + } + PackageSet pset = PackageSet::FromString(Cache, str, out); + pkgsets[modID].insert(pset.begin(), pset.end()); + } + return pkgsets; +} + /*}}}*/ +// FromCommandLine - Return all packages specified on commandline /*{{{*/ +PackageSet PackageSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, std::ostream &out) { + PackageSet pkgset; + for (const char **I = cmdline; *I != 0; ++I) { + PackageSet pset = FromString(Cache, *I, out); + pkgset.insert(pset.begin(), pset.end()); + } + return pkgset; +} + /*}}}*/ +// FromString - Return all packages matching a specific string /*{{{*/ +PackageSet PackageSet::FromString(pkgCacheFile &Cache, std::string const &str, std::ostream &out) { + std::string pkg = str; + size_t archfound = pkg.find_last_of(':'); + std::string arch; + if (archfound != std::string::npos) { + arch = pkg.substr(archfound+1); + pkg.erase(archfound); + } + + pkgCache::PkgIterator Pkg; + if (arch.empty() == true) { + pkgCache::GrpIterator Grp = Cache.GetPkgCache()->FindGrp(pkg); + if (Grp.end() == false) + Pkg = Grp.FindPreferredPkg(); + } else + Pkg = Cache.GetPkgCache()->FindPkg(pkg, arch); + + if (Pkg.end() == false) { + PackageSet pkgset; + pkgset.insert(Pkg); + return pkgset; + } + PackageSet regex = FromRegEx(Cache, str, out); + if (regex.empty() == true) + _error->Warning(_("Unable to locate package %s"), str.c_str()); + return regex; +} + /*}}}*/ +// GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ +std::map<unsigned short, VersionSet> VersionSet::GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list<VersionSet::Modifier> const &mods, + unsigned short const &fallback, std::ostream &out) { + std::map<unsigned short, VersionSet> versets; + for (const char **I = cmdline; *I != 0; ++I) { + unsigned short modID = fallback; + VersionSet::Version select = VersionSet::NEWEST; + std::string str = *I; + for (std::list<VersionSet::Modifier>::const_iterator mod = mods.begin(); + mod != mods.end(); ++mod) { + if (modID == fallback && mod->ID == fallback) + select = mod->SelectVersion; + size_t const alength = strlen(mod->Alias); + switch(mod->Pos) { + case VersionSet::Modifier::POSTFIX: + if (str.compare(str.length() - alength, alength, + mod->Alias, 0, alength) != 0) + continue; + str.erase(str.length() - alength); + modID = mod->ID; + select = mod->SelectVersion; + break; + case VersionSet::Modifier::PREFIX: + continue; + case VersionSet::Modifier::NONE: + continue; + } + break; + } + VersionSet vset = VersionSet::FromString(Cache, str, select , out); + versets[modID].insert(vset.begin(), vset.end()); + } + return versets; +} + /*}}}*/ +// FromCommandLine - Return all versions specified on commandline /*{{{*/ +APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, + APT::VersionSet::Version const &fallback, std::ostream &out) { + VersionSet verset; + for (const char **I = cmdline; *I != 0; ++I) { + VersionSet vset = VersionSet::FromString(Cache, *I, fallback, out); + verset.insert(vset.begin(), vset.end()); + } + return verset; +} + /*}}}*/ +// FromString - Returns all versions spedcified by a string /*{{{*/ +APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, + APT::VersionSet::Version const &fallback, std::ostream &out) { + std::string ver; + bool verIsRel = false; + size_t const vertag = pkg.find_last_of("/="); + if (vertag != string::npos) { + ver = pkg.substr(vertag+1); + verIsRel = (pkg[vertag] == '/'); + pkg.erase(vertag); + } + PackageSet pkgset = PackageSet::FromString(Cache, pkg.c_str(), out); + VersionSet verset; + for (PackageSet::const_iterator P = pkgset.begin(); + P != pkgset.end(); ++P) { + if (vertag == string::npos) { + AddSelectedVersion(Cache, verset, P, fallback); + continue; + } + pkgCache::VerIterator V; + if (ver == "installed") + V = getInstalledVer(Cache, P); + else if (ver == "candidate") + V = getCandidateVer(Cache, P); + else { + pkgVersionMatch Match(ver, (verIsRel == true ? pkgVersionMatch::Release : + pkgVersionMatch::Version)); + V = Match.Find(P); + if (V.end() == true) { + if (verIsRel == true) + _error->Error(_("Release '%s' for '%s' was not found"), + ver.c_str(), P.FullName(true).c_str()); + else + _error->Error(_("Version '%s' for '%s' was not found"), + ver.c_str(), P.FullName(true).c_str()); + continue; + } + } + if (V.end() == true) + continue; + if (ver == V.VerStr()) + ioprintf(out, _("Selected version '%s' (%s) for '%s'\n"), + V.VerStr(), V.RelStr().c_str(), P.FullName(true).c_str()); + verset.insert(V); + } + return verset; +} + /*}}}*/ +// AddSelectedVersion - add version from package based on fallback /*{{{*/ +bool VersionSet::AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, + pkgCache::PkgIterator const &P, VersionSet::Version const &fallback, + bool const &AllowError) { + pkgCache::VerIterator V; + switch(fallback) { + case VersionSet::ALL: + if (P->VersionList != 0) + for (V = P.VersionList(); V.end() != true; ++V) + verset.insert(V); + else if (AllowError == false) + return _error->Error(_("Can't select versions from package '%s' as it purely virtual"), P.FullName(true).c_str()); + else + return false; + break; + case VersionSet::CANDANDINST: + verset.insert(getInstalledVer(Cache, P, AllowError)); + verset.insert(getCandidateVer(Cache, P, AllowError)); + break; + case VersionSet::CANDIDATE: + verset.insert(getCandidateVer(Cache, P, AllowError)); + break; + case VersionSet::INSTALLED: + verset.insert(getInstalledVer(Cache, P, AllowError)); + break; + case VersionSet::CANDINST: + V = getCandidateVer(Cache, P, true); + if (V.end() == true) + V = getInstalledVer(Cache, P, true); + if (V.end() == false) + verset.insert(V); + else if (AllowError == false) + return _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), P.FullName(true).c_str()); + else + return false; + break; + case VersionSet::INSTCAND: + V = getInstalledVer(Cache, P, true); + if (V.end() == true) + V = getCandidateVer(Cache, P, true); + if (V.end() == false) + verset.insert(V); + else if (AllowError == false) + return _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), P.FullName(true).c_str()); + else + return false; + break; + case VersionSet::NEWEST: + if (P->VersionList != 0) + verset.insert(P.VersionList()); + else if (AllowError == false) + return _error->Error(_("Can't select newest version from package '%s' as it is purely virtual"), P.FullName(true).c_str()); + else + return false; + break; + } + return true; +} + /*}}}*/ +// getCandidateVer - Returns the candidate version of the given package /*{{{*/ +pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg, bool const &AllowError) { + pkgCache::VerIterator Cand; + if (Cache.IsDepCacheBuilt() == true) + Cand = Cache[Pkg].CandidateVerIter(Cache); + else { + if (unlikely(Cache.BuildPolicy() == false)) + return pkgCache::VerIterator(*Cache); + Cand = Cache.GetPolicy()->GetCandidateVer(Pkg); + } + if (AllowError == false && Cand.end() == true) + _error->Error(_("Can't select candidate version from package %s as it has no candidate"), Pkg.FullName(true).c_str()); + return Cand; +} + /*}}}*/ +// getInstalledVer - Returns the installed version of the given package /*{{{*/ +pkgCache::VerIterator VersionSet::getInstalledVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg, bool const &AllowError) { + if (AllowError == false && Pkg->CurrentVer == 0) + _error->Error(_("Can't select installed version from package %s as it is not installed"), Pkg.FullName(true).c_str()); + return Pkg.CurrentVer(); +} + /*}}}*/ +} diff --git a/cmdline/cacheset.h b/cmdline/cacheset.h new file mode 100644 index 000000000..2bc268380 --- /dev/null +++ b/cmdline/cacheset.h @@ -0,0 +1,274 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/** \file cacheset.h + Wrappers around std::set to have set::iterators which behave + similar to the Iterators of the cache structures. + + Provides also a few helper methods which work with these sets */ + /*}}}*/ +#ifndef APT_CACHESET_H +#define APT_CACHESET_H +// Include Files /*{{{*/ +#include <iostream> +#include <fstream> +#include <list> +#include <map> +#include <set> +#include <string> + +#include <apt-pkg/cachefile.h> +#include <apt-pkg/pkgcache.h> + /*}}}*/ +namespace APT { +class PackageSet : public std::set<pkgCache::PkgIterator> { /*{{{*/ +/** \class APT::PackageSet + + Simple wrapper around a std::set to provide a similar interface to + a set of packages as to the complete set of all packages in the + pkgCache. */ +public: /*{{{*/ + /** \brief smell like a pkgCache::PkgIterator */ + class const_iterator : public std::set<pkgCache::PkgIterator>::const_iterator { + public: + const_iterator(std::set<pkgCache::PkgIterator>::const_iterator x) : + std::set<pkgCache::PkgIterator>::const_iterator(x) {} + + operator pkgCache::PkgIterator(void) { return **this; } + + inline const char *Name() const {return (**this).Name(); } + inline std::string FullName(bool const &Pretty) const { return (**this).FullName(Pretty); } + inline std::string FullName() const { return (**this).FullName(); } + inline const char *Section() const {return (**this).Section(); } + inline bool Purge() const {return (**this).Purge(); } + inline const char *Arch() const {return (**this).Arch(); } + inline pkgCache::GrpIterator Group() const { return (**this).Group(); } + inline pkgCache::VerIterator VersionList() const { return (**this).VersionList(); } + inline pkgCache::VerIterator CurrentVer() const { return (**this).CurrentVer(); } + inline pkgCache::DepIterator RevDependsList() const { return (**this).RevDependsList(); } + inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); } + inline pkgCache::PkgIterator::OkState State() const { return (**this).State(); } + inline const char *CandVersion() const { return (**this).CandVersion(); } + inline const char *CurVersion() const { return (**this).CurVersion(); } + inline pkgCache *Cache() const { return (**this).Cache(); }; + inline unsigned long Index() const {return (**this).Index();}; + // we have only valid iterators here + inline bool end() const { return false; }; + + friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, (*i)); } + + inline pkgCache::Package const * operator->() const { + return &***this; + }; + }; + // 103. set::iterator is required to be modifiable, but this allows modification of keys + typedef APT::PackageSet::const_iterator iterator; + + using std::set<pkgCache::PkgIterator>::insert; + inline void insert(pkgCache::PkgIterator const &P) { if (P.end() == false) std::set<pkgCache::PkgIterator>::insert(P); }; + + /** \brief returns all packages in the cache whose name matchs a given pattern + + A simple helper responsible for executing a regular expression on all + package names in the cache. Optional it prints a a notice about the + packages chosen cause of the given package. + \param Cache the packages are in + \param pattern regular expression for package names + \param out stream to print the notice to */ + static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string pattern, std::ostream &out); + static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string const &pattern) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::PackageSet::FromRegEx(Cache, pattern, out); + } + + /** \brief returns all packages specified by a string + + \param Cache the packages are in + \param string String the package name(s) should be extracted from + \param out stream to print various notices to */ + static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string, std::ostream &out); + static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::PackageSet::FromString(Cache, string, out); + } + + /** \brief returns all packages specified on the commandline + + Get all package names from the commandline and executes regex's if needed. + No special package command is supported, just plain names. + \param Cache the packages are in + \param cmdline Command line the package names should be extracted from + \param out stream to print various notices to */ + static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, std::ostream &out); + static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::PackageSet::FromCommandLine(Cache, cmdline, out); + } + + struct Modifier { + enum Position { NONE, PREFIX, POSTFIX }; + unsigned short ID; + const char * const Alias; + Position Pos; + Modifier (unsigned short const &id, const char * const alias, Position const &pos) : ID(id), Alias(alias), Pos(pos) {}; + }; + + static std::map<unsigned short, PackageSet> GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list<PackageSet::Modifier> const &mods, + unsigned short const &fallback, std::ostream &out); + static std::map<unsigned short, PackageSet> GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list<PackageSet::Modifier> const &mods, + unsigned short const &fallback) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::PackageSet::GroupedFromCommandLine(Cache, cmdline, + mods, fallback, out); + } + /*}}}*/ +}; /*}}}*/ +class VersionSet : public std::set<pkgCache::VerIterator> { /*{{{*/ +/** \class APT::VersionSet + + Simple wrapper around a std::set to provide a similar interface to + a set of versions as to the complete set of all versions in the + pkgCache. */ +public: /*{{{*/ + /** \brief smell like a pkgCache::VerIterator */ + class const_iterator : public std::set<pkgCache::VerIterator>::const_iterator { + public: + const_iterator(std::set<pkgCache::VerIterator>::const_iterator x) : + std::set<pkgCache::VerIterator>::const_iterator(x) {} + + operator pkgCache::VerIterator(void) { return **this; } + + inline pkgCache *Cache() const { return (**this).Cache(); }; + inline unsigned long Index() const {return (**this).Index();}; + // we have only valid iterators here + inline bool end() const { return false; }; + + inline pkgCache::Version const * operator->() const { + return &***this; + }; + + inline int CompareVer(const pkgCache::VerIterator &B) const { return (**this).CompareVer(B); }; + inline const char *VerStr() const { return (**this).VerStr(); }; + inline const char *Section() const { return (**this).Section(); }; + inline const char *Arch() const { return (**this).Arch(); }; + inline const char *Arch(bool const pseudo) const { return (**this).Arch(pseudo); }; + inline pkgCache::PkgIterator ParentPkg() const { return (**this).ParentPkg(); }; + inline pkgCache::DescIterator DescriptionList() const { return (**this).DescriptionList(); }; + inline pkgCache::DescIterator TranslatedDescription() const { return (**this).TranslatedDescription(); }; + inline pkgCache::DepIterator DependsList() const { return (**this).DependsList(); }; + inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); }; + inline pkgCache::VerFileIterator FileList() const { return (**this).FileList(); }; + inline bool Downloadable() const { return (**this).Downloadable(); }; + inline const char *PriorityType() const { return (**this).PriorityType(); }; + inline string RelStr() const { return (**this).RelStr(); }; + inline bool Automatic() const { return (**this).Automatic(); }; + inline bool Pseudo() const { return (**this).Pseudo(); }; + inline pkgCache::VerFileIterator NewestFile() const { return (**this).NewestFile(); }; + }; + // 103. set::iterator is required to be modifiable, but this allows modification of keys + typedef APT::VersionSet::const_iterator iterator; + + using std::set<pkgCache::VerIterator>::insert; + inline void insert(pkgCache::VerIterator const &V) { if (V.end() == false) std::set<pkgCache::VerIterator>::insert(V); }; + + /** \brief specifies which version(s) will be returned if non is given */ + enum Version { + /** All versions */ + ALL, + /** Candidate and installed version */ + CANDANDINST, + /** Candidate version */ + CANDIDATE, + /** Installed version */ + INSTALLED, + /** Candidate or if non installed version */ + CANDINST, + /** Installed or if non candidate version */ + INSTCAND, + /** Newest version */ + NEWEST + }; + + /** \brief returns all versions specified on the commandline + + Get all versions from the commandline, uses given default version if + non specifically requested and executes regex's if needed on names. + \param Cache the packages and versions are in + \param cmdline Command line the versions should be extracted from + \param out stream to print various notices to */ + static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, + APT::VersionSet::Version const &fallback, std::ostream &out); + static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, + APT::VersionSet::Version const &fallback) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::VersionSet::FromCommandLine(Cache, cmdline, fallback, out); + } + static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { + return APT::VersionSet::FromCommandLine(Cache, cmdline, CANDINST); + } + + static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, + APT::VersionSet::Version const &fallback, std::ostream &out); + static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, + APT::VersionSet::Version const &fallback) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::VersionSet::FromString(Cache, pkg, fallback, out); + } + static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg) { + return APT::VersionSet::FromString(Cache, pkg, CANDINST); + } + + struct Modifier { + enum Position { NONE, PREFIX, POSTFIX }; + unsigned short ID; + const char * const Alias; + Position Pos; + VersionSet::Version SelectVersion; + Modifier (unsigned short const &id, const char * const alias, Position const &pos, + VersionSet::Version const &select) : ID(id), Alias(alias), Pos(pos), + SelectVersion(select) {}; + }; + + static std::map<unsigned short, VersionSet> GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list<VersionSet::Modifier> const &mods, + unsigned short const &fallback, std::ostream &out); + static std::map<unsigned short, VersionSet> GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list<VersionSet::Modifier> const &mods, + unsigned short const &fallback) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::VersionSet::GroupedFromCommandLine(Cache, cmdline, + mods, fallback, out); + } + /*}}}*/ +protected: /*{{{*/ + + /** \brief returns the candidate version of the package + + \param Cache to be used to query for information + \param Pkg we want the candidate version from this package + \param AllowError add an error to the stack if not */ + static pkgCache::VerIterator getCandidateVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg, bool const &AllowError = false); + + /** \brief returns the installed version of the package + + \param Cache to be used to query for information + \param Pkg we want the installed version from this package + \param AllowError add an error to the stack if not */ + static pkgCache::VerIterator getInstalledVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg, bool const &AllowError = false); + + + static bool AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, + pkgCache::PkgIterator const &P, VersionSet::Version const &fallback, + bool const &AllowError = false); + + /*}}}*/ +}; /*}}}*/ +} +#endif diff --git a/cmdline/makefile b/cmdline/makefile index 917ccc96a..4ffe49ee0 100644 --- a/cmdline/makefile +++ b/cmdline/makefile @@ -9,14 +9,14 @@ include ../buildlib/defaults.mak PROGRAM=apt-cache SLIBS = -lapt-pkg $(INTLLIBS) LIB_MAKES = apt-pkg/makefile -SOURCE = apt-cache.cc +SOURCE = apt-cache.cc cacheset.cc include $(PROGRAM_H) # The apt-get program PROGRAM=apt-get SLIBS = -lapt-pkg -lutil $(INTLLIBS) LIB_MAKES = apt-pkg/makefile -SOURCE = apt-get.cc acqprogress.cc +SOURCE = apt-get.cc acqprogress.cc cacheset.cc include $(PROGRAM_H) # The apt-config program diff --git a/debian/changelog b/debian/changelog index f2a18d397..2648730ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low - * apt-pkg/cacheset.cc: + * cmdline/cacheset.cc: + - doesn't include it in the library for now as it is too volatile - get the candidate either from an already built depcache or use the policy which is a bit faster than depcache generation * apt-pkg/orderlist.cc: -- cgit v1.2.3 From 8ceeb9d695f7c8fc5d856aa4f8647e88c4a8659f Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 16 Jun 2010 17:19:21 +0200 Subject: add a simple method to VerIterator to check if two Versions are similar --- apt-pkg/cacheiterators.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index f0b40dbb5..51bf6819e 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -30,6 +30,8 @@ #ifndef PKGLIB_CACHEITERATORS_H #define PKGLIB_CACHEITERATORS_H #include<iterator> + +#include<string.h> // abstract Iterator template /*{{{*/ /* This template provides the very basic iterator methods we need to have for doing some walk-over-the-cache magic */ @@ -183,6 +185,13 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> { // Comparison int CompareVer(const VerIterator &B) const; + /** \brief compares two version and returns if they are similar + + This method should be used to identify if two pseudo versions are + refering to the same "real" version */ + inline bool SimilarVer(const VerIterator &B) const { + return (B.end() == false && S->Hash == B->Hash && strcmp(VerStr(), B.VerStr()) == 0); + }; // Accessors inline const char *VerStr() const {return S->VerStr == 0?0:Owner->StrP + S->VerStr;}; -- cgit v1.2.3 From 1019948cea2e6adbd4b0df3f07b52c90187b1a05 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 16 Jun 2010 17:48:37 +0200 Subject: * apt-pkg/depcache.cc: - SetCandidateVer for all pseudo packages - SetReInstall for the "all" package of a pseudo package --- apt-pkg/depcache.cc | 32 +++++++++++++++++++++++++++++++- apt-pkg/depcache.h | 2 +- debian/changelog | 3 +++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 3ae5f5953..d082b8404 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1453,6 +1453,9 @@ bool pkgDepCache::IsInstallOk(PkgIterator const &Pkg,bool AutoInst, /* */ void pkgDepCache::SetReInstall(PkgIterator const &Pkg,bool To) { + if (unlikely(Pkg.end() == true)) + return; + ActionGroup group(*this); RemoveSizes(Pkg); @@ -1466,12 +1469,17 @@ void pkgDepCache::SetReInstall(PkgIterator const &Pkg,bool To) AddStates(Pkg); AddSizes(Pkg); + + if (unlikely(Pkg.CurrentVer().end() == true) || Pkg.CurrentVer().Pseudo() == false) + return; + + SetReInstall(Pkg.Group().FindPkg("all"), To); } /*}}}*/ // DepCache::SetCandidateVersion - Change the candidate version /*{{{*/ // --------------------------------------------------------------------- /* */ -void pkgDepCache::SetCandidateVersion(VerIterator TargetVer) +void pkgDepCache::SetCandidateVersion(VerIterator TargetVer, bool const &Pseudo) { ActionGroup group(*this); @@ -1489,6 +1497,28 @@ void pkgDepCache::SetCandidateVersion(VerIterator TargetVer) AddStates(Pkg); Update(Pkg); AddSizes(Pkg); + + if (TargetVer.Pseudo() == false || Pseudo == false) + return; + + // the version was pseudo: set all other pseudos also + pkgCache::GrpIterator Grp = Pkg.Group(); + for (Pkg = Grp.FindPkg("any"); Pkg.end() == false; ++Pkg) + { + StateCache &P = PkgState[Pkg->ID]; + if (TargetVer.SimilarVer(P.CandidateVerIter(*this)) == true || + (P.CandidateVerIter(*this).Pseudo() == false && + strcmp(Pkg.Arch(), "all") != 0)) + continue; + + for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; ++Ver) + { + if (TargetVer.SimilarVer(Ver) == false) + continue; + SetCandidateVersion(Ver, false); + break; + } + } } void pkgDepCache::MarkAuto(const PkgIterator &Pkg, bool Auto) diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index c6f245a80..72d7cce5d 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -405,7 +405,7 @@ class pkgDepCache : protected pkgCache::Namespace bool ForceImportantDeps = false); void SetReInstall(PkgIterator const &Pkg,bool To); - void SetCandidateVersion(VerIterator TargetVer); + void SetCandidateVersion(VerIterator TargetVer, bool const &Pseudo = true); /** Set the "is automatically installed" flag of Pkg. */ void MarkAuto(const PkgIterator &Pkg, bool Auto); diff --git a/debian/changelog b/debian/changelog index 2648730ec..4de21d343 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low - packages that are not touched doesn't need to be unpacked * debian/control: - remove intltool's dependency as it is an ubuntu artefact + * apt-pkg/depcache.cc: + - SetCandidateVer for all pseudo packages + - SetReInstall for the "all" package of a pseudo package -- David Kalnischkies <kalnischkies@gmail.com> Thu, 10 Jun 2010 16:36:58 +0200 -- cgit v1.2.3 From 8d60bef0c235f86772686df1499ae5e9593437e2 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 17 Jun 2010 11:17:13 +0200 Subject: test-indexes.sh: More verbose failures on wrong/missing indexes --- test/test-indexes.sh | 53 +++++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/test/test-indexes.sh b/test/test-indexes.sh index 58b9cff72..d79e9e7e4 100755 --- a/test/test-indexes.sh +++ b/test/test-indexes.sh @@ -27,6 +27,28 @@ APT_CACHE="$BUILDDIR/bin/apt-cache $OPTS $DEBUG" exit 1 } +# if $1 == "compressed", check that we have compressed indexes, otherwise +# uncompressed ones +check_indexes() { + local F + if [ "$1" = "compressed" ]; then + ! test -e var/lib/apt/lists/*_Packages || F=1 + ! test -e var/lib/apt/lists/*_Sources || F=1 + test -e var/lib/apt/lists/*_Packages.gz || F=1 + test -e var/lib/apt/lists/*_Sources.gz || F=1 + else + test -e var/lib/apt/lists/*_Packages || F=1 + test -e var/lib/apt/lists/*_Sources || F=1 + ! test -e var/lib/apt/lists/*_Packages.gz || F=1 + ! test -e var/lib/apt/lists/*_Sources.gz || F=1 + fi + + if [ -n "$F" ]; then + ls -l var/lib/apt/lists/ + exit 1 + fi +} + echo "---- building sandbox----" WORKDIR=$(mktemp -d) trap "cd /; rm -rf $WORKDIR" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM @@ -49,11 +71,7 @@ key=$(echo "$out" | sed -n '/NO_PUBKEY/ { s/^.*NO_PUBKEY \([[:alnum:]]\+\)$/\1/; # get keyring gpg --no-options --no-default-keyring --secret-keyring etc/apt/secring.gpg --trustdb-name etc/apt/trustdb.gpg --keyring etc/apt/trusted.gpg --primary-keyring etc/apt/trusted.gpg --keyserver $GPG_KEYSERVER --recv-keys $key $APT_GET update - -test -e var/lib/apt/lists/*_Packages -test -e var/lib/apt/lists/*_Sources -! test -e var/lib/apt/lists/*_Packages.gz -! test -e var/lib/apt/lists/*_Sources.gz +check_indexes echo "---- uncompressed cache ----" $APT_CACHE show $TEST_PKG | grep -q ^Version: @@ -84,25 +102,16 @@ rm -r $TEST_SRC* echo "----- uncompressed update with preexisting indexes, no pdiff ----" $APT_GET -o Acquire::PDiffs=false update -test -e var/lib/apt/lists/*_Packages -test -e var/lib/apt/lists/*_Sources -! test -e var/lib/apt/lists/*_Packages.gz -! test -e var/lib/apt/lists/*_Sources.gz +check_indexes echo "----- uncompressed update with preexisting indexes, with pdiff ----" $APT_GET -o Acquire::PDiffs=true update -test -e var/lib/apt/lists/*_Packages -test -e var/lib/apt/lists/*_Sources -! test -e var/lib/apt/lists/*_Packages.gz -! test -e var/lib/apt/lists/*_Sources.gz +check_indexes echo "----- compressed update ----" find var/lib/apt/lists/ -type f | xargs -r rm $APT_GET -o Acquire::GzipIndexes=true update -! test -e var/lib/apt/lists/*_Packages -! test -e var/lib/apt/lists/*_Sources -test -e var/lib/apt/lists/*_Packages.gz -test -e var/lib/apt/lists/*_Sources.gz +check_indexes compressed echo "---- compressed cache ----" $APT_CACHE show $TEST_PKG | grep -q ^Version: @@ -131,16 +140,10 @@ rm -r $TEST_SRC* echo "----- compressed update with preexisting indexes, no pdiff ----" $APT_GET -o Acquire::PDiffs=false -o Acquire::GzipIndexes=true update -! test -e var/lib/apt/lists/*_Packages -! test -e var/lib/apt/lists/*_Sources -test -e var/lib/apt/lists/*_Packages.gz -test -e var/lib/apt/lists/*_Sources.gz +check_indexes compressed echo "----- compressed update with preexisting indexes, with pdiff ----" $APT_GET -o Acquire::PDiffs=true -o Acquire::GzipIndexes=true update -! test -e var/lib/apt/lists/*_Packages -! test -e var/lib/apt/lists/*_Sources -test -e var/lib/apt/lists/*_Packages.gz -test -e var/lib/apt/lists/*_Sources.gz +check_indexes compressed echo "---- ALL TESTS PASSED ----" -- cgit v1.2.3 From 2aab191f2a87d4d33a78d76e3c2978689c142190 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 17 Jun 2010 11:47:51 +0200 Subject: test-indexes.sh: Refactor common code into functions --- test/test-indexes.sh | 155 +++++++++++++++++++++++++++------------------------ 1 file changed, 81 insertions(+), 74 deletions(-) diff --git a/test/test-indexes.sh b/test/test-indexes.sh index d79e9e7e4..fdc1a698a 100755 --- a/test/test-indexes.sh +++ b/test/test-indexes.sh @@ -15,7 +15,7 @@ TEST_PKG="python-psyco-doc" export LD_LIBRARY_PATH=$BUILDDIR/bin -OPTS="-o RootDir=. -o Dir::Bin::Methods=$BUILDDIR/bin/methods -o Debug::NoLocking=true" +OPTS="-qq -o RootDir=. -o Dir::Bin::Methods=$BUILDDIR/bin/methods -o Debug::NoLocking=true" DEBUG="" #DEBUG="-o Debug::pkgCacheGen=true" #DEBUG="-o Debug::pkgAcquire=true" @@ -27,9 +27,25 @@ APT_CACHE="$BUILDDIR/bin/apt-cache $OPTS $DEBUG" exit 1 } +check_update() { + echo "--- apt-get update $@ (no trusted keys)" + + rm -f etc/apt/trusted.gpg etc/apt/secring.gpg + touch etc/apt/trusted.gpg etc/apt/secring.gpg + out=$($APT_GET "$@" update 2>&1) + echo "$out" | grep -q NO_PUBKEY + key=$(echo "$out" | sed -n '/NO_PUBKEY/ { s/^.*NO_PUBKEY \([[:alnum:]]\+\)$/\1/; p}') + # get keyring + gpg -q --no-options --no-default-keyring --secret-keyring etc/apt/secring.gpg --trustdb-name etc/apt/trustdb.gpg --keyring etc/apt/trusted.gpg --primary-keyring etc/apt/trusted.gpg --keyserver $GPG_KEYSERVER --recv-keys $key + + echo "--- apt-get update $@ (with trusted keys)" + $APT_GET "$@" update +} + # if $1 == "compressed", check that we have compressed indexes, otherwise # uncompressed ones check_indexes() { + echo "--- only ${1:-uncompressed} index files present" local F if [ "$1" = "compressed" ]; then ! test -e var/lib/apt/lists/*_Packages || F=1 @@ -44,12 +60,54 @@ check_indexes() { fi if [ -n "$F" ]; then - ls -l var/lib/apt/lists/ + ls -laR var/lib/apt/lists/ exit 1 fi } -echo "---- building sandbox----" +# test apt-cache commands +check_cache() { + echo "--- apt-cache commands" + + $APT_CACHE show $TEST_PKG | grep -q ^Version: + # again (with cache) + $APT_CACHE show $TEST_PKG | grep -q ^Version: + rm var/cache/apt/*.bin + $APT_CACHE policy $TEST_PKG | grep -q '500 http://' + # again (with cache) + $APT_CACHE policy $TEST_PKG | grep -q '500 http://' + + TEST_SRC=`$APT_CACHE show $TEST_PKG | grep ^Source: | awk '{print $2}'` + rm var/cache/apt/*.bin + $APT_CACHE showsrc $TEST_SRC | grep -q ^Binary: + # again (with cache) + $APT_CACHE showsrc $TEST_SRC | grep -q ^Binary: +} + +# test apt-get install +check_install() { + echo "--- apt-get install" + + $APT_GET install -d $TEST_PKG + test -e var/cache/apt/archives/$TEST_PKG*.deb + $APT_GET clean + ! test -e var/cache/apt/archives/$TEST_PKG*.deb +} + +# test apt-get source +check_get_source() { + echo "--- apt-get source" + $APT_GET source $TEST_PKG + test -f $TEST_SRC_*.dsc + test -d $TEST_SRC-* + rm -r $TEST_SRC* +} + +############################################################################ +# main +############################################################################ + +echo "===== building sandbox =====" WORKDIR=$(mktemp -d) trap "cd /; rm -rf $WORKDIR" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM cd $WORKDIR @@ -63,87 +121,36 @@ touch var/lib/dpkg/status echo "deb $TEST_SOURCE" > etc/apt/sources.list echo "deb-src $TEST_SOURCE" >> etc/apt/sources.list -echo "---- uncompressed update ----" +echo "===== uncompressed indexes =====" # first attempt should fail, no trusted GPG key -out=$($APT_GET update 2>&1) -echo "$out" | grep -q NO_PUBKEY -key=$(echo "$out" | sed -n '/NO_PUBKEY/ { s/^.*NO_PUBKEY \([[:alnum:]]\+\)$/\1/; p}') -# get keyring -gpg --no-options --no-default-keyring --secret-keyring etc/apt/secring.gpg --trustdb-name etc/apt/trustdb.gpg --keyring etc/apt/trusted.gpg --primary-keyring etc/apt/trusted.gpg --keyserver $GPG_KEYSERVER --recv-keys $key -$APT_GET update +check_update check_indexes +check_cache +check_install +check_get_source -echo "---- uncompressed cache ----" -$APT_CACHE show $TEST_PKG | grep -q ^Version: -# again (with cache) -$APT_CACHE show $TEST_PKG | grep -q ^Version: -rm var/cache/apt/*.bin -$APT_CACHE policy $TEST_PKG | grep -q '500 http://' -# again (with cache) -$APT_CACHE policy $TEST_PKG | grep -q '500 http://' - -TEST_SRC=`$APT_CACHE show $TEST_PKG | grep ^Source: | awk '{print $2}'` -rm var/cache/apt/*.bin -$APT_CACHE showsrc $TEST_SRC | grep -q ^Binary: -# again (with cache) -$APT_CACHE showsrc $TEST_SRC | grep -q ^Binary: - -echo "---- uncompressed install ----" -$APT_GET install -d $TEST_PKG -test -e var/cache/apt/archives/$TEST_PKG*.deb -$APT_GET clean -! test -e var/cache/apt/archives/$TEST_PKG*.deb - -echo "---- uncompressed get source ----" -$APT_GET source $TEST_PKG -test -f $TEST_SRC_*.dsc -test -d $TEST_SRC-* -rm -r $TEST_SRC* - -echo "----- uncompressed update with preexisting indexes, no pdiff ----" -$APT_GET -o Acquire::PDiffs=false update +echo "--- apt-get update with preexisting indexes" +$APT_GET update check_indexes -echo "----- uncompressed update with preexisting indexes, with pdiff ----" +echo "--- apt-get update with preexisting indexes and pdiff mode" $APT_GET -o Acquire::PDiffs=true update check_indexes -echo "----- compressed update ----" +echo "===== compressed indexes =====" find var/lib/apt/lists/ -type f | xargs -r rm -$APT_GET -o Acquire::GzipIndexes=true update +check_update -o Acquire::GzipIndexes=true check_indexes compressed +check_cache +check_install +check_get_source -echo "---- compressed cache ----" -$APT_CACHE show $TEST_PKG | grep -q ^Version: -# again (with cache) -$APT_CACHE show $TEST_PKG | grep -q ^Version: -rm var/cache/apt/*.bin -$APT_CACHE policy $TEST_PKG | grep -q '500 http://' -# again (with cache) -$APT_CACHE policy $TEST_PKG | grep -q '500 http://' - -TEST_SRC=`$APT_CACHE show $TEST_PKG | grep ^Source: | awk '{print $2}'` -rm var/cache/apt/*.bin -$APT_CACHE showsrc $TEST_SRC | grep -q ^Binary: -# again (with cache) -$APT_CACHE showsrc $TEST_SRC | grep -q ^Binary: - -echo "---- compressed install ----" -$APT_GET install -d $TEST_PKG -! test -e var/cache/apt/archives/$TEST_PKG*.deb - -echo "---- compressed get source ----" -$APT_GET source $TEST_PKG -test -f $TEST_SRC_*.dsc -test -d $TEST_SRC-* -rm -r $TEST_SRC* - -echo "----- compressed update with preexisting indexes, no pdiff ----" -$APT_GET -o Acquire::PDiffs=false -o Acquire::GzipIndexes=true update -check_indexes compressed +echo "--- apt-get update with preexisting indexes" +check_update -o Acquire::GzipIndexes=true +check_indexes -echo "----- compressed update with preexisting indexes, with pdiff ----" -$APT_GET -o Acquire::PDiffs=true -o Acquire::GzipIndexes=true update -check_indexes compressed +echo "--- apt-get update with preexisting indexes and pdiff mode" +check_update -o Acquire::GzipIndexes=true -o Acquire::PDiffs=true update +check_indexes -echo "---- ALL TESTS PASSED ----" +echo "===== ALL TESTS PASSED =====" -- cgit v1.2.3 From 81563bc11a6491b85d55dbefa9f25f8035ab187e Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 17 Jun 2010 12:18:54 +0200 Subject: test-indexes: Use /etc/apt from temporary work dir, not from system --- test/test-indexes.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test/test-indexes.sh b/test/test-indexes.sh index fdc1a698a..452b0cc7a 100755 --- a/test/test-indexes.sh +++ b/test/test-indexes.sh @@ -15,7 +15,7 @@ TEST_PKG="python-psyco-doc" export LD_LIBRARY_PATH=$BUILDDIR/bin -OPTS="-qq -o RootDir=. -o Dir::Bin::Methods=$BUILDDIR/bin/methods -o Debug::NoLocking=true" +OPTS="-qq -o Dir::Bin::Methods=$BUILDDIR/bin/methods -o Debug::NoLocking=true" DEBUG="" #DEBUG="-o Debug::pkgCacheGen=true" #DEBUG="-o Debug::pkgAcquire=true" @@ -115,12 +115,18 @@ cd $WORKDIR rm -fr etc var rm -f home ln -s /home home -mkdir -p etc/apt/preferences.d etc/apt/trusted.gpg.d var/cache/apt/archives/partial var/lib/apt/lists/partial var/lib/dpkg +mkdir -p etc/apt/preferences.d etc/apt/trusted.gpg.d etc/apt/apt.conf.d var/cache/apt/archives/partial var/lib/apt/lists/partial var/lib/dpkg cp /etc/apt/trusted.gpg etc/apt touch var/lib/dpkg/status echo "deb $TEST_SOURCE" > etc/apt/sources.list echo "deb-src $TEST_SOURCE" >> etc/apt/sources.list +# specifying -o RootDir at the command line does not work for +# etc/apt/apt.conf.d/ since it is parsed after pkgInitConfig(); $APT_CONFIG is +# checked first, so this works +echo 'RootDir ".";' > apt_config +export APT_CONFIG=`pwd`/apt_config + echo "===== uncompressed indexes =====" # first attempt should fail, no trusted GPG key check_update -- cgit v1.2.3 From 08abac551a4bd4a26be4935d6f0707855f166da0 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 17 Jun 2010 13:18:19 +0200 Subject: test-indexes.sh: Actually test for non/pre-existing indexes in compressed mode --- test/test-indexes.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/test-indexes.sh b/test/test-indexes.sh index 452b0cc7a..514e82534 100755 --- a/test/test-indexes.sh +++ b/test/test-indexes.sh @@ -32,6 +32,7 @@ check_update() { rm -f etc/apt/trusted.gpg etc/apt/secring.gpg touch etc/apt/trusted.gpg etc/apt/secring.gpg + find var/lib/apt/lists/ -type f | xargs -r rm out=$($APT_GET "$@" update 2>&1) echo "$out" | grep -q NO_PUBKEY key=$(echo "$out" | sed -n '/NO_PUBKEY/ { s/^.*NO_PUBKEY \([[:alnum:]]\+\)$/\1/; p}') @@ -39,6 +40,7 @@ check_update() { gpg -q --no-options --no-default-keyring --secret-keyring etc/apt/secring.gpg --trustdb-name etc/apt/trustdb.gpg --keyring etc/apt/trusted.gpg --primary-keyring etc/apt/trusted.gpg --keyserver $GPG_KEYSERVER --recv-keys $key echo "--- apt-get update $@ (with trusted keys)" + find var/lib/apt/lists/ -type f | xargs -r rm $APT_GET "$@" update } @@ -144,7 +146,6 @@ $APT_GET -o Acquire::PDiffs=true update check_indexes echo "===== compressed indexes =====" -find var/lib/apt/lists/ -type f | xargs -r rm check_update -o Acquire::GzipIndexes=true check_indexes compressed check_cache @@ -152,11 +153,11 @@ check_install check_get_source echo "--- apt-get update with preexisting indexes" -check_update -o Acquire::GzipIndexes=true +$APT_GET -o Acquire::GzipIndexes=true update check_indexes echo "--- apt-get update with preexisting indexes and pdiff mode" -check_update -o Acquire::GzipIndexes=true -o Acquire::PDiffs=true update +$APT_GET -o Acquire::GzipIndexes=true -o Acquire::PDiffs=true update check_indexes echo "===== ALL TESTS PASSED =====" -- cgit v1.2.3 From 321798bedb529edf914f2c884e4d38363c908315 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 17 Jun 2010 13:35:23 +0200 Subject: test-indexes.sh: fix check_indexes call in compressed mode --- test/test-indexes.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test-indexes.sh b/test/test-indexes.sh index 514e82534..2c6ccfedf 100755 --- a/test/test-indexes.sh +++ b/test/test-indexes.sh @@ -154,10 +154,10 @@ check_get_source echo "--- apt-get update with preexisting indexes" $APT_GET -o Acquire::GzipIndexes=true update -check_indexes +check_indexes compressed echo "--- apt-get update with preexisting indexes and pdiff mode" $APT_GET -o Acquire::GzipIndexes=true -o Acquire::PDiffs=true update -check_indexes +check_indexes compressed echo "===== ALL TESTS PASSED =====" -- cgit v1.2.3 From 0b9032b180763ec974cdc918f93910540f05293a Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 17 Jun 2010 13:36:52 +0200 Subject: pkgAcqIndex::Done(): If we have an IMS-Hit, also rename the destination file in GzipIndexes mode, to avoid it being cleaned --- apt-pkg/acquire-item.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index bcfe6a98a..fe81ee791 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -739,16 +739,21 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash, ErrorText = "Method gave a blank filename"; } + string compExt = flExtension(flNotDir(URI(Desc.URI).Path)); + // The files timestamp matches - if (StringToBool(LookupTag(Message,"IMS-Hit"),false) == true) + if (StringToBool(LookupTag(Message,"IMS-Hit"),false) == true) { + if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz") + // Update DestFile for .gz suffix so that the clean operation keeps it + DestFile += ".gz"; return; + } if (FileName == DestFile) Erase = true; else Local = true; - string compExt = flExtension(flNotDir(URI(Desc.URI).Path)); string decompProg; // If we enable compressed indexes and already have gzip, keep it -- cgit v1.2.3 From eee5ab3cb4a20a26468e6a0dc78ca0706b2b4ec6 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 17 Jun 2010 13:38:42 +0200 Subject: test-indexes.sh: Just for paranoia, test that apt-cache is still working after apt-get update with previously existing indexes --- test/test-indexes.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/test-indexes.sh b/test/test-indexes.sh index 2c6ccfedf..84413d2dd 100755 --- a/test/test-indexes.sh +++ b/test/test-indexes.sh @@ -140,10 +140,12 @@ check_get_source echo "--- apt-get update with preexisting indexes" $APT_GET update check_indexes +check_cache echo "--- apt-get update with preexisting indexes and pdiff mode" $APT_GET -o Acquire::PDiffs=true update check_indexes +check_cache echo "===== compressed indexes =====" check_update -o Acquire::GzipIndexes=true @@ -155,9 +157,11 @@ check_get_source echo "--- apt-get update with preexisting indexes" $APT_GET -o Acquire::GzipIndexes=true update check_indexes compressed +check_cache echo "--- apt-get update with preexisting indexes and pdiff mode" $APT_GET -o Acquire::GzipIndexes=true -o Acquire::PDiffs=true update check_indexes compressed +check_cache echo "===== ALL TESTS PASSED =====" -- cgit v1.2.3 From 0311890f60a1075222acf066a6405cb452b475d0 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 17 Jun 2010 13:41:48 +0200 Subject: test-indexes.sh: Also test compressed index mode with apt.conf.d file --- test/test-indexes.sh | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/test/test-indexes.sh b/test/test-indexes.sh index 84413d2dd..ce2c36481 100755 --- a/test/test-indexes.sh +++ b/test/test-indexes.sh @@ -33,12 +33,16 @@ check_update() { rm -f etc/apt/trusted.gpg etc/apt/secring.gpg touch etc/apt/trusted.gpg etc/apt/secring.gpg find var/lib/apt/lists/ -type f | xargs -r rm + + # first attempt should fail, no trusted GPG key out=$($APT_GET "$@" update 2>&1) echo "$out" | grep -q NO_PUBKEY key=$(echo "$out" | sed -n '/NO_PUBKEY/ { s/^.*NO_PUBKEY \([[:alnum:]]\+\)$/\1/; p}') + # get keyring gpg -q --no-options --no-default-keyring --secret-keyring etc/apt/secring.gpg --trustdb-name etc/apt/trustdb.gpg --keyring etc/apt/trusted.gpg --primary-keyring etc/apt/trusted.gpg --keyserver $GPG_KEYSERVER --recv-keys $key + # now it should work echo "--- apt-get update $@ (with trusted keys)" find var/lib/apt/lists/ -type f | xargs -r rm $APT_GET "$@" update @@ -130,7 +134,6 @@ echo 'RootDir ".";' > apt_config export APT_CONFIG=`pwd`/apt_config echo "===== uncompressed indexes =====" -# first attempt should fail, no trusted GPG key check_update check_indexes check_cache @@ -147,7 +150,7 @@ $APT_GET -o Acquire::PDiffs=true update check_indexes check_cache -echo "===== compressed indexes =====" +echo "===== compressed indexes (CLI option) =====" check_update -o Acquire::GzipIndexes=true check_indexes compressed check_cache @@ -164,4 +167,26 @@ $APT_GET -o Acquire::GzipIndexes=true -o Acquire::PDiffs=true update check_indexes compressed check_cache +echo "===== compressed indexes (apt.conf.d option) =====" +cat <<EOF > etc/apt/apt.conf.d/02compress-indexes +Acquire::GzipIndexes "true"; +Acquire::CompressionTypes::Order:: "gz"; +EOF + +check_update +check_indexes compressed +check_cache +check_install +check_get_source + +echo "--- apt-get update with preexisting indexes" +$APT_GET update +check_indexes compressed +check_cache + +echo "--- apt-get update with preexisting indexes and pdiff mode" +$APT_GET -o Acquire::PDiffs=true update +check_indexes compressed +check_cache + echo "===== ALL TESTS PASSED =====" -- cgit v1.2.3 From 594bfe6a9f11e393469522fdea54444488d6f8a3 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 17 Jun 2010 13:58:39 +0200 Subject: test-indexes.sh: quiesce apt-get source; we know that we cannot verify package signatures --- test/test-indexes.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/test-indexes.sh b/test/test-indexes.sh index ce2c36481..916532183 100755 --- a/test/test-indexes.sh +++ b/test/test-indexes.sh @@ -103,7 +103,8 @@ check_install() { # test apt-get source check_get_source() { echo "--- apt-get source" - $APT_GET source $TEST_PKG + # quiesce: it'll complain about not being able to verify the signature + $APT_GET source $TEST_PKG >/dev/null 2>&1 test -f $TEST_SRC_*.dsc test -d $TEST_SRC-* rm -r $TEST_SRC* -- cgit v1.2.3 From a5de4117b60617ace639fb1e09e8903279185c2e Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 19 Jun 2010 09:13:33 +0200 Subject: fix the gcc warning about the initialisation order of variables caused by moving Policy to public again (and therefore after SrcList) --- apt-pkg/cachefile.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc index 01598386c..964c5bd8b 100644 --- a/apt-pkg/cachefile.cc +++ b/apt-pkg/cachefile.cc @@ -28,7 +28,7 @@ // --------------------------------------------------------------------- /* */ pkgCacheFile::pkgCacheFile() : Map(NULL), Cache(NULL), DCache(NULL), - Policy(NULL), SrcList(NULL) + SrcList(NULL), Policy(NULL) { } /*}}}*/ -- cgit v1.2.3 From dc0f01f7cbe2ed8ae6a1d2dbc0e00c19bb04679d Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 19 Jun 2010 11:49:38 +0200 Subject: get packages by task^ with FromTask() --- cmdline/cacheset.cc | 76 ++++++++++++++++++++++++++++++++++++++++++++++++----- cmdline/cacheset.h | 20 ++++++++++++-- debian/changelog | 1 + 3 files changed, 88 insertions(+), 9 deletions(-) diff --git a/cmdline/cacheset.cc b/cmdline/cacheset.cc index fde52168a..55ab26780 100644 --- a/cmdline/cacheset.cc +++ b/cmdline/cacheset.cc @@ -11,27 +11,83 @@ // Include Files /*{{{*/ #include <apt-pkg/aptconfiguration.h> #include <apt-pkg/error.h> -#include <apt-pkg/cacheset.h> #include <apt-pkg/strutl.h> #include <apt-pkg/versionmatch.h> #include <apti18n.h> +#include "cacheset.h" + #include <vector> #include <regex.h> /*}}}*/ namespace APT { +// FromTask - Return all packages in the cache from a specific task /*{{{*/ +PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, std::ostream &out) { + PackageSet pkgset; + if (Cache.BuildCaches() == false || Cache.BuildDepCache() == false) + return pkgset; + + size_t archfound = pattern.find_last_of(':'); + std::string arch = "native"; + if (archfound != std::string::npos) { + arch = pattern.substr(archfound+1); + pattern.erase(archfound); + } + + if (pattern[pattern.length() -1] != '^') + return pkgset; + pattern.erase(pattern.length()-1); + + // get the records + pkgRecords Recs(Cache); + + // build regexp for the task + regex_t Pattern; + char S[300]; + snprintf(S, sizeof(S), "^Task:.*[, ]%s([, ]|$)", pattern.c_str()); + if(regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE) != 0) { + _error->Error("Failed to compile task regexp"); + return pkgset; + } + + for (pkgCache::GrpIterator Grp = Cache->GrpBegin(); Grp.end() == false; ++Grp) { + pkgCache::PkgIterator Pkg = Grp.FindPkg(arch); + if (Pkg.end() == true) + continue; + pkgCache::VerIterator ver = Cache[Pkg].CandidateVerIter(Cache); + if(ver.end() == true) + continue; + + pkgRecords::Parser &parser = Recs.Lookup(ver.FileList()); + const char *start, *end; + parser.GetRec(start,end); + unsigned int const length = end - start; + char buf[length]; + strncpy(buf, start, length); + buf[length-1] = '\0'; + if (regexec(&Pattern, buf, 0, 0, 0) == 0) + pkgset.insert(Pkg); + } + + if (pkgset.empty() == true) + _error->Error(_("Couldn't find task %s"), pattern.c_str()); + + regfree(&Pattern); + return pkgset; +} + /*}}}*/ // FromRegEx - Return all packages in the cache matching a pattern /*{{{*/ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, std::ostream &out) { PackageSet pkgset; - std::string arch = "native"; static const char * const isregex = ".?+*|[^$"; if (pattern.find_first_of(isregex) == std::string::npos) return pkgset; size_t archfound = pattern.find_last_of(':'); + std::string arch = "native"; if (archfound != std::string::npos) { arch = pattern.substr(archfound+1); if (arch.find_first_of(isregex) == std::string::npos) @@ -142,10 +198,16 @@ PackageSet PackageSet::FromString(pkgCacheFile &Cache, std::string const &str, s pkgset.insert(Pkg); return pkgset; } - PackageSet regex = FromRegEx(Cache, str, out); - if (regex.empty() == true) - _error->Warning(_("Unable to locate package %s"), str.c_str()); - return regex; + PackageSet pset = FromTask(Cache, str, out); + if (pset.empty() == false) + return pset; + + pset = FromRegEx(Cache, str, out); + if (pset.empty() == false) + return pset; + + _error->Warning(_("Unable to locate package %s"), str.c_str()); + return pset; } /*}}}*/ // GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ @@ -236,7 +298,7 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, } if (V.end() == true) continue; - if (ver == V.VerStr()) + if (ver != V.VerStr()) ioprintf(out, _("Selected version '%s' (%s) for '%s'\n"), V.VerStr(), V.RelStr().c_str(), P.FullName(true).c_str()); verset.insert(V); diff --git a/cmdline/cacheset.h b/cmdline/cacheset.h index 2bc268380..64a72e758 100644 --- a/cmdline/cacheset.h +++ b/cmdline/cacheset.h @@ -28,7 +28,7 @@ class PackageSet : public std::set<pkgCache::PkgIterator> { /*{{{*/ pkgCache. */ public: /*{{{*/ /** \brief smell like a pkgCache::PkgIterator */ - class const_iterator : public std::set<pkgCache::PkgIterator>::const_iterator { + class const_iterator : public std::set<pkgCache::PkgIterator>::const_iterator {/*{{{*/ public: const_iterator(std::set<pkgCache::PkgIterator>::const_iterator x) : std::set<pkgCache::PkgIterator>::const_iterator(x) {} @@ -62,10 +62,25 @@ public: /*{{{*/ }; // 103. set::iterator is required to be modifiable, but this allows modification of keys typedef APT::PackageSet::const_iterator iterator; + /*}}}*/ using std::set<pkgCache::PkgIterator>::insert; inline void insert(pkgCache::PkgIterator const &P) { if (P.end() == false) std::set<pkgCache::PkgIterator>::insert(P); }; + /** \brief returns all packages in the cache who belong to the given task + + A simple helper responsible for search for all members of a task + in the cache. Optional it prints a a notice about the + packages chosen cause of the given task. + \param Cache the packages are in + \param pattern name of the task + \param out stream to print the notice to */ + static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string pattern, std::ostream &out); + static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string const &pattern) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::PackageSet::FromTask(Cache, pattern, out); + } + /** \brief returns all packages in the cache whose name matchs a given pattern A simple helper responsible for executing a regular expression on all @@ -134,7 +149,7 @@ class VersionSet : public std::set<pkgCache::VerIterator> { /*{{{*/ pkgCache. */ public: /*{{{*/ /** \brief smell like a pkgCache::VerIterator */ - class const_iterator : public std::set<pkgCache::VerIterator>::const_iterator { + class const_iterator : public std::set<pkgCache::VerIterator>::const_iterator {/*{{{*/ public: const_iterator(std::set<pkgCache::VerIterator>::const_iterator x) : std::set<pkgCache::VerIterator>::const_iterator(x) {} @@ -168,6 +183,7 @@ public: /*{{{*/ inline bool Pseudo() const { return (**this).Pseudo(); }; inline pkgCache::VerFileIterator NewestFile() const { return (**this).NewestFile(); }; }; + /*}}}*/ // 103. set::iterator is required to be modifiable, but this allows modification of keys typedef APT::VersionSet::const_iterator iterator; diff --git a/debian/changelog b/debian/changelog index 4de21d343..f6645c0fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low - doesn't include it in the library for now as it is too volatile - get the candidate either from an already built depcache or use the policy which is a bit faster than depcache generation + - get packages by task^ with FromTask() * apt-pkg/orderlist.cc: - untouched packages are never missing * apt-pkg/packagemanager.cc: -- cgit v1.2.3 From 313678129b6f8ad37216db0b4e7679059ab37e56 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 19 Jun 2010 14:16:40 +0200 Subject: * cmdline/apt-get.cc: - use the cachsets in the install commands --- cmdline/apt-cache.cc | 3 +- cmdline/apt-get.cc | 249 ++++++++++----------------------------------------- debian/changelog | 2 + 3 files changed, 51 insertions(+), 203 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 7cb95b3f8..2332a0f13 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -29,7 +29,8 @@ #include <apt-pkg/tagfile.h> #include <apt-pkg/algorithms.h> #include <apt-pkg/sptr.h> -#include <apt-pkg/cacheset.h> + +#include "cacheset.h" #include <config.h> #include <apti18n.h> diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 0ada46c73..c081ca130 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -40,12 +40,12 @@ #include <apt-pkg/sptr.h> #include <apt-pkg/md5.h> #include <apt-pkg/versionmatch.h> -#include <apt-pkg/cacheset.h> #include <config.h> #include <apti18n.h> #include "acqprogress.h" +#include "cacheset.h" #include <set> #include <locale.h> @@ -1252,41 +1252,6 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, if ((State.InstBroken() == true || State.InstPolicyBroken() == true) && BrokenFix == false) Cache.MarkInstall(Pkg,true); - return true; -} - /*}}}*/ -// TryToChangeVer - Try to change a candidate version /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool TryToChangeVer(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, - const char *VerTag,bool IsRel) -{ - pkgVersionMatch Match(VerTag,(IsRel == true?pkgVersionMatch::Release : - pkgVersionMatch::Version)); - - pkgCache::VerIterator Ver = Match.Find(Pkg); - - if (Ver.end() == true) - { - if (IsRel == true) - return _error->Error(_("Release '%s' for '%s' was not found"), - VerTag,Pkg.FullName(true).c_str()); - return _error->Error(_("Version '%s' for '%s' was not found"), - VerTag,Pkg.FullName(true).c_str()); - } - - if (strcmp(VerTag,Ver.VerStr()) != 0) - { - ioprintf(c1out,_("Selected version %s (%s) for %s\n"), - Ver.VerStr(),Ver.RelStr().c_str(),Pkg.FullName(true).c_str()); - } - - Cache.SetCandidateVersion(Ver); - - // Set the all package to the same candidate - if (Ver.Pseudo() == true) - Cache.SetCandidateVersion(Match.Find(Pkg.Group().FindPkg("all"))); - return true; } /*}}}*/ @@ -1624,61 +1589,6 @@ bool DoUpgrade(CommandLine &CmdL) return InstallPackages(Cache,true); } /*}}}*/ -// DoInstallTask - Install task from the command line /*{{{*/ -// --------------------------------------------------------------------- -/* Install named task */ -bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix, - bool BrokenFix, - unsigned int& ExpectedInst, - const char *taskname, - bool Remove) -{ - const char *start, *end; - pkgCache::PkgIterator Pkg; - char buf[64*1024]; - regex_t Pattern; - - // get the records - pkgRecords Recs(Cache); - - // build regexp for the task - char S[300]; - snprintf(S, sizeof(S), "^Task:.*[, ]%s([, ]|$)", taskname); - if(regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE) != 0) - return _error->Error("Failed to compile task regexp"); - - bool found = false; - bool res = true; - - // two runs, first ignore dependencies, second install any missing - for(int IgnoreBroken=1; IgnoreBroken >= 0; IgnoreBroken--) - { - for (Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) - { - pkgCache::VerIterator ver = Cache[Pkg].CandidateVerIter(Cache); - if(ver.end()) - continue; - pkgRecords::Parser &parser = Recs.Lookup(ver.FileList()); - parser.GetRec(start,end); - strncpy(buf, start, end-start); - buf[end-start] = 0x0; - if (regexec(&Pattern,buf,0,0,0) != 0) - continue; - res &= TryToInstall(Pkg,Cache,Fix,Remove,IgnoreBroken,ExpectedInst); - found = true; - } - } - - // now let the problem resolver deal with any issues - Fix.Resolve(true); - - if(!found) - _error->Error(_("Couldn't find task %s"),taskname); - - regfree(&Pattern); - return res; -} - /*}}}*/ // DoInstall - Install packages from the command line /*{{{*/ // --------------------------------------------------------------------- /* Install named packages */ @@ -1696,138 +1606,73 @@ bool DoInstall(CommandLine &CmdL) unsigned int AutoMarkChanged = 0; unsigned int ExpectedInst = 0; - unsigned int Packages = 0; pkgProblemResolver Fix(Cache); - - bool DefRemove = false; + + unsigned short fallback = 0; if (strcasecmp(CmdL.FileList[0],"remove") == 0) - DefRemove = true; + fallback = 1; else if (strcasecmp(CmdL.FileList[0], "purge") == 0) { _config->Set("APT::Get::Purge", true); - DefRemove = true; + fallback = 1; } else if (strcasecmp(CmdL.FileList[0], "autoremove") == 0) { _config->Set("APT::Get::AutomaticRemove", "true"); - DefRemove = true; + fallback = 1; } // new scope for the ActionGroup { + // TODO: Howto get an ExpectedInst count ? pkgDepCache::ActionGroup group(Cache); - for (const char **I = CmdL.FileList + 1; *I != 0; I++) - { - // Duplicate the string - unsigned int Length = strlen(*I); - char S[300]; - if (Length >= sizeof(S)) - continue; - strcpy(S,*I); - - // See if we are removing and special indicators.. - bool Remove = DefRemove; - char *VerTag = 0; - bool VerIsRel = false; + std::list<APT::VersionSet::Modifier> mods; + mods.push_back(APT::VersionSet::Modifier(0, "+", + APT::VersionSet::Modifier::POSTFIX, APT::VersionSet::CANDINST)); + mods.push_back(APT::VersionSet::Modifier(1, "-", + APT::VersionSet::Modifier::POSTFIX, APT::VersionSet::INSTCAND)); + std::map<unsigned short, APT::VersionSet> verset = APT::VersionSet::GroupedFromCommandLine(Cache, + CmdL.FileList + 1, mods, fallback, c0out); - // this is a task! - if (Length >= 1 && S[Length - 1] == '^') - { - S[--Length] = 0; - // tasks must always be confirmed - ExpectedInst += 1000; - // see if we can install it - TryInstallTask(Cache, Fix, BrokenFix, ExpectedInst, S, Remove); - continue; - } + if (_error->PendingError() == true) + return false; - while (Cache->FindPkg(S).end() == true) + for (APT::VersionSet::const_iterator Ver = verset[0].begin(); + Ver != verset[0].end(); ++Ver) + { + pkgCache::PkgIterator Pkg = Ver.ParentPkg(); + Cache->SetCandidateVersion(Ver); + + if (TryToInstall(Pkg, Cache, Fix, false, BrokenFix, ExpectedInst) == false) + return false; + + // see if we need to fix the auto-mark flag + // e.g. apt-get install foo + // where foo is marked automatic + if (Cache[Pkg].Install() == false && + (Cache[Pkg].Flags & pkgCache::Flag::Auto) && + _config->FindB("APT::Get::ReInstall",false) == false && + _config->FindB("APT::Get::Only-Upgrade",false) == false && + _config->FindB("APT::Get::Download-Only",false) == false) { - // Handle an optional end tag indicating what to do - if (Length >= 1 && S[Length - 1] == '-') - { - Remove = true; - S[--Length] = 0; - continue; - } - - if (Length >= 1 && S[Length - 1] == '+') - { - Remove = false; - S[--Length] = 0; - continue; - } - - char *Slash = strchr(S,'='); - if (Slash != 0) - { - VerIsRel = false; - *Slash = 0; - VerTag = Slash + 1; - } - - Slash = strchr(S,'/'); - if (Slash != 0) - { - VerIsRel = true; - *Slash = 0; - VerTag = Slash + 1; - } - - break; + ioprintf(c1out,_("%s set to manually installed.\n"), + Pkg.FullName(true).c_str()); + Cache->MarkAuto(Pkg,false); + AutoMarkChanged++; } - - // Locate the package - pkgCache::PkgIterator Pkg = Cache->FindPkg(S); - Packages++; - if (Pkg.end() == true) - { - APT::PackageSet pkgset = APT::PackageSet::FromRegEx(Cache, S, c1out); - if (pkgset.empty() == true) - return _error->Error(_("Couldn't find package %s"),S); - - // Regexs must always be confirmed - ExpectedInst += 1000; - - bool Hit = false; - for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) - { - if (VerTag != 0) - if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false) - return false; + } - Hit |= TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix, - ExpectedInst,false); - } + for (APT::VersionSet::const_iterator Ver = verset[1].begin(); + Ver != verset[1].end(); ++Ver) + { + pkgCache::PkgIterator Pkg = Ver.ParentPkg(); - if (Hit == false) - return _error->Error(_("Couldn't find package %s"),S); - } - else - { - if (VerTag != 0) - if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false) - return false; - if (TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix,ExpectedInst) == false) - return false; - - // see if we need to fix the auto-mark flag - // e.g. apt-get install foo - // where foo is marked automatic - if(!Remove && - Cache[Pkg].Install() == false && - (Cache[Pkg].Flags & pkgCache::Flag::Auto) && - _config->FindB("APT::Get::ReInstall",false) == false && - _config->FindB("APT::Get::Only-Upgrade",false) == false && - _config->FindB("APT::Get::Download-Only",false) == false) - { - ioprintf(c1out,_("%s set to manually installed.\n"), - Pkg.FullName(true).c_str()); - Cache->MarkAuto(Pkg,false); - AutoMarkChanged++; - } - } + if (TryToInstall(Pkg, Cache, Fix, true, BrokenFix, ExpectedInst) == false) + return false; } + if (_error->PendingError() == true) + return false; + /* If we are in the Broken fixing mode we do not attempt to fix the problems. This is if the user invoked install without -f and gave packages */ diff --git a/debian/changelog b/debian/changelog index f6645c0fe..00877eefb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low - get the candidate either from an already built depcache or use the policy which is a bit faster than depcache generation - get packages by task^ with FromTask() + * cmdline/apt-get.cc: + - use the cachsets in the install commands * apt-pkg/orderlist.cc: - untouched packages are never missing * apt-pkg/packagemanager.cc: -- cgit v1.2.3 From 9d706e45650240cb7b05104211d93220dd6f614c Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Mon, 21 Jun 2010 13:22:40 +0200 Subject: debian/changelog: it is an ABI break after all --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 380060aa6..e44d7986d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,8 +11,9 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low * apt-pkg/contrib/fileutl.{h,cc}: - Add support for transparent reading of gzipped files. - Link against zlib (in apt-pkg/makefile) and add zlib build dependency. - - [Weak internal ABI BREAK] This changes the behaviour of FileFd for - reading gzipped files. + - [ABI BREAK] This adds a new private member to FileFd, but its + initialization is in the public header file. This also changes the + behaviour of FileFd for reading gzipped files. * configure.in: - Check for zlib library and headers. * apt-pkg/deb/debindexfile.cc: -- cgit v1.2.3 From 70e706adf75ed319d931a220ce27db2b981093f5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 22 Jun 2010 18:01:11 +0200 Subject: =?UTF-8?q?Use=20an=20abstract=20helper=20for=20error=20handling?= =?UTF-8?q?=20and=20output=20instead=20of=20doing=20this=20directly=20in?= =?UTF-8?q?=20the=20CacheSets.=20With=20this=20method=20an=20application?= =?UTF-8?q?=20like=20apt-get=20can=20change=20the=20behavior=20of=20the=20?= =?UTF-8?q?CacheSets=20to=20his=20liking.=20It=20can=20for=20example=20eas?= =?UTF-8?q?ily=20keep=20track=20of=20how=20packages=20were=20added=20to=20?= =?UTF-8?q?the=20set:=20by=20names=20or=20with=20regex's=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmdline/apt-get.cc | 79 ++++++++++++++++------- cmdline/cacheset.cc | 179 ++++++++++++++++++++++++++++++++++------------------ cmdline/cacheset.h | 104 ++++++++++++++++++++---------- 3 files changed, 244 insertions(+), 118 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index c081ca130..6a7d7a448 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1079,7 +1079,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, name matching it was split out.. */ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, pkgProblemResolver &Fix,bool Remove,bool BrokenFix, - unsigned int &ExpectedInst,bool AllowFail = true) + bool AllowFail = true) { /* This is a pure virtual package and there is a single available candidate providing it. */ @@ -1244,9 +1244,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, Pkg.FullName(true).c_str()); } } - else - ExpectedInst++; - + // Install it with autoinstalling enabled (if we not respect the minial // required deps or the policy) if ((State.InstBroken() == true || State.InstPolicyBroken() == true) && BrokenFix == false) @@ -1589,6 +1587,41 @@ bool DoUpgrade(CommandLine &CmdL) return InstallPackages(Cache,true); } /*}}}*/ +// CacheSetHelperAPTGet - responsible for message telling from the CacheSets/*{{{*/ +class CacheSetHelperAPTGet : public APT::CacheSetHelper { + /** \brief stream message should be printed to */ + std::ostream &out; + /** \brief were things like Task or RegEx used to select packages? */ + bool explicitlyNamed; + +public: + CacheSetHelperAPTGet(std::ostream &out) : APT::CacheSetHelper(true), out(out) { + explicitlyNamed = true; + } + + virtual void showTaskSelection(APT::PackageSet const &pkgset, string const &pattern) { + for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) + ioprintf(out, _("Note, selecting %s for task '%s'\n"), + Pkg.FullName(true).c_str(), pattern.c_str()); + explicitlyNamed = false; + } + virtual void showRegExSelection(APT::PackageSet const &pkgset, string const &pattern) { + for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) + ioprintf(out, _("Note, selecting %s for regex '%s'\n"), + Pkg.FullName(true).c_str(), pattern.c_str()); + explicitlyNamed = false; + } + virtual void showSelectedVersion(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const Ver, + string const &ver, bool const &verIsRel) { + if (ver != Ver.VerStr()) + ioprintf(out, _("Selected version '%s' (%s) for '%s'\n"), + Ver.VerStr(), Ver.RelStr().c_str(), Pkg.FullName(true).c_str()); + } + + inline bool allPkgNamedExplicitly() const { return explicitlyNamed; } + +}; + /*}}}*/ // DoInstall - Install packages from the command line /*{{{*/ // --------------------------------------------------------------------- /* Install named packages */ @@ -1605,7 +1638,6 @@ bool DoInstall(CommandLine &CmdL) BrokenFix = true; unsigned int AutoMarkChanged = 0; - unsigned int ExpectedInst = 0; pkgProblemResolver Fix(Cache); unsigned short fallback = 0; @@ -1621,28 +1653,29 @@ bool DoInstall(CommandLine &CmdL) _config->Set("APT::Get::AutomaticRemove", "true"); fallback = 1; } - // new scope for the ActionGroup - { - // TODO: Howto get an ExpectedInst count ? - pkgDepCache::ActionGroup group(Cache); - std::list<APT::VersionSet::Modifier> mods; - mods.push_back(APT::VersionSet::Modifier(0, "+", + + std::list<APT::VersionSet::Modifier> mods; + mods.push_back(APT::VersionSet::Modifier(0, "+", APT::VersionSet::Modifier::POSTFIX, APT::VersionSet::CANDINST)); - mods.push_back(APT::VersionSet::Modifier(1, "-", + mods.push_back(APT::VersionSet::Modifier(1, "-", APT::VersionSet::Modifier::POSTFIX, APT::VersionSet::INSTCAND)); - std::map<unsigned short, APT::VersionSet> verset = APT::VersionSet::GroupedFromCommandLine(Cache, - CmdL.FileList + 1, mods, fallback, c0out); + CacheSetHelperAPTGet helper(c0out); + std::map<unsigned short, APT::VersionSet> verset = APT::VersionSet::GroupedFromCommandLine(Cache, + CmdL.FileList + 1, mods, fallback, helper); - if (_error->PendingError() == true) - return false; + if (_error->PendingError() == true) + return false; + // new scope for the ActionGroup + { + pkgDepCache::ActionGroup group(Cache); for (APT::VersionSet::const_iterator Ver = verset[0].begin(); Ver != verset[0].end(); ++Ver) { pkgCache::PkgIterator Pkg = Ver.ParentPkg(); Cache->SetCandidateVersion(Ver); - if (TryToInstall(Pkg, Cache, Fix, false, BrokenFix, ExpectedInst) == false) + if (TryToInstall(Pkg, Cache, Fix, false, BrokenFix) == false) return false; // see if we need to fix the auto-mark flag @@ -1666,7 +1699,7 @@ bool DoInstall(CommandLine &CmdL) { pkgCache::PkgIterator Pkg = Ver.ParentPkg(); - if (TryToInstall(Pkg, Cache, Fix, true, BrokenFix, ExpectedInst) == false) + if (TryToInstall(Pkg, Cache, Fix, true, BrokenFix) == false) return false; } @@ -1719,7 +1752,7 @@ bool DoInstall(CommandLine &CmdL) /* Print out a list of packages that are going to be installed extra to what the user asked */ - if (Cache->InstCount() != ExpectedInst) + if (Cache->InstCount() != verset[0].size()) { string List; string VersionsList; @@ -1845,7 +1878,8 @@ bool DoInstall(CommandLine &CmdL) Cache->writeStateFile(NULL); // See if we need to prompt - if (Cache->InstCount() == ExpectedInst && Cache->DelCount() == 0) + // FIXME: check if really the packages in the set are going to be installed + if (Cache->InstCount() == verset[0].size() && Cache->DelCount() == 0) return InstallPackages(Cache,false,false); return InstallPackages(Cache,false); @@ -2429,7 +2463,6 @@ bool DoBuildDep(CommandLine &CmdL) } // Install the requested packages - unsigned int ExpectedInst = 0; vector <pkgSrcRecords::Parser::BuildDepRec>::iterator D; pkgProblemResolver Fix(Cache); bool skipAlternatives = false; // skip remaining alternatives in an or group @@ -2460,7 +2493,7 @@ bool DoBuildDep(CommandLine &CmdL) */ if (IV.end() == false && Cache->VS().CheckDep(IV.VerStr(),(*D).Op,(*D).Version.c_str()) == true) - TryToInstall(Pkg,Cache,Fix,true,false,ExpectedInst); + TryToInstall(Pkg,Cache,Fix,true,false); } else // BuildDep || BuildDepIndep { @@ -2576,7 +2609,7 @@ bool DoBuildDep(CommandLine &CmdL) if (_config->FindB("Debug::BuildDeps",false) == true) cout << " Trying to install " << (*D).Package << endl; - if (TryToInstall(Pkg,Cache,Fix,false,false,ExpectedInst) == true) + if (TryToInstall(Pkg,Cache,Fix,false,false) == true) { // We successfully installed something; skip remaining alternatives skipAlternatives = hasAlternatives; diff --git a/cmdline/cacheset.cc b/cmdline/cacheset.cc index 55ab26780..88a98fdbe 100644 --- a/cmdline/cacheset.cc +++ b/cmdline/cacheset.cc @@ -24,7 +24,7 @@ /*}}}*/ namespace APT { // FromTask - Return all packages in the cache from a specific task /*{{{*/ -PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, std::ostream &out) { +PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) { PackageSet pkgset; if (Cache.BuildCaches() == false || Cache.BuildDepCache() == false) return pkgset; @@ -67,19 +67,22 @@ PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, std::o char buf[length]; strncpy(buf, start, length); buf[length-1] = '\0'; - if (regexec(&Pattern, buf, 0, 0, 0) == 0) - pkgset.insert(Pkg); + if (regexec(&Pattern, buf, 0, 0, 0) != 0) + continue; + + pkgset.insert(Pkg); } + regfree(&Pattern); if (pkgset.empty() == true) - _error->Error(_("Couldn't find task %s"), pattern.c_str()); + return helper.canNotFindTask(Cache, pattern); - regfree(&Pattern); + helper.showTaskSelection(pkgset, pattern); return pkgset; } /*}}}*/ // FromRegEx - Return all packages in the cache matching a pattern /*{{{*/ -PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, std::ostream &out) { +PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) { PackageSet pkgset; static const char * const isregex = ".?+*|[^$"; @@ -121,14 +124,14 @@ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, std:: continue; } - ioprintf(out, _("Note, selecting %s for regex '%s'\n"), - Pkg.FullName(true).c_str(), pattern.c_str()); - pkgset.insert(Pkg); } - regfree(&Pattern); + if (pkgset.empty() == true) + return helper.canNotFindRegEx(Cache, pattern); + + helper.showRegExSelection(pkgset, pattern); return pkgset; } /*}}}*/ @@ -136,7 +139,7 @@ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, std:: std::map<unsigned short, PackageSet> PackageSet::GroupedFromCommandLine( pkgCacheFile &Cache, const char **cmdline, std::list<PackageSet::Modifier> const &mods, - unsigned short const &fallback, std::ostream &out) { + unsigned short const &fallback, CacheSetHelper &helper) { std::map<unsigned short, PackageSet> pkgsets; for (const char **I = cmdline; *I != 0; ++I) { unsigned short modID = fallback; @@ -159,24 +162,23 @@ std::map<unsigned short, PackageSet> PackageSet::GroupedFromCommandLine( } break; } - PackageSet pset = PackageSet::FromString(Cache, str, out); - pkgsets[modID].insert(pset.begin(), pset.end()); + pkgsets[modID].insert(PackageSet::FromString(Cache, str, helper)); } return pkgsets; } /*}}}*/ // FromCommandLine - Return all packages specified on commandline /*{{{*/ -PackageSet PackageSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, std::ostream &out) { +PackageSet PackageSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, CacheSetHelper &helper) { PackageSet pkgset; for (const char **I = cmdline; *I != 0; ++I) { - PackageSet pset = FromString(Cache, *I, out); + PackageSet pset = FromString(Cache, *I, helper); pkgset.insert(pset.begin(), pset.end()); } return pkgset; } /*}}}*/ // FromString - Return all packages matching a specific string /*{{{*/ -PackageSet PackageSet::FromString(pkgCacheFile &Cache, std::string const &str, std::ostream &out) { +PackageSet PackageSet::FromString(pkgCacheFile &Cache, std::string const &str, CacheSetHelper &helper) { std::string pkg = str; size_t archfound = pkg.find_last_of(':'); std::string arch; @@ -198,23 +200,22 @@ PackageSet PackageSet::FromString(pkgCacheFile &Cache, std::string const &str, s pkgset.insert(Pkg); return pkgset; } - PackageSet pset = FromTask(Cache, str, out); + PackageSet pset = FromTask(Cache, str, helper); if (pset.empty() == false) return pset; - pset = FromRegEx(Cache, str, out); + pset = FromRegEx(Cache, str, helper); if (pset.empty() == false) return pset; - _error->Warning(_("Unable to locate package %s"), str.c_str()); - return pset; + return helper.canNotFindPackage(Cache, str); } /*}}}*/ // GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ std::map<unsigned short, VersionSet> VersionSet::GroupedFromCommandLine( pkgCacheFile &Cache, const char **cmdline, std::list<VersionSet::Modifier> const &mods, - unsigned short const &fallback, std::ostream &out) { + unsigned short const &fallback, CacheSetHelper &helper) { std::map<unsigned short, VersionSet> versets; for (const char **I = cmdline; *I != 0; ++I) { unsigned short modID = fallback; @@ -241,18 +242,17 @@ std::map<unsigned short, VersionSet> VersionSet::GroupedFromCommandLine( } break; } - VersionSet vset = VersionSet::FromString(Cache, str, select , out); - versets[modID].insert(vset.begin(), vset.end()); + versets[modID].insert(VersionSet::FromString(Cache, str, select , helper)); } return versets; } /*}}}*/ // FromCommandLine - Return all versions specified on commandline /*{{{*/ APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, - APT::VersionSet::Version const &fallback, std::ostream &out) { + APT::VersionSet::Version const &fallback, CacheSetHelper &helper) { VersionSet verset; for (const char **I = cmdline; *I != 0; ++I) { - VersionSet vset = VersionSet::FromString(Cache, *I, fallback, out); + VersionSet vset = VersionSet::FromString(Cache, *I, fallback, helper); verset.insert(vset.begin(), vset.end()); } return verset; @@ -260,7 +260,7 @@ APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cm /*}}}*/ // FromString - Returns all versions spedcified by a string /*{{{*/ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, - APT::VersionSet::Version const &fallback, std::ostream &out) { + APT::VersionSet::Version const &fallback, CacheSetHelper &helper) { std::string ver; bool verIsRel = false; size_t const vertag = pkg.find_last_of("/="); @@ -269,19 +269,19 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, verIsRel = (pkg[vertag] == '/'); pkg.erase(vertag); } - PackageSet pkgset = PackageSet::FromString(Cache, pkg.c_str(), out); + PackageSet pkgset = PackageSet::FromString(Cache, pkg.c_str(), helper); VersionSet verset; for (PackageSet::const_iterator P = pkgset.begin(); P != pkgset.end(); ++P) { if (vertag == string::npos) { - AddSelectedVersion(Cache, verset, P, fallback); + AddSelectedVersion(Cache, verset, P, fallback, helper); continue; } pkgCache::VerIterator V; if (ver == "installed") - V = getInstalledVer(Cache, P); + V = getInstalledVer(Cache, P, helper); else if (ver == "candidate") - V = getCandidateVer(Cache, P); + V = getCandidateVer(Cache, P, helper); else { pkgVersionMatch Match(ver, (verIsRel == true ? pkgVersionMatch::Release : pkgVersionMatch::Version)); @@ -298,76 +298,70 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, } if (V.end() == true) continue; - if (ver != V.VerStr()) - ioprintf(out, _("Selected version '%s' (%s) for '%s'\n"), - V.VerStr(), V.RelStr().c_str(), P.FullName(true).c_str()); + helper.showSelectedVersion(P, V, ver, verIsRel); verset.insert(V); } return verset; } /*}}}*/ // AddSelectedVersion - add version from package based on fallback /*{{{*/ -bool VersionSet::AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, +void VersionSet::AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, pkgCache::PkgIterator const &P, VersionSet::Version const &fallback, - bool const &AllowError) { + CacheSetHelper &helper) { pkgCache::VerIterator V; + bool showErrors; switch(fallback) { case VersionSet::ALL: if (P->VersionList != 0) for (V = P.VersionList(); V.end() != true; ++V) verset.insert(V); - else if (AllowError == false) - return _error->Error(_("Can't select versions from package '%s' as it purely virtual"), P.FullName(true).c_str()); else - return false; + verset.insert(helper.canNotFindAllVer(Cache, P)); break; case VersionSet::CANDANDINST: - verset.insert(getInstalledVer(Cache, P, AllowError)); - verset.insert(getCandidateVer(Cache, P, AllowError)); + verset.insert(getInstalledVer(Cache, P, helper)); + verset.insert(getCandidateVer(Cache, P, helper)); break; case VersionSet::CANDIDATE: - verset.insert(getCandidateVer(Cache, P, AllowError)); + verset.insert(getCandidateVer(Cache, P, helper)); break; case VersionSet::INSTALLED: - verset.insert(getInstalledVer(Cache, P, AllowError)); + verset.insert(getInstalledVer(Cache, P, helper)); break; case VersionSet::CANDINST: - V = getCandidateVer(Cache, P, true); + showErrors = helper.showErrors(false); + V = getCandidateVer(Cache, P, helper); if (V.end() == true) - V = getInstalledVer(Cache, P, true); + V = getInstalledVer(Cache, P, helper); + helper.showErrors(showErrors); if (V.end() == false) verset.insert(V); - else if (AllowError == false) - return _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), P.FullName(true).c_str()); else - return false; + verset.insert(helper.canNotFindInstCandVer(Cache, P)); break; case VersionSet::INSTCAND: - V = getInstalledVer(Cache, P, true); + showErrors = helper.showErrors(false); + V = getInstalledVer(Cache, P, helper); if (V.end() == true) - V = getCandidateVer(Cache, P, true); + V = getCandidateVer(Cache, P, helper); + helper.showErrors(showErrors); if (V.end() == false) verset.insert(V); - else if (AllowError == false) - return _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), P.FullName(true).c_str()); else - return false; + verset.insert(helper.canNotFindInstCandVer(Cache, P)); break; case VersionSet::NEWEST: if (P->VersionList != 0) verset.insert(P.VersionList()); - else if (AllowError == false) - return _error->Error(_("Can't select newest version from package '%s' as it is purely virtual"), P.FullName(true).c_str()); else - return false; + verset.insert(helper.canNotFindNewestVer(Cache, P)); break; } - return true; } /*}}}*/ // getCandidateVer - Returns the candidate version of the given package /*{{{*/ pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg, bool const &AllowError) { + pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper) { pkgCache::VerIterator Cand; if (Cache.IsDepCacheBuilt() == true) Cand = Cache[Pkg].CandidateVerIter(Cache); @@ -376,17 +370,78 @@ pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache, return pkgCache::VerIterator(*Cache); Cand = Cache.GetPolicy()->GetCandidateVer(Pkg); } - if (AllowError == false && Cand.end() == true) - _error->Error(_("Can't select candidate version from package %s as it has no candidate"), Pkg.FullName(true).c_str()); + if (Cand.end() == true) + return helper.canNotFindCandidateVer(Cache, Pkg); return Cand; } /*}}}*/ // getInstalledVer - Returns the installed version of the given package /*{{{*/ pkgCache::VerIterator VersionSet::getInstalledVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg, bool const &AllowError) { - if (AllowError == false && Pkg->CurrentVer == 0) - _error->Error(_("Can't select installed version from package %s as it is not installed"), Pkg.FullName(true).c_str()); + pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper) { + if (Pkg->CurrentVer == 0) + return helper.canNotFindInstalledVer(Cache, Pkg); return Pkg.CurrentVer(); } /*}}}*/ +// canNotFindTask - handle the case no package is found for a task /*{{{*/ +PackageSet CacheSetHelper::canNotFindTask(pkgCacheFile &Cache, std::string pattern) { + if (ShowError == true) + _error->Error(_("Couldn't find task '%s'"), pattern.c_str()); + return PackageSet(); +} + /*}}}*/ +// canNotFindRegEx - handle the case no package is found by a regex /*{{{*/ +PackageSet CacheSetHelper::canNotFindRegEx(pkgCacheFile &Cache, std::string pattern) { + if (ShowError == true) + _error->Error(_("Couldn't find any package by regex '%s'"), pattern.c_str()); + return PackageSet(); +} + /*}}}*/ +// canNotFindPackage - handle the case no package is found from a string/*{{{*/ +PackageSet CacheSetHelper::canNotFindPackage(pkgCacheFile &Cache, std::string const &str) { + if (ShowError == true) + _error->Error(_("Unable to locate package %s"), str.c_str()); + return PackageSet(); +} + /*}}}*/ +// canNotFindAllVer /*{{{*/ +VersionSet CacheSetHelper::canNotFindAllVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg) { + if (ShowError == true) + _error->Error(_("Can't select versions from package '%s' as it purely virtual"), Pkg.FullName(true).c_str()); + return VersionSet(); +} + /*}}}*/ +// canNotFindInstCandVer /*{{{*/ +VersionSet CacheSetHelper::canNotFindInstCandVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg) { + if (ShowError == true) + _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str()); + return VersionSet(); +} + /*}}}*/ +// canNotFindNewestVer /*{{{*/ +pkgCache::VerIterator CacheSetHelper::canNotFindNewestVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg) { + if (ShowError == true) + _error->Error(_("Can't select newest version from package '%s' as it is purely virtual"), Pkg.FullName(true).c_str()); + return pkgCache::VerIterator(*Cache); +} + /*}}}*/ +// canNotFindCandidateVer /*{{{*/ +pkgCache::VerIterator CacheSetHelper::canNotFindCandidateVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg) { + if (ShowError == true) + _error->Error(_("Can't select candidate version from package %s as it has no candidate"), Pkg.FullName(true).c_str()); + return pkgCache::VerIterator(*Cache); +} + /*}}}*/ +// canNotFindInstalledVer /*{{{*/ +pkgCache::VerIterator CacheSetHelper::canNotFindInstalledVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg) { + if (ShowError == true) + _error->Error(_("Can't select installed version from package %s as it is not installed"), Pkg.FullName(true).c_str()); + return pkgCache::VerIterator(*Cache); +} + /*}}}*/ } diff --git a/cmdline/cacheset.h b/cmdline/cacheset.h index 64a72e758..9c9491020 100644 --- a/cmdline/cacheset.h +++ b/cmdline/cacheset.h @@ -20,6 +20,45 @@ #include <apt-pkg/pkgcache.h> /*}}}*/ namespace APT { +class PackageSet; +class VersionSet; +class CacheSetHelper { /*{{{*/ +/** \class APT::CacheSetHelper + Simple base class with a lot of virtual methods which can be overridden + to alter the behavior or the output of the CacheSets. + + This helper is passed around by the static methods in the CacheSets and + used every time they hit an error condition or something could be + printed out. +*/ +public: /*{{{*/ + CacheSetHelper(bool const &ShowError = true) : ShowError(ShowError) {}; + virtual ~CacheSetHelper() {}; + + virtual void showTaskSelection(PackageSet const &pkgset, string const &pattern) {}; + virtual void showRegExSelection(PackageSet const &pkgset, string const &pattern) {}; + virtual void showSelectedVersion(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const Ver, + string const &ver, bool const &verIsRel) {}; + + virtual PackageSet canNotFindTask(pkgCacheFile &Cache, std::string pattern); + virtual PackageSet canNotFindRegEx(pkgCacheFile &Cache, std::string pattern); + virtual PackageSet canNotFindPackage(pkgCacheFile &Cache, std::string const &str); + virtual VersionSet canNotFindAllVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg); + virtual VersionSet canNotFindInstCandVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg); + virtual pkgCache::VerIterator canNotFindNewestVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg); + virtual pkgCache::VerIterator canNotFindCandidateVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg); + virtual pkgCache::VerIterator canNotFindInstalledVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg); + + bool showErrors() const { return ShowError; }; + bool showErrors(bool const &newValue) { if (ShowError == newValue) return ShowError; else return ((ShowError = newValue) == false); }; + /*}}}*/ +protected: + bool ShowError; +}; /*}}}*/ class PackageSet : public std::set<pkgCache::PkgIterator> { /*{{{*/ /** \class APT::PackageSet @@ -66,6 +105,7 @@ public: /*{{{*/ using std::set<pkgCache::PkgIterator>::insert; inline void insert(pkgCache::PkgIterator const &P) { if (P.end() == false) std::set<pkgCache::PkgIterator>::insert(P); }; + inline void insert(PackageSet const &pkgset) { insert(pkgset.begin(), pkgset.end()); }; /** \brief returns all packages in the cache who belong to the given task @@ -75,10 +115,10 @@ public: /*{{{*/ \param Cache the packages are in \param pattern name of the task \param out stream to print the notice to */ - static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string pattern, std::ostream &out); + static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper); static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string const &pattern) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::PackageSet::FromTask(Cache, pattern, out); + CacheSetHelper helper; + return APT::PackageSet::FromTask(Cache, pattern, helper); } /** \brief returns all packages in the cache whose name matchs a given pattern @@ -89,10 +129,10 @@ public: /*{{{*/ \param Cache the packages are in \param pattern regular expression for package names \param out stream to print the notice to */ - static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string pattern, std::ostream &out); + static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper); static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string const &pattern) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::PackageSet::FromRegEx(Cache, pattern, out); + CacheSetHelper helper; + return APT::PackageSet::FromRegEx(Cache, pattern, helper); } /** \brief returns all packages specified by a string @@ -100,10 +140,10 @@ public: /*{{{*/ \param Cache the packages are in \param string String the package name(s) should be extracted from \param out stream to print various notices to */ - static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string, std::ostream &out); + static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string, CacheSetHelper &helper); static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::PackageSet::FromString(Cache, string, out); + CacheSetHelper helper; + return APT::PackageSet::FromString(Cache, string, helper); } /** \brief returns all packages specified on the commandline @@ -113,10 +153,10 @@ public: /*{{{*/ \param Cache the packages are in \param cmdline Command line the package names should be extracted from \param out stream to print various notices to */ - static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, std::ostream &out); + static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, CacheSetHelper &helper); static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::PackageSet::FromCommandLine(Cache, cmdline, out); + CacheSetHelper helper; + return APT::PackageSet::FromCommandLine(Cache, cmdline, helper); } struct Modifier { @@ -130,14 +170,14 @@ public: /*{{{*/ static std::map<unsigned short, PackageSet> GroupedFromCommandLine( pkgCacheFile &Cache, const char **cmdline, std::list<PackageSet::Modifier> const &mods, - unsigned short const &fallback, std::ostream &out); + unsigned short const &fallback, CacheSetHelper &helper); static std::map<unsigned short, PackageSet> GroupedFromCommandLine( pkgCacheFile &Cache, const char **cmdline, std::list<PackageSet::Modifier> const &mods, unsigned short const &fallback) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); + CacheSetHelper helper; return APT::PackageSet::GroupedFromCommandLine(Cache, cmdline, - mods, fallback, out); + mods, fallback, helper); } /*}}}*/ }; /*}}}*/ @@ -189,6 +229,7 @@ public: /*{{{*/ using std::set<pkgCache::VerIterator>::insert; inline void insert(pkgCache::VerIterator const &V) { if (V.end() == false) std::set<pkgCache::VerIterator>::insert(V); }; + inline void insert(VersionSet const &verset) { insert(verset.begin(), verset.end()); }; /** \brief specifies which version(s) will be returned if non is given */ enum Version { @@ -216,22 +257,22 @@ public: /*{{{*/ \param cmdline Command line the versions should be extracted from \param out stream to print various notices to */ static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, - APT::VersionSet::Version const &fallback, std::ostream &out); + APT::VersionSet::Version const &fallback, CacheSetHelper &helper); static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, APT::VersionSet::Version const &fallback) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::VersionSet::FromCommandLine(Cache, cmdline, fallback, out); + CacheSetHelper helper; + return APT::VersionSet::FromCommandLine(Cache, cmdline, fallback, helper); } static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { return APT::VersionSet::FromCommandLine(Cache, cmdline, CANDINST); } static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, - APT::VersionSet::Version const &fallback, std::ostream &out); + APT::VersionSet::Version const &fallback, CacheSetHelper &helper); static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, APT::VersionSet::Version const &fallback) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::VersionSet::FromString(Cache, pkg, fallback, out); + CacheSetHelper helper; + return APT::VersionSet::FromString(Cache, pkg, fallback, helper); } static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg) { return APT::VersionSet::FromString(Cache, pkg, CANDINST); @@ -251,14 +292,14 @@ public: /*{{{*/ static std::map<unsigned short, VersionSet> GroupedFromCommandLine( pkgCacheFile &Cache, const char **cmdline, std::list<VersionSet::Modifier> const &mods, - unsigned short const &fallback, std::ostream &out); + unsigned short const &fallback, CacheSetHelper &helper); static std::map<unsigned short, VersionSet> GroupedFromCommandLine( pkgCacheFile &Cache, const char **cmdline, std::list<VersionSet::Modifier> const &mods, unsigned short const &fallback) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); + CacheSetHelper helper; return APT::VersionSet::GroupedFromCommandLine(Cache, cmdline, - mods, fallback, out); + mods, fallback, helper); } /*}}}*/ protected: /*{{{*/ @@ -266,23 +307,20 @@ protected: /*{{{*/ /** \brief returns the candidate version of the package \param Cache to be used to query for information - \param Pkg we want the candidate version from this package - \param AllowError add an error to the stack if not */ + \param Pkg we want the candidate version from this package */ static pkgCache::VerIterator getCandidateVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg, bool const &AllowError = false); + pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper); /** \brief returns the installed version of the package \param Cache to be used to query for information - \param Pkg we want the installed version from this package - \param AllowError add an error to the stack if not */ + \param Pkg we want the installed version from this package */ static pkgCache::VerIterator getInstalledVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg, bool const &AllowError = false); - + pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper); - static bool AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, + static void AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, pkgCache::PkgIterator const &P, VersionSet::Version const &fallback, - bool const &AllowError = false); + CacheSetHelper &helper); /*}}}*/ }; /*}}}*/ -- cgit v1.2.3 From 330463dd2374bd11757c6f2662f279fc31f035a0 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode <jak@debian.org> Date: Thu, 24 Jun 2010 10:57:45 +0200 Subject: methods/ftp.h: Handle different logins are on the same server (Closes: #586904). --- debian/changelog | 7 +++++++ methods/ftp.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d29705d24..037dfa7bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.26~exp8) experimental; urgency=low + + * methods/ftp.h: + - Handle different logins are on the same server (Closes: #586904). + + -- Julian Andres Klode <jak@debian.org> Thu, 24 Jun 2010 10:56:39 +0200 + apt (0.7.26~exp7) experimental; urgency=low * apt-pkg/cachefile.h: diff --git a/methods/ftp.h b/methods/ftp.h index 1bcea41b6..d7f1f7fbe 100644 --- a/methods/ftp.h +++ b/methods/ftp.h @@ -40,7 +40,7 @@ class FTPConn public: - bool Comp(URI Other) {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;}; + bool Comp(URI Other) {return Other.Host == ServerName.Host && Other.Port == ServerName.Port && Other.User == ServerName.User && Other.Password == ServerName.Password; }; // Raw connection IO bool ReadResp(unsigned int &Ret,string &Text); -- cgit v1.2.3 From c4fc2fd7fa0fc63fd8cd6bc9b73492e6baf0222a Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 24 Jun 2010 21:27:27 +0200 Subject: Switch FileFd to not transparently gunzip, since that breaks code which expects the compressed contents to stay (such as the copy backend, or when using file:// repositories. Instead, introduce a new ReadOnlyGzip mode and use that where needed --- apt-pkg/acquire-item.cc | 4 ++-- apt-pkg/contrib/fileutl.cc | 14 +++++++++----- apt-pkg/contrib/fileutl.h | 2 +- apt-pkg/deb/debindexfile.cc | 6 +++--- apt-pkg/deb/debrecords.cc | 2 +- apt-pkg/deb/debsrcrecords.h | 2 +- cmdline/apt-cache.cc | 2 +- debian/changelog | 10 +++++++--- 8 files changed, 25 insertions(+), 17 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index fe81ee791..9abdb0ad0 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -228,7 +228,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/ ss >> ServerSha1 >> size; unsigned long const ServerSize = atol(size.c_str()); - FileFd fd(CurrentPackagesFile, FileFd::ReadOnly); + FileFd fd(CurrentPackagesFile, FileFd::ReadOnlyGzip); SHA1Summation SHA1; SHA1.AddFD(fd.Fd(), fd.Size()); string const local_sha1 = SHA1.Result(); @@ -459,7 +459,7 @@ bool pkgAcqIndexDiffs::QueueNextDiff() /*{{{*/ string FinalFile = _config->FindDir("Dir::State::lists"); FinalFile += URItoFileName(RealURI); - FileFd fd(FinalFile, FileFd::ReadOnly); + FileFd fd(FinalFile, FileFd::ReadOnlyGzip); SHA1Summation SHA1; SHA1.AddFD(fd.Fd(), fd.Size()); string local_sha1 = string(SHA1.Result()); diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 11a9e7f7b..2b91a46f7 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -604,12 +604,16 @@ bool FileFd::Open(string FileName,OpenMode Mode, unsigned long Perms) { case ReadOnly: iFd = open(FileName.c_str(),O_RDONLY); + break; + + case ReadOnlyGzip: + iFd = open(FileName.c_str(),O_RDONLY); if (iFd > 0 && FileName.compare(FileName.size()-3, 3, ".gz") == 0) { - gz = gzdopen (iFd, "r"); - if (gz == NULL) { - close (iFd); - iFd = -1; - } + gz = gzdopen (iFd, "r"); + if (gz == NULL) { + close (iFd); + iFd = -1; + } } break; diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 9925bbed4..c4b282126 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -41,7 +41,7 @@ class FileFd gzFile gz; public: - enum OpenMode {ReadOnly,WriteEmpty,WriteExists,WriteAny,WriteTemp}; + enum OpenMode {ReadOnly,WriteEmpty,WriteExists,WriteAny,WriteTemp,ReadOnlyGzip}; inline bool Read(void *To,unsigned long Size,bool AllowEof) { diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 9832329c0..7d7bd09fb 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -273,7 +273,7 @@ unsigned long debPackagesIndex::Size() const bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const { string PackageFile = IndexFile("Packages"); - FileFd Pkg(PackageFile,FileFd::ReadOnly); + FileFd Pkg(PackageFile,FileFd::ReadOnlyGzip); debListParser Parser(&Pkg); if (_error->PendingError() == true) return _error->Error("Problem opening %s",PackageFile.c_str()); @@ -464,7 +464,7 @@ bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const string TranslationFile = IndexFile(Language); if (TranslationsAvailable() && FileExists(TranslationFile)) { - FileFd Trans(TranslationFile,FileFd::ReadOnly); + FileFd Trans(TranslationFile,FileFd::ReadOnlyGzip); debListParser TransParser(&Trans); if (_error->PendingError() == true) return false; @@ -544,7 +544,7 @@ unsigned long debStatusIndex::Size() const /* */ bool debStatusIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const { - FileFd Pkg(File,FileFd::ReadOnly); + FileFd Pkg(File,FileFd::ReadOnlyGzip); if (_error->PendingError() == true) return false; debListParser Parser(&Pkg); diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc index 34ef0d8f2..ec9e395ef 100644 --- a/apt-pkg/deb/debrecords.cc +++ b/apt-pkg/deb/debrecords.cc @@ -19,7 +19,7 @@ // --------------------------------------------------------------------- /* */ debRecordParser::debRecordParser(string FileName,pkgCache &Cache) : - File(FileName,FileFd::ReadOnly), + File(FileName,FileFd::ReadOnlyGzip), Tags(&File, std::max(Cache.Head().MaxVerFileSize, Cache.Head().MaxDescFileSize) + 200) { diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h index c39d78bae..905264daa 100644 --- a/apt-pkg/deb/debsrcrecords.h +++ b/apt-pkg/deb/debsrcrecords.h @@ -48,7 +48,7 @@ class debSrcRecordParser : public pkgSrcRecords::Parser virtual bool Files(vector<pkgSrcRecords::File> &F); debSrcRecordParser(string const &File,pkgIndexFile const *Index) - : Parser(Index), Fd(File,FileFd::ReadOnly), Tags(&Fd,102400), + : Parser(Index), Fd(File,FileFd::ReadOnlyGzip), Tags(&Fd,102400), Buffer(0), BufSize(0) {} ~debSrcRecordParser(); }; diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 3f68579cc..2b47184f9 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1220,7 +1220,7 @@ bool DisplayRecord(pkgCache::VerIterator V) if (I.IsOk() == false) return _error->Error(_("Package file %s is out of sync."),I.FileName()); - FileFd PkgF(I.FileName(),FileFd::ReadOnly); + FileFd PkgF(I.FileName(),FileFd::ReadOnlyGzip); if (_error->PendingError() == true) return false; diff --git a/debian/changelog b/debian/changelog index e44d7986d..f3f2d3df4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,13 +9,17 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low - Make DEB_BUILD_OPTIONS=noopt actually work by passing the right CXXFLAGS. * apt-pkg/contrib/fileutl.{h,cc}: - - Add support for transparent reading of gzipped files. + - Add support for reading of gzipped files with the new "ReadOnlyGzip" + OpenMode. - Link against zlib (in apt-pkg/makefile) and add zlib build dependency. - [ABI BREAK] This adds a new private member to FileFd, but its - initialization is in the public header file. This also changes the - behaviour of FileFd for reading gzipped files. + initialization is in the public header file. * configure.in: - Check for zlib library and headers. + * apt-pkg/acquire-item.cc, apt-pkg/deb/debindexfile.cc, + apt-pkg/deb/debrecords.cc, apt-pkg/deb/debsrcrecords.h, + cmdline/apt-cache.cc: + - Open Packages, Sources, and Translations indexes in "ReadOnlyGzip" mode. * apt-pkg/deb/debindexfile.cc: - If we do not find uncompressed package/source/translation indexes, look for gzip compressed ones. -- cgit v1.2.3 From c19625e7dc99caea960c91b1ce6dc999ec6f4ed4 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 24 Jun 2010 21:27:59 +0200 Subject: test-indexes.sh: Test handling of local file:// archives --- test/test-indexes.sh | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/test/test-indexes.sh b/test/test-indexes.sh index 916532183..b0ae4dcd4 100755 --- a/test/test-indexes.sh +++ b/test/test-indexes.sh @@ -21,6 +21,7 @@ DEBUG="" #DEBUG="-o Debug::pkgAcquire=true" APT_GET="$BUILDDIR/bin/apt-get $OPTS $DEBUG" APT_CACHE="$BUILDDIR/bin/apt-cache $OPTS $DEBUG" +APT_FTPARCHIVE="$BUILDDIR/bin/apt-ftparchive" [ -x "$BUILDDIR/bin/apt-get" ] || { echo "please build the tree first" >&2 @@ -79,9 +80,9 @@ check_cache() { # again (with cache) $APT_CACHE show $TEST_PKG | grep -q ^Version: rm var/cache/apt/*.bin - $APT_CACHE policy $TEST_PKG | grep -q '500 http://' + $APT_CACHE policy $TEST_PKG | egrep -q '500 (http://|file:/)' # again (with cache) - $APT_CACHE policy $TEST_PKG | grep -q '500 http://' + $APT_CACHE policy $TEST_PKG | egrep -q '500 (http://|file:/)' TEST_SRC=`$APT_CACHE show $TEST_PKG | grep ^Source: | awk '{print $2}'` rm var/cache/apt/*.bin @@ -131,7 +132,7 @@ echo "deb-src $TEST_SOURCE" >> etc/apt/sources.list # specifying -o RootDir at the command line does not work for # etc/apt/apt.conf.d/ since it is parsed after pkgInitConfig(); $APT_CONFIG is # checked first, so this works -echo 'RootDir ".";' > apt_config +echo "RootDir \"$WORKDIR\";" > apt_config export APT_CONFIG=`pwd`/apt_config echo "===== uncompressed indexes =====" @@ -190,4 +191,34 @@ $APT_GET -o Acquire::PDiffs=true update check_indexes compressed check_cache +rm etc/apt/apt.conf.d/02compress-indexes + +echo "==== apt-ftparchive ====" +mkdir arch +$APT_GET install -d $TEST_PKG +cp var/cache/apt/archives/$TEST_PKG*.deb arch/ +cd arch +$APT_GET source -d $TEST_PKG >/dev/null 2>&1 +$APT_FTPARCHIVE packages . | gzip -9 > Packages.gz +$APT_FTPARCHIVE sources . | gzip -9 > Sources.gz +cd .. + +echo "deb file://$WORKDIR/arch / +deb-src file://$WORKDIR/arch /" > etc/apt/sources.list +$APT_GET clean + +echo "==== uncompressed indexes from local file:// archive ====" +echo "--- apt-get update" +$APT_GET update +check_indexes +check_cache +check_get_source + +echo "==== compressed indexes from local file:// archive ====" +echo "--- apt-get update" +$APT_GET -o Acquire::GzipIndexes=true update +check_indexes compressed +check_cache +check_get_source + echo "===== ALL TESTS PASSED =====" -- cgit v1.2.3 From 7aeee3653d7d0dc34769bb74a2bf4824b438834f Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 24 Jun 2010 22:43:07 +0200 Subject: apt-pkg/acquire-item.cc: Fix handling of local (file:/) sources --- apt-pkg/acquire-item.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 9abdb0ad0..a506aa9aa 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -757,7 +757,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash, string decompProg; // If we enable compressed indexes and already have gzip, keep it - if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz") { + if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz" && !Local) { string FinalFile = _config->FindDir("Dir::State::lists"); FinalFile += URItoFileName(RealURI) + ".gz"; //if(Debug) -- cgit v1.2.3 From 9a3a552a2859040ffc587a4e5d8d96311038e680 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 24 Jun 2010 22:59:48 +0200 Subject: test-indexes.sh: EXFAIL: file:/ URIs currently decompress even with the GzipIndexes option; not a big deal for now --- test/test-indexes.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/test-indexes.sh b/test/test-indexes.sh index b0ae4dcd4..dad3e1fb2 100755 --- a/test/test-indexes.sh +++ b/test/test-indexes.sh @@ -217,7 +217,9 @@ check_get_source echo "==== compressed indexes from local file:// archive ====" echo "--- apt-get update" $APT_GET -o Acquire::GzipIndexes=true update -check_indexes compressed +# EXFAIL: file:/ URIs currently decompress even with above option +#check_indexes compressed +check_indexes check_cache check_get_source -- cgit v1.2.3 From 98ee7cd35cf205c52b3698ee91cec76d704a3937 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 25 Jun 2010 08:01:48 +0200 Subject: * apt-pkg/contrib/error.{cc,h}: - complete rewrite but use the same API - add NOTICE and DEBUG as new types of a message --- apt-pkg/contrib/error.cc | 333 ++++++++++++++++++++++------------------------- apt-pkg/contrib/error.h | 230 +++++++++++++++++++++++++++----- debian/changelog | 5 +- 3 files changed, 360 insertions(+), 208 deletions(-) diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc index 927b7e05c..837d9e615 100644 --- a/apt-pkg/contrib/error.cc +++ b/apt-pkg/contrib/error.cc @@ -1,16 +1,15 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: error.cc,v 1.11 2002/03/26 07:38:58 jgg Exp $ /* ###################################################################### - - Global Erorr Class - Global error mechanism + + Global Error Class - Global error mechanism We use a simple STL vector to store each error record. A PendingFlag is kept which indicates when the vector contains a Sever error. - + This source is placed in the Public Domain, do with it what you will It was originally written by Jason Gunthorpe. - + ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ @@ -19,7 +18,6 @@ #include <iostream> #include <errno.h> #include <stdio.h> -#include <stdarg.h> #include <unistd.h> #include <string> @@ -28,209 +26,188 @@ #include "config.h" /*}}}*/ -using namespace std; - // Global Error Object /*{{{*/ /* If the implementation supports posix threads then the accessor function is compiled to be thread safe otherwise a non-safe version is used. A Per-Thread error object is maintained in much the same manner as libc manages errno */ #if defined(_POSIX_THREADS) && defined(HAVE_PTHREAD) - #include <pthread.h> - - static pthread_key_t ErrorKey; - static void ErrorDestroy(void *Obj) {delete (GlobalError *)Obj;}; - static void KeyAlloc() {pthread_key_create(&ErrorKey,ErrorDestroy);}; - - GlobalError *_GetErrorObj() - { - static pthread_once_t Once = PTHREAD_ONCE_INIT; - pthread_once(&Once,KeyAlloc); - - void *Res = pthread_getspecific(ErrorKey); - if (Res == 0) - pthread_setspecific(ErrorKey,Res = new GlobalError); - return (GlobalError *)Res; - } + #include <pthread.h> + + static pthread_key_t ErrorKey; + static void ErrorDestroy(void *Obj) {delete (GlobalError *)Obj;}; + static void KeyAlloc() {pthread_key_create(&ErrorKey,ErrorDestroy);}; + + GlobalError *_GetErrorObj() { + static pthread_once_t Once = PTHREAD_ONCE_INIT; + pthread_once(&Once,KeyAlloc); + + void *Res = pthread_getspecific(ErrorKey); + if (Res == 0) + pthread_setspecific(ErrorKey,Res = new GlobalError); + return (GlobalError *)Res; + } #else - GlobalError *_GetErrorObj() - { - static GlobalError *Obj = new GlobalError; - return Obj; - } + GlobalError *_GetErrorObj() { + static GlobalError *Obj = new GlobalError; + return Obj; + } #endif /*}}}*/ - // GlobalError::GlobalError - Constructor /*{{{*/ -// --------------------------------------------------------------------- -/* */ -GlobalError::GlobalError() : List(0), PendingFlag(false) -{ +GlobalError::GlobalError() : PendingFlag(false) {} + /*}}}*/ +// GlobalError::FatalE - Get part of the error string from errno /*{{{*/ +bool GlobalError::FatalE(const char *Function,const char *Description,...) { + va_list args; + va_start(args,Description); + return InsertErrno(FATAL, Function, Description, args); } /*}}}*/ // GlobalError::Errno - Get part of the error string from errno /*{{{*/ -// --------------------------------------------------------------------- -/* Function indicates the stdlib function that failed and Description is - a user string that leads the text. Form is: - Description - Function (errno: strerror) - Carefull of the buffer overrun, sprintf. - */ -bool GlobalError::Errno(const char *Function,const char *Description,...) -{ - va_list args; - va_start(args,Description); - - // sprintf the description - char S[400]; - vsnprintf(S,sizeof(S),Description,args); - snprintf(S + strlen(S),sizeof(S) - strlen(S), - " - %s (%i: %s)",Function,errno,strerror(errno)); - - // Put it on the list - Item *Itm = new Item; - Itm->Text = S; - Itm->Error = true; - Insert(Itm); - - PendingFlag = true; - - return false; +bool GlobalError::Errno(const char *Function,const char *Description,...) { + va_list args; + va_start(args,Description); + return InsertErrno(ERROR, Function, Description, args); } /*}}}*/ -// GlobalError::WarningE - Get part of the warn string from errno /*{{{*/ -// --------------------------------------------------------------------- -/* Function indicates the stdlib function that failed and Description is - a user string that leads the text. Form is: - Description - Function (errno: strerror) - Carefull of the buffer overrun, sprintf. - */ -bool GlobalError::WarningE(const char *Function,const char *Description,...) -{ - va_list args; - va_start(args,Description); - - // sprintf the description - char S[400]; - vsnprintf(S,sizeof(S),Description,args); - snprintf(S + strlen(S),sizeof(S) - strlen(S), - " - %s (%i: %s)",Function,errno,strerror(errno)); - - // Put it on the list - Item *Itm = new Item; - Itm->Text = S; - Itm->Error = false; - Insert(Itm); - - return false; +// GlobalError::WarningE - Get part of the warning string from errno /*{{{*/ +bool GlobalError::WarningE(const char *Function,const char *Description,...) { + va_list args; + va_start(args,Description); + return InsertErrno(WARNING, Function, Description, args); +} + /*}}}*/ +// GlobalError::NoticeE - Get part of the notice string from errno /*{{{*/ +bool GlobalError::NoticeE(const char *Function,const char *Description,...) { + va_list args; + va_start(args,Description); + return InsertErrno(NOTICE, Function, Description, args); +} + /*}}}*/ +// GlobalError::DebugE - Get part of the debug string from errno /*{{{*/ +bool GlobalError::DebugE(const char *Function,const char *Description,...) { + va_list args; + va_start(args,Description); + return InsertErrno(DEBUG, Function, Description, args); +} + /*}}}*/ +// GlobalError::InsertErrno - formats an error message with the errno /*{{{*/ +bool GlobalError::InsertErrno(MsgType type, const char* Function, + const char* Description, va_list const &args) { + char S[400]; + vsnprintf(S,sizeof(S),Description,args); + snprintf(S + strlen(S),sizeof(S) - strlen(S), + " - %s (%i: %s)", Function, errno, strerror(errno)); + return Insert(type, S, args); +} + /*}}}*/ +// GlobalError::Fatal - Add a fatal error to the list /*{{{*/ +bool GlobalError::Fatal(const char *Description,...) { + va_list args; + va_start(args,Description); + return Insert(FATAL, Description, args); } /*}}}*/ // GlobalError::Error - Add an error to the list /*{{{*/ -// --------------------------------------------------------------------- -/* Just vsprintfs and pushes */ -bool GlobalError::Error(const char *Description,...) -{ - va_list args; - va_start(args,Description); - - // sprintf the description - char S[400]; - vsnprintf(S,sizeof(S),Description,args); - - // Put it on the list - Item *Itm = new Item; - Itm->Text = S; - Itm->Error = true; - Insert(Itm); - - PendingFlag = true; - - return false; +bool GlobalError::Error(const char *Description,...) { + va_list args; + va_start(args,Description); + return Insert(ERROR, Description, args); } /*}}}*/ // GlobalError::Warning - Add a warning to the list /*{{{*/ -// --------------------------------------------------------------------- -/* This doesn't set the pending error flag */ -bool GlobalError::Warning(const char *Description,...) +bool GlobalError::Warning(const char *Description,...) { + va_list args; + va_start(args,Description); + return Insert(WARNING, Description, args); +} + /*}}}*/ +// GlobalError::Notice - Add a notice to the list /*{{{*/ +bool GlobalError::Notice(const char *Description,...) { - va_list args; - va_start(args,Description); - - // sprintf the description - char S[400]; - vsnprintf(S,sizeof(S),Description,args); - - // Put it on the list - Item *Itm = new Item; - Itm->Text = S; - Itm->Error = false; - Insert(Itm); - - return false; + va_list args; + va_start(args,Description); + return Insert(NOTICE, Description, args); } /*}}}*/ -// GlobalError::PopMessage - Pulls a single message out /*{{{*/ -// --------------------------------------------------------------------- -/* This should be used in a loop checking empty() each cycle. It returns - true if the message is an error. */ -bool GlobalError::PopMessage(string &Text) +// GlobalError::Debug - Add a debug to the list /*{{{*/ +bool GlobalError::Debug(const char *Description,...) { - if (List == 0) - return false; - - bool Ret = List->Error; - Text = List->Text; - Item *Old = List; - List = List->Next; - delete Old; - - // This really should check the list to see if only warnings are left.. - if (List == 0) - PendingFlag = false; - - return Ret; + va_list args; + va_start(args,Description); + return Insert(DEBUG, Description, args); +} + /*}}}*/ +// GlobalError::Insert - Insert a new item at the end /*{{{*/ +bool GlobalError::Insert(MsgType type, const char* Description, + va_list const &args) { + char S[400]; + vsnprintf(S,sizeof(S),Description,args); + + Item const m(S, type); + Messages.push_back(m); + + if (type == ERROR || type == FATAL) + PendingFlag = true; + + if (type == FATAL || type == DEBUG) + std::clog << m << std::endl; + + return false; +} + /*}}}*/ +// GlobalError::PopMessage - Pulls a single message out /*{{{*/ +bool GlobalError::PopMessage(std::string &Text) { + if (Messages.empty() == true) + return false; + + Item const msg = Messages.front(); + Messages.pop_front(); + + bool const Ret = (msg.Type == ERROR || msg.Type == FATAL); + Text = msg.Text; + if (PendingFlag == false || Ret == false) + return Ret; + + // check if another error message is pending + for (std::list<Item>::const_iterator m = Messages.begin(); + m != Messages.end(); m++) + if (m->Type == ERROR || m->Type == FATAL) + return Ret; + + PendingFlag = false; + return Ret; } /*}}}*/ // GlobalError::DumpErrors - Dump all of the errors/warns to cerr /*{{{*/ -// --------------------------------------------------------------------- -/* */ -void GlobalError::DumpErrors() -{ - // Print any errors or warnings found - string Err; - while (empty() == false) - { - bool Type = PopMessage(Err); - if (Type == true) - cerr << "E: " << Err << endl; - else - cerr << "W: " << Err << endl; - } +void GlobalError::DumpErrors(std::ostream &out, MsgType const &trashhold) { + for (std::list<Item>::const_iterator m = Messages.begin(); + m != Messages.end(); m++) + if (m->Type >= trashhold) + out << (*m) << std::endl; + Discard(); } /*}}}*/ -// GlobalError::Discard - Discard /*{{{*/ -// --------------------------------------------------------------------- -/* */ -void GlobalError::Discard() -{ - while (List != 0) - { - Item *Old = List; - List = List->Next; - delete Old; - } - - PendingFlag = false; +// GlobalError::Discard - Discard /*{{{*/ +void GlobalError::Discard() { + Messages.clear(); + PendingFlag = false; }; /*}}}*/ -// GlobalError::Insert - Insert a new item at the end /*{{{*/ -// --------------------------------------------------------------------- -/* */ -void GlobalError::Insert(Item *Itm) -{ - Item **End = &List; - for (Item *I = List; I != 0; I = I->Next) - End = &I->Next; - Itm->Next = *End; - *End = Itm; +// GlobalError::empty - does our error list include anything? /*{{{*/ +bool GlobalError::empty(MsgType const &trashhold) const { + if (PendingFlag == true) + return false; + + if (Messages.empty() == true) + return true; + + for (std::list<Item>::const_iterator m = Messages.begin(); + m != Messages.end(); m++) + if (m->Type >= trashhold) + return false; + + return true; } /*}}}*/ diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index 8d5ec05ea..fc7b38f1b 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -42,43 +42,215 @@ #include <apt-pkg/macros.h> +#include <iostream> +#include <list> #include <string> -class GlobalError +#include <stdarg.h> + +class GlobalError /*{{{*/ { - struct Item - { - std::string Text; - bool Error; - Item *Next; - }; - - Item *List; - bool PendingFlag; - void Insert(Item *I); - - public: +public: /*{{{*/ + /** \brief a message can have one of following severity */ + enum MsgType { + /** \brief Message will be printed instantly as it is likely that + this error will lead to a complete crash */ + FATAL = 40, + /** \brief An error does hinder the correct execution and should be corrected */ + ERROR = 30, + /** \brief indicates problem that can lead to errors later on */ + WARNING = 20, + /** \brief deprecation warnings, old fallback behavior, … */ + NOTICE = 10, + /** \brief for developers only in areas it is hard to print something directly */ + DEBUG = 0 + }; - // Call to generate an error from a library call. - bool Errno(const char *Function,const char *Description,...) __like_printf(3) __cold; - bool WarningE(const char *Function,const char *Description,...) __like_printf(3) __cold; + /** \brief add a fatal error message with errno to the list + * + * \param Function name of the function generating the error + * \param Description format string for the error message + * + * \return \b false + */ + bool FatalE(const char *Function,const char *Description,...) __like_printf(3) __cold; - /* A warning should be considered less severe than an error, and may be - ignored by the client. */ - bool Error(const char *Description,...) __like_printf(2) __cold; - bool Warning(const char *Description,...) __like_printf(2) __cold; + /** \brief add an Error message with errno to the list + * + * \param Function name of the function generating the error + * \param Description format string for the error message + * + * \return \b false + */ + bool Errno(const char *Function,const char *Description,...) __like_printf(3) __cold; - // Simple accessors - inline bool PendingError() {return PendingFlag;}; - inline bool empty() {return List == 0;}; - bool PopMessage(std::string &Text); - void Discard(); + /** \brief add a warning message with errno to the list + * + * A warning should be considered less severe than an error and + * may be ignored by the client. + * + * \param Function Name of the function generates the warning. + * \param Description Format string for the warning message. + * + * \return \b false + */ + bool WarningE(const char *Function,const char *Description,...) __like_printf(3) __cold; - // Usefull routine to dump to cerr - void DumpErrors(); - - GlobalError(); + /** \brief add a notice message with errno to the list + * + * \param Function name of the function generating the error + * \param Description format string for the error message + * + * \return \b false + */ + bool NoticeE(const char *Function,const char *Description,...) __like_printf(3) __cold; + + /** \brief add a debug message with errno to the list + * + * \param Function name of the function generating the error + * \param Description format string for the error message + * + * \return \b false + */ + bool DebugE(const char *Function,const char *Description,...) __like_printf(3) __cold; + + /** \brief add an fatal error message to the list + * + * Most of the stuff we consider as "error" is also "fatal" for + * the user as the application will not have the expected result, + * but a fatal message here means that it gets printed directly + * to stderr in addiction to adding it to the list as the error + * leads sometimes to crashes and a maybe duplicated message + * is better than "Segfault" as the only displayed text + * + * \param Description Format string for the fatal error message. + * + * \return \b false + */ + bool Fatal(const char *Description,...) __like_printf(2) __cold; + + /** \brief add an Error message to the list + * + * \param Description Format string for the error message. + * + * \return \b false + */ + bool Error(const char *Description,...) __like_printf(2) __cold; + + /** \brief add a warning message to the list + * + * A warning should be considered less severe than an error and + * may be ignored by the client. + * + * \param Description Format string for the message + * + * \return \b false + */ + bool Warning(const char *Description,...) __like_printf(2) __cold; + + /** \brief add a notice message to the list + * + * A notice should be considered less severe than an error or a + * warning and can be ignored by the client without further problems + * for some times, but he should consider fixing the problem. + * This error type can be used for e.g. deprecation warnings of options. + * + * \param Description Format string for the message + * + * \return \b false + */ + bool Notice(const char *Description,...) __like_printf(2) __cold; + + /** \brief add a debug message to the list + * + * \param Description Format string for the message + * + * \return \b false + */ + bool Debug(const char *Description,...) __like_printf(2) __cold; + + /** \brief is an error in the list? + * + * \return \b true if an error is included in the list, \b false otherwise + */ + inline bool PendingError() const {return PendingFlag;}; + + /** \brief is the list empty? + * + * The default checks if the list is empty or contains only notices, + * if you want to check if also no notices happend set the parameter + * flag to \b false. + * + * \param WithoutNotice does notices count, default is \b true, so no + * + * \return \b true if an the list is empty, \b false otherwise + */ + bool empty(MsgType const &trashhold = WARNING) const; + + /** \brief returns and removes the first (or last) message in the list + * + * \param[out] Text message of the first/last item + * + * \return \b true if the message was an error, \b false otherwise + */ + bool PopMessage(std::string &Text); + + /** \brief clears the list of messages */ + void Discard(); + + /** \brief outputs the list of messages to the given stream + * + * Note that all messages are discarded, also the notices + * displayed or not. + * + * \param[out] out output stream to write the messages in + * \param WithoutNotice output notices or not + */ + void DumpErrors(std::ostream &out, MsgType const &trashhold = WARNING); + + /** \brief dumps the list of messages to std::cerr + * + * Note that all messages are discarded, also the notices + * displayed or not. + * + * \param WithoutNotice print notices or not + */ + void inline DumpErrors(MsgType const &trashhold = WARNING) { + DumpErrors(std::cerr, trashhold); + } + + GlobalError(); + /*}}}*/ +private: /*{{{*/ + struct Item { + std::string Text; + MsgType Type; + + Item(char const *Text, MsgType const &Type) : + Text(Text), Type(Type) {}; + + friend std::ostream& operator<< (std::ostream &out, Item i) { + switch(i.Type) { + case FATAL: + case ERROR: out << "E"; break; + case WARNING: out << "W"; break; + case NOTICE: out << "N"; break; + case DEBUG: out << "D"; break; + } + return out << ": " << i.Text; + } + }; + + std::list<Item> Messages; + bool PendingFlag; + + bool InsertErrno(MsgType type, const char* Function, + const char* Description, va_list const &args); + bool Insert(MsgType type, const char* Description, + va_list const &args); + /*}}}*/ }; + /*}}}*/ // The 'extra-ansi' syntax is used to help with collisions. GlobalError *_GetErrorObj(); diff --git a/debian/changelog b/debian/changelog index 00877eefb..3e7b16d62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,8 +16,11 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low * apt-pkg/depcache.cc: - SetCandidateVer for all pseudo packages - SetReInstall for the "all" package of a pseudo package + * apt-pkg/contrib/error.{cc,h}: + - complete rewrite but use the same API + - add NOTICE and DEBUG as new types of a message - -- David Kalnischkies <kalnischkies@gmail.com> Thu, 10 Jun 2010 16:36:58 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Fri, 25 Jun 2010 08:01:14 +0200 apt (0.7.26~exp7) experimental; urgency=low -- cgit v1.2.3 From c4ba7c44ff03d67ff982bbab26dc48d796041e02 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 25 Jun 2010 19:16:12 +0200 Subject: add a simple stack handling to be able to delay error handling --- apt-pkg/contrib/error.cc | 32 ++++++++++++++++- apt-pkg/contrib/error.h | 35 ++++++++++++++++++- debian/changelog | 3 +- test/libapt/globalerror_test.cc | 77 +++++++++++++++++++++++++++++++++++++++++ test/libapt/makefile | 10 ++++-- 5 files changed, 152 insertions(+), 5 deletions(-) create mode 100644 test/libapt/globalerror_test.cc diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc index 837d9e615..8cee21c9c 100644 --- a/apt-pkg/contrib/error.cc +++ b/apt-pkg/contrib/error.cc @@ -181,7 +181,13 @@ bool GlobalError::PopMessage(std::string &Text) { } /*}}}*/ // GlobalError::DumpErrors - Dump all of the errors/warns to cerr /*{{{*/ -void GlobalError::DumpErrors(std::ostream &out, MsgType const &trashhold) { +void GlobalError::DumpErrors(std::ostream &out, MsgType const &trashhold, + bool const &mergeStack) { + if (mergeStack == true) + for (std::list<MsgStack>::const_reverse_iterator s = Stacks.rbegin(); + s != Stacks.rend(); ++s) + Messages.insert(Messages.begin(), s->Messages.begin(), s->Messages.end()); + for (std::list<Item>::const_iterator m = Messages.begin(); m != Messages.end(); m++) if (m->Type >= trashhold) @@ -211,3 +217,27 @@ bool GlobalError::empty(MsgType const &trashhold) const { return true; } /*}}}*/ +// GlobalError::PushToStack /*{{{*/ +void GlobalError::PushToStack() { + MsgStack pack(Messages, PendingFlag); + Stacks.push_back(pack); + Discard(); +} + /*}}}*/ +// GlobalError::RevertToStack /*{{{*/ +void GlobalError::RevertToStack() { + Discard(); + MsgStack pack = Stacks.back(); + Messages = pack.Messages; + PendingFlag = pack.PendingFlag; + Stacks.pop_back(); +} + /*}}}*/ +// GlobalError::MergeWithStack /*{{{*/ +void GlobalError::MergeWithStack() { + MsgStack pack = Stacks.back(); + Messages.insert(Messages.begin(), pack.Messages.begin(), pack.Messages.end()); + PendingFlag = PendingFlag || pack.PendingFlag; + Stacks.pop_back(); +} + /*}}}*/ diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index fc7b38f1b..73735162d 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -206,7 +206,8 @@ public: /*{{{*/ * \param[out] out output stream to write the messages in * \param WithoutNotice output notices or not */ - void DumpErrors(std::ostream &out, MsgType const &trashhold = WARNING); + void DumpErrors(std::ostream &out, MsgType const &trashhold = WARNING, + bool const &mergeStack = true); /** \brief dumps the list of messages to std::cerr * @@ -219,6 +220,28 @@ public: /*{{{*/ DumpErrors(std::cerr, trashhold); } + /** \brief put the current Messages into the stack + * + * All "old" messages will be pushed into a stack to + * them later back, but for now the Message query will be + * empty and performs as no messages were present before. + * + * The stack can be as deep as you want - all stack operations + * will only operate on the last element in the stack. + */ + void PushToStack(); + + /** \brief throw away all current messages */ + void RevertToStack(); + + /** \brief merge current and stack together */ + void MergeWithStack(); + + /** \brief return the deep of the stack */ + size_t StackCount() const { + return Stacks.size(); + } + GlobalError(); /*}}}*/ private: /*{{{*/ @@ -244,6 +267,16 @@ private: /*{{{*/ std::list<Item> Messages; bool PendingFlag; + struct MsgStack { + std::list<Item> const Messages; + bool const PendingFlag; + + MsgStack(std::list<Item> const &Messages, bool const &Pending) : + Messages(Messages), PendingFlag(Pending) {}; + }; + + std::list<MsgStack> Stacks; + bool InsertErrno(MsgType type, const char* Function, const char* Description, va_list const &args); bool Insert(MsgType type, const char* Description, diff --git a/debian/changelog b/debian/changelog index 3e7b16d62..46e371165 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,8 +19,9 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low * apt-pkg/contrib/error.{cc,h}: - complete rewrite but use the same API - add NOTICE and DEBUG as new types of a message + - add a simple stack handling to be able to delay error handling - -- David Kalnischkies <kalnischkies@gmail.com> Fri, 25 Jun 2010 08:01:14 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Fri, 25 Jun 2010 19:15:21 +0200 apt (0.7.26~exp7) experimental; urgency=low diff --git a/test/libapt/globalerror_test.cc b/test/libapt/globalerror_test.cc new file mode 100644 index 000000000..b2752255f --- /dev/null +++ b/test/libapt/globalerror_test.cc @@ -0,0 +1,77 @@ +#include <apt-pkg/error.h> + +#include "assert.h" +#include <string> + +int main(int argc,char *argv[]) +{ + equals(_error->empty(), true); + equals(_error->PendingError(), false); + equals(_error->Notice("%s Notice", "A"), false); + equals(_error->empty(), true); + equals(_error->empty(GlobalError::DEBUG), false); + equals(_error->PendingError(), false); + equals(_error->Error("%s horrible %s %d times", "Something", "happend", 2), false); + equals(_error->PendingError(), true); + std::string text; + equals(_error->PopMessage(text), false); + equals(_error->PendingError(), true); + equals(text, "A Notice"); + equals(_error->PopMessage(text), true); + equals(text, "Something horrible happend 2 times"); + equals(_error->empty(GlobalError::DEBUG), true); + equals(_error->PendingError(), false); + equals(_error->Error("%s horrible %s %d times", "Something", "happend", 2), false); + equals(_error->PendingError(), true); + equals(_error->empty(GlobalError::FATAL), false); + _error->Discard(); + + equals(_error->empty(), true); + equals(_error->PendingError(), false); + equals(_error->Notice("%s Notice", "A"), false); + equals(_error->Error("%s horrible %s %d times", "Something", "happend", 2), false); + equals(_error->PendingError(), true); + equals(_error->empty(GlobalError::NOTICE), false); + _error->PushToStack(); + equals(_error->empty(GlobalError::NOTICE), true); + equals(_error->PendingError(), false); + equals(_error->Warning("%s Warning", "A"), false); + equals(_error->empty(GlobalError::ERROR), true); + equals(_error->PendingError(), false); + _error->RevertToStack(); + equals(_error->empty(GlobalError::ERROR), false); + equals(_error->PendingError(), true); + equals(_error->PopMessage(text), false); + equals(_error->PendingError(), true); + equals(text, "A Notice"); + equals(_error->PopMessage(text), true); + equals(text, "Something horrible happend 2 times"); + equals(_error->PendingError(), false); + equals(_error->empty(), true); + + equals(_error->Notice("%s Notice", "A"), false); + equals(_error->Error("%s horrible %s %d times", "Something", "happend", 2), false); + equals(_error->PendingError(), true); + equals(_error->empty(GlobalError::NOTICE), false); + _error->PushToStack(); + equals(_error->empty(GlobalError::NOTICE), true); + equals(_error->PendingError(), false); + equals(_error->Warning("%s Warning", "A"), false); + equals(_error->empty(GlobalError::ERROR), true); + equals(_error->PendingError(), false); + _error->MergeWithStack(); + equals(_error->empty(GlobalError::ERROR), false); + equals(_error->PendingError(), true); + equals(_error->PopMessage(text), false); + equals(_error->PendingError(), true); + equals(text, "A Notice"); + equals(_error->PopMessage(text), true); + equals(text, "Something horrible happend 2 times"); + equals(_error->PendingError(), false); + equals(_error->empty(), false); + equals(_error->PopMessage(text), false); + equals(text, "A Warning"); + equals(_error->empty(), true); + + return 0; +} diff --git a/test/libapt/makefile b/test/libapt/makefile index ee3401b35..50058262e 100644 --- a/test/libapt/makefile +++ b/test/libapt/makefile @@ -30,13 +30,19 @@ SOURCE = getlistoffilesindir_test.cc include $(PROGRAM_H) # Program for testing CommandLine reconstruction -PROGRAM = commandlineasstring${BASENAME} +PROGRAM = CommandlineAsString${BASENAME} SLIBS = -lapt-pkg SOURCE = commandlineasstring_test.cc include $(PROGRAM_H) # Program for testing debians version comparing -PROGRAM = compareversion${BASENAME} +PROGRAM = CompareVersion${BASENAME} SLIBS = -lapt-pkg SOURCE = compareversion_test.cc include $(PROGRAM_H) + +# test the GlobalError stack class +PROGRAM = GlobalError${BASENAME} +SLIBS = -lapt-pkg +SOURCE = globalerror_test.cc +include $(PROGRAM_H) -- cgit v1.2.3 From 65beb5720f82845bf175e0cd80f070da21838827 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 25 Jun 2010 20:11:11 +0200 Subject: print all messages if the application is in an interactive run --- cmdline/apt-cache.cc | 12 +++++------- cmdline/apt-cdrom.cc | 12 +++++------- cmdline/apt-get.cc | 12 +++++------- 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 2332a0f13..a4ec63eed 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1876,13 +1876,11 @@ int main(int argc,const char *argv[]) /*{{{*/ CmdL.DispatchArg(CmdsB); // Print any errors or warnings found during parsing - if (_error->empty() == false) - { - bool Errors = _error->PendingError(); + bool const Errors = _error->PendingError(); + if (_config->FindI("quiet",0) > 0) _error->DumpErrors(); - return Errors == true?100:0; - } - - return 0; + else + _error->DumpErrors(GlobalError::DEBUG); + return Errors == true ? 100 : 0; } /*}}}*/ diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 8b9eacae6..da2ffa390 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -273,13 +273,11 @@ int main(int argc,const char *argv[]) /*{{{*/ CmdL.DispatchArg(Cmds); // Print any errors or warnings found during parsing - if (_error->empty() == false) - { - bool Errors = _error->PendingError(); + bool const Errors = _error->PendingError(); + if (_config->FindI("quiet",0) > 0) _error->DumpErrors(); - return Errors == true?100:0; - } - - return 0; + else + _error->DumpErrors(GlobalError::DEBUG); + return Errors == true ? 100 : 0; } /*}}}*/ diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 6a7d7a448..605eedb0f 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2920,13 +2920,11 @@ int main(int argc,const char *argv[]) /*{{{*/ CmdL.DispatchArg(Cmds); // Print any errors or warnings found during parsing - if (_error->empty() == false) - { - bool Errors = _error->PendingError(); + bool const Errors = _error->PendingError(); + if (_config->FindI("quiet",0) > 0) _error->DumpErrors(); - return Errors == true?100:0; - } - - return 0; + else + _error->DumpErrors(GlobalError::DEBUG); + return Errors == true ? 100 : 0; } /*}}}*/ -- cgit v1.2.3 From 9f9717fa6bca13817cf9cf84d513e59d258af154 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 26 Jun 2010 09:03:26 +0200 Subject: * apt-pkg/aptconfiguration.cc: - show a deprecation notice for APT::Acquire::Translation --- apt-pkg/aptconfiguration.cc | 4 ++++ debian/changelog | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 0c050d9dc..44f1f318a 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -10,6 +10,7 @@ // Include Files /*{{{*/ #include <apt-pkg/aptconfiguration.h> #include <apt-pkg/configuration.h> +#include <apt-pkg/error.h> #include <apt-pkg/fileutl.h> #include <apt-pkg/macros.h> #include <apt-pkg/strutl.h> @@ -196,6 +197,9 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All, // it was undocumented and so it should be not very widthly used string const oldAcquire = _config->Find("APT::Acquire::Translation",""); if (oldAcquire.empty() == false && oldAcquire != "environment") { + // TRANSLATORS: the two %s are APT configuration options + _error->Notice("Option '%s' is deprecated. Please use '%s' instead, see 'man 5 apt.conf' for details.", + "APT::Acquire::Translation", "Acquire::Languages"); if (oldAcquire != "none") codes.push_back(oldAcquire); codes.push_back("en"); diff --git a/debian/changelog b/debian/changelog index 46e371165..06bde48fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,8 +20,10 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low - complete rewrite but use the same API - add NOTICE and DEBUG as new types of a message - add a simple stack handling to be able to delay error handling + * apt-pkg/aptconfiguration.cc: + - show a deprecation notice for APT::Acquire::Translation - -- David Kalnischkies <kalnischkies@gmail.com> Fri, 25 Jun 2010 19:15:21 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Sat, 26 Jun 2010 09:01:40 +0200 apt (0.7.26~exp7) experimental; urgency=low -- cgit v1.2.3 From 1f2933a8de0f3a26f51b4a0a2112cbdfd4461e9b Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 26 Jun 2010 13:29:24 +0200 Subject: - use the new MatchAgainstConfig for the DefaultRootSetFunc * apt-pkg/contrib/configuration.{cc,h}: - add a wrapper to match strings against configurable regex patterns --- apt-pkg/contrib/configuration.cc | 43 +++++++++++++++++++++++++++++++++++ apt-pkg/contrib/configuration.h | 19 +++++++++++++++- apt-pkg/depcache.cc | 48 ---------------------------------------- apt-pkg/depcache.h | 22 +++++------------- debian/changelog | 5 ++++- 5 files changed, 71 insertions(+), 66 deletions(-) diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 9129d92f0..81cc87d15 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -843,3 +843,46 @@ bool ReadConfigDir(Configuration &Conf,const string &Dir, return true; } /*}}}*/ +// MatchAgainstConfig Constructor /*{{{*/ +Configuration::MatchAgainstConfig::MatchAgainstConfig(char const * Config) +{ + std::vector<std::string> const strings = _config->FindVector(Config); + for (std::vector<std::string>::const_iterator s = strings.begin(); + s != strings.end(); ++s) + { + regex_t *p = new regex_t; + if (regcomp(p, s->c_str(), REG_EXTENDED | REG_ICASE | REG_NOSUB) == 0) + patterns.push_back(p); + else + { + regfree(p); + delete p; + _error->Warning("Regex compilation error for '%s' in configuration option '%s'", + s->c_str(), Config); + } + } + +} + /*}}}*/ +// MatchAgainstConfig Destructor /*{{{*/ +Configuration::MatchAgainstConfig::~MatchAgainstConfig() +{ + for(std::vector<regex_t *>::const_iterator p = patterns.begin(); + p != patterns.end(); ++p) + { + regfree(*p); + delete *p; + } +} + /*}}}*/ +// MatchAgainstConfig::Match - returns true if a pattern matches /*{{{*/ +bool Configuration::MatchAgainstConfig::Match(char const * str) const +{ + for(std::vector<regex_t *>::const_iterator p = patterns.begin(); + p != patterns.end(); ++p) + if (regexec(*p, str, 0, 0, 0) == 0) + return true; + + return false; +} + /*}}}*/ diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h index 2494c1d7c..cbe18e4e5 100644 --- a/apt-pkg/contrib/configuration.h +++ b/apt-pkg/contrib/configuration.h @@ -28,7 +28,7 @@ #ifndef PKGLIB_CONFIGURATION_H #define PKGLIB_CONFIGURATION_H - +#include <regex.h> #include <string> #include <vector> @@ -104,6 +104,23 @@ class Configuration Configuration(const Item *Root); Configuration(); ~Configuration(); + + /** \brief match a string against a configurable list of patterns */ + class MatchAgainstConfig + { + std::vector<regex_t *> patterns; + + public: + MatchAgainstConfig(char const * Config); + virtual ~MatchAgainstConfig(); + + /** \brief Returns \b true for a string matching one of the patterns */ + bool Match(char const * str) const; + bool Match(std::string const &str) const { return Match(str.c_str()); }; + + /** \brief returns if the matcher setup was successful */ + bool wasConstructedSuccessfully() const { return patterns.empty() == false; } + }; }; extern Configuration *_config; diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index d082b8404..8bca3e36e 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1635,54 +1635,6 @@ bool pkgDepCache::Policy::IsImportantDep(DepIterator Dep) else if(Dep->Type == pkgCache::Dep::Suggests) return _config->FindB("APT::Install-Suggests", false); - return false; -} - /*}}}*/ -pkgDepCache::DefaultRootSetFunc::DefaultRootSetFunc() /*{{{*/ - : constructedSuccessfully(false) -{ - Configuration::Item const *Opts; - Opts = _config->Tree("APT::NeverAutoRemove"); - if (Opts != 0 && Opts->Child != 0) - { - Opts = Opts->Child; - for (; Opts != 0; Opts = Opts->Next) - { - if (Opts->Value.empty() == true) - continue; - - regex_t *p = new regex_t; - if(regcomp(p,Opts->Value.c_str(), - REG_EXTENDED | REG_ICASE | REG_NOSUB) != 0) - { - regfree(p); - delete p; - _error->Error("Regex compilation error for APT::NeverAutoRemove"); - return; - } - - rootSetRegexp.push_back(p); - } - } - - constructedSuccessfully = true; -} - /*}}}*/ -pkgDepCache::DefaultRootSetFunc::~DefaultRootSetFunc() /*{{{*/ -{ - for(unsigned int i = 0; i < rootSetRegexp.size(); i++) - { - regfree(rootSetRegexp[i]); - delete rootSetRegexp[i]; - } -} - /*}}}*/ -bool pkgDepCache::DefaultRootSetFunc::InRootSet(const pkgCache::PkgIterator &pkg) /*{{{*/ -{ - for(unsigned int i = 0; i < rootSetRegexp.size(); i++) - if (regexec(rootSetRegexp[i], pkg.Name(), 0, 0, 0) == 0) - return true; - return false; } /*}}}*/ diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 72d7cce5d..66c099b80 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -38,11 +38,10 @@ #ifndef PKGLIB_DEPCACHE_H #define PKGLIB_DEPCACHE_H - +#include <apt-pkg/configuration.h> #include <apt-pkg/pkgcache.h> #include <apt-pkg/progress.h> - -#include <regex.h> +#include <apt-pkg/error.h> #include <vector> #include <memory> @@ -184,22 +183,13 @@ class pkgDepCache : protected pkgCache::Namespace /** \brief Returns \b true for packages matching a regular * expression in APT::NeverAutoRemove. */ - class DefaultRootSetFunc : public InRootSetFunc + class DefaultRootSetFunc : public InRootSetFunc, public Configuration::MatchAgainstConfig { - std::vector<regex_t *> rootSetRegexp; - bool constructedSuccessfully; - public: - DefaultRootSetFunc(); - ~DefaultRootSetFunc(); - - /** \return \b true if the class initialized successfully, \b - * false otherwise. Used to avoid throwing an exception, since - * APT classes generally don't. - */ - bool wasConstructedSuccessfully() const { return constructedSuccessfully; } + DefaultRootSetFunc() : Configuration::MatchAgainstConfig("APT::NeverRemove") {}; + virtual ~DefaultRootSetFunc() {}; - bool InRootSet(const pkgCache::PkgIterator &pkg); + bool InRootSet(const pkgCache::PkgIterator &pkg) { return pkg.end() == true && Match(pkg.Name()); }; }; struct StateCache diff --git a/debian/changelog b/debian/changelog index 06bde48fc..4500614a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,14 +16,17 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low * apt-pkg/depcache.cc: - SetCandidateVer for all pseudo packages - SetReInstall for the "all" package of a pseudo package + - use the new MatchAgainstConfig for the DefaultRootSetFunc * apt-pkg/contrib/error.{cc,h}: - complete rewrite but use the same API - add NOTICE and DEBUG as new types of a message - add a simple stack handling to be able to delay error handling * apt-pkg/aptconfiguration.cc: - show a deprecation notice for APT::Acquire::Translation + * apt-pkg/contrib/configuration.{cc,h}: + - add a wrapper to match strings against configurable regex patterns - -- David Kalnischkies <kalnischkies@gmail.com> Sat, 26 Jun 2010 09:01:40 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Sat, 26 Jun 2010 13:28:48 +0200 apt (0.7.26~exp7) experimental; urgency=low -- cgit v1.2.3 From 1408e219e76e577fb84ef1c48e58337b6569feec Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 26 Jun 2010 18:40:15 +0200 Subject: * apt-pkg/contrib/fileutl.cc: - show notice about ignored file instead of being always silent - add a Dir::Ignore-Files-Silently list option to control the notice * --- apt-pkg/contrib/fileutl.cc | 4 ++++ apt-pkg/init.cc | 5 +++++ debian/changelog | 6 +++++- doc/apt.conf.5.xml | 9 +++++++++ 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 16f7ce929..e95ddf562 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -281,6 +281,7 @@ std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> c } std::vector<string> List; + Configuration::MatchAgainstConfig SilentIgnore("Dir::Ignore-Files-Silently"); DIR *D = opendir(Dir.c_str()); if (D == 0) { @@ -306,6 +307,7 @@ std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> c { if (Debug == true) std::clog << "Bad file: " << Ent->d_name << " → no extension" << std::endl; + _error->Notice("Ignoring file '%s' in directory '%s' as it has no filename extension", Ent->d_name, Dir.c_str()); continue; } } @@ -313,6 +315,8 @@ std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> c { if (Debug == true) std::clog << "Bad file: " << Ent->d_name << " → bad extension »" << flExtension(Ent->d_name) << "«" << std::endl; + if (SilentIgnore.Match(Ent->d_name) == false) + _error->Notice("Ignoring file '%s' in directory '%s' as it has an invalid filename extension", Ent->d_name, Dir.c_str()); continue; } } diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 21472eb3b..7a332c86e 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -78,6 +78,11 @@ bool pkgInitConfig(Configuration &Cnf) Cnf.Set("Dir::Log::Terminal","term.log"); Cnf.Set("Dir::Log::History","history.log"); + Cnf.Set("Dir::Ignore-Files-Silently::", "~$"); + Cnf.Set("Dir::Ignore-Files-Silently::", "\\.disabled$"); + Cnf.Set("Dir::Ignore-Files-Silently::", "\\.bak$"); + Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$"); + // Translation Cnf.Set("APT::Acquire::Translation", "environment"); diff --git a/debian/changelog b/debian/changelog index 4500614a0..722e7ffc4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,8 +25,12 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low - show a deprecation notice for APT::Acquire::Translation * apt-pkg/contrib/configuration.{cc,h}: - add a wrapper to match strings against configurable regex patterns + * apt-pkg/contrib/fileutl.cc: + - show notice about ignored file instead of being always silent + - add a Dir::Ignore-Files-Silently list option to control the notice + * - -- David Kalnischkies <kalnischkies@gmail.com> Sat, 26 Jun 2010 13:28:48 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Sat, 26 Jun 2010 18:40:01 +0200 apt (0.7.26~exp7) experimental; urgency=low diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 0cf4bb663..39e2c8e6b 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -507,6 +507,15 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; will be looked up in <filename>/tmp/staging/var/lib/dpkg/status</filename>. </para> + + <para> + The <literal>Ignore-Files-Silently</literal> list can be used to specify + which files APT should silently ignore while parsing the files in the + fragment directories. Per default a file which end with <literal>.disabled</literal>, + <literal>~</literal>, <literal>.bak</literal> or <literal>.dpkg-[a-z]+</literal> + is silently ignored. As seen in the last default value these patterns can use regular + expression syntax. + </para> </refsect1> <refsect1><title>APT in DSelect -- cgit v1.2.3 From 5afa55c6703a71a198aac950db30ffc6ca49f269 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 26 Jun 2010 18:42:42 +0200 Subject: make the MMap Grow Error a fatal one as while in theory the code should never segfault it still tend to do it so better show it directly --- apt-pkg/contrib/mmap.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index d233e51bc..d71066243 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -297,7 +297,7 @@ unsigned long DynamicMMap::RawAllocate(unsigned long Size,unsigned long Aln) { if(!Grow()) { - _error->Error(_("Dynamic MMap ran out of room. Please increase the size " + _error->Fatal(_("Dynamic MMap ran out of room. Please increase the size " "of APT::Cache-Limit. Current value: %lu. (man 5 apt.conf)"), WorkSpace); return 0; } -- cgit v1.2.3 From c340d1851242e691e7e0baad18a662d6c7a62bc8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 26 Jun 2010 19:04:20 +0200 Subject: do not override the user set quiet setting even if the target is not a tty --- cmdline/apt-cache.cc | 2 +- cmdline/apt-cdrom.cc | 2 +- cmdline/apt-get.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index a4ec63eed..a5b3141d7 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1868,7 +1868,7 @@ int main(int argc,const char *argv[]) /*{{{*/ } // Deal with stdout not being a tty - if (isatty(STDOUT_FILENO) && _config->FindI("quiet",0) < 1) + if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1) _config->Set("quiet","1"); // if (_config->FindB("APT::Cache::Generate",true) == false) diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index da2ffa390..d1268edf9 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -266,7 +266,7 @@ int main(int argc,const char *argv[]) /*{{{*/ return ShowHelp(); // Deal with stdout not being a tty - if (isatty(STDOUT_FILENO) && _config->FindI("quiet",0) < 1) + if (isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1) _config->Set("quiet","1"); // Match the operation diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 605eedb0f..e3477b6db 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2899,7 +2899,7 @@ int main(int argc,const char *argv[]) /*{{{*/ } // Deal with stdout not being a tty - if (!isatty(STDOUT_FILENO) && _config->FindI("quiet",0) < 1) + if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1) _config->Set("quiet","1"); // Setup the output streams -- cgit v1.2.3 From 320352e00477f3b0cfd12efd736bd08c7908fecc Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 26 Jun 2010 19:22:23 +0200 Subject: give the APT::Cache::Generate option her effect back --- cmdline/apt-cache.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index a5b3141d7..c790559e7 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1871,7 +1871,9 @@ int main(int argc,const char *argv[]) /*{{{*/ if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1) _config->Set("quiet","1"); -// if (_config->FindB("APT::Cache::Generate",true) == false) + if (_config->Exists("APT::Cache::Generate") == true) + _config->Set("pkgCacheFile::Generate", _config->FindB("APT::Cache::Generate", true)); + if (CmdL.DispatchArg(CmdsA,false) == false && _error->PendingError() == false) CmdL.DispatchArg(CmdsB); -- cgit v1.2.3 From 5c640e864f8b5f1c175682a94f6c6d0dff42d4bc Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 26 Jun 2010 20:49:47 +0200 Subject: always mark the all package if a pseudo package is marked for install --- apt-pkg/depcache.cc | 4 ++++ debian/changelog | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 8bca3e36e..c93993ab1 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1255,6 +1255,10 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, Update(Pkg); AddSizes(Pkg); + // always trigger the install of the all package for a pseudo package + if (P.CandidateVerIter(*Cache).Pseudo() == true) + MarkInstall(Pkg.Group().FindPkg("all"), AutoInst, Depth, FromUser, ForceImportantDeps); + if (AutoInst == false) return; diff --git a/debian/changelog b/debian/changelog index 722e7ffc4..fbe814d84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low - SetCandidateVer for all pseudo packages - SetReInstall for the "all" package of a pseudo package - use the new MatchAgainstConfig for the DefaultRootSetFunc + - always mark the all package if a pseudo package is marked for install * apt-pkg/contrib/error.{cc,h}: - complete rewrite but use the same API - add NOTICE and DEBUG as new types of a message @@ -28,9 +29,8 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low * apt-pkg/contrib/fileutl.cc: - show notice about ignored file instead of being always silent - add a Dir::Ignore-Files-Silently list option to control the notice - * - -- David Kalnischkies Sat, 26 Jun 2010 18:40:01 +0200 + -- David Kalnischkies Sat, 26 Jun 2010 20:43:09 +0200 apt (0.7.26~exp7) experimental; urgency=low -- cgit v1.2.3 From d4af23c2d81116b8f7557ee795059bca126ae9f4 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sat, 26 Jun 2010 20:56:44 +0200 Subject: * apt-pkg/deb/deblistparser.cc: - Handle architecture wildcards (Closes: #547724). --- apt-pkg/deb/deblistparser.cc | 10 +++++++++- debian/changelog | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 83c5b8d2e..ddbd0d31a 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -19,6 +19,7 @@ #include #include +#include #include /*}}}*/ @@ -572,8 +573,15 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop, I++; } - if (stringcmp(arch,I,End) == 0) + if (stringcmp(arch,I,End) == 0) { Found = true; + } else { + std::string wildcard = SubstVar(string(I, End), "any", "*"); + if (fnmatch(wildcard.c_str(), arch.c_str(), 0) == 0) + Found = true; + else if (fnmatch(wildcard.c_str(), ("linux-" + arch).c_str(), 0) == 0) + Found = true; + } if (*End++ == ']') { I = End; diff --git a/debian/changelog b/debian/changelog index 037dfa7bd..8de7d18e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ apt (0.7.26~exp8) experimental; urgency=low * methods/ftp.h: - Handle different logins are on the same server (Closes: #586904). + * apt-pkg/deb/deblistparser.cc: + - Handle architecture wildcards (Closes: #547724). -- Julian Andres Klode Thu, 24 Jun 2010 10:56:39 +0200 -- cgit v1.2.3 From 7ecb5be707d7365df3af157a122b52667b96ace9 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sat, 26 Jun 2010 21:16:20 +0200 Subject: debian/changelog: Fix a typo --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8de7d18e3..105936177 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ apt (0.7.26~exp8) experimental; urgency=low * methods/ftp.h: - - Handle different logins are on the same server (Closes: #586904). + - Handle different logins on the same server (Closes: #586904). * apt-pkg/deb/deblistparser.cc: - Handle architecture wildcards (Closes: #547724). -- cgit v1.2.3 From 48c39e3246b72802a6f723eef1ce0c30e06be33d Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 26 Jun 2010 21:17:34 +0200 Subject: - only print errors if all tries to get a package by string failed * --- cmdline/cacheset.cc | 18 ++++++++++++------ debian/changelog | 4 +++- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/cmdline/cacheset.cc b/cmdline/cacheset.cc index 88a98fdbe..2b00187d8 100644 --- a/cmdline/cacheset.cc +++ b/cmdline/cacheset.cc @@ -200,15 +200,21 @@ PackageSet PackageSet::FromString(pkgCacheFile &Cache, std::string const &str, C pkgset.insert(Pkg); return pkgset; } + + _error->PushToStack(); + PackageSet pset = FromTask(Cache, str, helper); - if (pset.empty() == false) - return pset; + if (pset.empty() == true) { + pset = FromRegEx(Cache, str, helper); + if (pset.empty() == true) + pset = helper.canNotFindPackage(Cache, str); + } - pset = FromRegEx(Cache, str, helper); if (pset.empty() == false) - return pset; - - return helper.canNotFindPackage(Cache, str); + _error->RevertToStack(); + else + _error->MergeWithStack(); + return pset; } /*}}}*/ // GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ diff --git a/debian/changelog b/debian/changelog index fbe814d84..32a18cf59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low - get the candidate either from an already built depcache or use the policy which is a bit faster than depcache generation - get packages by task^ with FromTask() + - only print errors if all tries to get a package by string failed * cmdline/apt-get.cc: - use the cachsets in the install commands * apt-pkg/orderlist.cc: @@ -29,8 +30,9 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low * apt-pkg/contrib/fileutl.cc: - show notice about ignored file instead of being always silent - add a Dir::Ignore-Files-Silently list option to control the notice + * - -- David Kalnischkies Sat, 26 Jun 2010 20:43:09 +0200 + -- David Kalnischkies Sat, 26 Jun 2010 21:17:08 +0200 apt (0.7.26~exp7) experimental; urgency=low -- cgit v1.2.3 From 3b20aef1a2b5fd2fcd6f62a819edbdb19631fb98 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sat, 26 Jun 2010 23:01:49 +0200 Subject: apt-pkg/deb/deblistparser.cc: Fix bug in architecture wildcard support. Previously, linux-any was always matched, because the code simply appended linux- to the APT::Architecture value. Now, it does this only if the APT::Architecture value does not contain "-". --- apt-pkg/deb/deblistparser.cc | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index ddbd0d31a..00016679a 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -473,6 +473,14 @@ const char *debListParser::ConvertRelation(const char *I,unsigned int &Op) return I; } +/* + * CompleteArch: + * + * The complete architecture, consisting of -. + */ +static string CompleteArch(std::string& arch) { + return (arch.find("-") != string::npos) ? arch : "linux-" + arch; +} /*}}}*/ // ListParser::ParseDepends - Parse a dependency element /*{{{*/ // --------------------------------------------------------------------- @@ -546,6 +554,7 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop, if (ParseArchFlags == true) { string arch = _config->Find("APT::Architecture"); + string completeArch = CompleteArch(arch); // Parse an architecture if (I != Stop && *I == '[') @@ -577,9 +586,7 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop, Found = true; } else { std::string wildcard = SubstVar(string(I, End), "any", "*"); - if (fnmatch(wildcard.c_str(), arch.c_str(), 0) == 0) - Found = true; - else if (fnmatch(wildcard.c_str(), ("linux-" + arch).c_str(), 0) == 0) + if (fnmatch(wildcard.c_str(), completeArch.c_str(), 0) == 0) Found = true; } -- cgit v1.2.3 From 5143f361005775e3674f4f5871ad574cbe8ef705 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sun, 27 Jun 2010 21:04:53 +0200 Subject: deblistparser: Special-case *-armel, lpia and powerpcspe architectures. --- apt-pkg/deb/deblistparser.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 00016679a..6ede14c4d 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -479,6 +479,12 @@ const char *debListParser::ConvertRelation(const char *I,unsigned int &Op) * The complete architecture, consisting of -. */ static string CompleteArch(std::string& arch) { + if (arch == "armel") return "linux-arm"; + if (arch == "lpia") return "linux-i386"; + if (arch == "powerpcspe") return "linux-powerpc"; + if (arch == "uclibc-linux-armel") return "linux-arm"; + if (arch == "uclinux-armel") return "uclinux-arm"; + return (arch.find("-") != string::npos) ? arch : "linux-" + arch; } /*}}}*/ -- cgit v1.2.3 From ae4a4f91e90fb09a8de1699f18f3b28d095c4d73 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 28 Jun 2010 17:21:14 +0200 Subject: * apt-pkg/versionmatch.cc: - Support matching pins by regular expressions or glob() like patterns, regular expressions have to be put between to slashes; for example, /.*/. --- apt-pkg/versionmatch.cc | 58 +++++++++++++++++++++++++++++++++++++++---------- apt-pkg/versionmatch.h | 2 ++ debian/changelog | 4 ++++ 3 files changed, 52 insertions(+), 12 deletions(-) diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc index e5f0fafd2..72c9bff2d 100644 --- a/apt-pkg/versionmatch.cc +++ b/apt-pkg/versionmatch.cc @@ -18,6 +18,10 @@ #include #include +#include +#include +#include + /*}}}*/ // VersionMatch::pkgVersionMatch - Constructor /*{{{*/ @@ -162,6 +166,36 @@ pkgCache::VerIterator pkgVersionMatch::Find(pkgCache::PkgIterator Pkg) // This will be Ended by now. return Ver; } + +#ifndef FNM_CASEFOLD +#define FNM_CASEFOLD 0 +#endif + +bool pkgVersionMatch::ExpressionMatches(const char *pattern, const char *string) +{ + std::cerr << "MATCH " << pattern; + if (pattern[0] == '/') { + bool res = false; + size_t length = strlen(pattern); + if (pattern[length - 1] == '/') { + regex_t preg; + char *regex = strdup(pattern + 1); + regex[length - 2] = '\0'; + if (regcomp(&preg, regex, REG_EXTENDED | REG_ICASE) != 0) { + std::cerr << "E: Invalid regular expression: " << regex << "\n"; + } else if (regexec(&preg, string, 0, NULL, 0) == 0) { + res = true; + } + free(regex); + return res; + } + } + return fnmatch(pattern, string, FNM_CASEFOLD) == 0; +} +bool pkgVersionMatch::ExpressionMatches(const std::string& pattern, const char *string) +{ + return ExpressionMatches(pattern.c_str(), string); +} /*}}}*/ // VersionMatch::FileMatch - Match against an index file /*{{{*/ // --------------------------------------------------------------------- @@ -185,37 +219,37 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File) if (RelVerStr.empty() == false) if (File->Version == 0 || - MatchVer(File.Version(),RelVerStr,RelVerPrefixMatch) == false) + (MatchVer(File.Version(),RelVerStr,RelVerPrefixMatch) == false && + ExpressionMatches(RelVerStr, File.Version()) == false)) return false; if (RelOrigin.empty() == false) - if (File->Origin == 0 || - stringcasecmp(RelOrigin,File.Origin()) != 0) + if (File->Origin == 0 || !ExpressionMatches(RelOrigin,File.Origin())) return false; if (RelArchive.empty() == false) if (File->Archive == 0 || - stringcasecmp(RelArchive,File.Archive()) != 0) + !ExpressionMatches(RelArchive,File.Archive())) return false; if (RelCodename.empty() == false) if (File->Codename == 0 || - stringcasecmp(RelCodename,File.Codename()) != 0) + !ExpressionMatches(RelCodename,File.Codename())) return false; if (RelRelease.empty() == false) if ((File->Archive == 0 || - stringcasecmp(RelRelease,File.Archive()) != 0) && + !ExpressionMatches(RelRelease,File.Archive())) && (File->Codename == 0 || - stringcasecmp(RelRelease,File.Codename()) != 0)) + !ExpressionMatches(RelRelease,File.Codename()))) return false; if (RelLabel.empty() == false) if (File->Label == 0 || - stringcasecmp(RelLabel,File.Label()) != 0) + !ExpressionMatches(RelLabel,File.Label())) return false; if (RelComponent.empty() == false) if (File->Component == 0 || - stringcasecmp(RelComponent,File.Component()) != 0) + !ExpressionMatches(RelComponent,File.Component())) return false; if (RelArchitecture.empty() == false) if (File->Architecture == 0 || - stringcasecmp(RelArchitecture,File.Architecture()) != 0) + !ExpressionMatches(RelArchitecture,File.Architecture())) return false; return true; } @@ -223,12 +257,12 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File) if (Type == Origin) { if (OrSite.empty() == false) { - if (File->Site == 0 || OrSite != File.Site()) + if (File->Site == 0 || !ExpressionMatches(OrSite, File.Site())) return false; } else // so we are talking about file:// or status file if (strcmp(File.Site(),"") == 0 && File->Archive != 0) // skip the status file return false; - return (OrSite == File.Site()); /* both strings match */ + return (ExpressionMatches(OrSite, File.Site())); /* both strings match */ } return false; diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h index a8da072ae..39639a23d 100644 --- a/apt-pkg/versionmatch.h +++ b/apt-pkg/versionmatch.h @@ -67,6 +67,8 @@ class pkgVersionMatch enum MatchType {None = 0,Version,Release,Origin} Type; bool MatchVer(const char *A,string B,bool Prefix); + bool ExpressionMatches(const char *pattern, const char *string); + bool ExpressionMatches(const std::string& pattern, const char *string); bool FileMatch(pkgCache::PkgFileIterator File); pkgCache::VerIterator Find(pkgCache::PkgIterator Pkg); diff --git a/debian/changelog b/debian/changelog index 105936177..659facb37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ apt (0.7.26~exp8) experimental; urgency=low - Handle different logins on the same server (Closes: #586904). * apt-pkg/deb/deblistparser.cc: - Handle architecture wildcards (Closes: #547724). + * apt-pkg/versionmatch.cc: + - Support matching pins by regular expressions or glob() like patterns, + regular expressions have to be put between to slashes; for example, + /.*/. -- Julian Andres Klode Thu, 24 Jun 2010 10:56:39 +0200 -- cgit v1.2.3 From 05002864535069dbc35fd1c713ab072a5b6df65f Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 28 Jun 2010 17:29:11 +0200 Subject: Also support regular expressions and glob() patterns in "Pin: version". --- apt-pkg/versionmatch.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc index 72c9bff2d..2abb73e8d 100644 --- a/apt-pkg/versionmatch.cc +++ b/apt-pkg/versionmatch.cc @@ -155,6 +155,8 @@ pkgCache::VerIterator pkgVersionMatch::Find(pkgCache::PkgIterator Pkg) { if (MatchVer(Ver.VerStr(),VerStr,VerPrefixMatch) == true) return Ver; + if (ExpressionMatches(VerStr, Ver.VerStr()) == true) + return Ver; continue; } -- cgit v1.2.3 From 01934fb1fe79cddcc3cb4c79c99c3c30390fdef6 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 28 Jun 2010 17:30:40 +0200 Subject: Remove debugging stuff, this was not meant to be here. --- apt-pkg/versionmatch.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc index 2abb73e8d..65908f733 100644 --- a/apt-pkg/versionmatch.cc +++ b/apt-pkg/versionmatch.cc @@ -175,7 +175,6 @@ pkgCache::VerIterator pkgVersionMatch::Find(pkgCache::PkgIterator Pkg) bool pkgVersionMatch::ExpressionMatches(const char *pattern, const char *string) { - std::cerr << "MATCH " << pattern; if (pattern[0] == '/') { bool res = false; size_t length = strlen(pattern); -- cgit v1.2.3 From 4213f040ac8464d8826b64746c49c21c53a1ab12 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 28 Jun 2010 17:34:54 +0200 Subject: Use _error->Warning() instead of writing to std::cerr. --- apt-pkg/versionmatch.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc index 65908f733..a269338d6 100644 --- a/apt-pkg/versionmatch.cc +++ b/apt-pkg/versionmatch.cc @@ -183,7 +183,7 @@ bool pkgVersionMatch::ExpressionMatches(const char *pattern, const char *string) char *regex = strdup(pattern + 1); regex[length - 2] = '\0'; if (regcomp(&preg, regex, REG_EXTENDED | REG_ICASE) != 0) { - std::cerr << "E: Invalid regular expression: " << regex << "\n"; + _error->Warning("Invalid regular expression: %s", regex); } else if (regexec(&preg, string, 0, NULL, 0) == 0) { res = true; } -- cgit v1.2.3 From cec9f4f4bb39cc075acded3478d59d0f17d3ed89 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 28 Jun 2010 17:38:08 +0200 Subject: Also free regular expressions. --- apt-pkg/versionmatch.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc index a269338d6..093180f9b 100644 --- a/apt-pkg/versionmatch.cc +++ b/apt-pkg/versionmatch.cc @@ -188,6 +188,7 @@ bool pkgVersionMatch::ExpressionMatches(const char *pattern, const char *string) res = true; } free(regex); + regfree(&preg); return res; } } -- cgit v1.2.3 From bd631595620ca5b3c53ede4ef46c89399c26c5f3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 28 Jun 2010 22:13:17 +0200 Subject: - factor out code to get a single package FromName() - check in Grouped* first without modifier interpretation --- cmdline/cacheset.cc | 151 ++++++++++++++++++++++++++++++++++------------------ cmdline/cacheset.h | 15 +++++- debian/changelog | 4 +- 3 files changed, 116 insertions(+), 54 deletions(-) diff --git a/cmdline/cacheset.cc b/cmdline/cacheset.cc index 2b00187d8..42bc79693 100644 --- a/cmdline/cacheset.cc +++ b/cmdline/cacheset.cc @@ -25,11 +25,7 @@ namespace APT { // FromTask - Return all packages in the cache from a specific task /*{{{*/ PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) { - PackageSet pkgset; - if (Cache.BuildCaches() == false || Cache.BuildDepCache() == false) - return pkgset; - - size_t archfound = pattern.find_last_of(':'); + size_t const archfound = pattern.find_last_of(':'); std::string arch = "native"; if (archfound != std::string::npos) { arch = pattern.substr(archfound+1); @@ -37,9 +33,13 @@ PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, CacheS } if (pattern[pattern.length() -1] != '^') - return pkgset; + return APT::PackageSet(); pattern.erase(pattern.length()-1); + if (unlikely(Cache.GetPkgCache() == 0 || Cache.GetDepCache() == 0)) + return APT::PackageSet(); + + PackageSet pkgset; // get the records pkgRecords Recs(Cache); @@ -83,11 +83,9 @@ PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, CacheS /*}}}*/ // FromRegEx - Return all packages in the cache matching a pattern /*{{{*/ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) { - PackageSet pkgset; static const char * const isregex = ".?+*|[^$"; - if (pattern.find_first_of(isregex) == std::string::npos) - return pkgset; + return PackageSet(); size_t archfound = pattern.find_last_of(':'); std::string arch = "native"; @@ -105,9 +103,13 @@ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, Cache char Error[300]; regerror(Res, &Pattern, Error, sizeof(Error)); _error->Error(_("Regex compilation error - %s"), Error); - return pkgset; + return PackageSet(); } + if (unlikely(Cache.GetPkgCache() == 0)) + return PackageSet(); + + PackageSet pkgset; for (pkgCache::GrpIterator Grp = Cache.GetPkgCache()->GrpBegin(); Grp.end() == false; ++Grp) { if (regexec(&Pattern, Grp.Name(), 0, 0, 0) != 0) @@ -135,6 +137,33 @@ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, Cache return pkgset; } /*}}}*/ +// FromName - Returns the package defined by this string /*{{{*/ +pkgCache::PkgIterator PackageSet::FromName(pkgCacheFile &Cache, + std::string const &str, CacheSetHelper &helper) { + std::string pkg = str; + size_t archfound = pkg.find_last_of(':'); + std::string arch; + if (archfound != std::string::npos) { + arch = pkg.substr(archfound+1); + pkg.erase(archfound); + } + + if (Cache.GetPkgCache() == 0) + return pkgCache::PkgIterator(Cache, 0); + + pkgCache::PkgIterator Pkg(Cache, 0); + if (arch.empty() == true) { + pkgCache::GrpIterator Grp = Cache.GetPkgCache()->FindGrp(pkg); + if (Grp.end() == false) + Pkg = Grp.FindPreferredPkg(); + } else + Pkg = Cache.GetPkgCache()->FindPkg(pkg, arch); + + if (Pkg.end() == true) + return helper.canNotFindPkgName(Cache, str); + return Pkg; +} + /*}}}*/ // GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ std::map PackageSet::GroupedFromCommandLine( pkgCacheFile &Cache, const char **cmdline, @@ -144,6 +173,7 @@ std::map PackageSet::GroupedFromCommandLine( for (const char **I = cmdline; *I != 0; ++I) { unsigned short modID = fallback; std::string str = *I; + bool modifierPresent = false; for (std::list::const_iterator mod = mods.begin(); mod != mods.end(); ++mod) { size_t const alength = strlen(mod->Alias); @@ -160,8 +190,18 @@ std::map PackageSet::GroupedFromCommandLine( case PackageSet::Modifier::NONE: continue; } + modifierPresent = true; break; } + if (modifierPresent == true) { + bool const errors = helper.showErrors(false); + pkgCache::PkgIterator Pkg = FromName(Cache, *I, helper); + helper.showErrors(errors); + if (Pkg.end() == false) { + pkgsets[fallback].insert(Pkg); + continue; + } + } pkgsets[modID].insert(PackageSet::FromString(Cache, str, helper)); } return pkgsets; @@ -179,42 +219,26 @@ PackageSet PackageSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline /*}}}*/ // FromString - Return all packages matching a specific string /*{{{*/ PackageSet PackageSet::FromString(pkgCacheFile &Cache, std::string const &str, CacheSetHelper &helper) { - std::string pkg = str; - size_t archfound = pkg.find_last_of(':'); - std::string arch; - if (archfound != std::string::npos) { - arch = pkg.substr(archfound+1); - pkg.erase(archfound); - } - - pkgCache::PkgIterator Pkg; - if (arch.empty() == true) { - pkgCache::GrpIterator Grp = Cache.GetPkgCache()->FindGrp(pkg); - if (Grp.end() == false) - Pkg = Grp.FindPreferredPkg(); - } else - Pkg = Cache.GetPkgCache()->FindPkg(pkg, arch); - - if (Pkg.end() == false) { - PackageSet pkgset; - pkgset.insert(Pkg); - return pkgset; - } - _error->PushToStack(); - PackageSet pset = FromTask(Cache, str, helper); - if (pset.empty() == true) { - pset = FromRegEx(Cache, str, helper); - if (pset.empty() == true) - pset = helper.canNotFindPackage(Cache, str); + PackageSet pkgset; + pkgCache::PkgIterator Pkg = FromName(Cache, str, helper); + if (Pkg.end() == false) + pkgset.insert(Pkg); + else { + pkgset = FromTask(Cache, str, helper); + if (pkgset.empty() == true) { + pkgset = FromRegEx(Cache, str, helper); + if (pkgset.empty() == true) + pkgset = helper.canNotFindPackage(Cache, str); + } } - if (pset.empty() == false) + if (pkgset.empty() == false) _error->RevertToStack(); else _error->MergeWithStack(); - return pset; + return pkgset; } /*}}}*/ // GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ @@ -227,6 +251,7 @@ std::map VersionSet::GroupedFromCommandLine( unsigned short modID = fallback; VersionSet::Version select = VersionSet::NEWEST; std::string str = *I; + bool modifierPresent = false; for (std::list::const_iterator mod = mods.begin(); mod != mods.end(); ++mod) { if (modID == fallback && mod->ID == fallback) @@ -246,8 +271,19 @@ std::map VersionSet::GroupedFromCommandLine( case VersionSet::Modifier::NONE: continue; } + modifierPresent = true; break; } + + if (modifierPresent == true) { + bool const errors = helper.showErrors(false); + VersionSet const vset = VersionSet::FromString(Cache, std::string(*I), select, helper, true); + helper.showErrors(errors); + if (vset.empty() == false) { + versets[fallback].insert(vset); + continue; + } + } versets[modID].insert(VersionSet::FromString(Cache, str, select , helper)); } return versets; @@ -257,16 +293,15 @@ std::map VersionSet::GroupedFromCommandLine( APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, APT::VersionSet::Version const &fallback, CacheSetHelper &helper) { VersionSet verset; - for (const char **I = cmdline; *I != 0; ++I) { - VersionSet vset = VersionSet::FromString(Cache, *I, fallback, helper); - verset.insert(vset.begin(), vset.end()); - } + for (const char **I = cmdline; *I != 0; ++I) + verset.insert(VersionSet::FromString(Cache, *I, fallback, helper)); return verset; } /*}}}*/ // FromString - Returns all versions spedcified by a string /*{{{*/ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, - APT::VersionSet::Version const &fallback, CacheSetHelper &helper) { + APT::VersionSet::Version const &fallback, CacheSetHelper &helper, + bool const &onlyFromName) { std::string ver; bool verIsRel = false; size_t const vertag = pkg.find_last_of("/="); @@ -275,7 +310,13 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, verIsRel = (pkg[vertag] == '/'); pkg.erase(vertag); } - PackageSet pkgset = PackageSet::FromString(Cache, pkg.c_str(), helper); + PackageSet pkgset; + if (onlyFromName == false) + pkgset = PackageSet::FromString(Cache, pkg, helper); + else { + pkgset.insert(PackageSet::FromName(Cache, pkg, helper)); + } + VersionSet verset; for (PackageSet::const_iterator P = pkgset.begin(); P != pkgset.end(); ++P) { @@ -372,8 +413,8 @@ pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache, if (Cache.IsDepCacheBuilt() == true) Cand = Cache[Pkg].CandidateVerIter(Cache); else { - if (unlikely(Cache.BuildPolicy() == false)) - return pkgCache::VerIterator(*Cache); + if (unlikely(Cache.GetPolicy() == 0)) + return pkgCache::VerIterator(Cache); Cand = Cache.GetPolicy()->GetCandidateVer(Pkg); } if (Cand.end() == true) @@ -389,6 +430,14 @@ pkgCache::VerIterator VersionSet::getInstalledVer(pkgCacheFile &Cache, return Pkg.CurrentVer(); } /*}}}*/ +// canNotFindPkgName - handle the case no package has this name /*{{{*/ +pkgCache::PkgIterator CacheSetHelper::canNotFindPkgName(pkgCacheFile &Cache, + std::string const &str) { + if (ShowError == true) + _error->Error(_("Unable to locate package %s"), str.c_str()); + return pkgCache::PkgIterator(Cache, 0); +} + /*}}}*/ // canNotFindTask - handle the case no package is found for a task /*{{{*/ PackageSet CacheSetHelper::canNotFindTask(pkgCacheFile &Cache, std::string pattern) { if (ShowError == true) @@ -405,8 +454,6 @@ PackageSet CacheSetHelper::canNotFindRegEx(pkgCacheFile &Cache, std::string patt /*}}}*/ // canNotFindPackage - handle the case no package is found from a string/*{{{*/ PackageSet CacheSetHelper::canNotFindPackage(pkgCacheFile &Cache, std::string const &str) { - if (ShowError == true) - _error->Error(_("Unable to locate package %s"), str.c_str()); return PackageSet(); } /*}}}*/ @@ -431,7 +478,7 @@ pkgCache::VerIterator CacheSetHelper::canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { if (ShowError == true) _error->Error(_("Can't select newest version from package '%s' as it is purely virtual"), Pkg.FullName(true).c_str()); - return pkgCache::VerIterator(*Cache); + return pkgCache::VerIterator(Cache); } /*}}}*/ // canNotFindCandidateVer /*{{{*/ @@ -439,7 +486,7 @@ pkgCache::VerIterator CacheSetHelper::canNotFindCandidateVer(pkgCacheFile &Cache pkgCache::PkgIterator const &Pkg) { if (ShowError == true) _error->Error(_("Can't select candidate version from package %s as it has no candidate"), Pkg.FullName(true).c_str()); - return pkgCache::VerIterator(*Cache); + return pkgCache::VerIterator(Cache); } /*}}}*/ // canNotFindInstalledVer /*{{{*/ @@ -447,7 +494,7 @@ pkgCache::VerIterator CacheSetHelper::canNotFindInstalledVer(pkgCacheFile &Cache pkgCache::PkgIterator const &Pkg) { if (ShowError == true) _error->Error(_("Can't select installed version from package %s as it is not installed"), Pkg.FullName(true).c_str()); - return pkgCache::VerIterator(*Cache); + return pkgCache::VerIterator(Cache); } /*}}}*/ } diff --git a/cmdline/cacheset.h b/cmdline/cacheset.h index 9c9491020..21c42c511 100644 --- a/cmdline/cacheset.h +++ b/cmdline/cacheset.h @@ -40,6 +40,7 @@ public: /*{{{*/ virtual void showSelectedVersion(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const Ver, string const &ver, bool const &verIsRel) {}; + virtual pkgCache::PkgIterator canNotFindPkgName(pkgCacheFile &Cache, std::string const &str); virtual PackageSet canNotFindTask(pkgCacheFile &Cache, std::string pattern); virtual PackageSet canNotFindRegEx(pkgCacheFile &Cache, std::string pattern); virtual PackageSet canNotFindPackage(pkgCacheFile &Cache, std::string const &str); @@ -146,6 +147,17 @@ public: /*{{{*/ return APT::PackageSet::FromString(Cache, string, helper); } + /** \brief returns a package specified by a string + + \param Cache the package is in + \param string String the package name should be extracted from + \param out stream to print various notices to */ + static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &string, CacheSetHelper &helper); + static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &string) { + CacheSetHelper helper; + return APT::PackageSet::FromName(Cache, string, helper); + } + /** \brief returns all packages specified on the commandline Get all package names from the commandline and executes regex's if needed. @@ -268,7 +280,8 @@ public: /*{{{*/ } static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, - APT::VersionSet::Version const &fallback, CacheSetHelper &helper); + APT::VersionSet::Version const &fallback, CacheSetHelper &helper, + bool const &onlyFromName = false); static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, APT::VersionSet::Version const &fallback) { CacheSetHelper helper; diff --git a/debian/changelog b/debian/changelog index 32a18cf59..d7c6b8d0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low or use the policy which is a bit faster than depcache generation - get packages by task^ with FromTask() - only print errors if all tries to get a package by string failed + - factor out code to get a single package FromName() + - check in Grouped* first without modifier interpretation * cmdline/apt-get.cc: - use the cachsets in the install commands * apt-pkg/orderlist.cc: @@ -32,7 +34,7 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low - add a Dir::Ignore-Files-Silently list option to control the notice * - -- David Kalnischkies Sat, 26 Jun 2010 21:17:08 +0200 + -- David Kalnischkies Mon, 28 Jun 2010 22:12:24 +0200 apt (0.7.26~exp7) experimental; urgency=low -- cgit v1.2.3 From 9055046760d4e276914e10b96c6065fb885f118b Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 29 Jun 2010 15:21:24 +0200 Subject: debian/control: Set Standards-Version to 3.9.0 --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 659facb37..3a0fcd83d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ apt (0.7.26~exp8) experimental; urgency=low - Support matching pins by regular expressions or glob() like patterns, regular expressions have to be put between to slashes; for example, /.*/. + * debian/control: + - Set Standards-Version to 3.9.0 -- Julian Andres Klode Thu, 24 Jun 2010 10:56:39 +0200 diff --git a/debian/control b/debian/control index 9ac0d582e..8bc43568f 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: APT Development Team Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Luca Bruno , Julian Andres Klode -Standards-Version: 3.8.4 +Standards-Version: 3.9.0 Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen, intltool Build-Conflicts: autoconf2.13, automake1.4 -- cgit v1.2.3 From e67c08344dbb9ecd827658d74121fa9b66b28961 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 29 Jun 2010 17:14:45 +0200 Subject: for install, do all installs first and then the removes and vice versa --- cmdline/apt-get.cc | 92 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 54 insertions(+), 38 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index e3477b6db..7ba0e8e5c 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1640,24 +1640,27 @@ bool DoInstall(CommandLine &CmdL) unsigned int AutoMarkChanged = 0; pkgProblemResolver Fix(Cache); - unsigned short fallback = 0; + static const unsigned short MOD_REMOVE = 1; + static const unsigned short MOD_INSTALL = 2; + + unsigned short fallback = MOD_INSTALL; if (strcasecmp(CmdL.FileList[0],"remove") == 0) - fallback = 1; + fallback = MOD_REMOVE; else if (strcasecmp(CmdL.FileList[0], "purge") == 0) { _config->Set("APT::Get::Purge", true); - fallback = 1; + fallback = MOD_REMOVE; } else if (strcasecmp(CmdL.FileList[0], "autoremove") == 0) { _config->Set("APT::Get::AutomaticRemove", "true"); - fallback = 1; + fallback = MOD_REMOVE; } std::list mods; - mods.push_back(APT::VersionSet::Modifier(0, "+", + mods.push_back(APT::VersionSet::Modifier(MOD_INSTALL, "+", APT::VersionSet::Modifier::POSTFIX, APT::VersionSet::CANDINST)); - mods.push_back(APT::VersionSet::Modifier(1, "-", + mods.push_back(APT::VersionSet::Modifier(MOD_REMOVE, "-", APT::VersionSet::Modifier::POSTFIX, APT::VersionSet::INSTCAND)); CacheSetHelperAPTGet helper(c0out); std::map verset = APT::VersionSet::GroupedFromCommandLine(Cache, @@ -1666,41 +1669,54 @@ bool DoInstall(CommandLine &CmdL) if (_error->PendingError() == true) return false; + unsigned short order[] = { 0, 0, 0 }; + if (fallback == MOD_INSTALL) { + order[0] = MOD_INSTALL; + order[1] = MOD_REMOVE; + } else { + order[0] = MOD_REMOVE; + order[1] = MOD_INSTALL; + } + // new scope for the ActionGroup { pkgDepCache::ActionGroup group(Cache); - for (APT::VersionSet::const_iterator Ver = verset[0].begin(); - Ver != verset[0].end(); ++Ver) - { - pkgCache::PkgIterator Pkg = Ver.ParentPkg(); - Cache->SetCandidateVersion(Ver); - - if (TryToInstall(Pkg, Cache, Fix, false, BrokenFix) == false) - return false; - - // see if we need to fix the auto-mark flag - // e.g. apt-get install foo - // where foo is marked automatic - if (Cache[Pkg].Install() == false && - (Cache[Pkg].Flags & pkgCache::Flag::Auto) && - _config->FindB("APT::Get::ReInstall",false) == false && - _config->FindB("APT::Get::Only-Upgrade",false) == false && - _config->FindB("APT::Get::Download-Only",false) == false) - { - ioprintf(c1out,_("%s set to manually installed.\n"), - Pkg.FullName(true).c_str()); - Cache->MarkAuto(Pkg,false); - AutoMarkChanged++; - } - } - - for (APT::VersionSet::const_iterator Ver = verset[1].begin(); - Ver != verset[1].end(); ++Ver) + for (unsigned short i = 0; order[i] != 0; ++i) { - pkgCache::PkgIterator Pkg = Ver.ParentPkg(); + if (order[i] == MOD_INSTALL) + for (APT::VersionSet::const_iterator Ver = verset[MOD_INSTALL].begin(); + Ver != verset[MOD_INSTALL].end(); ++Ver) + { + pkgCache::PkgIterator Pkg = Ver.ParentPkg(); + Cache->SetCandidateVersion(Ver); + + if (TryToInstall(Pkg, Cache, Fix, false, BrokenFix) == false) + return false; + + // see if we need to fix the auto-mark flag + // e.g. apt-get install foo + // where foo is marked automatic + if (Cache[Pkg].Install() == false && + (Cache[Pkg].Flags & pkgCache::Flag::Auto) && + _config->FindB("APT::Get::ReInstall",false) == false && + _config->FindB("APT::Get::Only-Upgrade",false) == false && + _config->FindB("APT::Get::Download-Only",false) == false) + { + ioprintf(c1out,_("%s set to manually installed.\n"), + Pkg.FullName(true).c_str()); + Cache->MarkAuto(Pkg,false); + AutoMarkChanged++; + } + } + else if (order[i] == MOD_REMOVE) + for (APT::VersionSet::const_iterator Ver = verset[MOD_REMOVE].begin(); + Ver != verset[MOD_REMOVE].end(); ++Ver) + { + pkgCache::PkgIterator Pkg = Ver.ParentPkg(); - if (TryToInstall(Pkg, Cache, Fix, true, BrokenFix) == false) - return false; + if (TryToInstall(Pkg, Cache, Fix, true, BrokenFix) == false) + return false; + } } if (_error->PendingError() == true) @@ -1752,7 +1768,7 @@ bool DoInstall(CommandLine &CmdL) /* Print out a list of packages that are going to be installed extra to what the user asked */ - if (Cache->InstCount() != verset[0].size()) + if (Cache->InstCount() != verset[MOD_INSTALL].size()) { string List; string VersionsList; @@ -1879,7 +1895,7 @@ bool DoInstall(CommandLine &CmdL) // See if we need to prompt // FIXME: check if really the packages in the set are going to be installed - if (Cache->InstCount() == verset[0].size() && Cache->DelCount() == 0) + if (Cache->InstCount() == verset[MOD_INSTALL].size() && Cache->DelCount() == 0) return InstallPackages(Cache,false,false); return InstallPackages(Cache,false); -- cgit v1.2.3 From 3010fb0e069d2fd4c7a6ade4559bfb659bf8f2fb Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 29 Jun 2010 17:23:24 +0200 Subject: * apt-pkg/contrib/fileutl.cc: - Make FileFd replace files atomically in WriteTemp mode (for cache, etc). --- apt-pkg/contrib/fileutl.cc | 20 +++++++++++++++----- apt-pkg/contrib/fileutl.h | 3 ++- debian/changelog | 2 ++ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 16f7ce929..0b0739cda 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -27,6 +27,7 @@ #include #include +#include #include #include @@ -654,10 +655,11 @@ bool FileFd::Open(string FileName,OpenMode Mode, unsigned long Perms) case WriteEmpty: { - struct stat Buf; - if (lstat(FileName.c_str(),&Buf) == 0 && S_ISLNK(Buf.st_mode)) - unlink(FileName.c_str()); - iFd = open(FileName.c_str(),O_RDWR | O_CREAT | O_TRUNC,Perms); + Flags |= Replace; + char *name = strdup((FileName + ".XXXXXX").c_str()); + TemporaryFileName = string(mktemp(name)); + iFd = open(TemporaryFileName.c_str(),O_RDWR | O_CREAT | O_EXCL,Perms); + free(name); break; } @@ -839,11 +841,19 @@ bool FileFd::Close() if (iFd >= 0 && close(iFd) != 0) Res &= _error->Errno("close",_("Problem closing the file")); iFd = -1; - + + if ((Flags & Replace) == Replace) { + FileName = TemporaryFileName; // for the unlink() below. + if (rename(TemporaryFileName.c_str(), FileName.c_str()) != 0) + Res &= _error->Errno("rename",_("Problem renaming the file")); + } + if ((Flags & Fail) == Fail && (Flags & DelOnFail) == DelOnFail && FileName.empty() == false) if (unlink(FileName.c_str()) != 0) Res &= _error->WarningE("unlnk",_("Problem unlinking the file")); + + return Res; } /*}}}*/ diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 003bd9b83..528725f89 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -34,9 +34,10 @@ class FileFd int iFd; enum LocalFlags {AutoClose = (1<<0),Fail = (1<<1),DelOnFail = (1<<2), - HitEof = (1<<3)}; + HitEof = (1<<3), Replace = (1<<4) }; unsigned long Flags; string FileName; + string TemporaryFileName; public: enum OpenMode {ReadOnly,WriteEmpty,WriteExists,WriteAny,WriteTemp}; diff --git a/debian/changelog b/debian/changelog index 3a0fcd83d..1bf6815a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ apt (0.7.26~exp8) experimental; urgency=low - Support matching pins by regular expressions or glob() like patterns, regular expressions have to be put between to slashes; for example, /.*/. + * apt-pkg/contrib/fileutl.cc: + - Make FileFd replace files atomically in WriteTemp mode (for cache, etc). * debian/control: - Set Standards-Version to 3.9.0 -- cgit v1.2.3 From fd3b761e8cba6ed626639b50b1221246098c7b3a Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 29 Jun 2010 17:28:33 +0200 Subject: Fix the atomic replace. --- apt-pkg/contrib/fileutl.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 0b0739cda..0b62d1bd8 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -843,9 +843,9 @@ bool FileFd::Close() iFd = -1; if ((Flags & Replace) == Replace) { - FileName = TemporaryFileName; // for the unlink() below. if (rename(TemporaryFileName.c_str(), FileName.c_str()) != 0) Res &= _error->Errno("rename",_("Problem renaming the file")); + FileName = TemporaryFileName; // for the unlink() below. } if ((Flags & Fail) == Fail && (Flags & DelOnFail) == DelOnFail && -- cgit v1.2.3 From fb83c1d078b9f5e2e28a828c325dc62dcf060f2b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 29 Jun 2010 19:10:47 +0200 Subject: rename AddSelectedVersion() to a better public FromPackage() --- cmdline/cacheset.cc | 11 ++++++----- cmdline/cacheset.h | 14 +++++++++----- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/cmdline/cacheset.cc b/cmdline/cacheset.cc index 42bc79693..35ef74f9a 100644 --- a/cmdline/cacheset.cc +++ b/cmdline/cacheset.cc @@ -321,7 +321,7 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, for (PackageSet::const_iterator P = pkgset.begin(); P != pkgset.end(); ++P) { if (vertag == string::npos) { - AddSelectedVersion(Cache, verset, P, fallback, helper); + verset.insert(VersionSet::FromPackage(Cache, P, fallback, helper)); continue; } pkgCache::VerIterator V; @@ -351,10 +351,10 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, return verset; } /*}}}*/ -// AddSelectedVersion - add version from package based on fallback /*{{{*/ -void VersionSet::AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, - pkgCache::PkgIterator const &P, VersionSet::Version const &fallback, - CacheSetHelper &helper) { +// FromPackage - versions from package based on fallback /*{{{*/ +VersionSet VersionSet::FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P, + VersionSet::Version const &fallback, CacheSetHelper &helper) { + VersionSet verset; pkgCache::VerIterator V; bool showErrors; switch(fallback) { @@ -404,6 +404,7 @@ void VersionSet::AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, verset.insert(helper.canNotFindNewestVer(Cache, P)); break; } + return verset; } /*}}}*/ // getCandidateVer - Returns the candidate version of the given package /*{{{*/ diff --git a/cmdline/cacheset.h b/cmdline/cacheset.h index 21c42c511..bf863fb39 100644 --- a/cmdline/cacheset.h +++ b/cmdline/cacheset.h @@ -291,6 +291,15 @@ public: /*{{{*/ return APT::VersionSet::FromString(Cache, pkg, CANDINST); } + /** \brief returns all versions specified for the package + + \param Cache the package and versions are in + \param P the package in question + \param fallback the version(s) you want to get + \param helper the helper used for display and error handling */ + static VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P, + VersionSet::Version const &fallback, CacheSetHelper &helper); + struct Modifier { enum Position { NONE, PREFIX, POSTFIX }; unsigned short ID; @@ -330,11 +339,6 @@ protected: /*{{{*/ \param Pkg we want the installed version from this package */ static pkgCache::VerIterator getInstalledVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper); - - static void AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, - pkgCache::PkgIterator const &P, VersionSet::Version const &fallback, - CacheSetHelper &helper); - /*}}}*/ }; /*}}}*/ } -- cgit v1.2.3 From cf28bcadb301d00f6534fea97ccf1fde63041e7b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 29 Jun 2010 19:21:35 +0200 Subject: if the package has no installed & candidate but is virtual see if only one package provides it - if it is only one use this package instead --- cmdline/apt-get.cc | 86 ++++++++++++++++++++++++++++++----------------------- cmdline/cacheset.cc | 8 +++++ cmdline/cacheset.h | 2 ++ 3 files changed, 59 insertions(+), 37 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 7ba0e8e5c..d3ddcbfe8 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1081,41 +1081,6 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, pkgProblemResolver &Fix,bool Remove,bool BrokenFix, bool AllowFail = true) { - /* This is a pure virtual package and there is a single available - candidate providing it. */ - if (Cache[Pkg].CandidateVer == 0 && Pkg->ProvidesList != 0) - { - pkgCache::PkgIterator Prov; - bool found_one = false; - - for (pkgCache::PrvIterator P = Pkg.ProvidesList(); P; P++) - { - pkgCache::VerIterator const PVer = P.OwnerVer(); - pkgCache::PkgIterator const PPkg = PVer.ParentPkg(); - - /* Ignore versions that are not a candidate. */ - if (Cache[PPkg].CandidateVer != PVer) - continue; - - if (found_one == false) - { - Prov = PPkg; - found_one = true; - } - else if (PPkg != Prov) - { - found_one = false; // we found at least two - break; - } - } - - if (found_one == true) - { - ioprintf(c1out,_("Note, selecting %s instead of %s\n"), - Prov.FullName(true).c_str(),Pkg.FullName(true).c_str()); - Pkg = Prov; - } - } // Handle the no-upgrade case if (_config->FindB("APT::Get::upgrade",true) == false && @@ -1601,13 +1566,13 @@ public: virtual void showTaskSelection(APT::PackageSet const &pkgset, string const &pattern) { for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) - ioprintf(out, _("Note, selecting %s for task '%s'\n"), + ioprintf(out, _("Note, selecting '%s' for task '%s'\n"), Pkg.FullName(true).c_str(), pattern.c_str()); explicitlyNamed = false; } virtual void showRegExSelection(APT::PackageSet const &pkgset, string const &pattern) { for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) - ioprintf(out, _("Note, selecting %s for regex '%s'\n"), + ioprintf(out, _("Note, selecting '%s' for regex '%s'\n"), Pkg.FullName(true).c_str(), pattern.c_str()); explicitlyNamed = false; } @@ -1618,6 +1583,53 @@ public: Ver.VerStr(), Ver.RelStr().c_str(), Pkg.FullName(true).c_str()); } + virtual APT::VersionSet canNotFindCandInstVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { + return tryVirtualPackage(Cache, Pkg, APT::VersionSet::CANDINST); + } + + virtual APT::VersionSet canNotFindInstCandVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { + return tryVirtualPackage(Cache, Pkg, APT::VersionSet::INSTCAND); + } + + APT::VersionSet tryVirtualPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg, + APT::VersionSet::Version const &select) { + /* This is a pure virtual package and there is a single available + candidate providing it. */ + if (unlikely(Cache[Pkg].CandidateVer != 0) || Pkg->ProvidesList == 0) { + if (select == APT::VersionSet::CANDINST) + return APT::CacheSetHelper::canNotFindCandInstVer(Cache, Pkg); + return APT::CacheSetHelper::canNotFindInstCandVer(Cache, Pkg); + } + + pkgCache::PkgIterator Prov; + bool found_one = false; + for (pkgCache::PrvIterator P = Pkg.ProvidesList(); P; ++P) { + pkgCache::VerIterator const PVer = P.OwnerVer(); + pkgCache::PkgIterator const PPkg = PVer.ParentPkg(); + + /* Ignore versions that are not a candidate. */ + if (Cache[PPkg].CandidateVer != PVer) + continue; + + if (found_one == false) { + Prov = PPkg; + found_one = true; + } else if (PPkg != Prov) { + found_one = false; // we found at least two + break; + } + } + + if (found_one == true) { + ioprintf(out, _("Note, selecting '%s' instead of '%s'\n"), + Prov.FullName(true).c_str(), Pkg.FullName(true).c_str()); + return APT::VersionSet::FromPackage(Cache, Prov, select, *this); + } + if (select == APT::VersionSet::CANDINST) + return APT::CacheSetHelper::canNotFindCandInstVer(Cache, Pkg); + return APT::CacheSetHelper::canNotFindInstCandVer(Cache, Pkg); + } + inline bool allPkgNamedExplicitly() const { return explicitlyNamed; } }; diff --git a/cmdline/cacheset.cc b/cmdline/cacheset.cc index 35ef74f9a..cc2860a22 100644 --- a/cmdline/cacheset.cc +++ b/cmdline/cacheset.cc @@ -474,6 +474,14 @@ VersionSet CacheSetHelper::canNotFindInstCandVer(pkgCacheFile &Cache, return VersionSet(); } /*}}}*/ +// canNotFindInstCandVer /*{{{*/ +VersionSet CacheSetHelper::canNotFindCandInstVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg) { + if (ShowError == true) + _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str()); + return VersionSet(); +} + /*}}}*/ // canNotFindNewestVer /*{{{*/ pkgCache::VerIterator CacheSetHelper::canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { diff --git a/cmdline/cacheset.h b/cmdline/cacheset.h index bf863fb39..2ca794f28 100644 --- a/cmdline/cacheset.h +++ b/cmdline/cacheset.h @@ -47,6 +47,8 @@ public: /*{{{*/ virtual VersionSet canNotFindAllVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg); virtual VersionSet canNotFindInstCandVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg); + virtual VersionSet canNotFindCandInstVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg); virtual pkgCache::VerIterator canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg); virtual pkgCache::VerIterator canNotFindCandidateVer(pkgCacheFile &Cache, -- cgit v1.2.3 From c8db3fff877f102dc6fb62c4e4c7f700160b68f5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 2 Jul 2010 07:06:53 +0200 Subject: add a ConstructedBy member to the PackageSet which can be used by the e.g. FromString to tell the caller if the string was an exact match or found by regex or task. The two later ones can match packages for which we want to ignore failures in the VersionSet --- cmdline/cacheset.cc | 26 ++++++++++++++++---------- cmdline/cacheset.h | 42 +++++++++++++++++++++++++++++++++++------- 2 files changed, 51 insertions(+), 17 deletions(-) diff --git a/cmdline/cacheset.cc b/cmdline/cacheset.cc index cc2860a22..4d6d6a87c 100644 --- a/cmdline/cacheset.cc +++ b/cmdline/cacheset.cc @@ -33,13 +33,13 @@ PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, CacheS } if (pattern[pattern.length() -1] != '^') - return APT::PackageSet(); + return APT::PackageSet(TASK); pattern.erase(pattern.length()-1); if (unlikely(Cache.GetPkgCache() == 0 || Cache.GetDepCache() == 0)) - return APT::PackageSet(); + return APT::PackageSet(TASK); - PackageSet pkgset; + PackageSet pkgset(TASK); // get the records pkgRecords Recs(Cache); @@ -85,7 +85,7 @@ PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, CacheS PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) { static const char * const isregex = ".?+*|[^$"; if (pattern.find_first_of(isregex) == std::string::npos) - return PackageSet(); + return PackageSet(REGEX); size_t archfound = pattern.find_last_of(':'); std::string arch = "native"; @@ -103,13 +103,13 @@ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, Cache char Error[300]; regerror(Res, &Pattern, Error, sizeof(Error)); _error->Error(_("Regex compilation error - %s"), Error); - return PackageSet(); + return PackageSet(REGEX); } if (unlikely(Cache.GetPkgCache() == 0)) - return PackageSet(); + return PackageSet(REGEX); - PackageSet pkgset; + PackageSet pkgset(REGEX); for (pkgCache::GrpIterator Grp = Cache.GetPkgCache()->GrpBegin(); Grp.end() == false; ++Grp) { if (regexec(&Pattern, Grp.Name(), 0, 0, 0) != 0) @@ -318,8 +318,12 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, } VersionSet verset; + bool errors = true; + if (pkgset.getConstructor() != PackageSet::UNKNOWN) + errors = helper.showErrors(false); for (PackageSet::const_iterator P = pkgset.begin(); P != pkgset.end(); ++P) { + helper.canNotFindCandidateVer(Cache, P); if (vertag == string::npos) { verset.insert(VersionSet::FromPackage(Cache, P, fallback, helper)); continue; @@ -348,6 +352,8 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, helper.showSelectedVersion(P, V, ver, verIsRel); verset.insert(V); } + if (pkgset.getConstructor() != PackageSet::UNKNOWN) + helper.showErrors(errors); return verset; } /*}}}*/ @@ -487,7 +493,7 @@ pkgCache::VerIterator CacheSetHelper::canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { if (ShowError == true) _error->Error(_("Can't select newest version from package '%s' as it is purely virtual"), Pkg.FullName(true).c_str()); - return pkgCache::VerIterator(Cache); + return pkgCache::VerIterator(Cache, 0); } /*}}}*/ // canNotFindCandidateVer /*{{{*/ @@ -495,7 +501,7 @@ pkgCache::VerIterator CacheSetHelper::canNotFindCandidateVer(pkgCacheFile &Cache pkgCache::PkgIterator const &Pkg) { if (ShowError == true) _error->Error(_("Can't select candidate version from package %s as it has no candidate"), Pkg.FullName(true).c_str()); - return pkgCache::VerIterator(Cache); + return pkgCache::VerIterator(Cache, 0); } /*}}}*/ // canNotFindInstalledVer /*{{{*/ @@ -503,7 +509,7 @@ pkgCache::VerIterator CacheSetHelper::canNotFindInstalledVer(pkgCacheFile &Cache pkgCache::PkgIterator const &Pkg) { if (ShowError == true) _error->Error(_("Can't select installed version from package %s as it is not installed"), Pkg.FullName(true).c_str()); - return pkgCache::VerIterator(Cache); + return pkgCache::VerIterator(Cache, 0); } /*}}}*/ } diff --git a/cmdline/cacheset.h b/cmdline/cacheset.h index 2ca794f28..c8c3dd096 100644 --- a/cmdline/cacheset.h +++ b/cmdline/cacheset.h @@ -117,7 +117,7 @@ public: /*{{{*/ packages chosen cause of the given task. \param Cache the packages are in \param pattern name of the task - \param out stream to print the notice to */ + \param helper responsible for error and message handling */ static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper); static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string const &pattern) { CacheSetHelper helper; @@ -131,7 +131,7 @@ public: /*{{{*/ packages chosen cause of the given package. \param Cache the packages are in \param pattern regular expression for package names - \param out stream to print the notice to */ + \param helper responsible for error and message handling */ static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper); static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string const &pattern) { CacheSetHelper helper; @@ -142,7 +142,7 @@ public: /*{{{*/ \param Cache the packages are in \param string String the package name(s) should be extracted from - \param out stream to print various notices to */ + \param helper responsible for error and message handling */ static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string, CacheSetHelper &helper); static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string) { CacheSetHelper helper; @@ -153,7 +153,7 @@ public: /*{{{*/ \param Cache the package is in \param string String the package name should be extracted from - \param out stream to print various notices to */ + \param helper responsible for error and message handling */ static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &string, CacheSetHelper &helper); static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &string) { CacheSetHelper helper; @@ -166,7 +166,7 @@ public: /*{{{*/ No special package command is supported, just plain names. \param Cache the packages are in \param cmdline Command line the package names should be extracted from - \param out stream to print various notices to */ + \param helper responsible for error and message handling */ static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, CacheSetHelper &helper); static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { CacheSetHelper helper; @@ -181,6 +181,17 @@ public: /*{{{*/ Modifier (unsigned short const &id, const char * const alias, Position const &pos) : ID(id), Alias(alias), Pos(pos) {}; }; + /** \brief group packages by a action modifiers + + At some point it is needed to get from the same commandline + different package sets grouped by a modifier. Take + apt-get install apt awesome- + as an example. + \param Cache the packages are in + \param cmdline Command line the package names should be extracted from + \param mods list of modifiers the method should accept + \param fallback the default modifier group for a package + \param helper responsible for error and message handling */ static std::map GroupedFromCommandLine( pkgCacheFile &Cache, const char **cmdline, std::list const &mods, @@ -193,6 +204,15 @@ public: /*{{{*/ return APT::PackageSet::GroupedFromCommandLine(Cache, cmdline, mods, fallback, helper); } + + enum Constructor { UNKNOWN, REGEX, TASK }; + Constructor getConstructor() const { return ConstructedBy; }; + + PackageSet() : ConstructedBy(UNKNOWN) {}; + PackageSet(Constructor const &by) : ConstructedBy(by) {}; + /*}}}*/ +private: /*{{{*/ + Constructor ConstructedBy; /*}}}*/ }; /*}}}*/ class VersionSet : public std::set { /*{{{*/ @@ -269,7 +289,7 @@ public: /*{{{*/ non specifically requested and executes regex's if needed on names. \param Cache the packages and versions are in \param cmdline Command line the versions should be extracted from - \param out stream to print various notices to */ + \param helper responsible for error and message handling */ static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, APT::VersionSet::Version const &fallback, CacheSetHelper &helper); static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, @@ -299,8 +319,16 @@ public: /*{{{*/ \param P the package in question \param fallback the version(s) you want to get \param helper the helper used for display and error handling */ - static VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P, + static APT::VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P, VersionSet::Version const &fallback, CacheSetHelper &helper); + static APT::VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P, + APT::VersionSet::Version const &fallback) { + CacheSetHelper helper; + return APT::VersionSet::FromPackage(Cache, P, fallback, helper); + } + static APT::VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P) { + return APT::VersionSet::FromPackage(Cache, P, CANDINST); + } struct Modifier { enum Position { NONE, PREFIX, POSTFIX }; -- cgit v1.2.3 From b8ad551295c70a882b629ee94668e8ea527d1a7d Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 3 Jul 2010 20:09:17 +0200 Subject: Refactor TryToInstall to look a bit saner by splitting the Remove and the Virtual packages part out of the loop. The function still exists unchanged as TryToInstallBuildDep through for the BuildDep installation method --- cmdline/apt-get.cc | 229 ++++++++++++++++++++++++++++++++++++++++------------ cmdline/cacheset.cc | 1 - 2 files changed, 177 insertions(+), 53 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index d3ddcbfe8..d17300943 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1073,11 +1073,11 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, return true; } /*}}}*/ -// TryToInstall - Try to install a single package /*{{{*/ +// TryToInstallBuildDep - Try to install a single package /*{{{*/ // --------------------------------------------------------------------- /* This used to be inlined in DoInstall, but with the advent of regex package name matching it was split out.. */ -bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, +bool TryToInstallBuildDep(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, pkgProblemResolver &Fix,bool Remove,bool BrokenFix, bool AllowFail = true) { @@ -1552,6 +1552,93 @@ bool DoUpgrade(CommandLine &CmdL) return InstallPackages(Cache,true); } /*}}}*/ +// TryToInstall - Mark a package for installation /*{{{*/ +struct TryToInstall { + pkgCacheFile* Cache; + pkgProblemResolver* Fix; + bool FixBroken; + unsigned long AutoMarkChanged; + + TryToInstall(pkgCacheFile &Cache, pkgProblemResolver &PM, bool const &FixBroken) : Cache(&Cache), Fix(&PM), + FixBroken(FixBroken), AutoMarkChanged(0) {}; + + void operator() (pkgCache::VerIterator const &Ver) { + pkgCache::PkgIterator Pkg = Ver.ParentPkg(); + Cache->GetDepCache()->SetCandidateVersion(Ver); + pkgDepCache::StateCache &State = (*Cache)[Pkg]; + + // Handle the no-upgrade case + if (_config->FindB("APT::Get::upgrade",true) == false && Pkg->CurrentVer != 0) + ioprintf(c1out,_("Skipping %s, it is already installed and upgrade is not set.\n"), + Pkg.FullName(true).c_str()); + // Ignore request for install if package would be new + else if (_config->FindB("APT::Get::Only-Upgrade", false) == true && Pkg->CurrentVer == 0) + ioprintf(c1out,_("Skipping %s, it is not installed and only upgrades are requested.\n"), + Pkg.FullName(true).c_str()); + else { + Fix->Clear(Pkg); + Fix->Protect(Pkg); + Cache->GetDepCache()->MarkInstall(Pkg,false); + + if (State.Install() == false) { + if (_config->FindB("APT::Get::ReInstall",false) == true) { + if (Pkg->CurrentVer == 0 || Pkg.CurrentVer().Downloadable() == false) + ioprintf(c1out,_("Reinstallation of %s is not possible, it cannot be downloaded.\n"), + Pkg.FullName(true).c_str()); + else + Cache->GetDepCache()->SetReInstall(Pkg, true); + } else + ioprintf(c1out,_("%s is already the newest version.\n"), + Pkg.FullName(true).c_str()); + } + + // Install it with autoinstalling enabled (if we not respect the minial + // required deps or the policy) + if ((State.InstBroken() == true || State.InstPolicyBroken() == true) && FixBroken == false) + Cache->GetDepCache()->MarkInstall(Pkg,true); + } + + // see if we need to fix the auto-mark flag + // e.g. apt-get install foo + // where foo is marked automatic + if (State.Install() == false && + (State.Flags & pkgCache::Flag::Auto) && + _config->FindB("APT::Get::ReInstall",false) == false && + _config->FindB("APT::Get::Only-Upgrade",false) == false && + _config->FindB("APT::Get::Download-Only",false) == false) + { + ioprintf(c1out,_("%s set to manually installed.\n"), + Pkg.FullName(true).c_str()); + Cache->GetDepCache()->MarkAuto(Pkg,false); + AutoMarkChanged++; + } + } +}; + /*}}}*/ +// TryToRemove - Mark a package for removal /*{{{*/ +struct TryToRemove { + pkgCacheFile* Cache; + pkgProblemResolver* Fix; + bool FixBroken; + unsigned long AutoMarkChanged; + + TryToRemove(pkgCacheFile &Cache, pkgProblemResolver &PM) : Cache(&Cache), Fix(&PM) {}; + + void operator() (pkgCache::VerIterator const &Ver) + { + pkgCache::PkgIterator Pkg = Ver.ParentPkg(); + + Fix->Clear(Pkg); + Fix->Protect(Pkg); + Fix->Remove(Pkg); + + if (Pkg->CurrentVer == 0) + ioprintf(c1out,_("Package %s is not installed, so not removed\n"),Pkg.FullName(true).c_str()); + else + Cache->GetDepCache()->MarkDelete(Pkg,_config->FindB("APT::Get::Purge",false)); + } +}; + /*}}}*/ // CacheSetHelperAPTGet - responsible for message telling from the CacheSets/*{{{*/ class CacheSetHelperAPTGet : public APT::CacheSetHelper { /** \brief stream message should be printed to */ @@ -1559,6 +1646,8 @@ class CacheSetHelperAPTGet : public APT::CacheSetHelper { /** \brief were things like Task or RegEx used to select packages? */ bool explicitlyNamed; + APT::PackageSet virtualPkgs; + public: CacheSetHelperAPTGet(std::ostream &out) : APT::CacheSetHelper(true), out(out) { explicitlyNamed = true; @@ -1583,23 +1672,85 @@ public: Ver.VerStr(), Ver.RelStr().c_str(), Pkg.FullName(true).c_str()); } - virtual APT::VersionSet canNotFindCandInstVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { - return tryVirtualPackage(Cache, Pkg, APT::VersionSet::CANDINST); + void showVirtualPackageErrors(pkgCacheFile &Cache) { + for (APT::PackageSet::const_iterator Pkg = virtualPkgs.begin(); + Pkg != virtualPkgs.end(); ++Pkg) { + if (Pkg->ProvidesList != 0) { + ioprintf(c1out,_("Package %s is a virtual package provided by:\n"), + Pkg.FullName(true).c_str()); + + pkgCache::PrvIterator I = Pkg.ProvidesList(); + unsigned short provider = 0; + for (; I.end() == false; ++I) { + pkgCache::PkgIterator Pkg = I.OwnerPkg(); + + if (Cache[Pkg].CandidateVerIter(Cache) == I.OwnerVer()) { + out << " " << Pkg.FullName(true) << " " << I.OwnerVer().VerStr(); + if (Cache[Pkg].Install() == true && Cache[Pkg].NewInstall() == false) + out << _(" [Installed]"); + out << endl; + ++provider; + } + } + // if we found no candidate which provide this package, show non-candidates + if (provider == 0) + for (I = Pkg.ProvidesList(); I.end() == false; I++) + out << " " << I.OwnerPkg().FullName(true) << " " << I.OwnerVer().VerStr() + << _(" [Not candidate version]") << endl; + else + out << _("You should explicitly select one to install.") << endl; + } else { + ioprintf(out, + _("Package %s is not available, but is referred to by another package.\n" + "This may mean that the package is missing, has been obsoleted, or\n" + "is only available from another source\n"),Pkg.FullName(true).c_str()); + + string List; + string VersionsList; + SPtrArray Seen = new bool[Cache.GetPkgCache()->Head().PackageCount]; + memset(Seen,0,Cache.GetPkgCache()->Head().PackageCount*sizeof(*Seen)); + for (pkgCache::DepIterator Dep = Pkg.RevDependsList(); + Dep.end() == false; Dep++) { + if (Dep->Type != pkgCache::Dep::Replaces) + continue; + if (Seen[Dep.ParentPkg()->ID] == true) + continue; + Seen[Dep.ParentPkg()->ID] = true; + List += Dep.ParentPkg().FullName(true) + " "; + //VersionsList += string(Dep.ParentPkg().CurVersion) + "\n"; ??? + } + ShowList(out,_("However the following packages replace it:"),List,VersionsList); + } + out << std::endl; + } } - virtual APT::VersionSet canNotFindInstCandVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { - return tryVirtualPackage(Cache, Pkg, APT::VersionSet::INSTCAND); + virtual pkgCache::VerIterator canNotFindCandidateVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { + APT::VersionSet const verset = tryVirtualPackage(Cache, Pkg, APT::VersionSet::CANDIDATE); + if (verset.empty() == false) + return *(verset.begin()); + if (ShowError == true) { + _error->Error(_("Package '%s' has no installation candidate"),Pkg.FullName(true).c_str()); + virtualPkgs.insert(Pkg); + } + return pkgCache::VerIterator(Cache, 0); + } + + virtual pkgCache::VerIterator canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { + APT::VersionSet const verset = tryVirtualPackage(Cache, Pkg, APT::VersionSet::NEWEST); + if (verset.empty() == false) + return *(verset.begin()); + if (ShowError == true) + ioprintf(out, _("Virtual packages like '%s' can't be removed\n"), Pkg.FullName(true).c_str()); + return pkgCache::VerIterator(Cache, 0); } APT::VersionSet tryVirtualPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg, APT::VersionSet::Version const &select) { /* This is a pure virtual package and there is a single available candidate providing it. */ - if (unlikely(Cache[Pkg].CandidateVer != 0) || Pkg->ProvidesList == 0) { - if (select == APT::VersionSet::CANDINST) - return APT::CacheSetHelper::canNotFindCandInstVer(Cache, Pkg); - return APT::CacheSetHelper::canNotFindInstCandVer(Cache, Pkg); - } + if (unlikely(Cache[Pkg].CandidateVer != 0) || Pkg->ProvidesList == 0) + return APT::VersionSet(); pkgCache::PkgIterator Prov; bool found_one = false; @@ -1625,9 +1776,7 @@ public: Prov.FullName(true).c_str(), Pkg.FullName(true).c_str()); return APT::VersionSet::FromPackage(Cache, Prov, select, *this); } - if (select == APT::VersionSet::CANDINST) - return APT::CacheSetHelper::canNotFindCandInstVer(Cache, Pkg); - return APT::CacheSetHelper::canNotFindInstCandVer(Cache, Pkg); + return APT::VersionSet(); } inline bool allPkgNamedExplicitly() const { return explicitlyNamed; } @@ -1649,7 +1798,6 @@ bool DoInstall(CommandLine &CmdL) if (Cache->BrokenCount() != 0) BrokenFix = true; - unsigned int AutoMarkChanged = 0; pkgProblemResolver Fix(Cache); static const unsigned short MOD_REMOVE = 1; @@ -1671,15 +1819,18 @@ bool DoInstall(CommandLine &CmdL) std::list mods; mods.push_back(APT::VersionSet::Modifier(MOD_INSTALL, "+", - APT::VersionSet::Modifier::POSTFIX, APT::VersionSet::CANDINST)); + APT::VersionSet::Modifier::POSTFIX, APT::VersionSet::CANDIDATE)); mods.push_back(APT::VersionSet::Modifier(MOD_REMOVE, "-", - APT::VersionSet::Modifier::POSTFIX, APT::VersionSet::INSTCAND)); + APT::VersionSet::Modifier::POSTFIX, APT::VersionSet::NEWEST)); CacheSetHelperAPTGet helper(c0out); std::map verset = APT::VersionSet::GroupedFromCommandLine(Cache, CmdL.FileList + 1, mods, fallback, helper); if (_error->PendingError() == true) + { + helper.showVirtualPackageErrors(Cache); return false; + } unsigned short order[] = { 0, 0, 0 }; if (fallback == MOD_INSTALL) { @@ -1690,45 +1841,19 @@ bool DoInstall(CommandLine &CmdL) order[1] = MOD_INSTALL; } + TryToInstall InstallAction(Cache, Fix, BrokenFix); + TryToRemove RemoveAction(Cache, Fix); + // new scope for the ActionGroup { pkgDepCache::ActionGroup group(Cache); + for (unsigned short i = 0; order[i] != 0; ++i) { if (order[i] == MOD_INSTALL) - for (APT::VersionSet::const_iterator Ver = verset[MOD_INSTALL].begin(); - Ver != verset[MOD_INSTALL].end(); ++Ver) - { - pkgCache::PkgIterator Pkg = Ver.ParentPkg(); - Cache->SetCandidateVersion(Ver); - - if (TryToInstall(Pkg, Cache, Fix, false, BrokenFix) == false) - return false; - - // see if we need to fix the auto-mark flag - // e.g. apt-get install foo - // where foo is marked automatic - if (Cache[Pkg].Install() == false && - (Cache[Pkg].Flags & pkgCache::Flag::Auto) && - _config->FindB("APT::Get::ReInstall",false) == false && - _config->FindB("APT::Get::Only-Upgrade",false) == false && - _config->FindB("APT::Get::Download-Only",false) == false) - { - ioprintf(c1out,_("%s set to manually installed.\n"), - Pkg.FullName(true).c_str()); - Cache->MarkAuto(Pkg,false); - AutoMarkChanged++; - } - } + InstallAction = std::for_each(verset[MOD_INSTALL].begin(), verset[MOD_INSTALL].end(), InstallAction); else if (order[i] == MOD_REMOVE) - for (APT::VersionSet::const_iterator Ver = verset[MOD_REMOVE].begin(); - Ver != verset[MOD_REMOVE].end(); ++Ver) - { - pkgCache::PkgIterator Pkg = Ver.ParentPkg(); - - if (TryToInstall(Pkg, Cache, Fix, true, BrokenFix) == false) - return false; - } + RemoveAction = std::for_each(verset[MOD_REMOVE].begin(), verset[MOD_REMOVE].end(), RemoveAction); } if (_error->PendingError() == true) @@ -1899,7 +2024,7 @@ bool DoInstall(CommandLine &CmdL) // if nothing changed in the cache, but only the automark information // we write the StateFile here, otherwise it will be written in // cache.commit() - if (AutoMarkChanged > 0 && + if (InstallAction.AutoMarkChanged > 0 && Cache->DelCount() == 0 && Cache->InstCount() == 0 && Cache->BadCount() == 0 && _config->FindB("APT::Get::Simulate",false) == false) @@ -2521,7 +2646,7 @@ bool DoBuildDep(CommandLine &CmdL) */ if (IV.end() == false && Cache->VS().CheckDep(IV.VerStr(),(*D).Op,(*D).Version.c_str()) == true) - TryToInstall(Pkg,Cache,Fix,true,false); + TryToInstallBuildDep(Pkg,Cache,Fix,true,false); } else // BuildDep || BuildDepIndep { @@ -2637,7 +2762,7 @@ bool DoBuildDep(CommandLine &CmdL) if (_config->FindB("Debug::BuildDeps",false) == true) cout << " Trying to install " << (*D).Package << endl; - if (TryToInstall(Pkg,Cache,Fix,false,false) == true) + if (TryToInstallBuildDep(Pkg,Cache,Fix,false,false) == true) { // We successfully installed something; skip remaining alternatives skipAlternatives = hasAlternatives; diff --git a/cmdline/cacheset.cc b/cmdline/cacheset.cc index 4d6d6a87c..b96b60450 100644 --- a/cmdline/cacheset.cc +++ b/cmdline/cacheset.cc @@ -323,7 +323,6 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, errors = helper.showErrors(false); for (PackageSet::const_iterator P = pkgset.begin(); P != pkgset.end(); ++P) { - helper.canNotFindCandidateVer(Cache, P); if (vertag == string::npos) { verset.insert(VersionSet::FromPackage(Cache, P, fallback, helper)); continue; -- cgit v1.2.3 From 21d4c9f192b5af9c8edb39356712aac853881348 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 3 Jul 2010 23:55:12 +0200 Subject: reorder classes a bit and make TryToInstallBuildDep use them --- cmdline/apt-get.cc | 610 ++++++++++++++++++++++------------------------------- 1 file changed, 250 insertions(+), 360 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index d17300943..38b93e7e5 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -609,6 +609,240 @@ void Stats(ostream &out,pkgDepCache &Dep) Dep.BadCount()); } /*}}}*/ +// CacheSetHelperAPTGet - responsible for message telling from the CacheSets/*{{{*/ +class CacheSetHelperAPTGet : public APT::CacheSetHelper { + /** \brief stream message should be printed to */ + std::ostream &out; + /** \brief were things like Task or RegEx used to select packages? */ + bool explicitlyNamed; + + APT::PackageSet virtualPkgs; + +public: + CacheSetHelperAPTGet(std::ostream &out) : APT::CacheSetHelper(true), out(out) { + explicitlyNamed = true; + } + + virtual void showTaskSelection(APT::PackageSet const &pkgset, string const &pattern) { + for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) + ioprintf(out, _("Note, selecting '%s' for task '%s'\n"), + Pkg.FullName(true).c_str(), pattern.c_str()); + explicitlyNamed = false; + } + virtual void showRegExSelection(APT::PackageSet const &pkgset, string const &pattern) { + for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) + ioprintf(out, _("Note, selecting '%s' for regex '%s'\n"), + Pkg.FullName(true).c_str(), pattern.c_str()); + explicitlyNamed = false; + } + virtual void showSelectedVersion(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const Ver, + string const &ver, bool const &verIsRel) { + if (ver != Ver.VerStr()) + ioprintf(out, _("Selected version '%s' (%s) for '%s'\n"), + Ver.VerStr(), Ver.RelStr().c_str(), Pkg.FullName(true).c_str()); + } + + bool showVirtualPackageErrors(pkgCacheFile &Cache) { + if (virtualPkgs.empty() == true) + return true; + for (APT::PackageSet::const_iterator Pkg = virtualPkgs.begin(); + Pkg != virtualPkgs.end(); ++Pkg) { + if (Pkg->ProvidesList != 0) { + ioprintf(c1out,_("Package %s is a virtual package provided by:\n"), + Pkg.FullName(true).c_str()); + + pkgCache::PrvIterator I = Pkg.ProvidesList(); + unsigned short provider = 0; + for (; I.end() == false; ++I) { + pkgCache::PkgIterator Pkg = I.OwnerPkg(); + + if (Cache[Pkg].CandidateVerIter(Cache) == I.OwnerVer()) { + out << " " << Pkg.FullName(true) << " " << I.OwnerVer().VerStr(); + if (Cache[Pkg].Install() == true && Cache[Pkg].NewInstall() == false) + out << _(" [Installed]"); + out << endl; + ++provider; + } + } + // if we found no candidate which provide this package, show non-candidates + if (provider == 0) + for (I = Pkg.ProvidesList(); I.end() == false; I++) + out << " " << I.OwnerPkg().FullName(true) << " " << I.OwnerVer().VerStr() + << _(" [Not candidate version]") << endl; + else + out << _("You should explicitly select one to install.") << endl; + } else { + ioprintf(out, + _("Package %s is not available, but is referred to by another package.\n" + "This may mean that the package is missing, has been obsoleted, or\n" + "is only available from another source\n"),Pkg.FullName(true).c_str()); + + string List; + string VersionsList; + SPtrArray Seen = new bool[Cache.GetPkgCache()->Head().PackageCount]; + memset(Seen,0,Cache.GetPkgCache()->Head().PackageCount*sizeof(*Seen)); + for (pkgCache::DepIterator Dep = Pkg.RevDependsList(); + Dep.end() == false; Dep++) { + if (Dep->Type != pkgCache::Dep::Replaces) + continue; + if (Seen[Dep.ParentPkg()->ID] == true) + continue; + Seen[Dep.ParentPkg()->ID] = true; + List += Dep.ParentPkg().FullName(true) + " "; + //VersionsList += string(Dep.ParentPkg().CurVersion) + "\n"; ??? + } + ShowList(out,_("However the following packages replace it:"),List,VersionsList); + } + out << std::endl; + } + return false; + } + + virtual pkgCache::VerIterator canNotFindCandidateVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { + APT::VersionSet const verset = tryVirtualPackage(Cache, Pkg, APT::VersionSet::CANDIDATE); + if (verset.empty() == false) + return *(verset.begin()); + if (ShowError == true) { + _error->Error(_("Package '%s' has no installation candidate"),Pkg.FullName(true).c_str()); + virtualPkgs.insert(Pkg); + } + return pkgCache::VerIterator(Cache, 0); + } + + virtual pkgCache::VerIterator canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { + APT::VersionSet const verset = tryVirtualPackage(Cache, Pkg, APT::VersionSet::NEWEST); + if (verset.empty() == false) + return *(verset.begin()); + if (ShowError == true) + ioprintf(out, _("Virtual packages like '%s' can't be removed\n"), Pkg.FullName(true).c_str()); + return pkgCache::VerIterator(Cache, 0); + } + + APT::VersionSet tryVirtualPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg, + APT::VersionSet::Version const &select) { + /* This is a pure virtual package and there is a single available + candidate providing it. */ + if (unlikely(Cache[Pkg].CandidateVer != 0) || Pkg->ProvidesList == 0) + return APT::VersionSet(); + + pkgCache::PkgIterator Prov; + bool found_one = false; + for (pkgCache::PrvIterator P = Pkg.ProvidesList(); P; ++P) { + pkgCache::VerIterator const PVer = P.OwnerVer(); + pkgCache::PkgIterator const PPkg = PVer.ParentPkg(); + + /* Ignore versions that are not a candidate. */ + if (Cache[PPkg].CandidateVer != PVer) + continue; + + if (found_one == false) { + Prov = PPkg; + found_one = true; + } else if (PPkg != Prov) { + found_one = false; // we found at least two + break; + } + } + + if (found_one == true) { + ioprintf(out, _("Note, selecting '%s' instead of '%s'\n"), + Prov.FullName(true).c_str(), Pkg.FullName(true).c_str()); + return APT::VersionSet::FromPackage(Cache, Prov, select, *this); + } + return APT::VersionSet(); + } + + inline bool allPkgNamedExplicitly() const { return explicitlyNamed; } + +}; + /*}}}*/ +// TryToInstall - Mark a package for installation /*{{{*/ +struct TryToInstall { + pkgCacheFile* Cache; + pkgProblemResolver* Fix; + bool FixBroken; + unsigned long AutoMarkChanged; + + TryToInstall(pkgCacheFile &Cache, pkgProblemResolver &PM, bool const &FixBroken) : Cache(&Cache), Fix(&PM), + FixBroken(FixBroken), AutoMarkChanged(0) {}; + + void operator() (pkgCache::VerIterator const &Ver) { + pkgCache::PkgIterator Pkg = Ver.ParentPkg(); + Cache->GetDepCache()->SetCandidateVersion(Ver); + pkgDepCache::StateCache &State = (*Cache)[Pkg]; + + // Handle the no-upgrade case + if (_config->FindB("APT::Get::upgrade",true) == false && Pkg->CurrentVer != 0) + ioprintf(c1out,_("Skipping %s, it is already installed and upgrade is not set.\n"), + Pkg.FullName(true).c_str()); + // Ignore request for install if package would be new + else if (_config->FindB("APT::Get::Only-Upgrade", false) == true && Pkg->CurrentVer == 0) + ioprintf(c1out,_("Skipping %s, it is not installed and only upgrades are requested.\n"), + Pkg.FullName(true).c_str()); + else { + Fix->Clear(Pkg); + Fix->Protect(Pkg); + Cache->GetDepCache()->MarkInstall(Pkg,false); + + if (State.Install() == false) { + if (_config->FindB("APT::Get::ReInstall",false) == true) { + if (Pkg->CurrentVer == 0 || Pkg.CurrentVer().Downloadable() == false) + ioprintf(c1out,_("Reinstallation of %s is not possible, it cannot be downloaded.\n"), + Pkg.FullName(true).c_str()); + else + Cache->GetDepCache()->SetReInstall(Pkg, true); + } else + ioprintf(c1out,_("%s is already the newest version.\n"), + Pkg.FullName(true).c_str()); + } + + // Install it with autoinstalling enabled (if we not respect the minial + // required deps or the policy) + if ((State.InstBroken() == true || State.InstPolicyBroken() == true) && FixBroken == false) + Cache->GetDepCache()->MarkInstall(Pkg,true); + } + + // see if we need to fix the auto-mark flag + // e.g. apt-get install foo + // where foo is marked automatic + if (State.Install() == false && + (State.Flags & pkgCache::Flag::Auto) && + _config->FindB("APT::Get::ReInstall",false) == false && + _config->FindB("APT::Get::Only-Upgrade",false) == false && + _config->FindB("APT::Get::Download-Only",false) == false) + { + ioprintf(c1out,_("%s set to manually installed.\n"), + Pkg.FullName(true).c_str()); + Cache->GetDepCache()->MarkAuto(Pkg,false); + AutoMarkChanged++; + } + } +}; + /*}}}*/ +// TryToRemove - Mark a package for removal /*{{{*/ +struct TryToRemove { + pkgCacheFile* Cache; + pkgProblemResolver* Fix; + bool FixBroken; + unsigned long AutoMarkChanged; + + TryToRemove(pkgCacheFile &Cache, pkgProblemResolver &PM) : Cache(&Cache), Fix(&PM) {}; + + void operator() (pkgCache::VerIterator const &Ver) + { + pkgCache::PkgIterator Pkg = Ver.ParentPkg(); + + Fix->Clear(Pkg); + Fix->Protect(Pkg); + Fix->Remove(Pkg); + + if (Pkg->CurrentVer == 0) + ioprintf(c1out,_("Package %s is not installed, so not removed\n"),Pkg.FullName(true).c_str()); + else + Cache->GetDepCache()->MarkDelete(Pkg,_config->FindB("APT::Get::Purge",false)); + } +}; + /*}}}*/ // CacheFile::NameComp - QSort compare by name /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -1077,143 +1311,30 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, // --------------------------------------------------------------------- /* This used to be inlined in DoInstall, but with the advent of regex package name matching it was split out.. */ -bool TryToInstallBuildDep(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, +bool TryToInstallBuildDep(pkgCache::PkgIterator Pkg,pkgCacheFile &Cache, pkgProblemResolver &Fix,bool Remove,bool BrokenFix, bool AllowFail = true) { - - // Handle the no-upgrade case - if (_config->FindB("APT::Get::upgrade",true) == false && - Pkg->CurrentVer != 0) - { - if (AllowFail == true) - ioprintf(c1out,_("Skipping %s, it is already installed and upgrade is not set.\n"), - Pkg.FullName(true).c_str()); - return true; - } - - // Ignore request for install if package would be new - if (_config->FindB("APT::Get::Only-Upgrade", false) == true && - Pkg->CurrentVer == 0) - { - if (AllowFail == true) - ioprintf(c1out,_("Skipping %s, it is not installed and only upgrades are requested.\n"), - Pkg.Name()); - return true; - } - - // Check if there is something at all to install - pkgDepCache::StateCache &State = Cache[Pkg]; - if (Remove == true && Pkg->CurrentVer == 0) - { - Fix.Clear(Pkg); - Fix.Protect(Pkg); - Fix.Remove(Pkg); - - /* We want to continue searching for regex hits, so we return false here - otherwise this is not really an error. */ - if (AllowFail == false) - return false; - - ioprintf(c1out,_("Package %s is not installed, so not removed\n"),Pkg.FullName(true).c_str()); - return true; - } - - if (State.CandidateVer == 0 && Remove == false) + if (Cache[Pkg].CandidateVer == 0 && Pkg->ProvidesList != 0) { - if (AllowFail == false) - return false; - - if (Pkg->ProvidesList != 0) - { - ioprintf(c1out,_("Package %s is a virtual package provided by:\n"), - Pkg.FullName(true).c_str()); - - pkgCache::PrvIterator I = Pkg.ProvidesList(); - unsigned short provider = 0; - for (; I.end() == false; I++) - { - pkgCache::PkgIterator Pkg = I.OwnerPkg(); - - if (Cache[Pkg].CandidateVerIter(Cache) == I.OwnerVer()) - { - c1out << " " << Pkg.FullName(true) << " " << I.OwnerVer().VerStr(); - if (Cache[Pkg].Install() == true && Cache[Pkg].NewInstall() == false) - c1out << _(" [Installed]"); - c1out << endl; - ++provider; - } - } - // if we found no candidate which provide this package, show non-candidates - if (provider == 0) - for (I = Pkg.ProvidesList(); I.end() == false; I++) - c1out << " " << I.OwnerPkg().FullName(true) << " " << I.OwnerVer().VerStr() - << _(" [Not candidate version]") << endl; - else - c1out << _("You should explicitly select one to install.") << endl; - } - else - { - ioprintf(c1out, - _("Package %s is not available, but is referred to by another package.\n" - "This may mean that the package is missing, has been obsoleted, or\n" - "is only available from another source\n"),Pkg.FullName(true).c_str()); - - string List; - string VersionsList; - SPtrArray Seen = new bool[Cache.Head().PackageCount]; - memset(Seen,0,Cache.Head().PackageCount*sizeof(*Seen)); - pkgCache::DepIterator Dep = Pkg.RevDependsList(); - for (; Dep.end() == false; Dep++) - { - if (Dep->Type != pkgCache::Dep::Replaces) - continue; - if (Seen[Dep.ParentPkg()->ID] == true) - continue; - Seen[Dep.ParentPkg()->ID] = true; - List += Dep.ParentPkg().FullName(true) + " "; - //VersionsList += string(Dep.ParentPkg().CurVersion) + "\n"; ??? - } - ShowList(c1out,_("However the following packages replace it:"),List,VersionsList); - } - - _error->Error(_("Package %s has no installation candidate"),Pkg.FullName(true).c_str()); - return false; + CacheSetHelperAPTGet helper(c1out); + helper.showErrors(AllowFail == false); + pkgCache::VerIterator Ver = helper.canNotFindNewestVer(Cache, Pkg); + if (Ver.end() == false) + Pkg = Ver.ParentPkg(); + else if (helper.showVirtualPackageErrors(Cache) == false) + return AllowFail; } - Fix.Clear(Pkg); - Fix.Protect(Pkg); if (Remove == true) { - Fix.Remove(Pkg); - Cache.MarkDelete(Pkg,_config->FindB("APT::Get::Purge",false)); - return true; - } - - // Install it - Cache.MarkInstall(Pkg,false); - if (State.Install() == false) - { - if (_config->FindB("APT::Get::ReInstall",false) == true) - { - if (Pkg->CurrentVer == 0 || Pkg.CurrentVer().Downloadable() == false) - ioprintf(c1out,_("Reinstallation of %s is not possible, it cannot be downloaded.\n"), - Pkg.FullName(true).c_str()); - else - Cache.SetReInstall(Pkg,true); - } - else - { - if (AllowFail == true) - ioprintf(c1out,_("%s is already the newest version.\n"), - Pkg.FullName(true).c_str()); - } - } - - // Install it with autoinstalling enabled (if we not respect the minial - // required deps or the policy) - if ((State.InstBroken() == true || State.InstPolicyBroken() == true) && BrokenFix == false) - Cache.MarkInstall(Pkg,true); + TryToRemove RemoveAction(Cache, Fix); + RemoveAction(Pkg.VersionList()); + } else if (Cache[Pkg].CandidateVer != 0) { + TryToInstall InstallAction(Cache, Fix, BrokenFix); + InstallAction(Cache[Pkg].CandidateVerIter(Cache)); + } else + return AllowFail; return true; } @@ -1552,237 +1673,6 @@ bool DoUpgrade(CommandLine &CmdL) return InstallPackages(Cache,true); } /*}}}*/ -// TryToInstall - Mark a package for installation /*{{{*/ -struct TryToInstall { - pkgCacheFile* Cache; - pkgProblemResolver* Fix; - bool FixBroken; - unsigned long AutoMarkChanged; - - TryToInstall(pkgCacheFile &Cache, pkgProblemResolver &PM, bool const &FixBroken) : Cache(&Cache), Fix(&PM), - FixBroken(FixBroken), AutoMarkChanged(0) {}; - - void operator() (pkgCache::VerIterator const &Ver) { - pkgCache::PkgIterator Pkg = Ver.ParentPkg(); - Cache->GetDepCache()->SetCandidateVersion(Ver); - pkgDepCache::StateCache &State = (*Cache)[Pkg]; - - // Handle the no-upgrade case - if (_config->FindB("APT::Get::upgrade",true) == false && Pkg->CurrentVer != 0) - ioprintf(c1out,_("Skipping %s, it is already installed and upgrade is not set.\n"), - Pkg.FullName(true).c_str()); - // Ignore request for install if package would be new - else if (_config->FindB("APT::Get::Only-Upgrade", false) == true && Pkg->CurrentVer == 0) - ioprintf(c1out,_("Skipping %s, it is not installed and only upgrades are requested.\n"), - Pkg.FullName(true).c_str()); - else { - Fix->Clear(Pkg); - Fix->Protect(Pkg); - Cache->GetDepCache()->MarkInstall(Pkg,false); - - if (State.Install() == false) { - if (_config->FindB("APT::Get::ReInstall",false) == true) { - if (Pkg->CurrentVer == 0 || Pkg.CurrentVer().Downloadable() == false) - ioprintf(c1out,_("Reinstallation of %s is not possible, it cannot be downloaded.\n"), - Pkg.FullName(true).c_str()); - else - Cache->GetDepCache()->SetReInstall(Pkg, true); - } else - ioprintf(c1out,_("%s is already the newest version.\n"), - Pkg.FullName(true).c_str()); - } - - // Install it with autoinstalling enabled (if we not respect the minial - // required deps or the policy) - if ((State.InstBroken() == true || State.InstPolicyBroken() == true) && FixBroken == false) - Cache->GetDepCache()->MarkInstall(Pkg,true); - } - - // see if we need to fix the auto-mark flag - // e.g. apt-get install foo - // where foo is marked automatic - if (State.Install() == false && - (State.Flags & pkgCache::Flag::Auto) && - _config->FindB("APT::Get::ReInstall",false) == false && - _config->FindB("APT::Get::Only-Upgrade",false) == false && - _config->FindB("APT::Get::Download-Only",false) == false) - { - ioprintf(c1out,_("%s set to manually installed.\n"), - Pkg.FullName(true).c_str()); - Cache->GetDepCache()->MarkAuto(Pkg,false); - AutoMarkChanged++; - } - } -}; - /*}}}*/ -// TryToRemove - Mark a package for removal /*{{{*/ -struct TryToRemove { - pkgCacheFile* Cache; - pkgProblemResolver* Fix; - bool FixBroken; - unsigned long AutoMarkChanged; - - TryToRemove(pkgCacheFile &Cache, pkgProblemResolver &PM) : Cache(&Cache), Fix(&PM) {}; - - void operator() (pkgCache::VerIterator const &Ver) - { - pkgCache::PkgIterator Pkg = Ver.ParentPkg(); - - Fix->Clear(Pkg); - Fix->Protect(Pkg); - Fix->Remove(Pkg); - - if (Pkg->CurrentVer == 0) - ioprintf(c1out,_("Package %s is not installed, so not removed\n"),Pkg.FullName(true).c_str()); - else - Cache->GetDepCache()->MarkDelete(Pkg,_config->FindB("APT::Get::Purge",false)); - } -}; - /*}}}*/ -// CacheSetHelperAPTGet - responsible for message telling from the CacheSets/*{{{*/ -class CacheSetHelperAPTGet : public APT::CacheSetHelper { - /** \brief stream message should be printed to */ - std::ostream &out; - /** \brief were things like Task or RegEx used to select packages? */ - bool explicitlyNamed; - - APT::PackageSet virtualPkgs; - -public: - CacheSetHelperAPTGet(std::ostream &out) : APT::CacheSetHelper(true), out(out) { - explicitlyNamed = true; - } - - virtual void showTaskSelection(APT::PackageSet const &pkgset, string const &pattern) { - for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) - ioprintf(out, _("Note, selecting '%s' for task '%s'\n"), - Pkg.FullName(true).c_str(), pattern.c_str()); - explicitlyNamed = false; - } - virtual void showRegExSelection(APT::PackageSet const &pkgset, string const &pattern) { - for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) - ioprintf(out, _("Note, selecting '%s' for regex '%s'\n"), - Pkg.FullName(true).c_str(), pattern.c_str()); - explicitlyNamed = false; - } - virtual void showSelectedVersion(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const Ver, - string const &ver, bool const &verIsRel) { - if (ver != Ver.VerStr()) - ioprintf(out, _("Selected version '%s' (%s) for '%s'\n"), - Ver.VerStr(), Ver.RelStr().c_str(), Pkg.FullName(true).c_str()); - } - - void showVirtualPackageErrors(pkgCacheFile &Cache) { - for (APT::PackageSet::const_iterator Pkg = virtualPkgs.begin(); - Pkg != virtualPkgs.end(); ++Pkg) { - if (Pkg->ProvidesList != 0) { - ioprintf(c1out,_("Package %s is a virtual package provided by:\n"), - Pkg.FullName(true).c_str()); - - pkgCache::PrvIterator I = Pkg.ProvidesList(); - unsigned short provider = 0; - for (; I.end() == false; ++I) { - pkgCache::PkgIterator Pkg = I.OwnerPkg(); - - if (Cache[Pkg].CandidateVerIter(Cache) == I.OwnerVer()) { - out << " " << Pkg.FullName(true) << " " << I.OwnerVer().VerStr(); - if (Cache[Pkg].Install() == true && Cache[Pkg].NewInstall() == false) - out << _(" [Installed]"); - out << endl; - ++provider; - } - } - // if we found no candidate which provide this package, show non-candidates - if (provider == 0) - for (I = Pkg.ProvidesList(); I.end() == false; I++) - out << " " << I.OwnerPkg().FullName(true) << " " << I.OwnerVer().VerStr() - << _(" [Not candidate version]") << endl; - else - out << _("You should explicitly select one to install.") << endl; - } else { - ioprintf(out, - _("Package %s is not available, but is referred to by another package.\n" - "This may mean that the package is missing, has been obsoleted, or\n" - "is only available from another source\n"),Pkg.FullName(true).c_str()); - - string List; - string VersionsList; - SPtrArray Seen = new bool[Cache.GetPkgCache()->Head().PackageCount]; - memset(Seen,0,Cache.GetPkgCache()->Head().PackageCount*sizeof(*Seen)); - for (pkgCache::DepIterator Dep = Pkg.RevDependsList(); - Dep.end() == false; Dep++) { - if (Dep->Type != pkgCache::Dep::Replaces) - continue; - if (Seen[Dep.ParentPkg()->ID] == true) - continue; - Seen[Dep.ParentPkg()->ID] = true; - List += Dep.ParentPkg().FullName(true) + " "; - //VersionsList += string(Dep.ParentPkg().CurVersion) + "\n"; ??? - } - ShowList(out,_("However the following packages replace it:"),List,VersionsList); - } - out << std::endl; - } - } - - virtual pkgCache::VerIterator canNotFindCandidateVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { - APT::VersionSet const verset = tryVirtualPackage(Cache, Pkg, APT::VersionSet::CANDIDATE); - if (verset.empty() == false) - return *(verset.begin()); - if (ShowError == true) { - _error->Error(_("Package '%s' has no installation candidate"),Pkg.FullName(true).c_str()); - virtualPkgs.insert(Pkg); - } - return pkgCache::VerIterator(Cache, 0); - } - - virtual pkgCache::VerIterator canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { - APT::VersionSet const verset = tryVirtualPackage(Cache, Pkg, APT::VersionSet::NEWEST); - if (verset.empty() == false) - return *(verset.begin()); - if (ShowError == true) - ioprintf(out, _("Virtual packages like '%s' can't be removed\n"), Pkg.FullName(true).c_str()); - return pkgCache::VerIterator(Cache, 0); - } - - APT::VersionSet tryVirtualPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg, - APT::VersionSet::Version const &select) { - /* This is a pure virtual package and there is a single available - candidate providing it. */ - if (unlikely(Cache[Pkg].CandidateVer != 0) || Pkg->ProvidesList == 0) - return APT::VersionSet(); - - pkgCache::PkgIterator Prov; - bool found_one = false; - for (pkgCache::PrvIterator P = Pkg.ProvidesList(); P; ++P) { - pkgCache::VerIterator const PVer = P.OwnerVer(); - pkgCache::PkgIterator const PPkg = PVer.ParentPkg(); - - /* Ignore versions that are not a candidate. */ - if (Cache[PPkg].CandidateVer != PVer) - continue; - - if (found_one == false) { - Prov = PPkg; - found_one = true; - } else if (PPkg != Prov) { - found_one = false; // we found at least two - break; - } - } - - if (found_one == true) { - ioprintf(out, _("Note, selecting '%s' instead of '%s'\n"), - Prov.FullName(true).c_str(), Pkg.FullName(true).c_str()); - return APT::VersionSet::FromPackage(Cache, Prov, select, *this); - } - return APT::VersionSet(); - } - - inline bool allPkgNamedExplicitly() const { return explicitlyNamed; } - -}; - /*}}}*/ // DoInstall - Install packages from the command line /*{{{*/ // --------------------------------------------------------------------- /* Install named packages */ -- cgit v1.2.3 From 2fbfb111312257fa5fc29b0c2ed386fb712f960e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 4 Jul 2010 00:32:52 +0200 Subject: prefer the Policy if it is built instead of the DepCache and if DepCache is not available as fallback built the Policy --- cmdline/apt-get.cc | 3 +++ cmdline/cacheset.cc | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 38b93e7e5..9a6c12ee0 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -768,6 +768,9 @@ struct TryToInstall { void operator() (pkgCache::VerIterator const &Ver) { pkgCache::PkgIterator Pkg = Ver.ParentPkg(); + +std::clog << "INSTALL " << Pkg << " VER " << Ver.VerStr() << std::endl; + Cache->GetDepCache()->SetCandidateVersion(Ver); pkgDepCache::StateCache &State = (*Cache)[Pkg]; diff --git a/cmdline/cacheset.cc b/cmdline/cacheset.cc index b96b60450..78c9d3f6c 100644 --- a/cmdline/cacheset.cc +++ b/cmdline/cacheset.cc @@ -416,12 +416,13 @@ VersionSet VersionSet::FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator co pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper) { pkgCache::VerIterator Cand; - if (Cache.IsDepCacheBuilt() == true) - Cand = Cache[Pkg].CandidateVerIter(Cache); - else { + if (Cache.IsPolicyBuilt() == true || Cache.IsDepCacheBuilt() == false) + { if (unlikely(Cache.GetPolicy() == 0)) return pkgCache::VerIterator(Cache); Cand = Cache.GetPolicy()->GetCandidateVer(Pkg); + } else { + Cand = Cache[Pkg].CandidateVerIter(Cache); } if (Cand.end() == true) return helper.canNotFindCandidateVer(Cache, Pkg); -- cgit v1.2.3 From e841200b9389ffc90e290310207bcb47e8a52be2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 4 Jul 2010 14:23:20 +0200 Subject: * apt-pkg/policy.h: - add another round of const& madness as the previous round accidently NOT override the virtual GetCandidateVer() method (Closes: #587725) --- apt-pkg/algorithms.h | 2 +- apt-pkg/cacheiterators.h | 32 ++++++++++++++++---------------- apt-pkg/depcache.cc | 4 ++-- apt-pkg/depcache.h | 6 +++--- apt-pkg/pkgcache.cc | 12 ++++++------ apt-pkg/policy.h | 2 +- debian/changelog | 4 +++- 7 files changed, 32 insertions(+), 30 deletions(-) diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h index cee30b679..cf4a98c4f 100644 --- a/apt-pkg/algorithms.h +++ b/apt-pkg/algorithms.h @@ -48,7 +48,7 @@ class pkgSimulate : public pkgPackageManager /*{{{*/ pkgDepCache *Cache; public: - virtual VerIterator GetCandidateVer(PkgIterator Pkg) + virtual VerIterator GetCandidateVer(PkgIterator const &Pkg) { return (*Cache)[Pkg].CandidateVerIter(*Cache); } diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 51bf6819e..dfe5707e1 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -105,13 +105,13 @@ class pkgCache::GrpIterator: public Iterator { inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;}; inline PkgIterator PackageList() const; - PkgIterator FindPkg(string Arch = "any"); + PkgIterator FindPkg(string Arch = "any") const; /** \brief find the package with the "best" architecture The best architecture is either the "native" or the first in the list of Architectures which is not an end-Pointer */ - PkgIterator FindPreferredPkg(); - PkgIterator NextPkg(PkgIterator const &Pkg); + PkgIterator FindPreferredPkg() const; + PkgIterator NextPkg(PkgIterator const &Pkg) const; // Constructors inline GrpIterator(pkgCache &Owner, Group *Trg) : Iterator(Owner, Trg), HashIndex(0) { @@ -272,17 +272,17 @@ class pkgCache::DepIterator : public Iterator { // Accessors inline const char *TargetVer() const {return S->Version == 0?0:Owner->StrP + S->Version;}; - inline PkgIterator TargetPkg() {return PkgIterator(*Owner,Owner->PkgP + S->Package);}; - inline PkgIterator SmartTargetPkg() {PkgIterator R(*Owner,0);SmartTargetPkg(R);return R;}; - inline VerIterator ParentVer() {return VerIterator(*Owner,Owner->VerP + S->ParentVer);}; - inline PkgIterator ParentPkg() {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->ParentVer].ParentPkg);}; - inline bool Reverse() {return Type == DepRev;}; - bool IsCritical(); + inline PkgIterator TargetPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->Package);}; + inline PkgIterator SmartTargetPkg() const {PkgIterator R(*Owner,0);SmartTargetPkg(R);return R;}; + inline VerIterator ParentVer() const {return VerIterator(*Owner,Owner->VerP + S->ParentVer);}; + inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->ParentVer].ParentPkg);}; + inline bool Reverse() const {return Type == DepRev;}; + bool IsCritical() const; void GlobOr(DepIterator &Start,DepIterator &End); - Version **AllTargets(); - bool SmartTargetPkg(PkgIterator &Result); - inline const char *CompType() {return Owner->CompType(S->CompareOp);}; - inline const char *DepType() {return Owner->DepType(S->Type);}; + Version **AllTargets() const; + bool SmartTargetPkg(PkgIterator &Result) const; + inline const char *CompType() const {return Owner->CompType(S->CompareOp);}; + inline const char *DepType() const {return Owner->DepType(S->Type);}; inline DepIterator(pkgCache &Owner, Dependency *Trg, Version* = 0) : Iterator(Owner, Trg), Type(DepVer) { @@ -315,9 +315,9 @@ class pkgCache::PrvIterator : public Iterator { // Accessors inline const char *Name() const {return Owner->StrP + Owner->PkgP[S->ParentPkg].Name;}; inline const char *ProvideVersion() const {return S->ProvideVersion == 0?0:Owner->StrP + S->ProvideVersion;}; - inline PkgIterator ParentPkg() {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);}; - inline VerIterator OwnerVer() {return VerIterator(*Owner,Owner->VerP + S->Version);}; - inline PkgIterator OwnerPkg() {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->Version].ParentPkg);}; + inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);}; + inline VerIterator OwnerVer() const {return VerIterator(*Owner,Owner->VerP + S->Version);}; + inline PkgIterator OwnerPkg() const {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->Version].ParentPkg);}; inline PrvIterator() : Iterator(), Type(PrvVer) {}; diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index c93993ab1..05127fe18 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1585,7 +1585,7 @@ const char *pkgDepCache::StateCache::StripEpoch(const char *Ver) // --------------------------------------------------------------------- /* The default just returns the highest available version that is not a source and automatic. */ -pkgCache::VerIterator pkgDepCache::Policy::GetCandidateVer(PkgIterator Pkg) +pkgCache::VerIterator pkgDepCache::Policy::GetCandidateVer(PkgIterator const &Pkg) { /* Not source/not automatic versions cannot be a candidate version unless they are already installed */ @@ -1620,7 +1620,7 @@ pkgCache::VerIterator pkgDepCache::Policy::GetCandidateVer(PkgIterator Pkg) // Policy::IsImportantDep - True if the dependency is important /*{{{*/ // --------------------------------------------------------------------- /* */ -bool pkgDepCache::Policy::IsImportantDep(DepIterator Dep) +bool pkgDepCache::Policy::IsImportantDep(DepIterator const &Dep) { if(Dep.IsCritical()) return true; diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 66c099b80..45276dc95 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -256,8 +256,8 @@ class pkgDepCache : protected pkgCache::Namespace { public: - virtual VerIterator GetCandidateVer(PkgIterator Pkg); - virtual bool IsImportantDep(DepIterator Dep); + virtual VerIterator GetCandidateVer(PkgIterator const &Pkg); + virtual bool IsImportantDep(DepIterator const &Dep); virtual ~Policy() {}; }; @@ -334,7 +334,7 @@ class pkgDepCache : protected pkgCache::Namespace inline pkgVersioningSystem &VS() {return *Cache->VS;}; // Policy implementation - inline VerIterator GetCandidateVer(PkgIterator Pkg) {return LocalPolicy->GetCandidateVer(Pkg);}; + inline VerIterator GetCandidateVer(PkgIterator const &Pkg) {return LocalPolicy->GetCandidateVer(Pkg);}; inline bool IsImportantDep(DepIterator Dep) {return LocalPolicy->IsImportantDep(Dep);}; inline Policy &GetPolicy() {return *LocalPolicy;}; diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 30bb41470..68aa83d0c 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -307,7 +307,7 @@ const char *pkgCache::Priority(unsigned char Prio) // GrpIterator::FindPkg - Locate a package by arch /*{{{*/ // --------------------------------------------------------------------- /* Returns an End-Pointer on error, pointer to the package otherwise */ -pkgCache::PkgIterator pkgCache::GrpIterator::FindPkg(string Arch) { +pkgCache::PkgIterator pkgCache::GrpIterator::FindPkg(string Arch) const { if (unlikely(IsGood() == false || S->FirstPackage == 0)) return PkgIterator(*Owner, 0); @@ -346,7 +346,7 @@ pkgCache::PkgIterator pkgCache::GrpIterator::FindPkg(string Arch) { // GrpIterator::FindPreferredPkg - Locate the "best" package /*{{{*/ // --------------------------------------------------------------------- /* Returns an End-Pointer on error, pointer to the package otherwise */ -pkgCache::PkgIterator pkgCache::GrpIterator::FindPreferredPkg() { +pkgCache::PkgIterator pkgCache::GrpIterator::FindPreferredPkg() const { pkgCache::PkgIterator Pkg = FindPkg("native"); if (Pkg.end() == false) return Pkg; @@ -367,7 +367,7 @@ pkgCache::PkgIterator pkgCache::GrpIterator::FindPreferredPkg() { /* Returns an End-Pointer on error, pointer to the package otherwise. We can't simply ++ to the next as the next package of the last will be from a different group (with the same hash value) */ -pkgCache::PkgIterator pkgCache::GrpIterator::NextPkg(pkgCache::PkgIterator const &LastPkg) { +pkgCache::PkgIterator pkgCache::GrpIterator::NextPkg(pkgCache::PkgIterator const &LastPkg) const { if (unlikely(IsGood() == false || S->FirstPackage == 0 || LastPkg.end() == true)) return PkgIterator(*Owner, 0); @@ -504,7 +504,7 @@ std::string pkgCache::PkgIterator::FullName(bool const &Pretty) const // --------------------------------------------------------------------- /* Currently critical deps are defined as depends, predepends and conflicts (including dpkg's Breaks fields). */ -bool pkgCache::DepIterator::IsCritical() +bool pkgCache::DepIterator::IsCritical() const { if (S->Type == pkgCache::Dep::Conflicts || S->Type == pkgCache::Dep::DpkgBreaks || @@ -528,7 +528,7 @@ bool pkgCache::DepIterator::IsCritical() In Conjunction with the DepCache the value of Result may not be super-good since the policy may have made it uninstallable. Using AllTargets is better in this case. */ -bool pkgCache::DepIterator::SmartTargetPkg(PkgIterator &Result) +bool pkgCache::DepIterator::SmartTargetPkg(PkgIterator &Result) const { Result = TargetPkg(); @@ -577,7 +577,7 @@ bool pkgCache::DepIterator::SmartTargetPkg(PkgIterator &Result) provides. It includes every possible package-version that could satisfy the dependency. The last item in the list has a 0. The resulting pointer must be delete [] 'd */ -pkgCache::Version **pkgCache::DepIterator::AllTargets() +pkgCache::Version **pkgCache::DepIterator::AllTargets() const { Version **Res = 0; unsigned long Size =0; diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h index 28cb3ccbb..f8b2678de 100644 --- a/apt-pkg/policy.h +++ b/apt-pkg/policy.h @@ -76,7 +76,7 @@ class pkgPolicy : public pkgDepCache::Policy // Things for the cache interface. virtual pkgCache::VerIterator GetCandidateVer(pkgCache::PkgIterator const &Pkg); - virtual bool IsImportantDep(pkgCache::DepIterator Dep) {return pkgDepCache::Policy::IsImportantDep(Dep);}; + virtual bool IsImportantDep(pkgCache::DepIterator const &Dep) {return pkgDepCache::Policy::IsImportantDep(Dep);}; bool InitDefaults(); pkgPolicy(pkgCache *Owner); diff --git a/debian/changelog b/debian/changelog index d7c6b8d0c..0b1ca3cf1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,7 +32,9 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low * apt-pkg/contrib/fileutl.cc: - show notice about ignored file instead of being always silent - add a Dir::Ignore-Files-Silently list option to control the notice - * + * apt-pkg/policy.h: + - add another round of const& madness as the previous round accidently + NOT override the virtual GetCandidateVer() method (Closes: #587725) -- David Kalnischkies Mon, 28 Jun 2010 22:12:24 +0200 -- cgit v1.2.3 From dcfa253fa4b3c563b3ed085c40d3336933840d55 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 4 Jul 2010 17:04:07 +0200 Subject: clean deblistparser a bit by get the Architectures at one place instead of distributed in a few methods --- apt-pkg/deb/deblistparser.cc | 23 ++++++++++------------- apt-pkg/deb/deblistparser.h | 4 +++- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 83c5b8d2e..d1931f909 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -38,6 +38,8 @@ debListParser::debListParser(FileFd *File, string const &Arch) : Tags(File), Arch(Arch) { if (Arch == "native") this->Arch = _config->Find("APT::Architecture"); + Architectures = APT::Configuration::getArchitectures(); + MultiArchEnabled = Architectures.size() > 1; } /*}}}*/ // ListParser::UniqFindTagWrite - Find the tag and write a unq string /*{{{*/ @@ -155,10 +157,9 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver) to a NOP in the download/install step - this package will ensure that it is downloaded only one time and installed only one time -- even if the architecture bound versions coming in and out on regular basis. */ - bool const static multiArch = APT::Configuration::getArchitectures().size() > 1; if (strcmp(Ver.Arch(true),"all") == 0) return true; - else if (multiArch == true) + else if (MultiArchEnabled == true) { // our pseudo packages have no size to not confuse the fetcher Ver->Size = 0; @@ -620,9 +621,6 @@ bool debListParser::ParseDepends(pkgCache::VerIterator Ver, if (Section.Find(Tag,Start,Stop) == false) return true; - static std::vector const archs = APT::Configuration::getArchitectures(); - static bool const multiArch = archs.size() <= 1; - string Package; string const pkgArch = Ver.Arch(true); string Version; @@ -634,13 +632,13 @@ bool debListParser::ParseDepends(pkgCache::VerIterator Ver, if (Start == 0) return _error->Error("Problem parsing dependency %s",Tag); - if (multiArch == true && + if (MultiArchEnabled == true && (Type == pkgCache::Dep::Conflicts || Type == pkgCache::Dep::DpkgBreaks || Type == pkgCache::Dep::Replaces)) { - for (std::vector::const_iterator a = archs.begin(); - a != archs.end(); ++a) + for (std::vector::const_iterator a = Architectures.begin(); + a != Architectures.end(); ++a) if (NewDepends(Ver,Package,*a,Version,Op,Type) == false) return false; } @@ -692,14 +690,13 @@ bool debListParser::ParseProvides(pkgCache::VerIterator Ver) if (Ver->MultiArch != pkgCache::Version::Foreign) return true; - std::vector const archs = APT::Configuration::getArchitectures(); - if (archs.size() <= 1) + if (MultiArchEnabled == false) return true; string const Package = Ver.ParentPkg().Name(); string const Version = Ver.VerStr(); - for (std::vector::const_iterator a = archs.begin(); - a != archs.end(); ++a) + for (std::vector::const_iterator a = Architectures.begin(); + a != Architectures.end(); ++a) { if (NewProvides(Ver, Package, *a, Version) == false) return false; @@ -739,7 +736,7 @@ bool debListParser::Step() if (Architecture.empty() == true) return true; - if (Arch.empty() == true) + if (Arch.empty() == true || MultiArchEnabled == false) { if (APT::Configuration::checkArchitecture(Architecture) == true) return true; diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 8da051530..6c81d9fa0 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -32,7 +32,9 @@ class debListParser : public pkgCacheGenerator::ListParser pkgTagSection Section; unsigned long iOffset; string Arch; - + std::vector Architectures; + bool MultiArchEnabled; + unsigned long UniqFindTagWrite(const char *Tag); bool ParseStatus(pkgCache::PkgIterator Pkg,pkgCache::VerIterator Ver); bool ParseDepends(pkgCache::VerIterator Ver,const char *Tag, -- cgit v1.2.3 From 6806db8ac030ab7401b7b8b8324c62bb7b4a0275 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 5 Jul 2010 11:34:35 +0200 Subject: make the specify order of packages irrelevant (half-close #196021) --- cmdline/apt-get.cc | 23 ++++++++++++++++++----- debian/changelog | 1 + 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 9a6c12ee0..7cf760c27 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -762,6 +762,7 @@ struct TryToInstall { pkgProblemResolver* Fix; bool FixBroken; unsigned long AutoMarkChanged; + APT::PackageSet doAutoInstallLater; TryToInstall(pkgCacheFile &Cache, pkgProblemResolver &PM, bool const &FixBroken) : Cache(&Cache), Fix(&PM), FixBroken(FixBroken), AutoMarkChanged(0) {}; @@ -769,8 +770,6 @@ struct TryToInstall { void operator() (pkgCache::VerIterator const &Ver) { pkgCache::PkgIterator Pkg = Ver.ParentPkg(); -std::clog << "INSTALL " << Pkg << " VER " << Ver.VerStr() << std::endl; - Cache->GetDepCache()->SetCandidateVersion(Ver); pkgDepCache::StateCache &State = (*Cache)[Pkg]; @@ -801,8 +800,8 @@ std::clog << "INSTALL " << Pkg << " VER " << Ver.VerStr() << std::endl; // Install it with autoinstalling enabled (if we not respect the minial // required deps or the policy) - if ((State.InstBroken() == true || State.InstPolicyBroken() == true) && FixBroken == false) - Cache->GetDepCache()->MarkInstall(Pkg,true); + if (FixBroken == false) + doAutoInstallLater.insert(Pkg); } // see if we need to fix the auto-mark flag @@ -820,6 +819,17 @@ std::clog << "INSTALL " << Pkg << " VER " << Ver.VerStr() << std::endl; AutoMarkChanged++; } } + + void doAutoInstall() { + for (APT::PackageSet::const_iterator P = doAutoInstallLater.begin(); + P != doAutoInstallLater.end(); ++P) { + pkgDepCache::StateCache &State = (*Cache)[P]; + if (State.InstBroken() == false && State.InstPolicyBroken() == false) + continue; + Cache->GetDepCache()->MarkInstall(P, true); + } + doAutoInstallLater.clear(); + } }; /*}}}*/ // TryToRemove - Mark a package for removal /*{{{*/ @@ -1336,6 +1346,7 @@ bool TryToInstallBuildDep(pkgCache::PkgIterator Pkg,pkgCacheFile &Cache, } else if (Cache[Pkg].CandidateVer != 0) { TryToInstall InstallAction(Cache, Fix, BrokenFix); InstallAction(Cache[Pkg].CandidateVerIter(Cache)); + InstallAction.doAutoInstall(); } else return AllowFail; @@ -1743,8 +1754,10 @@ bool DoInstall(CommandLine &CmdL) for (unsigned short i = 0; order[i] != 0; ++i) { - if (order[i] == MOD_INSTALL) + if (order[i] == MOD_INSTALL) { InstallAction = std::for_each(verset[MOD_INSTALL].begin(), verset[MOD_INSTALL].end(), InstallAction); + InstallAction.doAutoInstall(); + } else if (order[i] == MOD_REMOVE) RemoveAction = std::for_each(verset[MOD_REMOVE].begin(), verset[MOD_REMOVE].end(), RemoveAction); } diff --git a/debian/changelog b/debian/changelog index 0b1ca3cf1..a76bd0f0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low - check in Grouped* first without modifier interpretation * cmdline/apt-get.cc: - use the cachsets in the install commands + - make the specify order of packages irrelevant (half-close #196021) * apt-pkg/orderlist.cc: - untouched packages are never missing * apt-pkg/packagemanager.cc: -- cgit v1.2.3 From 3b5272950a1ac62178f7b8a0144c4c52e194be40 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 5 Jul 2010 11:42:57 +0200 Subject: Try to use NotEquals for the MultiArch Breaks dependencies instead of Less and Greater -> half the dependencies :) --- apt-pkg/pkgcachegen.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 5649cd6f8..05c01494b 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -572,10 +572,7 @@ bool pkgCacheGenerator::FinishCache(OpProgress *Progress) OldDepLast); // Breaks: ${self}:other (!= ${binary:Version}) NewDepends(D, V, V.VerStr(), - pkgCache::Dep::Less, pkgCache::Dep::DpkgBreaks, - OldDepLast); - NewDepends(D, V, V.VerStr(), - pkgCache::Dep::Greater, pkgCache::Dep::DpkgBreaks, + pkgCache::Dep::NotEquals, pkgCache::Dep::DpkgBreaks, OldDepLast); if (V->MultiArch == pkgCache::Version::All) { -- cgit v1.2.3 From 9643d533f38fa35b345755201eebfd227aa5adbb Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 5 Jul 2010 12:00:46 +0200 Subject: fix typos and add a proper Closes tag after the unmerge in debbugs --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index a76bd0f0d..51c75dad0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,7 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low - check in Grouped* first without modifier interpretation * cmdline/apt-get.cc: - use the cachsets in the install commands - - make the specify order of packages irrelevant (half-close #196021) + - make the specify order of packages irrelevant (Closes: #196021) * apt-pkg/orderlist.cc: - untouched packages are never missing * apt-pkg/packagemanager.cc: @@ -34,8 +34,8 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low - show notice about ignored file instead of being always silent - add a Dir::Ignore-Files-Silently list option to control the notice * apt-pkg/policy.h: - - add another round of const& madness as the previous round accidently - NOT override the virtual GetCandidateVer() method (Closes: #587725) + - add another round of const& madness as the previous round accidentally + NOT overrides the virtual GetCandidateVer() method (Closes: #587725) -- David Kalnischkies Mon, 28 Jun 2010 22:12:24 +0200 -- cgit v1.2.3 From af5cf9299fb60c255d4c1c30ca9a97e7e6acfef0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 5 Jul 2010 12:12:40 +0200 Subject: extends the ParseDepends testcase to have a look also at the Wildcards --- test/libapt/parsedepends_test.cc | 68 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/test/libapt/parsedepends_test.cc b/test/libapt/parsedepends_test.cc index b7befa561..7b496878d 100644 --- a/test/libapt/parsedepends_test.cc +++ b/test/libapt/parsedepends_test.cc @@ -21,6 +21,12 @@ int main(int argc,char *argv[]) { "apt (>= 0.7.25), " "not-for-me [ !dsk ], " "only-for-me [ dsk ], " + "any-for-me [ any ], " + "not-for-darwin [ !darwin-any ], " + "cpu-for-me [ any-dsk ], " + "os-for-me [ linux-any ], " + "cpu-not-for-me [ any-amd64 ], " + "os-not-for-me [ kfreebsd-any ], " "overlord-dev:any (= 7.15.3~) | overlord-dev:native (>> 7.15.5), " ; @@ -100,6 +106,68 @@ test: Start++; } + if (ParseArchFlags == true) { + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + equals("any-for-me", Package); + equals("", Version); + equals(Null | pkgCache::Dep::NoOp, Op); + } else { + equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch)); + Start = strstr(Start, ","); + Start++; + } + + if (ParseArchFlags == true) { + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + equals("not-for-darwin", Package); + equals("", Version); + equals(Null | pkgCache::Dep::NoOp, Op); + } else { + equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch)); + Start = strstr(Start, ","); + Start++; + } + + if (ParseArchFlags == true) { + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + equals("cpu-for-me", Package); + equals("", Version); + equals(Null | pkgCache::Dep::NoOp, Op); + } else { + equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch)); + Start = strstr(Start, ","); + Start++; + } + + if (ParseArchFlags == true) { + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + equals("os-for-me", Package); + equals("", Version); + equals(Null | pkgCache::Dep::NoOp, Op); + } else { + equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch)); + Start = strstr(Start, ","); + Start++; + } + + if (ParseArchFlags == true) { + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + equals("", Package); // cpu-not-for-me + } else { + equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch)); + Start = strstr(Start, ","); + Start++; + } + + if (ParseArchFlags == true) { + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + equals("", Package); // os-not-for-me + } else { + equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch)); + Start = strstr(Start, ","); + Start++; + } + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); if (StripMultiArch == true) equals("overlord-dev", Package); -- cgit v1.2.3 From 7e58ab0c0db9e5f27ae91251bf692bf79a046534 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 6 Jul 2010 10:21:45 +0200 Subject: wrap the mmap actions in the CacheGenerator in their own methods to be able to react on condition changes later then we can move mmap --- apt-pkg/pkgcachegen.cc | 53 ++++++++++++++++++++++++++++++++------------------ apt-pkg/pkgcachegen.h | 12 ++++++++---- 2 files changed, 42 insertions(+), 23 deletions(-) diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 05c01494b..6a9da4a92 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -61,8 +61,8 @@ pkgCacheGenerator::pkgCacheGenerator(DynamicMMap *pMap,OpProgress *Prog) : // Starting header *Cache.HeaderP = pkgCache::Header(); - Cache.HeaderP->VerSysName = Map.WriteString(_system->VS->Label); - Cache.HeaderP->Architecture = Map.WriteString(_config->Find("APT::Architecture")); + Cache.HeaderP->VerSysName = WriteStringInMap(_system->VS->Label); + Cache.HeaderP->Architecture = WriteStringInMap(_config->Find("APT::Architecture")); Cache.ReMap(); } else @@ -96,6 +96,21 @@ pkgCacheGenerator::~pkgCacheGenerator() Map.Sync(0,sizeof(pkgCache::Header)); } /*}}}*/ +// CacheGenerator::WriteStringInMap /*{{{*/ +unsigned long pkgCacheGenerator::WriteStringInMap(const char *String, + const unsigned long &Len) { + return Map.WriteString(String, Len); +} + /*}}}*/ +// CacheGenerator::WriteStringInMap /*{{{*/ +unsigned long pkgCacheGenerator::WriteStringInMap(const char *String) { + return Map.WriteString(String); +} + /*}}}*/ +unsigned long pkgCacheGenerator::AllocateInMap(const unsigned long &size) {/*{{{*/ + return Map.Allocate(size); +} + /*}}}*/ // CacheGenerator::MergeList - Merge the package list /*{{{*/ // --------------------------------------------------------------------- /* This provides the generation of the entries in the cache. Each loop @@ -342,12 +357,12 @@ bool pkgCacheGenerator::NewGroup(pkgCache::GrpIterator &Grp, const string &Name) return true; // Get a structure - unsigned long const Group = Map.Allocate(sizeof(pkgCache::Group)); + unsigned long const Group = AllocateInMap(sizeof(pkgCache::Group)); if (unlikely(Group == 0)) return false; Grp = pkgCache::GrpIterator(Cache, Cache.GrpP + Group); - Grp->Name = Map.WriteString(Name); + Grp->Name = WriteStringInMap(Name); if (unlikely(Grp->Name == 0)) return false; @@ -374,7 +389,7 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name return true; // Get a structure - unsigned long const Package = Map.Allocate(sizeof(pkgCache::Package)); + unsigned long const Package = AllocateInMap(sizeof(pkgCache::Package)); if (unlikely(Package == 0)) return false; Pkg = pkgCache::PkgIterator(Cache,Cache.PkgP + Package); @@ -418,7 +433,7 @@ bool pkgCacheGenerator::NewFileVer(pkgCache::VerIterator &Ver, return true; // Get a structure - unsigned long VerFile = Map.Allocate(sizeof(pkgCache::VerFile)); + unsigned long VerFile = AllocateInMap(sizeof(pkgCache::VerFile)); if (VerFile == 0) return 0; @@ -449,7 +464,7 @@ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver, unsigned long Next) { // Get a structure - unsigned long Version = Map.Allocate(sizeof(pkgCache::Version)); + unsigned long Version = AllocateInMap(sizeof(pkgCache::Version)); if (Version == 0) return 0; @@ -457,7 +472,7 @@ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver, Ver = pkgCache::VerIterator(Cache,Cache.VerP + Version); Ver->NextVer = Next; Ver->ID = Cache.HeaderP->VersionCount++; - Ver->VerStr = Map.WriteString(VerStr); + Ver->VerStr = WriteStringInMap(VerStr); if (Ver->VerStr == 0) return 0; @@ -474,7 +489,7 @@ bool pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator &Desc, return true; // Get a structure - unsigned long DescFile = Map.Allocate(sizeof(pkgCache::DescFile)); + unsigned long DescFile = AllocateInMap(sizeof(pkgCache::DescFile)); if (DescFile == 0) return false; @@ -507,7 +522,7 @@ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc, map_ptrloc Next) { // Get a structure - map_ptrloc Description = Map.Allocate(sizeof(pkgCache::Description)); + map_ptrloc Description = AllocateInMap(sizeof(pkgCache::Description)); if (Description == 0) return 0; @@ -515,8 +530,8 @@ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc, Desc = pkgCache::DescIterator(Cache,Cache.DescP + Description); Desc->NextDesc = Next; Desc->ID = Cache.HeaderP->DescriptionCount++; - Desc->language_code = Map.WriteString(Lang); - Desc->md5sum = Map.WriteString(md5sum.Value()); + Desc->language_code = WriteStringInMap(Lang); + Desc->md5sum = WriteStringInMap(md5sum.Value()); if (Desc->language_code == 0 || Desc->md5sum == 0) return 0; @@ -607,7 +622,7 @@ bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg, map_ptrloc *OldDepLast) { // Get a structure - unsigned long const Dependency = Map.Allocate(sizeof(pkgCache::Dependency)); + unsigned long const Dependency = AllocateInMap(sizeof(pkgCache::Dependency)); if (unlikely(Dependency == 0)) return false; @@ -625,7 +640,7 @@ bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg, if (I->Version != 0 && I.TargetVer() == Version) Dep->Version = I->Version;*/ if (Dep->Version == 0) - if (unlikely((Dep->Version = Map.WriteString(Version)) == 0)) + if (unlikely((Dep->Version = WriteStringInMap(Version)) == 0)) return false; } @@ -699,7 +714,7 @@ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver, return true; // Get a structure - unsigned long const Provides = Owner->Map.Allocate(sizeof(pkgCache::Provides)); + unsigned long const Provides = Owner->AllocateInMap(sizeof(pkgCache::Provides)); if (unlikely(Provides == 0)) return false; Cache.HeaderP->ProvidesCount++; @@ -734,12 +749,12 @@ bool pkgCacheGenerator::SelectFile(const string &File,const string &Site, unsigned long Flags) { // Get some space for the structure - CurrentFile = Cache.PkgFileP + Map.Allocate(sizeof(*CurrentFile)); + CurrentFile = Cache.PkgFileP + AllocateInMap(sizeof(*CurrentFile)); if (CurrentFile == Cache.PkgFileP) return false; // Fill it in - CurrentFile->FileName = Map.WriteString(File); + CurrentFile->FileName = WriteStringInMap(File); CurrentFile->Site = WriteUniqString(Site); CurrentFile->NextFile = Cache.HeaderP->FileList; CurrentFile->Flags = Flags; @@ -791,7 +806,7 @@ unsigned long pkgCacheGenerator::WriteUniqString(const char *S, } // Get a structure - unsigned long Item = Map.Allocate(sizeof(pkgCache::StringItem)); + unsigned long Item = AllocateInMap(sizeof(pkgCache::StringItem)); if (Item == 0) return 0; @@ -799,7 +814,7 @@ unsigned long pkgCacheGenerator::WriteUniqString(const char *S, pkgCache::StringItem *ItemP = Cache.StringItemP + Item; ItemP->NextItem = I - Cache.StringItemP; *Last = Item; - ItemP->String = Map.WriteString(S,Size); + ItemP->String = WriteStringInMap(S,Size); if (ItemP->String == 0) return 0; diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index ff0941e0c..a88c49451 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -31,9 +31,13 @@ class pkgIndexFile; class pkgCacheGenerator /*{{{*/ { private: - + pkgCache::StringItem *UniqHash[26]; - + unsigned long WriteStringInMap(std::string const &String) { return WriteStringInMap(String.c_str()); }; + unsigned long WriteStringInMap(const char *String); + unsigned long WriteStringInMap(const char *String, const unsigned long &Len); + unsigned long AllocateInMap(const unsigned long &size); + public: class ListParser; @@ -103,8 +107,8 @@ class pkgCacheGenerator::ListParser inline unsigned long WriteUniqString(string S) {return Owner->WriteUniqString(S);}; inline unsigned long WriteUniqString(const char *S,unsigned int Size) {return Owner->WriteUniqString(S,Size);}; - inline unsigned long WriteString(const string &S) {return Owner->Map.WriteString(S);}; - inline unsigned long WriteString(const char *S,unsigned int Size) {return Owner->Map.WriteString(S,Size);}; + inline unsigned long WriteString(const string &S) {return Owner->WriteStringInMap(S);}; + inline unsigned long WriteString(const char *S,unsigned int Size) {return Owner->WriteStringInMap(S,Size);}; bool NewDepends(pkgCache::VerIterator Ver,const string &Package, const string &Arch, const string &Version,unsigned int Op, unsigned int Type); -- cgit v1.2.3 From d13c2d3f7b10e558301a05948e91ac4a60160793 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Tue, 6 Jul 2010 12:48:06 +0200 Subject: FileFd(): Drop file name extension check in ReadOnlyGzip mode Drop the ".gz" extension check in FileFd::Open() in ReadOnlyGzip mode, to not depend on a particular file extension. This allows rewriting the gzip method using internal decompression (on ".decomp" files). This requires a zlib bug workaround in FileFd::Close(): When opening an empty file with gzdopen(), gzclose() fails with Z_BUF_ERROR. Do not count this as a failure. --- apt-pkg/contrib/fileutl.cc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 2b91a46f7..0d2d3f356 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -608,7 +608,7 @@ bool FileFd::Open(string FileName,OpenMode Mode, unsigned long Perms) case ReadOnlyGzip: iFd = open(FileName.c_str(),O_RDONLY); - if (iFd > 0 && FileName.compare(FileName.size()-3, 3, ".gz") == 0) { + if (iFd > 0) { gz = gzdopen (iFd, "r"); if (gz == NULL) { close (iFd); @@ -827,8 +827,16 @@ bool FileFd::Close() { bool Res = true; if ((Flags & AutoClose) == AutoClose) - if ((gz != NULL && gzclose(gz) != 0) || (gz == NULL && iFd > 0 && close(iFd) != 0)) - Res &= _error->Errno("close",_("Problem closing the file")); + { + if (gz != NULL) { + int e = gzclose(gz); + // gzdopen() on empty files always fails with "buffer error" here, ignore that + if (e != 0 && e != Z_BUF_ERROR) + Res &= _error->Errno("close",_("Problem closing the gzip file")); + } else + if (iFd > 0 && close(iFd) != 0) + Res &= _error->Errno("close",_("Problem closing the file")); + } iFd = -1; gz = NULL; -- cgit v1.2.3 From 127e6df37213a1fda0dd5b44182acf678ccbbf02 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Tue, 6 Jul 2010 13:14:57 +0200 Subject: methods/gzip.cc: With FileFd now being able to read gzipped files, there is no need for the gzip method any more to spawn an external gzip process. Rewrite it to use FileFd directly, which makes the code a lot simpler, and also using less memory and overhead. --- debian/changelog | 4 ++++ methods/gzip.cc | 63 +++++++------------------------------------------------- 2 files changed, 11 insertions(+), 56 deletions(-) diff --git a/debian/changelog b/debian/changelog index f3f2d3df4..6f3d2eb71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,10 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low - Fix return value of pkgAcqFile::Custom600Headers() in the non-index case, to avoid returning NULL and causing crashers in callers. This also fixes a compiler warning. + * methods/gzip.cc: With FileFd now being able to read gzipped files, there + is no need for the gzip method any more to spawn an external gzip process. + Rewrite it to use FileFd directly, which makes the code a lot simpler, and + also using less memory and overhead. -- Christian Perrier Tue, 11 May 2010 19:52:00 +0200 diff --git a/methods/gzip.cc b/methods/gzip.cc index f732c0b86..72e3ac909 100644 --- a/methods/gzip.cc +++ b/methods/gzip.cc @@ -23,8 +23,6 @@ #include /*}}}*/ -const char *Prog; - class GzipMethod : public pkgAcqMethod { virtual bool Fetch(FetchItem *Itm); @@ -43,14 +41,12 @@ bool GzipMethod::Fetch(FetchItem *Itm) URI Get = Itm->Uri; string Path = Get.Host + Get.Path; // To account for relative paths - string GzPathOption = "Dir::bin::"+string(Prog); - FetchResult Res; Res.Filename = Itm->DestFile; URIStart(Res); // Open the source and destination files - FileFd From(Path,FileFd::ReadOnly); + FileFd From(Path,FileFd::ReadOnlyGzip); // if the file is empty, just rename it and return if(From.Size() == 0) @@ -59,40 +55,12 @@ bool GzipMethod::Fetch(FetchItem *Itm) return true; } - int GzOut[2]; - if (pipe(GzOut) < 0) - return _error->Errno("pipe",_("Couldn't open pipe for %s"),Prog); - - // Fork gzip - pid_t Process = ExecFork(); - if (Process == 0) - { - close(GzOut[0]); - dup2(From.Fd(),STDIN_FILENO); - dup2(GzOut[1],STDOUT_FILENO); - From.Close(); - close(GzOut[1]); - SetCloseExec(STDIN_FILENO,false); - SetCloseExec(STDOUT_FILENO,false); - - const char *Args[3]; - string Tmp = _config->Find(GzPathOption,Prog); - Args[0] = Tmp.c_str(); - Args[1] = "-d"; - Args[2] = 0; - execvp(Args[0],(char **)Args); - _exit(100); - } - From.Close(); - close(GzOut[1]); - - FileFd FromGz(GzOut[0]); // For autoclose FileFd To(Itm->DestFile,FileFd::WriteEmpty); To.EraseOnFailure(); if (_error->PendingError() == true) return false; - // Read data from gzip, generate checksums and write + // Read data from source, generate checksums and write Hashes Hash; bool Failed = false; while (1) @@ -100,36 +68,23 @@ bool GzipMethod::Fetch(FetchItem *Itm) unsigned char Buffer[4*1024]; unsigned long Count; - Count = read(GzOut[0],Buffer,sizeof(Buffer)); - if (Count < 0 && errno == EINTR) - continue; - - if (Count < 0) + if (!From.Read(Buffer,sizeof(Buffer),&Count)) { - _error->Errno("read", _("Read error from %s process"),Prog); - Failed = true; - break; + To.OpFail(); + return false; } - if (Count == 0) break; - + Hash.Add(Buffer,Count); if (To.Write(Buffer,Count) == false) { Failed = true; - FromGz.Close(); break; } } - // Wait for gzip to finish - if (ExecWait(Process,_config->Find(GzPathOption,Prog).c_str(),false) == false) - { - To.OpFail(); - return false; - } - + From.Close(); To.Close(); if (Failed == true) @@ -165,9 +120,5 @@ int main(int argc, char *argv[]) setlocale(LC_ALL, ""); GzipMethod Mth; - - Prog = strrchr(argv[0],'/'); - Prog++; - return Mth.Run(); } -- cgit v1.2.3 From 24baab5c477bf1e57a0b169a7bac1d2e9ab0c974 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 7 Jul 2010 16:47:09 +0200 Subject: * apt-pkg/deb/dpkgpm.cc: - make the apt/term.log output unbuffered (thanks to Matt Zimmerman) --- apt-pkg/deb/dpkgpm.cc | 3 ++- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 8abe3f5c6..2bbc7a4ba 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -582,7 +583,7 @@ bool pkgDPkgPM::OpenLog() term_out = fopen(logfile_name.c_str(),"a"); if (term_out == NULL) return _error->WarningE(_("Could not open file '%s'"), logfile_name.c_str()); - + setvbuf(term_out, NULL, _IONBF, 0); chmod(logfile_name.c_str(), 0600); fprintf(term_out, "\nLog started: %s\n", timestr); } diff --git a/debian/changelog b/debian/changelog index f4cdeeec5..27acd33c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,8 @@ apt (0.7.25.4) UNRELEASED; urgency=low - install html doxygen in libapt-pkg-doc as well * methods/http.cc: - code cleanup, add (some) doxygen strings + * apt-pkg/deb/dpkgpm.cc: + - make the apt/term.log output unbuffered (thanks to Matt Zimmerman) [ Robert Collins ] * Change the package index Info methods to allow apt-cache policy to be -- cgit v1.2.3 From 32b9a14cb4c6bdcddfe84c4451c225ced1a34bb7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 8 Jul 2010 11:10:46 +0200 Subject: use references instead of copies in the Cache generation methods --- apt-pkg/deb/deblistparser.cc | 16 ++++++++-------- apt-pkg/deb/deblistparser.h | 14 +++++++------- apt-pkg/pkgcachegen.cc | 9 +++++---- apt-pkg/pkgcachegen.h | 12 ++++++------ 4 files changed, 26 insertions(+), 25 deletions(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 24df57a5c..2cfeb23e9 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -106,7 +106,7 @@ string debListParser::Version() // ListParser::NewVersion - Fill in the version structure /*{{{*/ // --------------------------------------------------------------------- /* */ -bool debListParser::NewVersion(pkgCache::VerIterator Ver) +bool debListParser::NewVersion(pkgCache::VerIterator &Ver) { // Parse the section Ver->Section = UniqFindTagWrite("Section"); @@ -251,8 +251,8 @@ MD5SumValue debListParser::Description_md5() // --------------------------------------------------------------------- /* This is called to update the package with any new information that might be found in the section */ -bool debListParser::UsePackage(pkgCache::PkgIterator Pkg, - pkgCache::VerIterator Ver) +bool debListParser::UsePackage(pkgCache::PkgIterator &Pkg, + pkgCache::VerIterator &Ver) { if (Pkg->Section == 0) Pkg->Section = UniqFindTagWrite("Section"); @@ -332,8 +332,8 @@ unsigned short debListParser::VersionHash() Some of the above are obsolete (I think?) flag = hold-* and status = post-inst-failed, removal-failed at least. */ -bool debListParser::ParseStatus(pkgCache::PkgIterator Pkg, - pkgCache::VerIterator Ver) +bool debListParser::ParseStatus(pkgCache::PkgIterator &Pkg, + pkgCache::VerIterator &Ver) { const char *Start; const char *Stop; @@ -634,7 +634,7 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop, // --------------------------------------------------------------------- /* This is the higher level depends parser. It takes a tag and generates a complete depends tree for the given version. */ -bool debListParser::ParseDepends(pkgCache::VerIterator Ver, +bool debListParser::ParseDepends(pkgCache::VerIterator &Ver, const char *Tag,unsigned int Type) { const char *Start; @@ -674,7 +674,7 @@ bool debListParser::ParseDepends(pkgCache::VerIterator Ver, // ListParser::ParseProvides - Parse the provides list /*{{{*/ // --------------------------------------------------------------------- /* */ -bool debListParser::ParseProvides(pkgCache::VerIterator Ver) +bool debListParser::ParseProvides(pkgCache::VerIterator &Ver) { const char *Start; const char *Stop; @@ -779,7 +779,7 @@ bool debListParser::Step() // ListParser::LoadReleaseInfo - Load the release information /*{{{*/ // --------------------------------------------------------------------- /* */ -bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator FileI, +bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI, FileFd &File, string component) { pkgTagFile Tags(&File, File.Size() + 256); // XXX diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 6c81d9fa0..4bc1bd93c 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -36,10 +36,10 @@ class debListParser : public pkgCacheGenerator::ListParser bool MultiArchEnabled; unsigned long UniqFindTagWrite(const char *Tag); - bool ParseStatus(pkgCache::PkgIterator Pkg,pkgCache::VerIterator Ver); - bool ParseDepends(pkgCache::VerIterator Ver,const char *Tag, + bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver); + bool ParseDepends(pkgCache::VerIterator &Ver,const char *Tag, unsigned int Type); - bool ParseProvides(pkgCache::VerIterator Ver); + bool ParseProvides(pkgCache::VerIterator &Ver); static bool GrabWord(string Word,WordList *List,unsigned char &Out); public: @@ -51,19 +51,19 @@ class debListParser : public pkgCacheGenerator::ListParser virtual string Architecture(); virtual bool ArchitectureAll(); virtual string Version(); - virtual bool NewVersion(pkgCache::VerIterator Ver); + virtual bool NewVersion(pkgCache::VerIterator &Ver); virtual string Description(); virtual string DescriptionLanguage(); virtual MD5SumValue Description_md5(); virtual unsigned short VersionHash(); - virtual bool UsePackage(pkgCache::PkgIterator Pkg, - pkgCache::VerIterator Ver); + virtual bool UsePackage(pkgCache::PkgIterator &Pkg, + pkgCache::VerIterator &Ver); virtual unsigned long Offset() {return iOffset;}; virtual unsigned long Size() {return Section.size();}; virtual bool Step(); - bool LoadReleaseInfo(pkgCache::PkgFileIterator FileI,FileFd &File, + bool LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,FileFd &File, string section); static const char *ParseDepends(const char *Start,const char *Stop, diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 6a9da4a92..62e457734 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -157,13 +157,14 @@ bool pkgCacheGenerator::MergeList(ListParser &List, // we first process the package, then the descriptions // (this has the bonus that we get MMap error when we run out // of MMap space) - if (List.UsePackage(Pkg,pkgCache::VerIterator(Cache)) == false) + pkgCache::VerIterator Ver(Cache); + if (List.UsePackage(Pkg, Ver) == false) return _error->Error(_("Error occurred while processing %s (UsePackage1)"), PackageName.c_str()); // Find the right version to write the description MD5SumValue CurMd5 = List.Description_md5(); - pkgCache::VerIterator Ver = Pkg.VersionList(); + Ver = Pkg.VersionList(); map_ptrloc *LastVer = &Pkg->VersionList; for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++) @@ -668,7 +669,7 @@ bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg, // --------------------------------------------------------------------- /* This creates a Group and the Package to link this dependency to if needed and handles also the caching of the old endpoint */ -bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, +bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator &Ver, const string &PackageName, const string &Arch, const string &Version, @@ -702,7 +703,7 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, // ListParser::NewProvides - Create a Provides element /*{{{*/ // --------------------------------------------------------------------- /* */ -bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver, +bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator &Ver, const string &PkgName, const string &PkgArch, const string &Version) diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index a88c49451..8f7739165 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -109,10 +109,10 @@ class pkgCacheGenerator::ListParser inline unsigned long WriteUniqString(const char *S,unsigned int Size) {return Owner->WriteUniqString(S,Size);}; inline unsigned long WriteString(const string &S) {return Owner->WriteStringInMap(S);}; inline unsigned long WriteString(const char *S,unsigned int Size) {return Owner->WriteStringInMap(S,Size);}; - bool NewDepends(pkgCache::VerIterator Ver,const string &Package, const string &Arch, + bool NewDepends(pkgCache::VerIterator &Ver,const string &Package, const string &Arch, const string &Version,unsigned int Op, unsigned int Type); - bool NewProvides(pkgCache::VerIterator Ver,const string &PkgName, + bool NewProvides(pkgCache::VerIterator &Ver,const string &PkgName, const string &PkgArch, const string &Version); public: @@ -122,13 +122,13 @@ class pkgCacheGenerator::ListParser virtual string Architecture() = 0; virtual bool ArchitectureAll() = 0; virtual string Version() = 0; - virtual bool NewVersion(pkgCache::VerIterator Ver) = 0; + virtual bool NewVersion(pkgCache::VerIterator &Ver) = 0; virtual string Description() = 0; virtual string DescriptionLanguage() = 0; virtual MD5SumValue Description_md5() = 0; virtual unsigned short VersionHash() = 0; - virtual bool UsePackage(pkgCache::PkgIterator Pkg, - pkgCache::VerIterator Ver) = 0; + virtual bool UsePackage(pkgCache::PkgIterator &Pkg, + pkgCache::VerIterator &Ver) = 0; virtual unsigned long Offset() = 0; virtual unsigned long Size() = 0; @@ -136,7 +136,7 @@ class pkgCacheGenerator::ListParser inline bool HasFileDeps() {return FoundFileDeps;}; virtual bool CollectFileProvides(pkgCache &Cache, - pkgCache::VerIterator Ver) {return true;}; + pkgCache::VerIterator &Ver) {return true;}; ListParser() : FoundFileDeps(false) {}; virtual ~ListParser() {}; -- cgit v1.2.3 From a9fe592842bfa17d91f4904d7fb0e3af3adebb17 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 8 Jul 2010 15:28:53 +0200 Subject: * apt-pkg/pkgcachegen.{cc,h}: - make the used MMap moveable (and therefore dynamic resizeable) by applying (some) mad pointer magic (Closes: #195018) --- apt-pkg/cacheiterators.h | 6 ++ apt-pkg/contrib/mmap.cc | 27 ++++-- apt-pkg/deb/debindexfile.cc | 1 + apt-pkg/pkgcache.cc | 5 +- apt-pkg/pkgcache.h | 2 +- apt-pkg/pkgcachegen.cc | 229 ++++++++++++++++++++++++++++++++------------ apt-pkg/pkgcachegen.h | 30 ++++-- debian/changelog | 3 + 8 files changed, 226 insertions(+), 77 deletions(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index dfe5707e1..eb8dee5e3 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -75,6 +75,12 @@ template class pkgCache::Iterator : inline bool IsGood() const { return S && Owner && ! end();}; inline unsigned long Index() const {return S - OwnerPointer();}; + void ReOwn(pkgCache &newOwner, void const * const oldMap, void const * const newMap) { + if (S == 0) + return; + S += (Str*)(newMap) - (Str*)(oldMap); + } + // Constructors - look out for the variable assigning inline Iterator() : S(0), Owner(0) {}; inline Iterator(pkgCache &Owner,Str *T = 0) : S(T), Owner(&Owner) {}; diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index d71066243..aa184b130 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -225,22 +225,22 @@ DynamicMMap::DynamicMMap(unsigned long Flags,unsigned long const &WorkSpace, // disable Moveable if we don't grow if (Grow == 0) - Flags &= ~Moveable; + this->Flags &= ~Moveable; #ifndef __linux__ // kfreebsd doesn't have mremap, so we use the fallback - if ((Flags & Moveable) == Moveable) - Flags |= Fallback; + if ((this->Flags & Moveable) == Moveable) + this->Flags |= Fallback; #endif #ifdef _POSIX_MAPPED_FILES - if ((Flags & Fallback) != Fallback) { + if ((this->Flags & Fallback) != Fallback) { // Set the permissions. int Prot = PROT_READ; int Map = MAP_PRIVATE | MAP_ANONYMOUS; - if ((Flags & ReadOnly) != ReadOnly) + if ((this->Flags & ReadOnly) != ReadOnly) Prot |= PROT_WRITE; - if ((Flags & Public) == Public) + if ((this->Flags & Public) == Public) Map = MAP_SHARED | MAP_ANONYMOUS; // use anonymous mmap() to get the memory @@ -314,7 +314,7 @@ unsigned long DynamicMMap::Allocate(unsigned long ItemSize) // Look for a matching pool entry Pool *I; Pool *Empty = 0; - for (I = Pools; I != Pools + PoolCount; I++) + for (I = Pools; I != Pools + PoolCount; ++I) { if (I->ItemSize == 0) Empty = I; @@ -342,7 +342,11 @@ unsigned long DynamicMMap::Allocate(unsigned long ItemSize) { const unsigned long size = 20*1024; I->Count = size/ItemSize; + Pool* oldPools = Pools; Result = RawAllocate(size,ItemSize); + if (Pools != oldPools) + I += Pools - oldPools; + // Does the allocation failed ? if (Result == 0 && _error->PendingError()) return 0; @@ -365,7 +369,7 @@ unsigned long DynamicMMap::WriteString(const char *String, if (Len == (unsigned long)-1) Len = strlen(String); - unsigned long Result = RawAllocate(Len+1,0); + unsigned long const Result = RawAllocate(Len+1,0); if (Result == 0 && _error->PendingError()) return 0; @@ -395,16 +399,20 @@ bool DynamicMMap::Grow() { return _error->Error(_("Unable to increase the size of the MMap as the " "limit of %lu bytes is already reached."), Limit); - unsigned long const newSize = WorkSpace + 1024*1024; + unsigned long const newSize = WorkSpace + GrowFactor; if(Fd != 0) { Fd->Seek(newSize - 1); char C = 0; Fd->Write(&C,sizeof(C)); } + + unsigned long const poolOffset = Pools - ((Pool*) Base); + if ((Flags & Fallback) != Fallback) { #if defined(_POSIX_MAPPED_FILES) && defined(__linux__) #ifdef MREMAP_MAYMOVE + if ((Flags & Moveable) == Moveable) Base = mremap(Base, WorkSpace, newSize, MREMAP_MAYMOVE); else @@ -425,6 +433,7 @@ bool DynamicMMap::Grow() { return false; } + Pools =(Pool*) Base + poolOffset; WorkSpace = newSize; return true; } diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 6d9e99497..5e6db3f38 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -277,6 +277,7 @@ bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const // Store the IMS information pkgCache::PkgFileIterator File = Gen.GetCurFile(); + pkgCacheGenerator::Dynamic DynFile(File); struct stat St; if (fstat(Pkg.Fd(),&St) != 0) return _error->Errno("fstat","Failed to stat"); diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 68aa83d0c..8af8ef7de 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -119,7 +119,7 @@ pkgCache::pkgCache(MMap *Map, bool DoMap) : Map(*Map) // Cache::ReMap - Reopen the cache file /*{{{*/ // --------------------------------------------------------------------- /* If the file is already closed then this will open it open it. */ -bool pkgCache::ReMap() +bool pkgCache::ReMap(bool const &Errorchecks) { // Apply the typecasts. HeaderP = (Header *)Map.Data(); @@ -135,6 +135,9 @@ bool pkgCache::ReMap() StringItemP = (StringItem *)Map.Data(); StrP = (char *)Map.Data(); + if (Errorchecks == false) + return true; + if (Map.Size() == 0 || HeaderP == 0) return _error->Error(_("Empty package cache")); diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 426bb9f13..799521784 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -174,7 +174,7 @@ class pkgCache /*{{{*/ StringItem *StringItemP; char *StrP; - virtual bool ReMap(); + virtual bool ReMap(bool const &Errorchecks = true); inline bool Sync() {return Map.Sync();}; inline MMap &GetMap() {return Map;}; inline void *DataEnd() {return ((unsigned char *)Map.Data()) + Map.Size();}; diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 62e457734..18bad6727 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -36,6 +36,7 @@ #include /*}}}*/ typedef vector::iterator FileIterator; +template std::set pkgCacheGenerator::Dynamic::toReMap; // CacheGenerator::pkgCacheGenerator - Constructor /*{{{*/ // --------------------------------------------------------------------- @@ -61,8 +62,12 @@ pkgCacheGenerator::pkgCacheGenerator(DynamicMMap *pMap,OpProgress *Prog) : // Starting header *Cache.HeaderP = pkgCache::Header(); - Cache.HeaderP->VerSysName = WriteStringInMap(_system->VS->Label); - Cache.HeaderP->Architecture = WriteStringInMap(_config->Find("APT::Architecture")); + map_ptrloc const idxVerSysName = WriteStringInMap(_system->VS->Label); + Cache.HeaderP->VerSysName = idxVerSysName; + map_ptrloc const idxArchitecture = WriteStringInMap(_config->Find("APT::Architecture")); + Cache.HeaderP->Architecture = idxArchitecture; + if (unlikely(idxVerSysName == 0 || idxArchitecture == 0)) + return; Cache.ReMap(); } else @@ -96,19 +101,65 @@ pkgCacheGenerator::~pkgCacheGenerator() Map.Sync(0,sizeof(pkgCache::Header)); } /*}}}*/ +void pkgCacheGenerator::ReMap(void const * const oldMap, void const * const newMap) {/*{{{*/ + if (oldMap == newMap) + return; + + Cache.ReMap(false); + + CurrentFile += (pkgCache::PackageFile*) newMap - (pkgCache::PackageFile*) oldMap; + + for (size_t i = 0; i < _count(UniqHash); ++i) + if (UniqHash[i] != 0) + UniqHash[i] += (pkgCache::StringItem*) newMap - (pkgCache::StringItem*) oldMap; + + for (std::set::const_iterator i = Dynamic::toReMap.begin(); + i != Dynamic::toReMap.end(); ++i) + (*i)->ReOwn(Cache, oldMap, newMap); + for (std::set::const_iterator i = Dynamic::toReMap.begin(); + i != Dynamic::toReMap.end(); ++i) + (*i)->ReOwn(Cache, oldMap, newMap); + for (std::set::const_iterator i = Dynamic::toReMap.begin(); + i != Dynamic::toReMap.end(); ++i) + (*i)->ReOwn(Cache, oldMap, newMap); + for (std::set::const_iterator i = Dynamic::toReMap.begin(); + i != Dynamic::toReMap.end(); ++i) + (*i)->ReOwn(Cache, oldMap, newMap); + for (std::set::const_iterator i = Dynamic::toReMap.begin(); + i != Dynamic::toReMap.end(); ++i) + (*i)->ReOwn(Cache, oldMap, newMap); + for (std::set::const_iterator i = Dynamic::toReMap.begin(); + i != Dynamic::toReMap.end(); ++i) + (*i)->ReOwn(Cache, oldMap, newMap); + for (std::set::const_iterator i = Dynamic::toReMap.begin(); + i != Dynamic::toReMap.end(); ++i) + (*i)->ReOwn(Cache, oldMap, newMap); +} /*}}}*/ // CacheGenerator::WriteStringInMap /*{{{*/ -unsigned long pkgCacheGenerator::WriteStringInMap(const char *String, +map_ptrloc pkgCacheGenerator::WriteStringInMap(const char *String, const unsigned long &Len) { - return Map.WriteString(String, Len); + void const * const oldMap = Map.Data(); + map_ptrloc const index = Map.WriteString(String, Len); + if (index != 0) + ReMap(oldMap, Map.Data()); + return index; } /*}}}*/ // CacheGenerator::WriteStringInMap /*{{{*/ -unsigned long pkgCacheGenerator::WriteStringInMap(const char *String) { - return Map.WriteString(String); +map_ptrloc pkgCacheGenerator::WriteStringInMap(const char *String) { + void const * const oldMap = Map.Data(); + map_ptrloc const index = Map.WriteString(String); + if (index != 0) + ReMap(oldMap, Map.Data()); + return index; } /*}}}*/ -unsigned long pkgCacheGenerator::AllocateInMap(const unsigned long &size) {/*{{{*/ - return Map.Allocate(size); +map_ptrloc pkgCacheGenerator::AllocateInMap(const unsigned long &size) {/*{{{*/ + void const * const oldMap = Map.Data(); + map_ptrloc const index = Map.Allocate(size); + if (index != 0) + ReMap(oldMap, Map.Data()); + return index; } /*}}}*/ // CacheGenerator::MergeList - Merge the package list /*{{{*/ @@ -142,6 +193,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List, { // Get a pointer to the package structure pkgCache::PkgIterator Pkg; + Dynamic DynPkg(Pkg); if (NewPackage(Pkg, PackageName, *arch) == false) return _error->Error(_("Error occurred while processing %s (NewPackage)"),PackageName.c_str()); Counter++; @@ -158,6 +210,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List, // (this has the bonus that we get MMap error when we run out // of MMap space) pkgCache::VerIterator Ver(Cache); + Dynamic DynVer(Ver); if (List.UsePackage(Pkg, Ver) == false) return _error->Error(_("Error occurred while processing %s (UsePackage1)"), PackageName.c_str()); @@ -165,11 +218,11 @@ bool pkgCacheGenerator::MergeList(ListParser &List, // Find the right version to write the description MD5SumValue CurMd5 = List.Description_md5(); Ver = Pkg.VersionList(); - map_ptrloc *LastVer = &Pkg->VersionList; - for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++) + for (; Ver.end() == false; ++Ver) { pkgCache::DescIterator Desc = Ver.DescriptionList(); + Dynamic DynDesc(Desc); map_ptrloc *LastDesc = &Ver->DescriptionList; bool duplicate=false; @@ -189,7 +242,11 @@ bool pkgCacheGenerator::MergeList(ListParser &List, if (MD5SumValue(Desc.md5()) == CurMd5) { // Add new description - *LastDesc = NewDescription(Desc, List.DescriptionLanguage(), CurMd5, *LastDesc); + void const * const oldMap = Map.Data(); + map_ptrloc const descindex = NewDescription(Desc, List.DescriptionLanguage(), CurMd5, *LastDesc); + if (oldMap != Map.Data()) + LastDesc += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap; + *LastDesc = descindex; Desc->ParentPkg = Pkg.Index(); if ((*LastDesc == 0 && _error->PendingError()) || NewFileDesc(Desc,List) == false) @@ -203,7 +260,9 @@ bool pkgCacheGenerator::MergeList(ListParser &List, } pkgCache::VerIterator Ver = Pkg.VersionList(); + Dynamic DynVer(Ver); map_ptrloc *LastVer = &Pkg->VersionList; + void const * oldMap = Map.Data(); int Res = 1; unsigned long const Hash = List.VersionHash(); for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++) @@ -242,21 +301,28 @@ bool pkgCacheGenerator::MergeList(ListParser &List, } // Add a new version - *LastVer = NewVersion(Ver,Version,*LastVer); + map_ptrloc const verindex = NewVersion(Ver,Version,*LastVer); + if (verindex == 0 && _error->PendingError()) + return _error->Error(_("Error occurred while processing %s (NewVersion%d)"), + PackageName.c_str(), 1); + + if (oldMap != Map.Data()) + LastVer += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap; + *LastVer = verindex; Ver->ParentPkg = Pkg.Index(); Ver->Hash = Hash; - if ((*LastVer == 0 && _error->PendingError()) || List.NewVersion(Ver) == false) - return _error->Error(_("Error occurred while processing %s (NewVersion1)"), - PackageName.c_str()); + if (List.NewVersion(Ver) == false) + return _error->Error(_("Error occurred while processing %s (NewVersion%d)"), + PackageName.c_str(), 2); if (List.UsePackage(Pkg,Ver) == false) return _error->Error(_("Error occurred while processing %s (UsePackage3)"), PackageName.c_str()); if (NewFileVer(Ver,List) == false) - return _error->Error(_("Error occurred while processing %s (NewVersion2)"), - PackageName.c_str()); + return _error->Error(_("Error occurred while processing %s (NewVersion%d)"), + PackageName.c_str(), 3); // Read only a single record and return if (OutVer != 0) @@ -269,13 +335,18 @@ bool pkgCacheGenerator::MergeList(ListParser &List, /* Record the Description data. Description data always exist in Packages and Translation-* files. */ pkgCache::DescIterator Desc = Ver.DescriptionList(); + Dynamic DynDesc(Desc); map_ptrloc *LastDesc = &Ver->DescriptionList; - + // Skip to the end of description set for (; Desc.end() == false; LastDesc = &Desc->NextDesc, Desc++); // Add new description - *LastDesc = NewDescription(Desc, List.DescriptionLanguage(), List.Description_md5(), *LastDesc); + oldMap = Map.Data(); + map_ptrloc const descindex = NewDescription(Desc, List.DescriptionLanguage(), List.Description_md5(), *LastDesc); + if (oldMap != Map.Data()) + LastDesc += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap; + *LastDesc = descindex; Desc->ParentPkg = Pkg.Index(); if ((*LastDesc == 0 && _error->PendingError()) || NewFileDesc(Desc,List) == false) @@ -322,6 +393,7 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List) continue; pkgCache::PkgIterator Pkg = Cache.FindPkg(PackageName); + Dynamic DynPkg(Pkg); if (Pkg.end() == true) return _error->Error(_("Error occurred while processing %s (FindPkg)"), PackageName.c_str()); @@ -331,6 +403,7 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List) unsigned long Hash = List.VersionHash(); pkgCache::VerIterator Ver = Pkg.VersionList(); + Dynamic DynVer(Ver); for (; Ver.end() == false; Ver++) { if (Ver->Hash == Hash && Version.c_str() == Ver.VerStr()) @@ -358,14 +431,15 @@ bool pkgCacheGenerator::NewGroup(pkgCache::GrpIterator &Grp, const string &Name) return true; // Get a structure - unsigned long const Group = AllocateInMap(sizeof(pkgCache::Group)); + map_ptrloc const Group = AllocateInMap(sizeof(pkgCache::Group)); if (unlikely(Group == 0)) return false; Grp = pkgCache::GrpIterator(Cache, Cache.GrpP + Group); - Grp->Name = WriteStringInMap(Name); - if (unlikely(Grp->Name == 0)) + map_ptrloc const idxName = WriteStringInMap(Name); + if (unlikely(idxName == 0)) return false; + Grp->Name = idxName; // Insert it into the hash table unsigned long const Hash = Cache.Hash(Name); @@ -382,6 +456,7 @@ bool pkgCacheGenerator::NewGroup(pkgCache::GrpIterator &Grp, const string &Name) bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name, const string &Arch) { pkgCache::GrpIterator Grp; + Dynamic DynGrp(Grp); if (unlikely(NewGroup(Grp, Name) == false)) return false; @@ -390,7 +465,7 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name return true; // Get a structure - unsigned long const Package = AllocateInMap(sizeof(pkgCache::Package)); + map_ptrloc const Package = AllocateInMap(sizeof(pkgCache::Package)); if (unlikely(Package == 0)) return false; Pkg = pkgCache::PkgIterator(Cache,Cache.PkgP + Package); @@ -416,9 +491,10 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name // Set the name, arch and the ID Pkg->Name = Grp->Name; Pkg->Group = Grp.Index(); - Pkg->Arch = WriteUniqString(Arch.c_str()); - if (unlikely(Pkg->Arch == 0)) + map_ptrloc const idxArch = WriteUniqString(Arch.c_str()); + if (unlikely(idxArch == 0)) return false; + Pkg->Arch = idxArch; Pkg->ID = Cache.HeaderP->PackageCount++; return true; @@ -434,7 +510,7 @@ bool pkgCacheGenerator::NewFileVer(pkgCache::VerIterator &Ver, return true; // Get a structure - unsigned long VerFile = AllocateInMap(sizeof(pkgCache::VerFile)); + map_ptrloc const VerFile = AllocateInMap(sizeof(pkgCache::VerFile)); if (VerFile == 0) return 0; @@ -465,7 +541,7 @@ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver, unsigned long Next) { // Get a structure - unsigned long Version = AllocateInMap(sizeof(pkgCache::Version)); + map_ptrloc const Version = AllocateInMap(sizeof(pkgCache::Version)); if (Version == 0) return 0; @@ -473,9 +549,10 @@ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver, Ver = pkgCache::VerIterator(Cache,Cache.VerP + Version); Ver->NextVer = Next; Ver->ID = Cache.HeaderP->VersionCount++; - Ver->VerStr = WriteStringInMap(VerStr); - if (Ver->VerStr == 0) + map_ptrloc const idxVerStr = WriteStringInMap(VerStr); + if (unlikely(idxVerStr == 0)) return 0; + Ver->VerStr = idxVerStr; return Version; } @@ -490,7 +567,7 @@ bool pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator &Desc, return true; // Get a structure - unsigned long DescFile = AllocateInMap(sizeof(pkgCache::DescFile)); + map_ptrloc const DescFile = AllocateInMap(sizeof(pkgCache::DescFile)); if (DescFile == 0) return false; @@ -523,7 +600,7 @@ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc, map_ptrloc Next) { // Get a structure - map_ptrloc Description = AllocateInMap(sizeof(pkgCache::Description)); + map_ptrloc const Description = AllocateInMap(sizeof(pkgCache::Description)); if (Description == 0) return 0; @@ -531,10 +608,12 @@ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc, Desc = pkgCache::DescIterator(Cache,Cache.DescP + Description); Desc->NextDesc = Next; Desc->ID = Cache.HeaderP->DescriptionCount++; - Desc->language_code = WriteStringInMap(Lang); - Desc->md5sum = WriteStringInMap(md5sum.Value()); - if (Desc->language_code == 0 || Desc->md5sum == 0) + map_ptrloc const idxlanguage_code = WriteStringInMap(Lang); + map_ptrloc const idxmd5sum = WriteStringInMap(md5sum.Value()); + if (unlikely(idxlanguage_code == 0 || idxmd5sum == 0)) return 0; + Desc->language_code = idxlanguage_code; + Desc->md5sum = idxmd5sum; return Description; } @@ -550,15 +629,22 @@ bool pkgCacheGenerator::FinishCache(OpProgress *Progress) if (archs.size() > 1) { // Create Conflicts in between the group - for (pkgCache::GrpIterator G = GetCache().GrpBegin(); G.end() != true; G++) + pkgCache::GrpIterator G = GetCache().GrpBegin(); + Dynamic DynG(G); + for (; G.end() != true; G++) { string const PkgName = G.Name(); - for (pkgCache::PkgIterator P = G.PackageList(); P.end() != true; P = G.NextPkg(P)) + pkgCache::PkgIterator P = G.PackageList(); + Dynamic DynP(P); + for (; P.end() != true; P = G.NextPkg(P)) { if (strcmp(P.Arch(),"all") == 0) continue; pkgCache::PkgIterator allPkg; - for (pkgCache::VerIterator V = P.VersionList(); V.end() != true; V++) + Dynamic DynallPkg(allPkg); + pkgCache::VerIterator V = P.VersionList(); + Dynamic DynV(V); + for (; V.end() != true; V++) { string const Arch = V.Arch(true); map_ptrloc *OldDepLast = NULL; @@ -578,6 +664,7 @@ bool pkgCacheGenerator::FinishCache(OpProgress *Progress) per group, therefore each group member conflicts with all other group members */ pkgCache::PkgIterator D = G.FindPkg(*A); + Dynamic DynD(D); if (D.end() == true) continue; if (coInstall == true) @@ -622,13 +709,15 @@ bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg, unsigned int const &Type, map_ptrloc *OldDepLast) { + void const * const oldMap = Map.Data(); // Get a structure - unsigned long const Dependency = AllocateInMap(sizeof(pkgCache::Dependency)); + map_ptrloc const Dependency = AllocateInMap(sizeof(pkgCache::Dependency)); if (unlikely(Dependency == 0)) return false; // Fill it in pkgCache::DepIterator Dep(Cache,Cache.DepP + Dependency); + Dynamic DynDep(Dep); Dep->ParentVer = Ver.Index(); Dep->Type = Type; Dep->CompareOp = Op; @@ -640,9 +729,12 @@ bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg, /* for (pkgCache::DepIterator I = Pkg.RevDependsList(); I.end() == false; I++) if (I->Version != 0 && I.TargetVer() == Version) Dep->Version = I->Version;*/ - if (Dep->Version == 0) - if (unlikely((Dep->Version = WriteStringInMap(Version)) == 0)) + if (Dep->Version == 0) { + map_ptrloc const index = WriteStringInMap(Version); + if (unlikely(index == 0)) return false; + Dep->Version = index; + } } // Link it to the package @@ -656,7 +748,8 @@ bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg, OldDepLast = &Ver->DependsList; for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++) OldDepLast = &D->NextDepends; - } + } else if (oldMap != Map.Data()) + OldDepLast += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap; Dep->NextDepends = *OldDepLast; *OldDepLast = Dep.Index(); @@ -677,11 +770,13 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator &Ver, unsigned int Type) { pkgCache::GrpIterator Grp; + Dynamic DynGrp(Grp); if (unlikely(Owner->NewGroup(Grp, PackageName) == false)) return false; // Locate the target package pkgCache::PkgIterator Pkg = Grp.FindPkg(Arch); + Dynamic DynPkg(Pkg); if (Pkg.end() == true) { if (unlikely(Owner->NewPackage(Pkg, PackageName, Arch) == false)) return false; @@ -715,13 +810,14 @@ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator &Ver, return true; // Get a structure - unsigned long const Provides = Owner->AllocateInMap(sizeof(pkgCache::Provides)); + map_ptrloc const Provides = Owner->AllocateInMap(sizeof(pkgCache::Provides)); if (unlikely(Provides == 0)) return false; Cache.HeaderP->ProvidesCount++; // Fill it in pkgCache::PrvIterator Prv(Cache,Cache.ProvideP + Provides,Cache.PkgP); + Dynamic DynPrv(Prv); Prv->Version = Ver.Index(); Prv->NextPkgProv = Ver->ProvidesList; Ver->ProvidesList = Prv.Index(); @@ -730,6 +826,7 @@ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator &Ver, // Locate the target package pkgCache::PkgIterator Pkg; + Dynamic DynPkg(Pkg); if (unlikely(Owner->NewPackage(Pkg,PkgName, PkgArch) == false)) return false; @@ -750,24 +847,29 @@ bool pkgCacheGenerator::SelectFile(const string &File,const string &Site, unsigned long Flags) { // Get some space for the structure - CurrentFile = Cache.PkgFileP + AllocateInMap(sizeof(*CurrentFile)); - if (CurrentFile == Cache.PkgFileP) + map_ptrloc const idxFile = AllocateInMap(sizeof(*CurrentFile)); + if (unlikely(idxFile == 0)) return false; - + CurrentFile = Cache.PkgFileP + idxFile; + // Fill it in - CurrentFile->FileName = WriteStringInMap(File); - CurrentFile->Site = WriteUniqString(Site); + map_ptrloc const idxFileName = WriteStringInMap(File); + map_ptrloc const idxSite = WriteUniqString(Site); + if (unlikely(idxFileName == 0 || idxSite == 0)) + return false; + CurrentFile->FileName = idxFileName; + CurrentFile->Site = idxSite; CurrentFile->NextFile = Cache.HeaderP->FileList; CurrentFile->Flags = Flags; CurrentFile->ID = Cache.HeaderP->PackageFileCount; - CurrentFile->IndexType = WriteUniqString(Index.GetType()->Label); + map_ptrloc const idxIndexType = WriteUniqString(Index.GetType()->Label); + if (unlikely(idxIndexType == 0)) + return false; + CurrentFile->IndexType = idxIndexType; PkgFileName = File; Cache.HeaderP->FileList = CurrentFile - Cache.PkgFileP; Cache.HeaderP->PackageFileCount++; - if (CurrentFile->FileName == 0) - return false; - if (Progress != 0) Progress->SubProgress(Index.Size()); return true; @@ -807,18 +909,25 @@ unsigned long pkgCacheGenerator::WriteUniqString(const char *S, } // Get a structure - unsigned long Item = AllocateInMap(sizeof(pkgCache::StringItem)); + void const * const oldMap = Map.Data(); + map_ptrloc const Item = AllocateInMap(sizeof(pkgCache::StringItem)); if (Item == 0) return 0; + map_ptrloc const idxString = WriteStringInMap(S,Size); + if (unlikely(idxString == 0)) + return 0; + if (oldMap != Map.Data()) { + Last += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap; + I += (pkgCache::StringItem*) Map.Data() - (pkgCache::StringItem*) oldMap; + } + *Last = Item; + // Fill in the structure pkgCache::StringItem *ItemP = Cache.StringItemP + Item; ItemP->NextItem = I - Cache.StringItemP; - *Last = Item; - ItemP->String = WriteStringInMap(S,Size); - if (ItemP->String == 0) - return 0; - + ItemP->String = idxString; + Bucket = ItemP; return ItemP->String; } @@ -1072,7 +1181,7 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress unlink(CacheFile.c_str()); CacheF = new FileFd(CacheFile,FileFd::WriteEmpty); fchmod(CacheF->Fd(),0644); - Map = new DynamicMMap(*CacheF,MMap::Public,MapSize); + Map = new DynamicMMap(*CacheF,MMap::Public | MMap::Moveable, MapSize); if (_error->PendingError() == true) return false; if (Debug == true) @@ -1081,7 +1190,7 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress else { // Just build it in memory.. - Map = new DynamicMMap(0,MapSize); + Map = new DynamicMMap(MMap::Moveable, MapSize); if (Debug == true) std::clog << "Open memory Map (not filebased)" << std::endl; } @@ -1194,7 +1303,7 @@ bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **O if (_system->AddStatusFiles(Files) == false) return false; - SPtr Map = new DynamicMMap(0,MapSize); + SPtr Map = new DynamicMMap(MMap::Moveable, MapSize); unsigned long CurrentSize = 0; unsigned long TotalSize = 0; diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 8f7739165..3bee1f958 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -23,6 +23,8 @@ #include #include +#include + class pkgSourceList; class OpProgress; class MMap; @@ -33,18 +35,32 @@ class pkgCacheGenerator /*{{{*/ private: pkgCache::StringItem *UniqHash[26]; - unsigned long WriteStringInMap(std::string const &String) { return WriteStringInMap(String.c_str()); }; - unsigned long WriteStringInMap(const char *String); - unsigned long WriteStringInMap(const char *String, const unsigned long &Len); - unsigned long AllocateInMap(const unsigned long &size); + map_ptrloc WriteStringInMap(std::string const &String) { return WriteStringInMap(String.c_str()); }; + map_ptrloc WriteStringInMap(const char *String); + map_ptrloc WriteStringInMap(const char *String, const unsigned long &Len); + map_ptrloc AllocateInMap(const unsigned long &size); public: class ListParser; friend class ListParser; - + + template class Dynamic { + Iter *I; + + public: + static std::set toReMap; + Dynamic(Iter &It) : I(&It) { + toReMap.insert(I); + } + + ~Dynamic() { + toReMap.erase(I); + } + }; + protected: - + DynamicMMap ⤅ pkgCache Cache; OpProgress *Progress; @@ -86,6 +102,8 @@ class pkgCacheGenerator /*{{{*/ MMap **OutMap = 0,bool AllowMem = false); static bool MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap); + void ReMap(void const * const oldMap, void const * const newMap); + pkgCacheGenerator(DynamicMMap *Map,OpProgress *Progress); ~pkgCacheGenerator(); }; diff --git a/debian/changelog b/debian/changelog index 878d5238a..dab703c6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,9 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low * apt-pkg/policy.h: - add another round of const& madness as the previous round accidentally NOT overrides the virtual GetCandidateVer() method (Closes: #587725) + * apt-pkg/pkgcachegen.{cc,h}: + - make the used MMap moveable (and therefore dynamic resizeable) by + applying (some) mad pointer magic (Closes: #195018) [ Julian Andres Klode ] * methods/ftp.h: -- cgit v1.2.3 From dcdf1ef18b37c243fc707869149f7761d964915c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 9 Jul 2010 17:00:28 +0200 Subject: * doc/apt.conf.5.xml: - add and document APT::Cache-{Start,Grow,Limit} options for mmap control --- apt-pkg/contrib/mmap.cc | 2 ++ apt-pkg/pkgcachegen.cc | 22 ++++++++++++++++------ apt-pkg/pkgcachegen.h | 1 + debian/changelog | 4 +++- doc/apt.conf.5.xml | 17 ++++++++++++++--- doc/examples/configure-index | 4 +++- 6 files changed, 39 insertions(+), 11 deletions(-) diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index aa184b130..69fb61fca 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -398,6 +398,8 @@ bool DynamicMMap::Grow() { if (Limit != 0 && WorkSpace >= Limit) return _error->Error(_("Unable to increase the size of the MMap as the " "limit of %lu bytes is already reached."), Limit); + if (GrowFactor <= 0) + return _error->Error(_("Unable to increase size of the MMap as automatic growing is disabled by user.")); unsigned long const newSize = WorkSpace + GrowFactor; diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 18bad6727..7ca8fbfda 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -1094,6 +1094,18 @@ static bool BuildCache(pkgCacheGenerator &Gen, return true; } /*}}}*/ +DynamicMMap* pkgCacheGenerator::CreateDynamicMMap(FileFd *CacheF, unsigned long Flags) { + unsigned long const MapStart = _config->FindI("APT::Cache-Start", 24*1024*1024); + unsigned long const MapGrow = _config->FindI("APT::Cache-Grow", 1*1024*1024); + unsigned long const MapLimit = _config->FindI("APT::Cache-Limit", 0); + Flags |= MMap::Moveable; + if (_config->FindB("APT::Cache-Fallback", false) == true) + Flags |= MMap::Fallback; + if (CacheF != NULL) + return new DynamicMMap(*CacheF, Flags, MapStart, MapGrow, MapLimit); + else + return new DynamicMMap(Flags, MapStart, MapGrow, MapLimit); +} // CacheGenerator::MakeStatusCache - Construct the status cache /*{{{*/ // --------------------------------------------------------------------- /* This makes sure that the status cache (the cache that has all @@ -1109,7 +1121,6 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress MMap **OutMap,bool AllowMem) { bool const Debug = _config->FindB("Debug::pkgCacheGen", false); - unsigned long const MapSize = _config->FindI("APT::Cache-Limit",24*1024*1024); vector Files; for (vector::const_iterator i = List.begin(); @@ -1181,7 +1192,7 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress unlink(CacheFile.c_str()); CacheF = new FileFd(CacheFile,FileFd::WriteEmpty); fchmod(CacheF->Fd(),0644); - Map = new DynamicMMap(*CacheF,MMap::Public | MMap::Moveable, MapSize); + Map = CreateDynamicMMap(CacheF, MMap::Public); if (_error->PendingError() == true) return false; if (Debug == true) @@ -1190,7 +1201,7 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress else { // Just build it in memory.. - Map = new DynamicMMap(MMap::Moveable, MapSize); + Map = CreateDynamicMMap(NULL); if (Debug == true) std::clog << "Open memory Map (not filebased)" << std::endl; } @@ -1297,13 +1308,12 @@ __deprecated bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutM { return pkgCacheGenerator::MakeOnlyStatusCache(&Progress, OutMap); } bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap) { - unsigned long MapSize = _config->FindI("APT::Cache-Limit",20*1024*1024); vector Files; unsigned long EndOfSource = Files.size(); if (_system->AddStatusFiles(Files) == false) return false; - - SPtr Map = new DynamicMMap(MMap::Moveable, MapSize); + + SPtr Map = CreateDynamicMMap(NULL); unsigned long CurrentSize = 0; unsigned long TotalSize = 0; diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 3bee1f958..20dd28030 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -101,6 +101,7 @@ class pkgCacheGenerator /*{{{*/ static bool MakeStatusCache(pkgSourceList &List,OpProgress *Progress, MMap **OutMap = 0,bool AllowMem = false); static bool MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap); + static DynamicMMap* CreateDynamicMMap(FileFd *CacheF, unsigned long Flags = 0); void ReMap(void const * const oldMap, void const * const newMap); diff --git a/debian/changelog b/debian/changelog index dab703c6b..f819908ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,8 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low * apt-pkg/pkgcachegen.{cc,h}: - make the used MMap moveable (and therefore dynamic resizeable) by applying (some) mad pointer magic (Closes: #195018) + * doc/apt.conf.5.xml: + - add and document APT::Cache-{Start,Grow,Limit} options for mmap control [ Julian Andres Klode ] * methods/ftp.h: @@ -55,7 +57,7 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low * debian/control: - Set Standards-Version to 3.9.0 - -- David Kalnischkies Mon, 05 Jul 2010 12:05:30 +0200 + -- David Kalnischkies Fri, 09 Jul 2010 16:55:53 +0200 apt (0.7.26~exp7) experimental; urgency=low diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 39e2c8e6b..7b7290794 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -199,9 +199,20 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; anything that those packages depend on. - Cache-Limit - APT uses a fixed size memory mapped cache file to store the 'available' - information. This sets the size of that cache (in bytes). + Cache-Start, Cache-Grow and Cache-Limit + APT uses since version 0.7.26 a resizable memory mapped cache file to store the 'available' + information. Cache-Start acts as a hint to which size the Cache will grow + and is therefore the amount of memory APT will request at startup. The default value is + 20971520 bytes (~20 MB). Note that these amount of space need to be available for APT + otherwise it will likely fail ungracefully, so for memory restricted devices these value should + be lowered while on systems with a lot of configured sources this might be increased. + Cache-Grow defines in byte with the default of 1048576 (~1 MB) how much + the Cache size will be increased in the event the space defined by Cache-Start + is not enough. These value will be applied again and again until either the cache is big + enough to store all information or the size of the cache reaches the Cache-Limit. + The default of Cache-Limit is 0 which stands for no limit. + If Cache-Grow is set to 0 the automatic grow of the cache is disabled. + Build-Essential diff --git a/doc/examples/configure-index b/doc/examples/configure-index index fdec32c2c..26fb53fec 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -95,7 +95,9 @@ APT Clean-Installed "true"; Immediate-Configure "true"; // DO NOT turn this off, see the man page Force-LoopBreak "false"; // DO NOT turn this on, see the man page - Cache-Limit "4194304"; + Cache-Start "20971520"; + Cache-Grow "1048576"; + Cache-Limit "0"; Default-Release ""; // consider Recommends, Suggests as important dependencies that should -- cgit v1.2.3 From 7635093c1c015e385a9e72bdd8a089fd9d48ab57 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 9 Jul 2010 19:51:19 +0200 Subject: switch from std::set to std::vector as it is way more simple, a bit faster and still provides everything we need for the Cache generator --- apt-pkg/pkgcachegen.cc | 16 ++++++++-------- apt-pkg/pkgcachegen.h | 12 +++++------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 7ca8fbfda..1175d5129 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -36,7 +36,7 @@ #include /*}}}*/ typedef vector::iterator FileIterator; -template std::set pkgCacheGenerator::Dynamic::toReMap; +template std::vector pkgCacheGenerator::Dynamic::toReMap(6); // CacheGenerator::pkgCacheGenerator - Constructor /*{{{*/ // --------------------------------------------------------------------- @@ -113,25 +113,25 @@ void pkgCacheGenerator::ReMap(void const * const oldMap, void const * const newM if (UniqHash[i] != 0) UniqHash[i] += (pkgCache::StringItem*) newMap - (pkgCache::StringItem*) oldMap; - for (std::set::const_iterator i = Dynamic::toReMap.begin(); + for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) (*i)->ReOwn(Cache, oldMap, newMap); - for (std::set::const_iterator i = Dynamic::toReMap.begin(); + for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) (*i)->ReOwn(Cache, oldMap, newMap); - for (std::set::const_iterator i = Dynamic::toReMap.begin(); + for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) (*i)->ReOwn(Cache, oldMap, newMap); - for (std::set::const_iterator i = Dynamic::toReMap.begin(); + for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) (*i)->ReOwn(Cache, oldMap, newMap); - for (std::set::const_iterator i = Dynamic::toReMap.begin(); + for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) (*i)->ReOwn(Cache, oldMap, newMap); - for (std::set::const_iterator i = Dynamic::toReMap.begin(); + for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) (*i)->ReOwn(Cache, oldMap, newMap); - for (std::set::const_iterator i = Dynamic::toReMap.begin(); + for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) (*i)->ReOwn(Cache, oldMap, newMap); } /*}}}*/ diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 20dd28030..ff198833a 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -23,7 +23,7 @@ #include #include -#include +#include class pkgSourceList; class OpProgress; @@ -46,16 +46,14 @@ class pkgCacheGenerator /*{{{*/ friend class ListParser; template class Dynamic { - Iter *I; - public: - static std::set toReMap; - Dynamic(Iter &It) : I(&It) { - toReMap.insert(I); + static std::vector toReMap; + Dynamic(Iter &I) { + toReMap.push_back(&I); } ~Dynamic() { - toReMap.erase(I); + toReMap.pop_back(); } }; -- cgit v1.2.3 From 5d062ce08e6125d9ef34d3e55d4a88c1937f4f21 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 9 Jul 2010 21:16:01 +0200 Subject: releasing version 0.7.26~exp8 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c4d18d70b..eebf4fd01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.26~exp8) UNRELEASED; urgency=low +apt (0.7.26~exp8) experimental; urgency=low [ David Kalnischkies ] * cmdline/cacheset.cc: @@ -59,7 +59,7 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low * debian/control: - Set Standards-Version to 3.9.0 - -- David Kalnischkies Mon, 05 Jul 2010 12:05:30 +0200 + -- Michael Vogt Fri, 09 Jul 2010 19:16:20 +0200 apt (0.7.26~exp7) experimental; urgency=low -- cgit v1.2.3 From 62d073d937742baf8621a11c3094e0320aa846cd Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 9 Jul 2010 21:46:42 +0200 Subject: check the state of the FileFd before renaming as otherwise the rename will be tried twice e.g. in an "apt-get update" run and every other piece of code closing the FileFd manual before the destructor will do it again. --- apt-pkg/contrib/fileutl.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 62d42e4da..8f7791a8a 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -843,19 +843,21 @@ bool FileFd::Close() bool Res = true; if ((Flags & AutoClose) == AutoClose) if (iFd >= 0 && close(iFd) != 0) - Res &= _error->Errno("close",_("Problem closing the file")); - iFd = -1; + Res &= _error->Errno("close",_("Problem closing the file %s"), FileName.c_str()); - if ((Flags & Replace) == Replace) { + if ((Flags & Replace) == Replace && iFd >= 0) { if (rename(TemporaryFileName.c_str(), FileName.c_str()) != 0) - Res &= _error->Errno("rename",_("Problem renaming the file")); + Res &= _error->Errno("rename",_("Problem renaming the file %s to %s"), TemporaryFileName.c_str(), FileName.c_str()); + FileName = TemporaryFileName; // for the unlink() below. } - + + iFd = -1; + if ((Flags & Fail) == Fail && (Flags & DelOnFail) == DelOnFail && FileName.empty() == false) if (unlink(FileName.c_str()) != 0) - Res &= _error->WarningE("unlnk",_("Problem unlinking the file")); + Res &= _error->WarningE("unlnk",_("Problem unlinking the file %s"), FileName.c_str()); return Res; -- cgit v1.2.3 From 137a73dc58b14f71a11da5940e099725f6dad8ef Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 9 Jul 2010 22:53:15 +0200 Subject: releasing version 0.7.26~exp9 --- debian/changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d2491606c..a4ee9a7f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -apt (0.7.26~exp9) UNRELEASEDexperimental; urgency=low +apt (0.7.26~exp9) experimental; urgency=low [ David Kalnischkies ] * doc/apt.conf.5.xml: - add and document APT::Cache-{Start,Grow,Limit} options for mmap control + * apt-pkg/contrib/fileutl.cc: + - do not fail von double close() -- Michael Vogt Fri, 09 Jul 2010 21:51:55 +0200 -- cgit v1.2.3 From 3c0929ecbeab50de9d38edc2eaebe92aeee65baf Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 10 Jul 2010 13:51:47 +0200 Subject: * apt-pkg/contrib/error.{cc,h}: - remove constness of va_list parameter to fix build on amd64 and co Thanks Eric Valette! (Closes: #588610) --- apt-pkg/contrib/error.cc | 9 ++++----- apt-pkg/contrib/error.h | 4 ++-- debian/changelog | 9 +++++++++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc index 8cee21c9c..fbb6e4636 100644 --- a/apt-pkg/contrib/error.cc +++ b/apt-pkg/contrib/error.cc @@ -94,11 +94,10 @@ bool GlobalError::DebugE(const char *Function,const char *Description,...) { /*}}}*/ // GlobalError::InsertErrno - formats an error message with the errno /*{{{*/ bool GlobalError::InsertErrno(MsgType type, const char* Function, - const char* Description, va_list const &args) { + const char* Description, va_list &args) { char S[400]; - vsnprintf(S,sizeof(S),Description,args); - snprintf(S + strlen(S),sizeof(S) - strlen(S), - " - %s (%i: %s)", Function, errno, strerror(errno)); + snprintf(S, sizeof(S), "%s - %s (%i: %s)", Description, + Function, errno, strerror(errno)); return Insert(type, S, args); } /*}}}*/ @@ -141,7 +140,7 @@ bool GlobalError::Debug(const char *Description,...) /*}}}*/ // GlobalError::Insert - Insert a new item at the end /*{{{*/ bool GlobalError::Insert(MsgType type, const char* Description, - va_list const &args) { + va_list &args) { char S[400]; vsnprintf(S,sizeof(S),Description,args); diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index 73735162d..e5517c2da 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -278,9 +278,9 @@ private: /*{{{*/ std::list Stacks; bool InsertErrno(MsgType type, const char* Function, - const char* Description, va_list const &args); + const char* Description, va_list &args); bool Insert(MsgType type, const char* Description, - va_list const &args); + va_list &args); /*}}}*/ }; /*}}}*/ diff --git a/debian/changelog b/debian/changelog index a4ee9a7f8..23a5f9351 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +apt (0.7.26~exp10) UNRELEASED; urgency=low + + [ David Kalnischkies ] + * apt-pkg/contrib/error.{cc,h}: + - remove constness of va_list parameter to fix build on amd64 and co + Thanks Eric Valette! (Closes: #588610) + + -- David Kalnischkies Sat, 10 Jul 2010 13:44:32 +0200 + apt (0.7.26~exp9) experimental; urgency=low [ David Kalnischkies ] -- cgit v1.2.3 From dd13742ef11a6a601a2e85afd9d80be92ed7513a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 11 Jul 2010 18:50:41 +0200 Subject: * apt-pkg/deb/debmetaindex.cc: - do not query each architecture for flat file archives --- apt-pkg/deb/debindexfile.cc | 8 ++++---- apt-pkg/deb/deblistparser.cc | 2 +- apt-pkg/deb/debmetaindex.cc | 14 ++++++++++++-- apt-pkg/pkgcachegen.cc | 2 ++ debian/changelog | 2 ++ 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 7e9a973a4..ba5b3f266 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -184,8 +184,8 @@ string debPackagesIndex::ArchiveInfo(pkgCache::VerIterator Ver) const Res += " "; Res += Ver.ParentPkg().Name(); Res += " "; - Res += Ver.Arch(); - Res += " "; + if (Dist[Dist.size() - 1] != '/') + Res.append(Ver.Arch()).append(" "); Res += Ver.VerStr(); return Res; } @@ -219,8 +219,8 @@ string debPackagesIndex::Info(const char *Type) const else Info += Dist + '/' + Section; Info += " "; - Info += Architecture; - Info += " "; + if (Dist[Dist.size() - 1] != '/') + Info += Architecture + " "; Info += Type; return Info; } diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 2cfeb23e9..5fb737970 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -757,7 +757,7 @@ bool debListParser::Step() if (Architecture.empty() == true) return true; - if (Arch.empty() == true || MultiArchEnabled == false) + if (Arch.empty() == true || Arch == "any" || MultiArchEnabled == false) { if (APT::Configuration::checkArchitecture(Architecture) == true) return true; diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 8df3ed18d..7366bd624 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -332,7 +332,12 @@ class debSLTypeDebian : public pkgSourceList::Type if (IsSrc == true) Deb->PushSectionEntry("source", new debReleaseIndex::debSectionEntry(Section, IsSrc)); else - Deb->PushSectionEntry(Archs, new debReleaseIndex::debSectionEntry(Section, IsSrc)); + { + if (Dist[Dist.size() - 1] == '/') + Deb->PushSectionEntry("any", new debReleaseIndex::debSectionEntry(Section, IsSrc)); + else + Deb->PushSectionEntry(Archs, new debReleaseIndex::debSectionEntry(Section, IsSrc)); + } return true; } } @@ -342,7 +347,12 @@ class debSLTypeDebian : public pkgSourceList::Type if (IsSrc == true) Deb->PushSectionEntry ("source", new debReleaseIndex::debSectionEntry(Section, IsSrc)); else - Deb->PushSectionEntry (Archs, new debReleaseIndex::debSectionEntry(Section, IsSrc)); + { + if (Dist[Dist.size() - 1] == '/') + Deb->PushSectionEntry ("any", new debReleaseIndex::debSectionEntry(Section, IsSrc)); + else + Deb->PushSectionEntry (Archs, new debReleaseIndex::debSectionEntry(Section, IsSrc)); + } List.push_back(Deb); return true; } diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 1175d5129..38f2d6a2a 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -1094,6 +1094,7 @@ static bool BuildCache(pkgCacheGenerator &Gen, return true; } /*}}}*/ +// CacheGenerator::CreateDynamicMMap - load an mmap with configuration options /*{{{*/ DynamicMMap* pkgCacheGenerator::CreateDynamicMMap(FileFd *CacheF, unsigned long Flags) { unsigned long const MapStart = _config->FindI("APT::Cache-Start", 24*1024*1024); unsigned long const MapGrow = _config->FindI("APT::Cache-Grow", 1*1024*1024); @@ -1106,6 +1107,7 @@ DynamicMMap* pkgCacheGenerator::CreateDynamicMMap(FileFd *CacheF, unsigned long else return new DynamicMMap(Flags, MapStart, MapGrow, MapLimit); } + /*}}}*/ // CacheGenerator::MakeStatusCache - Construct the status cache /*{{{*/ // --------------------------------------------------------------------- /* This makes sure that the status cache (the cache that has all diff --git a/debian/changelog b/debian/changelog index bc35468c3..b506fa433 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ apt (0.7.26~exp10) UNRELEASED; urgency=low * apt-pkg/contrib/error.{cc,h}: - remove constness of va_list parameter to fix build on amd64 and co Thanks Eric Valette! (Closes: #588610) + * apt-pkg/deb/debmetaindex.cc: + - do not query each architecture for flat file archives [ Martin Pitt ] * debian/rules: -- cgit v1.2.3 From ff1ad6fdb01ad8d477ab711e4f6fe006d622f3bc Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 11 Jul 2010 18:58:54 +0200 Subject: fix typo preventing display of architecture in Info() --- apt-pkg/deb/debmetaindex.cc | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 7366bd624..717d0bcde 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -23,7 +23,7 @@ string debReleaseIndex::Info(const char *Type, string const &Section, string con else { Info += Dist + '/' + Section; - if (Arch.empty() == true) + if (Arch.empty() != true) Info += " " + Arch; } Info += " "; diff --git a/debian/changelog b/debian/changelog index b506fa433..b0efc72e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ apt (0.7.26~exp10) UNRELEASED; urgency=low Thanks Eric Valette! (Closes: #588610) * apt-pkg/deb/debmetaindex.cc: - do not query each architecture for flat file archives + - fix typo preventing display of architecture in Info() [ Martin Pitt ] * debian/rules: -- cgit v1.2.3 From f7a35f2e813cff49470b4c4cb5b79cf6277f97d9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 11 Jul 2010 19:19:35 +0200 Subject: rename ReOwn to ReMap in the cacheiterators --- apt-pkg/cacheiterators.h | 4 ++-- apt-pkg/pkgcachegen.cc | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index eb8dee5e3..1dcc34532 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -75,8 +75,8 @@ template class pkgCache::Iterator : inline bool IsGood() const { return S && Owner && ! end();}; inline unsigned long Index() const {return S - OwnerPointer();}; - void ReOwn(pkgCache &newOwner, void const * const oldMap, void const * const newMap) { - if (S == 0) + void ReMap(void const * const oldMap, void const * const newMap) { + if (Owner == 0 || S == 0) return; S += (Str*)(newMap) - (Str*)(oldMap); } diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 38f2d6a2a..75f2ffe45 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -115,25 +115,25 @@ void pkgCacheGenerator::ReMap(void const * const oldMap, void const * const newM for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) - (*i)->ReOwn(Cache, oldMap, newMap); + (*i)->ReMap(oldMap, newMap); for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) - (*i)->ReOwn(Cache, oldMap, newMap); + (*i)->ReMap(oldMap, newMap); for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) - (*i)->ReOwn(Cache, oldMap, newMap); + (*i)->ReMap(oldMap, newMap); for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) - (*i)->ReOwn(Cache, oldMap, newMap); + (*i)->ReMap(oldMap, newMap); for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) - (*i)->ReOwn(Cache, oldMap, newMap); + (*i)->ReMap(oldMap, newMap); for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) - (*i)->ReOwn(Cache, oldMap, newMap); + (*i)->ReMap(oldMap, newMap); for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) - (*i)->ReOwn(Cache, oldMap, newMap); + (*i)->ReMap(oldMap, newMap); } /*}}}*/ // CacheGenerator::WriteStringInMap /*{{{*/ map_ptrloc pkgCacheGenerator::WriteStringInMap(const char *String, -- cgit v1.2.3 From f5eb830c02cb0724cb1d2e70f56cd508583aaf9a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 11 Jul 2010 19:44:14 +0200 Subject: mark all "Hash Sum mismatch" strings as translateable --- apt-pkg/acquire-item.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 020efdfaa..a289fb7ba 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1710,7 +1710,7 @@ void pkgAcqFile::Done(string Message,unsigned long Size,string CalcHash, if(!ExpectedHash.empty() && ExpectedHash.toStr() != CalcHash) { Status = StatError; - ErrorText = "Hash Sum mismatch"; + ErrorText = _("Hash Sum mismatch"); Rename(DestFile,DestFile + ".FAILED"); return; } -- cgit v1.2.3 From b09663668c4d8203543e56b25db822ba55d21529 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 11 Jul 2010 21:57:51 +0200 Subject: * methods/bzip2.cc: - add a copycat of the old gzip.cc as we need it for bzip2 and lzma --- debian/changelog | 4 +- methods/bzip2.cc | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ methods/makefile | 20 ++++--- 3 files changed, 191 insertions(+), 10 deletions(-) create mode 100644 methods/bzip2.cc diff --git a/debian/changelog b/debian/changelog index b0efc72e5..cfac23251 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ apt (0.7.26~exp10) UNRELEASED; urgency=low * apt-pkg/deb/debmetaindex.cc: - do not query each architecture for flat file archives - fix typo preventing display of architecture in Info() + * methods/bzip2.cc: + - add a copycat of the old gzip.cc as we need it for bzip2 and lzma [ Martin Pitt ] * debian/rules: @@ -43,7 +45,7 @@ apt (0.7.26~exp10) UNRELEASED; urgency=low Rewrite it to use FileFd directly, which makes the code a lot simpler, and also using less memory and overhead. - -- David Kalnischkies Sat, 10 Jul 2010 13:44:32 +0200 + -- David Kalnischkies Sun, 11 Jul 2010 21:56:36 +0200 apt (0.7.26~exp9) experimental; urgency=low diff --git a/methods/bzip2.cc b/methods/bzip2.cc new file mode 100644 index 000000000..5da214bfc --- /dev/null +++ b/methods/bzip2.cc @@ -0,0 +1,177 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/* ###################################################################### + + Bzip2 method - Take a file URI in and decompress it into the target + file. + + While the method is named "bzip2" it handles also other compression + types as it calls binaries based on the name of the method, + so it can also be used to handle gzip, lzma and others if named + correctly. + + ##################################################################### */ + /*}}}*/ +// Include Files /*{{{*/ +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + /*}}}*/ + +const char *Prog; + +class Bzip2Method : public pkgAcqMethod +{ + virtual bool Fetch(FetchItem *Itm); + + public: + + Bzip2Method() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {}; +}; + + +// Bzip2Method::Fetch - Decompress the passed URI /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool Bzip2Method::Fetch(FetchItem *Itm) +{ + URI Get = Itm->Uri; + string Path = Get.Host + Get.Path; // To account for relative paths + + string GzPathOption = "Dir::bin::"+string(Prog); + + FetchResult Res; + Res.Filename = Itm->DestFile; + URIStart(Res); + + // 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.c_str(), Itm->DestFile.c_str()); + return true; + } + + int GzOut[2]; + if (pipe(GzOut) < 0) + return _error->Errno("pipe",_("Couldn't open pipe for %s"),Prog); + + // Fork bzip2 + pid_t Process = ExecFork(); + if (Process == 0) + { + close(GzOut[0]); + dup2(From.Fd(),STDIN_FILENO); + dup2(GzOut[1],STDOUT_FILENO); + From.Close(); + close(GzOut[1]); + SetCloseExec(STDIN_FILENO,false); + SetCloseExec(STDOUT_FILENO,false); + + const char *Args[3]; + string Tmp = _config->Find(GzPathOption,Prog); + Args[0] = Tmp.c_str(); + Args[1] = "-d"; + Args[2] = 0; + execvp(Args[0],(char **)Args); + _exit(100); + } + From.Close(); + close(GzOut[1]); + + FileFd FromGz(GzOut[0]); // For autoclose + FileFd To(Itm->DestFile,FileFd::WriteEmpty); + To.EraseOnFailure(); + if (_error->PendingError() == true) + return false; + + // Read data from bzip2, generate checksums and write + Hashes Hash; + bool Failed = false; + while (1) + { + unsigned char Buffer[4*1024]; + unsigned long Count; + + Count = read(GzOut[0],Buffer,sizeof(Buffer)); + if (Count < 0 && errno == EINTR) + continue; + + if (Count < 0) + { + _error->Errno("read", _("Read error from %s process"),Prog); + Failed = true; + break; + } + + if (Count == 0) + break; + + Hash.Add(Buffer,Count); + if (To.Write(Buffer,Count) == false) + { + Failed = true; + FromGz.Close(); + break; + } + } + + // Wait for bzip2 to finish + if (ExecWait(Process,_config->Find(GzPathOption,Prog).c_str(),false) == false) + { + To.OpFail(); + return false; + } + + To.Close(); + + if (Failed == true) + return false; + + // Transfer the modification times + struct stat Buf; + if (stat(Path.c_str(),&Buf) != 0) + return _error->Errno("stat",_("Failed to stat")); + + struct utimbuf TimeBuf; + TimeBuf.actime = Buf.st_atime; + TimeBuf.modtime = Buf.st_mtime; + if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0) + return _error->Errno("utime",_("Failed to set modification time")); + + if (stat(Itm->DestFile.c_str(),&Buf) != 0) + return _error->Errno("stat",_("Failed to stat")); + + // Return a Done response + Res.LastModified = Buf.st_mtime; + Res.Size = Buf.st_size; + Res.TakeHashes(Hash); + + URIDone(Res); + + return true; +} + /*}}}*/ + +int main(int argc, char *argv[]) +{ + setlocale(LC_ALL, ""); + + Bzip2Method Mth; + + Prog = strrchr(argv[0],'/'); + Prog++; + + return Mth.Run(); +} diff --git a/methods/makefile b/methods/makefile index eabe85cfd..d94a85340 100644 --- a/methods/makefile +++ b/methods/makefile @@ -86,9 +86,16 @@ LIB_MAKES = apt-pkg/makefile SOURCE = mirror.cc http.cc rfc2553emu.cc connect.cc include $(PROGRAM_H) -# SSH and bzip2 method symlink -binary: $(BIN)/ssh $(BIN)/bzip2 $(BIN)/lzma -veryclean: clean-$(BIN)/ssh clean-$(BIN)/bzip2 clean-$(BIN)/lzma +# The gzip method +PROGRAM=bzip2 +SLIBS = -lapt-pkg $(INTLLIBS) +LIB_MAKES = apt-pkg/makefile +SOURCE = bzip2.cc +include $(PROGRAM_H) + +# SSH and lzma method symlink +binary: $(BIN)/ssh $(BIN)/lzma +veryclean: clean-$(BIN)/ssh clean-$(BIN)/lzma $(BIN)/ssh: echo "Installing ssh method link" @@ -96,13 +103,8 @@ $(BIN)/ssh: clean-$(BIN)/ssh: -rm $(BIN)/ssh -$(BIN)/bzip2: - echo "Installing bzip2 method link" - ln -fs gzip $(BIN)/bzip2 $(BIN)/lzma: echo "Installing lzma method link" - ln -fs gzip $(BIN)/lzma -clean-$(BIN)/bzip2: - -rm $(BIN)/bzip2 + ln -fs bzip2 $(BIN)/lzma clean-$(BIN)/lzma: -rm $(BIN)/lzma -- cgit v1.2.3 From d10cef824604012516f26efaae8bab1f29a7820a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 11 Jul 2010 23:07:58 +0200 Subject: accidently prefilling the vectors results in segfaults --- apt-pkg/pkgcachegen.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 75f2ffe45..c9a9a753c 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -36,7 +36,7 @@ #include /*}}}*/ typedef vector::iterator FileIterator; -template std::vector pkgCacheGenerator::Dynamic::toReMap(6); +template std::vector pkgCacheGenerator::Dynamic::toReMap; // CacheGenerator::pkgCacheGenerator - Constructor /*{{{*/ // --------------------------------------------------------------------- -- cgit v1.2.3 From d3814b27a7ba26236835180c37de72e6afbdffb2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 14 Jul 2010 22:59:43 +0200 Subject: * apt-pkg/depcache.cc: - handle "circular" conflicts for "all" packages correctly --- apt-pkg/depcache.cc | 8 ++++---- debian/changelog | 8 ++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 05127fe18..bc663a8e9 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -338,7 +338,7 @@ bool pkgDepCache::CheckDep(DepIterator Dep,int Type,PkgIterator &Res) /* Check simple depends. A depends -should- never self match but we allow it anyhow because dpkg does. Technically it is a packaging bug. Conflicts may never self match */ - if (Dep.TargetPkg() != Dep.ParentPkg() || + if (Dep.TargetPkg()->Group != Dep.ParentPkg()->Group || (Dep->Type != Dep::Conflicts && Dep->Type != Dep::DpkgBreaks && Dep->Type != Dep::Obsoletes)) { PkgIterator Pkg = Dep.TargetPkg(); @@ -367,9 +367,9 @@ bool pkgDepCache::CheckDep(DepIterator Dep,int Type,PkgIterator &Res) PkgIterator Pkg = Dep.ParentPkg(); for (; P.end() != true; P++) { - /* Provides may never be applied against the same package if it is - a conflicts. See the comment above. */ - if (P.OwnerPkg() == Pkg && + /* Provides may never be applied against the same package (or group) + if it is a conflicts. See the comment above. */ + if (P.OwnerPkg()->Group == Pkg->Group && (Dep->Type == Dep::Conflicts || Dep->Type == Dep::DpkgBreaks)) continue; diff --git a/debian/changelog b/debian/changelog index 0f87ce60f..76354aad7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.26~exp11) experimental; urgency=low + + [ David Kalnischkies ] + * apt-pkg/depcache.cc: + - handle "circular" conflicts for "all" packages correctly + + -- David Kalnischkies Wed, 14 Jul 2010 22:58:08 +0200 + apt (0.7.26~exp10) experimental; urgency=low [ David Kalnischkies ] -- cgit v1.2.3 From fe1af091b871f9af715d729e515f2e3a62802c6f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 16 Jul 2010 17:42:54 +0200 Subject: * cmdline/apt-cache.cc: - be able to omit dependency types in (r)depends (Closes: #319006) --- cmdline/apt-cache.cc | 77 ++++++++++++++++++++++++++++++++++++++++++---------- debian/changelog | 2 ++ doc/apt-cache.8.xml | 14 ++++++++++ 3 files changed, 78 insertions(+), 15 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 338be7029..557996693 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -569,9 +569,18 @@ bool Depends(CommandLine &CmdL) for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) Colours[Pkg->ID] = 1; - bool Recurse = _config->FindB("APT::Cache::RecurseDepends",false); - bool Installed = _config->FindB("APT::Cache::Installed",false); - bool Important = _config->FindB("APT::Cache::Important",false); + bool const Recurse = _config->FindB("APT::Cache::RecurseDepends", false); + bool const Installed = _config->FindB("APT::Cache::Installed", false); + bool const Important = _config->FindB("APT::Cache::Important", false); + bool const ShowDepType = _config->FindB("APT::Cache::ShowDependencyType",true); + bool const ShowPreDepends = _config->FindB("APT::Cache::ShowPre-Depends", true); + bool const ShowDepends = _config->FindB("APT::Cache::ShowDepends", true); + bool const ShowRecommends = _config->FindB("APT::Cache::ShowRecommends", Important == false); + bool const ShowSuggests = _config->FindB("APT::Cache::ShowSuggests", Important == false); + bool const ShowReplaces = _config->FindB("APT::Cache::ShowReplaces", Important == false); + bool const ShowConflicts = _config->FindB("APT::Cache::ShowConflicts", Important == false); + bool const ShowBreaks = _config->FindB("APT::Cache::ShowBreaks", Important == false); + bool const ShowEnhances = _config->FindB("APT::Cache::ShowEnhances", Important == false); bool DidSomething; do { @@ -594,12 +603,17 @@ bool Depends(CommandLine &CmdL) for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++) { - // Important deps only - if (Important == true) - if (D->Type != pkgCache::Dep::PreDepends && - D->Type != pkgCache::Dep::Depends) - continue; - + switch (D->Type) { + case pkgCache::Dep::PreDepends: if (!ShowPreDepends) continue; break; + case pkgCache::Dep::Depends: if (!ShowDepends) continue; break; + case pkgCache::Dep::Recommends: if (!ShowRecommends) continue; break; + case pkgCache::Dep::Suggests: if (!ShowSuggests) continue; break; + case pkgCache::Dep::Replaces: if (!ShowReplaces) continue; break; + case pkgCache::Dep::Conflicts: if (!ShowConflicts) continue; break; + case pkgCache::Dep::DpkgBreaks: if (!ShowBreaks) continue; break; + case pkgCache::Dep::Enhances: if (!ShowEnhances) continue; break; + } + pkgCache::PkgIterator Trg = D.TargetPkg(); if((Installed && Trg->CurrentVer != 0) || !Installed) @@ -611,10 +625,12 @@ bool Depends(CommandLine &CmdL) cout << " "; // Show the package + if (ShowDepType == true) + cout << D.DepType() << ": "; if (Trg->VersionList == 0) - cout << D.DepType() << ": <" << Trg.FullName(true) << ">" << endl; + cout << "<" << Trg.FullName(true) << ">" << endl; else - cout << D.DepType() << ": " << Trg.FullName(true) << endl; + cout << Trg.FullName(true) << endl; if (Recurse == true) Colours[D.TargetPkg()->ID]++; @@ -660,8 +676,18 @@ bool RDepends(CommandLine &CmdL) for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) Colours[Pkg->ID] = 1; - bool Recurse = _config->FindB("APT::Cache::RecurseDepends",false); - bool Installed = _config->FindB("APT::Cache::Installed",false); + bool const Recurse = _config->FindB("APT::Cache::RecurseDepends",false); + bool const Installed = _config->FindB("APT::Cache::Installed",false); + bool const Important = _config->FindB("APT::Cache::Important", false); + bool const ShowDepType = _config->FindB("APT::Cache::ShowDependencyType",false); + bool const ShowPreDepends = _config->FindB("APT::Cache::ShowPre-Depends", true); + bool const ShowDepends = _config->FindB("APT::Cache::ShowDepends", true); + bool const ShowRecommends = _config->FindB("APT::Cache::ShowRecommends", Important == false); + bool const ShowSuggests = _config->FindB("APT::Cache::ShowSuggests", Important == false); + bool const ShowReplaces = _config->FindB("APT::Cache::ShowReplaces", Important == false); + bool const ShowConflicts = _config->FindB("APT::Cache::ShowConflicts", Important == false); + bool const ShowBreaks = _config->FindB("APT::Cache::ShowBreaks", Important == false); + bool const ShowEnhances = _config->FindB("APT::Cache::ShowEnhances", Important == false); bool DidSomething; do { @@ -684,7 +710,18 @@ bool RDepends(CommandLine &CmdL) cout << "Reverse Depends:" << endl; for (pkgCache::DepIterator D = Pkg.RevDependsList(); D.end() == false; D++) - { + { + switch (D->Type) { + case pkgCache::Dep::PreDepends: if (!ShowPreDepends) continue; break; + case pkgCache::Dep::Depends: if (!ShowDepends) continue; break; + case pkgCache::Dep::Recommends: if (!ShowRecommends) continue; break; + case pkgCache::Dep::Suggests: if (!ShowSuggests) continue; break; + case pkgCache::Dep::Replaces: if (!ShowReplaces) continue; break; + case pkgCache::Dep::Conflicts: if (!ShowConflicts) continue; break; + case pkgCache::Dep::DpkgBreaks: if (!ShowBreaks) continue; break; + case pkgCache::Dep::Enhances: if (!ShowEnhances) continue; break; + } + // Show the package pkgCache::PkgIterator Trg = D.ParentPkg(); @@ -696,8 +733,10 @@ bool RDepends(CommandLine &CmdL) else cout << " "; + if (ShowDepType == true) + cout << D.DepType() << ": "; if (Trg->VersionList == 0) - cout << D.DepType() << ": <" << Trg.FullName(true) << ">" << endl; + cout << "<" << Trg.FullName(true) << ">" << endl; else cout << Trg.FullName(true) << endl; @@ -1820,6 +1859,14 @@ int main(int argc,const char *argv[]) /*{{{*/ {'c',"config-file",0,CommandLine::ConfigFile}, {'o',"option",0,CommandLine::ArbItem}, {0,"installed","APT::Cache::Installed",0}, + {0,"pre-depends","APT::Cache::ShowPreDepends",0}, + {0,"depends","APT::Cache::ShowDepends",0}, + {0,"recommends","APT::Cache::ShowRecommends",0}, + {0,"suggests","APT::Cache::ShowSuggests",0}, + {0,"replaces","APT::Cache::ShowReplaces",0}, + {0,"breaks","APT::Cache::ShowBreaks",0}, + {0,"conflicts","APT::Cache::ShowConflicts",0}, + {0,"enhances","APT::Cache::ShowEnhances",0}, {0,0,0,0}}; CommandLine::Dispatch CmdsA[] = {{"help",&ShowHelp}, {"add",&DoAdd}, diff --git a/debian/changelog b/debian/changelog index 76354aad7..128309b51 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ apt (0.7.26~exp11) experimental; urgency=low [ David Kalnischkies ] * apt-pkg/depcache.cc: - handle "circular" conflicts for "all" packages correctly + * cmdline/apt-cache.cc: + - be able to omit dependency types in (r)depends (Closes: #319006) -- David Kalnischkies Wed, 14 Jul 2010 22:58:08 +0200 diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 538de3c27..9a63421a8 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -309,6 +309,20 @@ Reverse Provides: Configuration Item: APT::Cache::Important. + + + + + + + + + Per default the depends and + rdepends print all dependencies. This can be twicked with + these flags which will omit the specified dependency type. + Configuration Item: APT::Cache::ShowDependencyType + e.g. APT::Cache::ShowRecommends. + Print full package records when searching. Configuration Item: APT::Cache::ShowFull. -- cgit v1.2.3 From 9ba5aa3b01f1f7c08c74f5d0a21971db221d30f1 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 17 Jul 2010 19:07:00 +0200 Subject: factor regex package name matches into newly created cachefilter classes --- apt-pkg/cachefilter.cc | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ apt-pkg/cachefilter.h | 29 +++++++++++++++++++++++++++ apt-pkg/makefile | 5 +++-- cmdline/cacheset.cc | 18 +++++------------ 4 files changed, 91 insertions(+), 15 deletions(-) create mode 100644 apt-pkg/cachefilter.cc create mode 100644 apt-pkg/cachefilter.h diff --git a/apt-pkg/cachefilter.cc b/apt-pkg/cachefilter.cc new file mode 100644 index 000000000..8f0725ea3 --- /dev/null +++ b/apt-pkg/cachefilter.cc @@ -0,0 +1,54 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/** \file cachefilter.h + Collection of functor classes */ + /*}}}*/ +// Include Files /*{{{*/ +#include +#include +#include + +#include + +#include + +#include + /*}}}*/ +namespace APT { +namespace CacheFilter { +PackageNameMatchesRegEx::PackageNameMatchesRegEx(std::string const &Pattern) {/*{{{*/ + pattern = new regex_t; + int const Res = regcomp(pattern, Pattern.c_str(), REG_EXTENDED | REG_ICASE | REG_NOSUB); + if (Res == 0) + return; + + delete pattern; + pattern = NULL; + char Error[300]; + regerror(Res, pattern, Error, sizeof(Error)); + _error->Error(_("Regex compilation error - %s"), Error); +} + /*}}}*/ +bool PackageNameMatchesRegEx::operator() (pkgCache::PkgIterator const &Pkg) {/*{{{*/ + if (unlikely(pattern == NULL)) + return false; + else + return regexec(pattern, Pkg.Name(), 0, 0, 0) == 0; +} + /*}}}*/ +bool PackageNameMatchesRegEx::operator() (pkgCache::GrpIterator const &Grp) {/*{{{*/ + if (unlikely(pattern == NULL)) + return false; + else + return regexec(pattern, Grp.Name(), 0, 0, 0) == 0; +} + /*}}}*/ +PackageNameMatchesRegEx::~PackageNameMatchesRegEx() { /*{{{*/ + if (pattern == NULL) + return; + regfree(pattern); + delete pattern; +} + /*}}}*/ +} +} diff --git a/apt-pkg/cachefilter.h b/apt-pkg/cachefilter.h new file mode 100644 index 000000000..e7ab1723f --- /dev/null +++ b/apt-pkg/cachefilter.h @@ -0,0 +1,29 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/** \file cachefilter.h + Collection of functor classes */ + /*}}}*/ +#ifndef APT_CACHEFILTER_H +#define APT_CACHEFILTER_H +// Include Files /*{{{*/ +#include + +#include + +#include + /*}}}*/ +namespace APT { +namespace CacheFilter { +// PackageNameMatchesRegEx /*{{{*/ +class PackageNameMatchesRegEx { + regex_t* pattern; +public: + PackageNameMatchesRegEx(std::string const &Pattern); + bool operator() (pkgCache::PkgIterator const &Pkg); + bool operator() (pkgCache::GrpIterator const &Grp); + ~PackageNameMatchesRegEx(); +}; + /*}}}*/ +} +} +#endif diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 2a7958536..e9e5651b0 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -35,14 +35,15 @@ SOURCE+= pkgcache.cc version.cc depcache.cc \ srcrecords.cc cachefile.cc versionmatch.cc policy.cc \ pkgsystem.cc indexfile.cc pkgcachegen.cc acquire-item.cc \ indexrecords.cc vendor.cc vendorlist.cc cdrom.cc indexcopy.cc \ - aptconfiguration.cc + aptconfiguration.cc cachefilter.cc HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.h \ orderlist.h sourcelist.h packagemanager.h tagfile.h \ init.h pkgcache.h version.h progress.h pkgrecords.h \ acquire.h acquire-worker.h acquire-item.h acquire-method.h \ clean.h srcrecords.h cachefile.h versionmatch.h policy.h \ pkgsystem.h indexfile.h metaindex.h indexrecords.h vendor.h \ - vendorlist.h cdrom.h indexcopy.h aptconfiguration.h + vendorlist.h cdrom.h indexcopy.h aptconfiguration.h \ + cachefilter.h # Source code for the debian specific components # In theory the deb headers do not need to be exported.. diff --git a/cmdline/cacheset.cc b/cmdline/cacheset.cc index 78c9d3f6c..0b099f442 100644 --- a/cmdline/cacheset.cc +++ b/cmdline/cacheset.cc @@ -10,6 +10,7 @@ /*}}}*/ // Include Files /*{{{*/ #include +#include #include #include #include @@ -97,22 +98,14 @@ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, Cache arch = "native"; } - regex_t Pattern; - int Res; - if ((Res = regcomp(&Pattern, pattern.c_str() , REG_EXTENDED | REG_ICASE | REG_NOSUB)) != 0) { - char Error[300]; - regerror(Res, &Pattern, Error, sizeof(Error)); - _error->Error(_("Regex compilation error - %s"), Error); - return PackageSet(REGEX); - } - if (unlikely(Cache.GetPkgCache() == 0)) return PackageSet(REGEX); + APT::CacheFilter::PackageNameMatchesRegEx regexfilter(pattern); + PackageSet pkgset(REGEX); - for (pkgCache::GrpIterator Grp = Cache.GetPkgCache()->GrpBegin(); Grp.end() == false; ++Grp) - { - if (regexec(&Pattern, Grp.Name(), 0, 0, 0) != 0) + for (pkgCache::GrpIterator Grp = Cache.GetPkgCache()->GrpBegin(); Grp.end() == false; ++Grp) { + if (regexfilter(Grp) == false) continue; pkgCache::PkgIterator Pkg = Grp.FindPkg(arch); if (Pkg.end() == true) { @@ -128,7 +121,6 @@ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, Cache pkgset.insert(Pkg); } - regfree(&Pattern); if (pkgset.empty() == true) return helper.canNotFindRegEx(Cache, pattern); -- cgit v1.2.3 From 8fde723961709118837153cdf94f150c680e10e9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 17 Jul 2010 20:04:44 +0200 Subject: * apt-pkg/cacheset.cc: - move them back to the library as they look stable now --- apt-pkg/cacheset.cc | 506 ++++++++++++++++++++++++++++++++++++++++++++++++++ apt-pkg/cacheset.h | 375 +++++++++++++++++++++++++++++++++++++ apt-pkg/makefile | 4 +- cmdline/apt-cache.cc | 3 +- cmdline/apt-get.cc | 2 +- cmdline/cacheset.cc | 507 --------------------------------------------------- cmdline/cacheset.h | 375 ------------------------------------- cmdline/makefile | 4 +- debian/changelog | 4 +- 9 files changed, 890 insertions(+), 890 deletions(-) create mode 100644 apt-pkg/cacheset.cc create mode 100644 apt-pkg/cacheset.h delete mode 100644 cmdline/cacheset.cc delete mode 100644 cmdline/cacheset.h diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc new file mode 100644 index 000000000..df7e99fd0 --- /dev/null +++ b/apt-pkg/cacheset.cc @@ -0,0 +1,506 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/* ###################################################################### + + Simple wrapper around a std::set to provide a similar interface to + a set of cache structures as to the complete set of all structures + in the pkgCache. Currently only Package is supported. + + ##################################################################### */ + /*}}}*/ +// Include Files /*{{{*/ +#include +#include +#include +#include +#include +#include + +#include + +#include + +#include + /*}}}*/ +namespace APT { +// FromTask - Return all packages in the cache from a specific task /*{{{*/ +PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) { + size_t const archfound = pattern.find_last_of(':'); + std::string arch = "native"; + if (archfound != std::string::npos) { + arch = pattern.substr(archfound+1); + pattern.erase(archfound); + } + + if (pattern[pattern.length() -1] != '^') + return APT::PackageSet(TASK); + pattern.erase(pattern.length()-1); + + if (unlikely(Cache.GetPkgCache() == 0 || Cache.GetDepCache() == 0)) + return APT::PackageSet(TASK); + + PackageSet pkgset(TASK); + // get the records + pkgRecords Recs(Cache); + + // build regexp for the task + regex_t Pattern; + char S[300]; + snprintf(S, sizeof(S), "^Task:.*[, ]%s([, ]|$)", pattern.c_str()); + if(regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE) != 0) { + _error->Error("Failed to compile task regexp"); + return pkgset; + } + + for (pkgCache::GrpIterator Grp = Cache->GrpBegin(); Grp.end() == false; ++Grp) { + pkgCache::PkgIterator Pkg = Grp.FindPkg(arch); + if (Pkg.end() == true) + continue; + pkgCache::VerIterator ver = Cache[Pkg].CandidateVerIter(Cache); + if(ver.end() == true) + continue; + + pkgRecords::Parser &parser = Recs.Lookup(ver.FileList()); + const char *start, *end; + parser.GetRec(start,end); + unsigned int const length = end - start; + char buf[length]; + strncpy(buf, start, length); + buf[length-1] = '\0'; + if (regexec(&Pattern, buf, 0, 0, 0) != 0) + continue; + + pkgset.insert(Pkg); + } + regfree(&Pattern); + + if (pkgset.empty() == true) + return helper.canNotFindTask(Cache, pattern); + + helper.showTaskSelection(pkgset, pattern); + return pkgset; +} + /*}}}*/ +// FromRegEx - Return all packages in the cache matching a pattern /*{{{*/ +PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) { + static const char * const isregex = ".?+*|[^$"; + if (pattern.find_first_of(isregex) == std::string::npos) + return PackageSet(REGEX); + + size_t archfound = pattern.find_last_of(':'); + std::string arch = "native"; + if (archfound != std::string::npos) { + arch = pattern.substr(archfound+1); + if (arch.find_first_of(isregex) == std::string::npos) + pattern.erase(archfound); + else + arch = "native"; + } + + if (unlikely(Cache.GetPkgCache() == 0)) + return PackageSet(REGEX); + + APT::CacheFilter::PackageNameMatchesRegEx regexfilter(pattern); + + PackageSet pkgset(REGEX); + for (pkgCache::GrpIterator Grp = Cache.GetPkgCache()->GrpBegin(); Grp.end() == false; ++Grp) { + if (regexfilter(Grp) == false) + continue; + pkgCache::PkgIterator Pkg = Grp.FindPkg(arch); + if (Pkg.end() == true) { + if (archfound == std::string::npos) { + std::vector archs = APT::Configuration::getArchitectures(); + for (std::vector::const_iterator a = archs.begin(); + a != archs.end() && Pkg.end() != true; ++a) + Pkg = Grp.FindPkg(*a); + } + if (Pkg.end() == true) + continue; + } + + pkgset.insert(Pkg); + } + + if (pkgset.empty() == true) + return helper.canNotFindRegEx(Cache, pattern); + + helper.showRegExSelection(pkgset, pattern); + return pkgset; +} + /*}}}*/ +// FromName - Returns the package defined by this string /*{{{*/ +pkgCache::PkgIterator PackageSet::FromName(pkgCacheFile &Cache, + std::string const &str, CacheSetHelper &helper) { + std::string pkg = str; + size_t archfound = pkg.find_last_of(':'); + std::string arch; + if (archfound != std::string::npos) { + arch = pkg.substr(archfound+1); + pkg.erase(archfound); + } + + if (Cache.GetPkgCache() == 0) + return pkgCache::PkgIterator(Cache, 0); + + pkgCache::PkgIterator Pkg(Cache, 0); + if (arch.empty() == true) { + pkgCache::GrpIterator Grp = Cache.GetPkgCache()->FindGrp(pkg); + if (Grp.end() == false) + Pkg = Grp.FindPreferredPkg(); + } else + Pkg = Cache.GetPkgCache()->FindPkg(pkg, arch); + + if (Pkg.end() == true) + return helper.canNotFindPkgName(Cache, str); + return Pkg; +} + /*}}}*/ +// GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ +std::map PackageSet::GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list const &mods, + unsigned short const &fallback, CacheSetHelper &helper) { + std::map pkgsets; + for (const char **I = cmdline; *I != 0; ++I) { + unsigned short modID = fallback; + std::string str = *I; + bool modifierPresent = false; + for (std::list::const_iterator mod = mods.begin(); + mod != mods.end(); ++mod) { + size_t const alength = strlen(mod->Alias); + switch(mod->Pos) { + case PackageSet::Modifier::POSTFIX: + if (str.compare(str.length() - alength, alength, + mod->Alias, 0, alength) != 0) + continue; + str.erase(str.length() - alength); + modID = mod->ID; + break; + case PackageSet::Modifier::PREFIX: + continue; + case PackageSet::Modifier::NONE: + continue; + } + modifierPresent = true; + break; + } + if (modifierPresent == true) { + bool const errors = helper.showErrors(false); + pkgCache::PkgIterator Pkg = FromName(Cache, *I, helper); + helper.showErrors(errors); + if (Pkg.end() == false) { + pkgsets[fallback].insert(Pkg); + continue; + } + } + pkgsets[modID].insert(PackageSet::FromString(Cache, str, helper)); + } + return pkgsets; +} + /*}}}*/ +// FromCommandLine - Return all packages specified on commandline /*{{{*/ +PackageSet PackageSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, CacheSetHelper &helper) { + PackageSet pkgset; + for (const char **I = cmdline; *I != 0; ++I) { + PackageSet pset = FromString(Cache, *I, helper); + pkgset.insert(pset.begin(), pset.end()); + } + return pkgset; +} + /*}}}*/ +// FromString - Return all packages matching a specific string /*{{{*/ +PackageSet PackageSet::FromString(pkgCacheFile &Cache, std::string const &str, CacheSetHelper &helper) { + _error->PushToStack(); + + PackageSet pkgset; + pkgCache::PkgIterator Pkg = FromName(Cache, str, helper); + if (Pkg.end() == false) + pkgset.insert(Pkg); + else { + pkgset = FromTask(Cache, str, helper); + if (pkgset.empty() == true) { + pkgset = FromRegEx(Cache, str, helper); + if (pkgset.empty() == true) + pkgset = helper.canNotFindPackage(Cache, str); + } + } + + if (pkgset.empty() == false) + _error->RevertToStack(); + else + _error->MergeWithStack(); + return pkgset; +} + /*}}}*/ +// GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ +std::map VersionSet::GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list const &mods, + unsigned short const &fallback, CacheSetHelper &helper) { + std::map versets; + for (const char **I = cmdline; *I != 0; ++I) { + unsigned short modID = fallback; + VersionSet::Version select = VersionSet::NEWEST; + std::string str = *I; + bool modifierPresent = false; + for (std::list::const_iterator mod = mods.begin(); + mod != mods.end(); ++mod) { + if (modID == fallback && mod->ID == fallback) + select = mod->SelectVersion; + size_t const alength = strlen(mod->Alias); + switch(mod->Pos) { + case VersionSet::Modifier::POSTFIX: + if (str.compare(str.length() - alength, alength, + mod->Alias, 0, alength) != 0) + continue; + str.erase(str.length() - alength); + modID = mod->ID; + select = mod->SelectVersion; + break; + case VersionSet::Modifier::PREFIX: + continue; + case VersionSet::Modifier::NONE: + continue; + } + modifierPresent = true; + break; + } + + if (modifierPresent == true) { + bool const errors = helper.showErrors(false); + VersionSet const vset = VersionSet::FromString(Cache, std::string(*I), select, helper, true); + helper.showErrors(errors); + if (vset.empty() == false) { + versets[fallback].insert(vset); + continue; + } + } + versets[modID].insert(VersionSet::FromString(Cache, str, select , helper)); + } + return versets; +} + /*}}}*/ +// FromCommandLine - Return all versions specified on commandline /*{{{*/ +APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, + APT::VersionSet::Version const &fallback, CacheSetHelper &helper) { + VersionSet verset; + for (const char **I = cmdline; *I != 0; ++I) + verset.insert(VersionSet::FromString(Cache, *I, fallback, helper)); + return verset; +} + /*}}}*/ +// FromString - Returns all versions spedcified by a string /*{{{*/ +APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, + APT::VersionSet::Version const &fallback, CacheSetHelper &helper, + bool const &onlyFromName) { + std::string ver; + bool verIsRel = false; + size_t const vertag = pkg.find_last_of("/="); + if (vertag != string::npos) { + ver = pkg.substr(vertag+1); + verIsRel = (pkg[vertag] == '/'); + pkg.erase(vertag); + } + PackageSet pkgset; + if (onlyFromName == false) + pkgset = PackageSet::FromString(Cache, pkg, helper); + else { + pkgset.insert(PackageSet::FromName(Cache, pkg, helper)); + } + + VersionSet verset; + bool errors = true; + if (pkgset.getConstructor() != PackageSet::UNKNOWN) + errors = helper.showErrors(false); + for (PackageSet::const_iterator P = pkgset.begin(); + P != pkgset.end(); ++P) { + if (vertag == string::npos) { + verset.insert(VersionSet::FromPackage(Cache, P, fallback, helper)); + continue; + } + pkgCache::VerIterator V; + if (ver == "installed") + V = getInstalledVer(Cache, P, helper); + else if (ver == "candidate") + V = getCandidateVer(Cache, P, helper); + else { + pkgVersionMatch Match(ver, (verIsRel == true ? pkgVersionMatch::Release : + pkgVersionMatch::Version)); + V = Match.Find(P); + if (V.end() == true) { + if (verIsRel == true) + _error->Error(_("Release '%s' for '%s' was not found"), + ver.c_str(), P.FullName(true).c_str()); + else + _error->Error(_("Version '%s' for '%s' was not found"), + ver.c_str(), P.FullName(true).c_str()); + continue; + } + } + if (V.end() == true) + continue; + helper.showSelectedVersion(P, V, ver, verIsRel); + verset.insert(V); + } + if (pkgset.getConstructor() != PackageSet::UNKNOWN) + helper.showErrors(errors); + return verset; +} + /*}}}*/ +// FromPackage - versions from package based on fallback /*{{{*/ +VersionSet VersionSet::FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P, + VersionSet::Version const &fallback, CacheSetHelper &helper) { + VersionSet verset; + pkgCache::VerIterator V; + bool showErrors; + switch(fallback) { + case VersionSet::ALL: + if (P->VersionList != 0) + for (V = P.VersionList(); V.end() != true; ++V) + verset.insert(V); + else + verset.insert(helper.canNotFindAllVer(Cache, P)); + break; + case VersionSet::CANDANDINST: + verset.insert(getInstalledVer(Cache, P, helper)); + verset.insert(getCandidateVer(Cache, P, helper)); + break; + case VersionSet::CANDIDATE: + verset.insert(getCandidateVer(Cache, P, helper)); + break; + case VersionSet::INSTALLED: + verset.insert(getInstalledVer(Cache, P, helper)); + break; + case VersionSet::CANDINST: + showErrors = helper.showErrors(false); + V = getCandidateVer(Cache, P, helper); + if (V.end() == true) + V = getInstalledVer(Cache, P, helper); + helper.showErrors(showErrors); + if (V.end() == false) + verset.insert(V); + else + verset.insert(helper.canNotFindInstCandVer(Cache, P)); + break; + case VersionSet::INSTCAND: + showErrors = helper.showErrors(false); + V = getInstalledVer(Cache, P, helper); + if (V.end() == true) + V = getCandidateVer(Cache, P, helper); + helper.showErrors(showErrors); + if (V.end() == false) + verset.insert(V); + else + verset.insert(helper.canNotFindInstCandVer(Cache, P)); + break; + case VersionSet::NEWEST: + if (P->VersionList != 0) + verset.insert(P.VersionList()); + else + verset.insert(helper.canNotFindNewestVer(Cache, P)); + break; + } + return verset; +} + /*}}}*/ +// getCandidateVer - Returns the candidate version of the given package /*{{{*/ +pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper) { + pkgCache::VerIterator Cand; + if (Cache.IsPolicyBuilt() == true || Cache.IsDepCacheBuilt() == false) + { + if (unlikely(Cache.GetPolicy() == 0)) + return pkgCache::VerIterator(Cache); + Cand = Cache.GetPolicy()->GetCandidateVer(Pkg); + } else { + Cand = Cache[Pkg].CandidateVerIter(Cache); + } + if (Cand.end() == true) + return helper.canNotFindCandidateVer(Cache, Pkg); + return Cand; +} + /*}}}*/ +// getInstalledVer - Returns the installed version of the given package /*{{{*/ +pkgCache::VerIterator VersionSet::getInstalledVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper) { + if (Pkg->CurrentVer == 0) + return helper.canNotFindInstalledVer(Cache, Pkg); + return Pkg.CurrentVer(); +} + /*}}}*/ +// canNotFindPkgName - handle the case no package has this name /*{{{*/ +pkgCache::PkgIterator CacheSetHelper::canNotFindPkgName(pkgCacheFile &Cache, + std::string const &str) { + if (ShowError == true) + _error->Error(_("Unable to locate package %s"), str.c_str()); + return pkgCache::PkgIterator(Cache, 0); +} + /*}}}*/ +// canNotFindTask - handle the case no package is found for a task /*{{{*/ +PackageSet CacheSetHelper::canNotFindTask(pkgCacheFile &Cache, std::string pattern) { + if (ShowError == true) + _error->Error(_("Couldn't find task '%s'"), pattern.c_str()); + return PackageSet(); +} + /*}}}*/ +// canNotFindRegEx - handle the case no package is found by a regex /*{{{*/ +PackageSet CacheSetHelper::canNotFindRegEx(pkgCacheFile &Cache, std::string pattern) { + if (ShowError == true) + _error->Error(_("Couldn't find any package by regex '%s'"), pattern.c_str()); + return PackageSet(); +} + /*}}}*/ +// canNotFindPackage - handle the case no package is found from a string/*{{{*/ +PackageSet CacheSetHelper::canNotFindPackage(pkgCacheFile &Cache, std::string const &str) { + return PackageSet(); +} + /*}}}*/ +// canNotFindAllVer /*{{{*/ +VersionSet CacheSetHelper::canNotFindAllVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg) { + if (ShowError == true) + _error->Error(_("Can't select versions from package '%s' as it purely virtual"), Pkg.FullName(true).c_str()); + return VersionSet(); +} + /*}}}*/ +// canNotFindInstCandVer /*{{{*/ +VersionSet CacheSetHelper::canNotFindInstCandVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg) { + if (ShowError == true) + _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str()); + return VersionSet(); +} + /*}}}*/ +// canNotFindInstCandVer /*{{{*/ +VersionSet CacheSetHelper::canNotFindCandInstVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg) { + if (ShowError == true) + _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str()); + return VersionSet(); +} + /*}}}*/ +// canNotFindNewestVer /*{{{*/ +pkgCache::VerIterator CacheSetHelper::canNotFindNewestVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg) { + if (ShowError == true) + _error->Error(_("Can't select newest version from package '%s' as it is purely virtual"), Pkg.FullName(true).c_str()); + return pkgCache::VerIterator(Cache, 0); +} + /*}}}*/ +// canNotFindCandidateVer /*{{{*/ +pkgCache::VerIterator CacheSetHelper::canNotFindCandidateVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg) { + if (ShowError == true) + _error->Error(_("Can't select candidate version from package %s as it has no candidate"), Pkg.FullName(true).c_str()); + return pkgCache::VerIterator(Cache, 0); +} + /*}}}*/ +// canNotFindInstalledVer /*{{{*/ +pkgCache::VerIterator CacheSetHelper::canNotFindInstalledVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg) { + if (ShowError == true) + _error->Error(_("Can't select installed version from package %s as it is not installed"), Pkg.FullName(true).c_str()); + return pkgCache::VerIterator(Cache, 0); +} + /*}}}*/ +} diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h new file mode 100644 index 000000000..c8c3dd096 --- /dev/null +++ b/apt-pkg/cacheset.h @@ -0,0 +1,375 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/** \file cacheset.h + Wrappers around std::set to have set::iterators which behave + similar to the Iterators of the cache structures. + + Provides also a few helper methods which work with these sets */ + /*}}}*/ +#ifndef APT_CACHESET_H +#define APT_CACHESET_H +// Include Files /*{{{*/ +#include +#include +#include +#include +#include +#include + +#include +#include + /*}}}*/ +namespace APT { +class PackageSet; +class VersionSet; +class CacheSetHelper { /*{{{*/ +/** \class APT::CacheSetHelper + Simple base class with a lot of virtual methods which can be overridden + to alter the behavior or the output of the CacheSets. + + This helper is passed around by the static methods in the CacheSets and + used every time they hit an error condition or something could be + printed out. +*/ +public: /*{{{*/ + CacheSetHelper(bool const &ShowError = true) : ShowError(ShowError) {}; + virtual ~CacheSetHelper() {}; + + virtual void showTaskSelection(PackageSet const &pkgset, string const &pattern) {}; + virtual void showRegExSelection(PackageSet const &pkgset, string const &pattern) {}; + virtual void showSelectedVersion(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const Ver, + string const &ver, bool const &verIsRel) {}; + + virtual pkgCache::PkgIterator canNotFindPkgName(pkgCacheFile &Cache, std::string const &str); + virtual PackageSet canNotFindTask(pkgCacheFile &Cache, std::string pattern); + virtual PackageSet canNotFindRegEx(pkgCacheFile &Cache, std::string pattern); + virtual PackageSet canNotFindPackage(pkgCacheFile &Cache, std::string const &str); + virtual VersionSet canNotFindAllVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg); + virtual VersionSet canNotFindInstCandVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg); + virtual VersionSet canNotFindCandInstVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg); + virtual pkgCache::VerIterator canNotFindNewestVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg); + virtual pkgCache::VerIterator canNotFindCandidateVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg); + virtual pkgCache::VerIterator canNotFindInstalledVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg); + + bool showErrors() const { return ShowError; }; + bool showErrors(bool const &newValue) { if (ShowError == newValue) return ShowError; else return ((ShowError = newValue) == false); }; + /*}}}*/ +protected: + bool ShowError; +}; /*}}}*/ +class PackageSet : public std::set { /*{{{*/ +/** \class APT::PackageSet + + Simple wrapper around a std::set to provide a similar interface to + a set of packages as to the complete set of all packages in the + pkgCache. */ +public: /*{{{*/ + /** \brief smell like a pkgCache::PkgIterator */ + class const_iterator : public std::set::const_iterator {/*{{{*/ + public: + const_iterator(std::set::const_iterator x) : + std::set::const_iterator(x) {} + + operator pkgCache::PkgIterator(void) { return **this; } + + inline const char *Name() const {return (**this).Name(); } + inline std::string FullName(bool const &Pretty) const { return (**this).FullName(Pretty); } + inline std::string FullName() const { return (**this).FullName(); } + inline const char *Section() const {return (**this).Section(); } + inline bool Purge() const {return (**this).Purge(); } + inline const char *Arch() const {return (**this).Arch(); } + inline pkgCache::GrpIterator Group() const { return (**this).Group(); } + inline pkgCache::VerIterator VersionList() const { return (**this).VersionList(); } + inline pkgCache::VerIterator CurrentVer() const { return (**this).CurrentVer(); } + inline pkgCache::DepIterator RevDependsList() const { return (**this).RevDependsList(); } + inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); } + inline pkgCache::PkgIterator::OkState State() const { return (**this).State(); } + inline const char *CandVersion() const { return (**this).CandVersion(); } + inline const char *CurVersion() const { return (**this).CurVersion(); } + inline pkgCache *Cache() const { return (**this).Cache(); }; + inline unsigned long Index() const {return (**this).Index();}; + // we have only valid iterators here + inline bool end() const { return false; }; + + friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, (*i)); } + + inline pkgCache::Package const * operator->() const { + return &***this; + }; + }; + // 103. set::iterator is required to be modifiable, but this allows modification of keys + typedef APT::PackageSet::const_iterator iterator; + /*}}}*/ + + using std::set::insert; + inline void insert(pkgCache::PkgIterator const &P) { if (P.end() == false) std::set::insert(P); }; + inline void insert(PackageSet const &pkgset) { insert(pkgset.begin(), pkgset.end()); }; + + /** \brief returns all packages in the cache who belong to the given task + + A simple helper responsible for search for all members of a task + in the cache. Optional it prints a a notice about the + packages chosen cause of the given task. + \param Cache the packages are in + \param pattern name of the task + \param helper responsible for error and message handling */ + static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper); + static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string const &pattern) { + CacheSetHelper helper; + return APT::PackageSet::FromTask(Cache, pattern, helper); + } + + /** \brief returns all packages in the cache whose name matchs a given pattern + + A simple helper responsible for executing a regular expression on all + package names in the cache. Optional it prints a a notice about the + packages chosen cause of the given package. + \param Cache the packages are in + \param pattern regular expression for package names + \param helper responsible for error and message handling */ + static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper); + static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string const &pattern) { + CacheSetHelper helper; + return APT::PackageSet::FromRegEx(Cache, pattern, helper); + } + + /** \brief returns all packages specified by a string + + \param Cache the packages are in + \param string String the package name(s) should be extracted from + \param helper responsible for error and message handling */ + static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string, CacheSetHelper &helper); + static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string) { + CacheSetHelper helper; + return APT::PackageSet::FromString(Cache, string, helper); + } + + /** \brief returns a package specified by a string + + \param Cache the package is in + \param string String the package name should be extracted from + \param helper responsible for error and message handling */ + static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &string, CacheSetHelper &helper); + static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &string) { + CacheSetHelper helper; + return APT::PackageSet::FromName(Cache, string, helper); + } + + /** \brief returns all packages specified on the commandline + + Get all package names from the commandline and executes regex's if needed. + No special package command is supported, just plain names. + \param Cache the packages are in + \param cmdline Command line the package names should be extracted from + \param helper responsible for error and message handling */ + static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, CacheSetHelper &helper); + static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { + CacheSetHelper helper; + return APT::PackageSet::FromCommandLine(Cache, cmdline, helper); + } + + struct Modifier { + enum Position { NONE, PREFIX, POSTFIX }; + unsigned short ID; + const char * const Alias; + Position Pos; + Modifier (unsigned short const &id, const char * const alias, Position const &pos) : ID(id), Alias(alias), Pos(pos) {}; + }; + + /** \brief group packages by a action modifiers + + At some point it is needed to get from the same commandline + different package sets grouped by a modifier. Take + apt-get install apt awesome- + as an example. + \param Cache the packages are in + \param cmdline Command line the package names should be extracted from + \param mods list of modifiers the method should accept + \param fallback the default modifier group for a package + \param helper responsible for error and message handling */ + static std::map GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list const &mods, + unsigned short const &fallback, CacheSetHelper &helper); + static std::map GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list const &mods, + unsigned short const &fallback) { + CacheSetHelper helper; + return APT::PackageSet::GroupedFromCommandLine(Cache, cmdline, + mods, fallback, helper); + } + + enum Constructor { UNKNOWN, REGEX, TASK }; + Constructor getConstructor() const { return ConstructedBy; }; + + PackageSet() : ConstructedBy(UNKNOWN) {}; + PackageSet(Constructor const &by) : ConstructedBy(by) {}; + /*}}}*/ +private: /*{{{*/ + Constructor ConstructedBy; + /*}}}*/ +}; /*}}}*/ +class VersionSet : public std::set { /*{{{*/ +/** \class APT::VersionSet + + Simple wrapper around a std::set to provide a similar interface to + a set of versions as to the complete set of all versions in the + pkgCache. */ +public: /*{{{*/ + /** \brief smell like a pkgCache::VerIterator */ + class const_iterator : public std::set::const_iterator {/*{{{*/ + public: + const_iterator(std::set::const_iterator x) : + std::set::const_iterator(x) {} + + operator pkgCache::VerIterator(void) { return **this; } + + inline pkgCache *Cache() const { return (**this).Cache(); }; + inline unsigned long Index() const {return (**this).Index();}; + // we have only valid iterators here + inline bool end() const { return false; }; + + inline pkgCache::Version const * operator->() const { + return &***this; + }; + + inline int CompareVer(const pkgCache::VerIterator &B) const { return (**this).CompareVer(B); }; + inline const char *VerStr() const { return (**this).VerStr(); }; + inline const char *Section() const { return (**this).Section(); }; + inline const char *Arch() const { return (**this).Arch(); }; + inline const char *Arch(bool const pseudo) const { return (**this).Arch(pseudo); }; + inline pkgCache::PkgIterator ParentPkg() const { return (**this).ParentPkg(); }; + inline pkgCache::DescIterator DescriptionList() const { return (**this).DescriptionList(); }; + inline pkgCache::DescIterator TranslatedDescription() const { return (**this).TranslatedDescription(); }; + inline pkgCache::DepIterator DependsList() const { return (**this).DependsList(); }; + inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); }; + inline pkgCache::VerFileIterator FileList() const { return (**this).FileList(); }; + inline bool Downloadable() const { return (**this).Downloadable(); }; + inline const char *PriorityType() const { return (**this).PriorityType(); }; + inline string RelStr() const { return (**this).RelStr(); }; + inline bool Automatic() const { return (**this).Automatic(); }; + inline bool Pseudo() const { return (**this).Pseudo(); }; + inline pkgCache::VerFileIterator NewestFile() const { return (**this).NewestFile(); }; + }; + /*}}}*/ + // 103. set::iterator is required to be modifiable, but this allows modification of keys + typedef APT::VersionSet::const_iterator iterator; + + using std::set::insert; + inline void insert(pkgCache::VerIterator const &V) { if (V.end() == false) std::set::insert(V); }; + inline void insert(VersionSet const &verset) { insert(verset.begin(), verset.end()); }; + + /** \brief specifies which version(s) will be returned if non is given */ + enum Version { + /** All versions */ + ALL, + /** Candidate and installed version */ + CANDANDINST, + /** Candidate version */ + CANDIDATE, + /** Installed version */ + INSTALLED, + /** Candidate or if non installed version */ + CANDINST, + /** Installed or if non candidate version */ + INSTCAND, + /** Newest version */ + NEWEST + }; + + /** \brief returns all versions specified on the commandline + + Get all versions from the commandline, uses given default version if + non specifically requested and executes regex's if needed on names. + \param Cache the packages and versions are in + \param cmdline Command line the versions should be extracted from + \param helper responsible for error and message handling */ + static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, + APT::VersionSet::Version const &fallback, CacheSetHelper &helper); + static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, + APT::VersionSet::Version const &fallback) { + CacheSetHelper helper; + return APT::VersionSet::FromCommandLine(Cache, cmdline, fallback, helper); + } + static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { + return APT::VersionSet::FromCommandLine(Cache, cmdline, CANDINST); + } + + static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, + APT::VersionSet::Version const &fallback, CacheSetHelper &helper, + bool const &onlyFromName = false); + static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, + APT::VersionSet::Version const &fallback) { + CacheSetHelper helper; + return APT::VersionSet::FromString(Cache, pkg, fallback, helper); + } + static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg) { + return APT::VersionSet::FromString(Cache, pkg, CANDINST); + } + + /** \brief returns all versions specified for the package + + \param Cache the package and versions are in + \param P the package in question + \param fallback the version(s) you want to get + \param helper the helper used for display and error handling */ + static APT::VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P, + VersionSet::Version const &fallback, CacheSetHelper &helper); + static APT::VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P, + APT::VersionSet::Version const &fallback) { + CacheSetHelper helper; + return APT::VersionSet::FromPackage(Cache, P, fallback, helper); + } + static APT::VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P) { + return APT::VersionSet::FromPackage(Cache, P, CANDINST); + } + + struct Modifier { + enum Position { NONE, PREFIX, POSTFIX }; + unsigned short ID; + const char * const Alias; + Position Pos; + VersionSet::Version SelectVersion; + Modifier (unsigned short const &id, const char * const alias, Position const &pos, + VersionSet::Version const &select) : ID(id), Alias(alias), Pos(pos), + SelectVersion(select) {}; + }; + + static std::map GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list const &mods, + unsigned short const &fallback, CacheSetHelper &helper); + static std::map GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list const &mods, + unsigned short const &fallback) { + CacheSetHelper helper; + return APT::VersionSet::GroupedFromCommandLine(Cache, cmdline, + mods, fallback, helper); + } + /*}}}*/ +protected: /*{{{*/ + + /** \brief returns the candidate version of the package + + \param Cache to be used to query for information + \param Pkg we want the candidate version from this package */ + static pkgCache::VerIterator getCandidateVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper); + + /** \brief returns the installed version of the package + + \param Cache to be used to query for information + \param Pkg we want the installed version from this package */ + static pkgCache::VerIterator getInstalledVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper); + /*}}}*/ +}; /*}}}*/ +} +#endif diff --git a/apt-pkg/makefile b/apt-pkg/makefile index e9e5651b0..4e5ec107f 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -35,7 +35,7 @@ SOURCE+= pkgcache.cc version.cc depcache.cc \ srcrecords.cc cachefile.cc versionmatch.cc policy.cc \ pkgsystem.cc indexfile.cc pkgcachegen.cc acquire-item.cc \ indexrecords.cc vendor.cc vendorlist.cc cdrom.cc indexcopy.cc \ - aptconfiguration.cc cachefilter.cc + aptconfiguration.cc cachefilter.cc cacheset.cc HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.h \ orderlist.h sourcelist.h packagemanager.h tagfile.h \ init.h pkgcache.h version.h progress.h pkgrecords.h \ @@ -43,7 +43,7 @@ HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.h \ clean.h srcrecords.h cachefile.h versionmatch.h policy.h \ pkgsystem.h indexfile.h metaindex.h indexrecords.h vendor.h \ vendorlist.h cdrom.h indexcopy.h aptconfiguration.h \ - cachefilter.h + cachefilter.h cacheset.h # Source code for the debian specific components # In theory the deb headers do not need to be exported.. diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 557996693..1a1ddcb8c 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -30,8 +31,6 @@ #include #include -#include "cacheset.h" - #include #include diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 7cf760c27..eaa982856 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -45,7 +46,6 @@ #include #include "acqprogress.h" -#include "cacheset.h" #include #include diff --git a/cmdline/cacheset.cc b/cmdline/cacheset.cc deleted file mode 100644 index 0b099f442..000000000 --- a/cmdline/cacheset.cc +++ /dev/null @@ -1,507 +0,0 @@ -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/ -/* ###################################################################### - - Simple wrapper around a std::set to provide a similar interface to - a set of cache structures as to the complete set of all structures - in the pkgCache. Currently only Package is supported. - - ##################################################################### */ - /*}}}*/ -// Include Files /*{{{*/ -#include -#include -#include -#include -#include - -#include - -#include "cacheset.h" - -#include - -#include - /*}}}*/ -namespace APT { -// FromTask - Return all packages in the cache from a specific task /*{{{*/ -PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) { - size_t const archfound = pattern.find_last_of(':'); - std::string arch = "native"; - if (archfound != std::string::npos) { - arch = pattern.substr(archfound+1); - pattern.erase(archfound); - } - - if (pattern[pattern.length() -1] != '^') - return APT::PackageSet(TASK); - pattern.erase(pattern.length()-1); - - if (unlikely(Cache.GetPkgCache() == 0 || Cache.GetDepCache() == 0)) - return APT::PackageSet(TASK); - - PackageSet pkgset(TASK); - // get the records - pkgRecords Recs(Cache); - - // build regexp for the task - regex_t Pattern; - char S[300]; - snprintf(S, sizeof(S), "^Task:.*[, ]%s([, ]|$)", pattern.c_str()); - if(regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE) != 0) { - _error->Error("Failed to compile task regexp"); - return pkgset; - } - - for (pkgCache::GrpIterator Grp = Cache->GrpBegin(); Grp.end() == false; ++Grp) { - pkgCache::PkgIterator Pkg = Grp.FindPkg(arch); - if (Pkg.end() == true) - continue; - pkgCache::VerIterator ver = Cache[Pkg].CandidateVerIter(Cache); - if(ver.end() == true) - continue; - - pkgRecords::Parser &parser = Recs.Lookup(ver.FileList()); - const char *start, *end; - parser.GetRec(start,end); - unsigned int const length = end - start; - char buf[length]; - strncpy(buf, start, length); - buf[length-1] = '\0'; - if (regexec(&Pattern, buf, 0, 0, 0) != 0) - continue; - - pkgset.insert(Pkg); - } - regfree(&Pattern); - - if (pkgset.empty() == true) - return helper.canNotFindTask(Cache, pattern); - - helper.showTaskSelection(pkgset, pattern); - return pkgset; -} - /*}}}*/ -// FromRegEx - Return all packages in the cache matching a pattern /*{{{*/ -PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) { - static const char * const isregex = ".?+*|[^$"; - if (pattern.find_first_of(isregex) == std::string::npos) - return PackageSet(REGEX); - - size_t archfound = pattern.find_last_of(':'); - std::string arch = "native"; - if (archfound != std::string::npos) { - arch = pattern.substr(archfound+1); - if (arch.find_first_of(isregex) == std::string::npos) - pattern.erase(archfound); - else - arch = "native"; - } - - if (unlikely(Cache.GetPkgCache() == 0)) - return PackageSet(REGEX); - - APT::CacheFilter::PackageNameMatchesRegEx regexfilter(pattern); - - PackageSet pkgset(REGEX); - for (pkgCache::GrpIterator Grp = Cache.GetPkgCache()->GrpBegin(); Grp.end() == false; ++Grp) { - if (regexfilter(Grp) == false) - continue; - pkgCache::PkgIterator Pkg = Grp.FindPkg(arch); - if (Pkg.end() == true) { - if (archfound == std::string::npos) { - std::vector archs = APT::Configuration::getArchitectures(); - for (std::vector::const_iterator a = archs.begin(); - a != archs.end() && Pkg.end() != true; ++a) - Pkg = Grp.FindPkg(*a); - } - if (Pkg.end() == true) - continue; - } - - pkgset.insert(Pkg); - } - - if (pkgset.empty() == true) - return helper.canNotFindRegEx(Cache, pattern); - - helper.showRegExSelection(pkgset, pattern); - return pkgset; -} - /*}}}*/ -// FromName - Returns the package defined by this string /*{{{*/ -pkgCache::PkgIterator PackageSet::FromName(pkgCacheFile &Cache, - std::string const &str, CacheSetHelper &helper) { - std::string pkg = str; - size_t archfound = pkg.find_last_of(':'); - std::string arch; - if (archfound != std::string::npos) { - arch = pkg.substr(archfound+1); - pkg.erase(archfound); - } - - if (Cache.GetPkgCache() == 0) - return pkgCache::PkgIterator(Cache, 0); - - pkgCache::PkgIterator Pkg(Cache, 0); - if (arch.empty() == true) { - pkgCache::GrpIterator Grp = Cache.GetPkgCache()->FindGrp(pkg); - if (Grp.end() == false) - Pkg = Grp.FindPreferredPkg(); - } else - Pkg = Cache.GetPkgCache()->FindPkg(pkg, arch); - - if (Pkg.end() == true) - return helper.canNotFindPkgName(Cache, str); - return Pkg; -} - /*}}}*/ -// GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ -std::map PackageSet::GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list const &mods, - unsigned short const &fallback, CacheSetHelper &helper) { - std::map pkgsets; - for (const char **I = cmdline; *I != 0; ++I) { - unsigned short modID = fallback; - std::string str = *I; - bool modifierPresent = false; - for (std::list::const_iterator mod = mods.begin(); - mod != mods.end(); ++mod) { - size_t const alength = strlen(mod->Alias); - switch(mod->Pos) { - case PackageSet::Modifier::POSTFIX: - if (str.compare(str.length() - alength, alength, - mod->Alias, 0, alength) != 0) - continue; - str.erase(str.length() - alength); - modID = mod->ID; - break; - case PackageSet::Modifier::PREFIX: - continue; - case PackageSet::Modifier::NONE: - continue; - } - modifierPresent = true; - break; - } - if (modifierPresent == true) { - bool const errors = helper.showErrors(false); - pkgCache::PkgIterator Pkg = FromName(Cache, *I, helper); - helper.showErrors(errors); - if (Pkg.end() == false) { - pkgsets[fallback].insert(Pkg); - continue; - } - } - pkgsets[modID].insert(PackageSet::FromString(Cache, str, helper)); - } - return pkgsets; -} - /*}}}*/ -// FromCommandLine - Return all packages specified on commandline /*{{{*/ -PackageSet PackageSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, CacheSetHelper &helper) { - PackageSet pkgset; - for (const char **I = cmdline; *I != 0; ++I) { - PackageSet pset = FromString(Cache, *I, helper); - pkgset.insert(pset.begin(), pset.end()); - } - return pkgset; -} - /*}}}*/ -// FromString - Return all packages matching a specific string /*{{{*/ -PackageSet PackageSet::FromString(pkgCacheFile &Cache, std::string const &str, CacheSetHelper &helper) { - _error->PushToStack(); - - PackageSet pkgset; - pkgCache::PkgIterator Pkg = FromName(Cache, str, helper); - if (Pkg.end() == false) - pkgset.insert(Pkg); - else { - pkgset = FromTask(Cache, str, helper); - if (pkgset.empty() == true) { - pkgset = FromRegEx(Cache, str, helper); - if (pkgset.empty() == true) - pkgset = helper.canNotFindPackage(Cache, str); - } - } - - if (pkgset.empty() == false) - _error->RevertToStack(); - else - _error->MergeWithStack(); - return pkgset; -} - /*}}}*/ -// GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ -std::map VersionSet::GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list const &mods, - unsigned short const &fallback, CacheSetHelper &helper) { - std::map versets; - for (const char **I = cmdline; *I != 0; ++I) { - unsigned short modID = fallback; - VersionSet::Version select = VersionSet::NEWEST; - std::string str = *I; - bool modifierPresent = false; - for (std::list::const_iterator mod = mods.begin(); - mod != mods.end(); ++mod) { - if (modID == fallback && mod->ID == fallback) - select = mod->SelectVersion; - size_t const alength = strlen(mod->Alias); - switch(mod->Pos) { - case VersionSet::Modifier::POSTFIX: - if (str.compare(str.length() - alength, alength, - mod->Alias, 0, alength) != 0) - continue; - str.erase(str.length() - alength); - modID = mod->ID; - select = mod->SelectVersion; - break; - case VersionSet::Modifier::PREFIX: - continue; - case VersionSet::Modifier::NONE: - continue; - } - modifierPresent = true; - break; - } - - if (modifierPresent == true) { - bool const errors = helper.showErrors(false); - VersionSet const vset = VersionSet::FromString(Cache, std::string(*I), select, helper, true); - helper.showErrors(errors); - if (vset.empty() == false) { - versets[fallback].insert(vset); - continue; - } - } - versets[modID].insert(VersionSet::FromString(Cache, str, select , helper)); - } - return versets; -} - /*}}}*/ -// FromCommandLine - Return all versions specified on commandline /*{{{*/ -APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, - APT::VersionSet::Version const &fallback, CacheSetHelper &helper) { - VersionSet verset; - for (const char **I = cmdline; *I != 0; ++I) - verset.insert(VersionSet::FromString(Cache, *I, fallback, helper)); - return verset; -} - /*}}}*/ -// FromString - Returns all versions spedcified by a string /*{{{*/ -APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, - APT::VersionSet::Version const &fallback, CacheSetHelper &helper, - bool const &onlyFromName) { - std::string ver; - bool verIsRel = false; - size_t const vertag = pkg.find_last_of("/="); - if (vertag != string::npos) { - ver = pkg.substr(vertag+1); - verIsRel = (pkg[vertag] == '/'); - pkg.erase(vertag); - } - PackageSet pkgset; - if (onlyFromName == false) - pkgset = PackageSet::FromString(Cache, pkg, helper); - else { - pkgset.insert(PackageSet::FromName(Cache, pkg, helper)); - } - - VersionSet verset; - bool errors = true; - if (pkgset.getConstructor() != PackageSet::UNKNOWN) - errors = helper.showErrors(false); - for (PackageSet::const_iterator P = pkgset.begin(); - P != pkgset.end(); ++P) { - if (vertag == string::npos) { - verset.insert(VersionSet::FromPackage(Cache, P, fallback, helper)); - continue; - } - pkgCache::VerIterator V; - if (ver == "installed") - V = getInstalledVer(Cache, P, helper); - else if (ver == "candidate") - V = getCandidateVer(Cache, P, helper); - else { - pkgVersionMatch Match(ver, (verIsRel == true ? pkgVersionMatch::Release : - pkgVersionMatch::Version)); - V = Match.Find(P); - if (V.end() == true) { - if (verIsRel == true) - _error->Error(_("Release '%s' for '%s' was not found"), - ver.c_str(), P.FullName(true).c_str()); - else - _error->Error(_("Version '%s' for '%s' was not found"), - ver.c_str(), P.FullName(true).c_str()); - continue; - } - } - if (V.end() == true) - continue; - helper.showSelectedVersion(P, V, ver, verIsRel); - verset.insert(V); - } - if (pkgset.getConstructor() != PackageSet::UNKNOWN) - helper.showErrors(errors); - return verset; -} - /*}}}*/ -// FromPackage - versions from package based on fallback /*{{{*/ -VersionSet VersionSet::FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P, - VersionSet::Version const &fallback, CacheSetHelper &helper) { - VersionSet verset; - pkgCache::VerIterator V; - bool showErrors; - switch(fallback) { - case VersionSet::ALL: - if (P->VersionList != 0) - for (V = P.VersionList(); V.end() != true; ++V) - verset.insert(V); - else - verset.insert(helper.canNotFindAllVer(Cache, P)); - break; - case VersionSet::CANDANDINST: - verset.insert(getInstalledVer(Cache, P, helper)); - verset.insert(getCandidateVer(Cache, P, helper)); - break; - case VersionSet::CANDIDATE: - verset.insert(getCandidateVer(Cache, P, helper)); - break; - case VersionSet::INSTALLED: - verset.insert(getInstalledVer(Cache, P, helper)); - break; - case VersionSet::CANDINST: - showErrors = helper.showErrors(false); - V = getCandidateVer(Cache, P, helper); - if (V.end() == true) - V = getInstalledVer(Cache, P, helper); - helper.showErrors(showErrors); - if (V.end() == false) - verset.insert(V); - else - verset.insert(helper.canNotFindInstCandVer(Cache, P)); - break; - case VersionSet::INSTCAND: - showErrors = helper.showErrors(false); - V = getInstalledVer(Cache, P, helper); - if (V.end() == true) - V = getCandidateVer(Cache, P, helper); - helper.showErrors(showErrors); - if (V.end() == false) - verset.insert(V); - else - verset.insert(helper.canNotFindInstCandVer(Cache, P)); - break; - case VersionSet::NEWEST: - if (P->VersionList != 0) - verset.insert(P.VersionList()); - else - verset.insert(helper.canNotFindNewestVer(Cache, P)); - break; - } - return verset; -} - /*}}}*/ -// getCandidateVer - Returns the candidate version of the given package /*{{{*/ -pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper) { - pkgCache::VerIterator Cand; - if (Cache.IsPolicyBuilt() == true || Cache.IsDepCacheBuilt() == false) - { - if (unlikely(Cache.GetPolicy() == 0)) - return pkgCache::VerIterator(Cache); - Cand = Cache.GetPolicy()->GetCandidateVer(Pkg); - } else { - Cand = Cache[Pkg].CandidateVerIter(Cache); - } - if (Cand.end() == true) - return helper.canNotFindCandidateVer(Cache, Pkg); - return Cand; -} - /*}}}*/ -// getInstalledVer - Returns the installed version of the given package /*{{{*/ -pkgCache::VerIterator VersionSet::getInstalledVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper) { - if (Pkg->CurrentVer == 0) - return helper.canNotFindInstalledVer(Cache, Pkg); - return Pkg.CurrentVer(); -} - /*}}}*/ -// canNotFindPkgName - handle the case no package has this name /*{{{*/ -pkgCache::PkgIterator CacheSetHelper::canNotFindPkgName(pkgCacheFile &Cache, - std::string const &str) { - if (ShowError == true) - _error->Error(_("Unable to locate package %s"), str.c_str()); - return pkgCache::PkgIterator(Cache, 0); -} - /*}}}*/ -// canNotFindTask - handle the case no package is found for a task /*{{{*/ -PackageSet CacheSetHelper::canNotFindTask(pkgCacheFile &Cache, std::string pattern) { - if (ShowError == true) - _error->Error(_("Couldn't find task '%s'"), pattern.c_str()); - return PackageSet(); -} - /*}}}*/ -// canNotFindRegEx - handle the case no package is found by a regex /*{{{*/ -PackageSet CacheSetHelper::canNotFindRegEx(pkgCacheFile &Cache, std::string pattern) { - if (ShowError == true) - _error->Error(_("Couldn't find any package by regex '%s'"), pattern.c_str()); - return PackageSet(); -} - /*}}}*/ -// canNotFindPackage - handle the case no package is found from a string/*{{{*/ -PackageSet CacheSetHelper::canNotFindPackage(pkgCacheFile &Cache, std::string const &str) { - return PackageSet(); -} - /*}}}*/ -// canNotFindAllVer /*{{{*/ -VersionSet CacheSetHelper::canNotFindAllVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg) { - if (ShowError == true) - _error->Error(_("Can't select versions from package '%s' as it purely virtual"), Pkg.FullName(true).c_str()); - return VersionSet(); -} - /*}}}*/ -// canNotFindInstCandVer /*{{{*/ -VersionSet CacheSetHelper::canNotFindInstCandVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg) { - if (ShowError == true) - _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str()); - return VersionSet(); -} - /*}}}*/ -// canNotFindInstCandVer /*{{{*/ -VersionSet CacheSetHelper::canNotFindCandInstVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg) { - if (ShowError == true) - _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str()); - return VersionSet(); -} - /*}}}*/ -// canNotFindNewestVer /*{{{*/ -pkgCache::VerIterator CacheSetHelper::canNotFindNewestVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg) { - if (ShowError == true) - _error->Error(_("Can't select newest version from package '%s' as it is purely virtual"), Pkg.FullName(true).c_str()); - return pkgCache::VerIterator(Cache, 0); -} - /*}}}*/ -// canNotFindCandidateVer /*{{{*/ -pkgCache::VerIterator CacheSetHelper::canNotFindCandidateVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg) { - if (ShowError == true) - _error->Error(_("Can't select candidate version from package %s as it has no candidate"), Pkg.FullName(true).c_str()); - return pkgCache::VerIterator(Cache, 0); -} - /*}}}*/ -// canNotFindInstalledVer /*{{{*/ -pkgCache::VerIterator CacheSetHelper::canNotFindInstalledVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg) { - if (ShowError == true) - _error->Error(_("Can't select installed version from package %s as it is not installed"), Pkg.FullName(true).c_str()); - return pkgCache::VerIterator(Cache, 0); -} - /*}}}*/ -} diff --git a/cmdline/cacheset.h b/cmdline/cacheset.h deleted file mode 100644 index c8c3dd096..000000000 --- a/cmdline/cacheset.h +++ /dev/null @@ -1,375 +0,0 @@ -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/ -/** \file cacheset.h - Wrappers around std::set to have set::iterators which behave - similar to the Iterators of the cache structures. - - Provides also a few helper methods which work with these sets */ - /*}}}*/ -#ifndef APT_CACHESET_H -#define APT_CACHESET_H -// Include Files /*{{{*/ -#include -#include -#include -#include -#include -#include - -#include -#include - /*}}}*/ -namespace APT { -class PackageSet; -class VersionSet; -class CacheSetHelper { /*{{{*/ -/** \class APT::CacheSetHelper - Simple base class with a lot of virtual methods which can be overridden - to alter the behavior or the output of the CacheSets. - - This helper is passed around by the static methods in the CacheSets and - used every time they hit an error condition or something could be - printed out. -*/ -public: /*{{{*/ - CacheSetHelper(bool const &ShowError = true) : ShowError(ShowError) {}; - virtual ~CacheSetHelper() {}; - - virtual void showTaskSelection(PackageSet const &pkgset, string const &pattern) {}; - virtual void showRegExSelection(PackageSet const &pkgset, string const &pattern) {}; - virtual void showSelectedVersion(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const Ver, - string const &ver, bool const &verIsRel) {}; - - virtual pkgCache::PkgIterator canNotFindPkgName(pkgCacheFile &Cache, std::string const &str); - virtual PackageSet canNotFindTask(pkgCacheFile &Cache, std::string pattern); - virtual PackageSet canNotFindRegEx(pkgCacheFile &Cache, std::string pattern); - virtual PackageSet canNotFindPackage(pkgCacheFile &Cache, std::string const &str); - virtual VersionSet canNotFindAllVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg); - virtual VersionSet canNotFindInstCandVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg); - virtual VersionSet canNotFindCandInstVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg); - virtual pkgCache::VerIterator canNotFindNewestVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg); - virtual pkgCache::VerIterator canNotFindCandidateVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg); - virtual pkgCache::VerIterator canNotFindInstalledVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg); - - bool showErrors() const { return ShowError; }; - bool showErrors(bool const &newValue) { if (ShowError == newValue) return ShowError; else return ((ShowError = newValue) == false); }; - /*}}}*/ -protected: - bool ShowError; -}; /*}}}*/ -class PackageSet : public std::set { /*{{{*/ -/** \class APT::PackageSet - - Simple wrapper around a std::set to provide a similar interface to - a set of packages as to the complete set of all packages in the - pkgCache. */ -public: /*{{{*/ - /** \brief smell like a pkgCache::PkgIterator */ - class const_iterator : public std::set::const_iterator {/*{{{*/ - public: - const_iterator(std::set::const_iterator x) : - std::set::const_iterator(x) {} - - operator pkgCache::PkgIterator(void) { return **this; } - - inline const char *Name() const {return (**this).Name(); } - inline std::string FullName(bool const &Pretty) const { return (**this).FullName(Pretty); } - inline std::string FullName() const { return (**this).FullName(); } - inline const char *Section() const {return (**this).Section(); } - inline bool Purge() const {return (**this).Purge(); } - inline const char *Arch() const {return (**this).Arch(); } - inline pkgCache::GrpIterator Group() const { return (**this).Group(); } - inline pkgCache::VerIterator VersionList() const { return (**this).VersionList(); } - inline pkgCache::VerIterator CurrentVer() const { return (**this).CurrentVer(); } - inline pkgCache::DepIterator RevDependsList() const { return (**this).RevDependsList(); } - inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); } - inline pkgCache::PkgIterator::OkState State() const { return (**this).State(); } - inline const char *CandVersion() const { return (**this).CandVersion(); } - inline const char *CurVersion() const { return (**this).CurVersion(); } - inline pkgCache *Cache() const { return (**this).Cache(); }; - inline unsigned long Index() const {return (**this).Index();}; - // we have only valid iterators here - inline bool end() const { return false; }; - - friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, (*i)); } - - inline pkgCache::Package const * operator->() const { - return &***this; - }; - }; - // 103. set::iterator is required to be modifiable, but this allows modification of keys - typedef APT::PackageSet::const_iterator iterator; - /*}}}*/ - - using std::set::insert; - inline void insert(pkgCache::PkgIterator const &P) { if (P.end() == false) std::set::insert(P); }; - inline void insert(PackageSet const &pkgset) { insert(pkgset.begin(), pkgset.end()); }; - - /** \brief returns all packages in the cache who belong to the given task - - A simple helper responsible for search for all members of a task - in the cache. Optional it prints a a notice about the - packages chosen cause of the given task. - \param Cache the packages are in - \param pattern name of the task - \param helper responsible for error and message handling */ - static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper); - static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string const &pattern) { - CacheSetHelper helper; - return APT::PackageSet::FromTask(Cache, pattern, helper); - } - - /** \brief returns all packages in the cache whose name matchs a given pattern - - A simple helper responsible for executing a regular expression on all - package names in the cache. Optional it prints a a notice about the - packages chosen cause of the given package. - \param Cache the packages are in - \param pattern regular expression for package names - \param helper responsible for error and message handling */ - static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper); - static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string const &pattern) { - CacheSetHelper helper; - return APT::PackageSet::FromRegEx(Cache, pattern, helper); - } - - /** \brief returns all packages specified by a string - - \param Cache the packages are in - \param string String the package name(s) should be extracted from - \param helper responsible for error and message handling */ - static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string, CacheSetHelper &helper); - static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string) { - CacheSetHelper helper; - return APT::PackageSet::FromString(Cache, string, helper); - } - - /** \brief returns a package specified by a string - - \param Cache the package is in - \param string String the package name should be extracted from - \param helper responsible for error and message handling */ - static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &string, CacheSetHelper &helper); - static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &string) { - CacheSetHelper helper; - return APT::PackageSet::FromName(Cache, string, helper); - } - - /** \brief returns all packages specified on the commandline - - Get all package names from the commandline and executes regex's if needed. - No special package command is supported, just plain names. - \param Cache the packages are in - \param cmdline Command line the package names should be extracted from - \param helper responsible for error and message handling */ - static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, CacheSetHelper &helper); - static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { - CacheSetHelper helper; - return APT::PackageSet::FromCommandLine(Cache, cmdline, helper); - } - - struct Modifier { - enum Position { NONE, PREFIX, POSTFIX }; - unsigned short ID; - const char * const Alias; - Position Pos; - Modifier (unsigned short const &id, const char * const alias, Position const &pos) : ID(id), Alias(alias), Pos(pos) {}; - }; - - /** \brief group packages by a action modifiers - - At some point it is needed to get from the same commandline - different package sets grouped by a modifier. Take - apt-get install apt awesome- - as an example. - \param Cache the packages are in - \param cmdline Command line the package names should be extracted from - \param mods list of modifiers the method should accept - \param fallback the default modifier group for a package - \param helper responsible for error and message handling */ - static std::map GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list const &mods, - unsigned short const &fallback, CacheSetHelper &helper); - static std::map GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list const &mods, - unsigned short const &fallback) { - CacheSetHelper helper; - return APT::PackageSet::GroupedFromCommandLine(Cache, cmdline, - mods, fallback, helper); - } - - enum Constructor { UNKNOWN, REGEX, TASK }; - Constructor getConstructor() const { return ConstructedBy; }; - - PackageSet() : ConstructedBy(UNKNOWN) {}; - PackageSet(Constructor const &by) : ConstructedBy(by) {}; - /*}}}*/ -private: /*{{{*/ - Constructor ConstructedBy; - /*}}}*/ -}; /*}}}*/ -class VersionSet : public std::set { /*{{{*/ -/** \class APT::VersionSet - - Simple wrapper around a std::set to provide a similar interface to - a set of versions as to the complete set of all versions in the - pkgCache. */ -public: /*{{{*/ - /** \brief smell like a pkgCache::VerIterator */ - class const_iterator : public std::set::const_iterator {/*{{{*/ - public: - const_iterator(std::set::const_iterator x) : - std::set::const_iterator(x) {} - - operator pkgCache::VerIterator(void) { return **this; } - - inline pkgCache *Cache() const { return (**this).Cache(); }; - inline unsigned long Index() const {return (**this).Index();}; - // we have only valid iterators here - inline bool end() const { return false; }; - - inline pkgCache::Version const * operator->() const { - return &***this; - }; - - inline int CompareVer(const pkgCache::VerIterator &B) const { return (**this).CompareVer(B); }; - inline const char *VerStr() const { return (**this).VerStr(); }; - inline const char *Section() const { return (**this).Section(); }; - inline const char *Arch() const { return (**this).Arch(); }; - inline const char *Arch(bool const pseudo) const { return (**this).Arch(pseudo); }; - inline pkgCache::PkgIterator ParentPkg() const { return (**this).ParentPkg(); }; - inline pkgCache::DescIterator DescriptionList() const { return (**this).DescriptionList(); }; - inline pkgCache::DescIterator TranslatedDescription() const { return (**this).TranslatedDescription(); }; - inline pkgCache::DepIterator DependsList() const { return (**this).DependsList(); }; - inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); }; - inline pkgCache::VerFileIterator FileList() const { return (**this).FileList(); }; - inline bool Downloadable() const { return (**this).Downloadable(); }; - inline const char *PriorityType() const { return (**this).PriorityType(); }; - inline string RelStr() const { return (**this).RelStr(); }; - inline bool Automatic() const { return (**this).Automatic(); }; - inline bool Pseudo() const { return (**this).Pseudo(); }; - inline pkgCache::VerFileIterator NewestFile() const { return (**this).NewestFile(); }; - }; - /*}}}*/ - // 103. set::iterator is required to be modifiable, but this allows modification of keys - typedef APT::VersionSet::const_iterator iterator; - - using std::set::insert; - inline void insert(pkgCache::VerIterator const &V) { if (V.end() == false) std::set::insert(V); }; - inline void insert(VersionSet const &verset) { insert(verset.begin(), verset.end()); }; - - /** \brief specifies which version(s) will be returned if non is given */ - enum Version { - /** All versions */ - ALL, - /** Candidate and installed version */ - CANDANDINST, - /** Candidate version */ - CANDIDATE, - /** Installed version */ - INSTALLED, - /** Candidate or if non installed version */ - CANDINST, - /** Installed or if non candidate version */ - INSTCAND, - /** Newest version */ - NEWEST - }; - - /** \brief returns all versions specified on the commandline - - Get all versions from the commandline, uses given default version if - non specifically requested and executes regex's if needed on names. - \param Cache the packages and versions are in - \param cmdline Command line the versions should be extracted from - \param helper responsible for error and message handling */ - static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, - APT::VersionSet::Version const &fallback, CacheSetHelper &helper); - static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, - APT::VersionSet::Version const &fallback) { - CacheSetHelper helper; - return APT::VersionSet::FromCommandLine(Cache, cmdline, fallback, helper); - } - static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { - return APT::VersionSet::FromCommandLine(Cache, cmdline, CANDINST); - } - - static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, - APT::VersionSet::Version const &fallback, CacheSetHelper &helper, - bool const &onlyFromName = false); - static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, - APT::VersionSet::Version const &fallback) { - CacheSetHelper helper; - return APT::VersionSet::FromString(Cache, pkg, fallback, helper); - } - static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg) { - return APT::VersionSet::FromString(Cache, pkg, CANDINST); - } - - /** \brief returns all versions specified for the package - - \param Cache the package and versions are in - \param P the package in question - \param fallback the version(s) you want to get - \param helper the helper used for display and error handling */ - static APT::VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P, - VersionSet::Version const &fallback, CacheSetHelper &helper); - static APT::VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P, - APT::VersionSet::Version const &fallback) { - CacheSetHelper helper; - return APT::VersionSet::FromPackage(Cache, P, fallback, helper); - } - static APT::VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P) { - return APT::VersionSet::FromPackage(Cache, P, CANDINST); - } - - struct Modifier { - enum Position { NONE, PREFIX, POSTFIX }; - unsigned short ID; - const char * const Alias; - Position Pos; - VersionSet::Version SelectVersion; - Modifier (unsigned short const &id, const char * const alias, Position const &pos, - VersionSet::Version const &select) : ID(id), Alias(alias), Pos(pos), - SelectVersion(select) {}; - }; - - static std::map GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list const &mods, - unsigned short const &fallback, CacheSetHelper &helper); - static std::map GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list const &mods, - unsigned short const &fallback) { - CacheSetHelper helper; - return APT::VersionSet::GroupedFromCommandLine(Cache, cmdline, - mods, fallback, helper); - } - /*}}}*/ -protected: /*{{{*/ - - /** \brief returns the candidate version of the package - - \param Cache to be used to query for information - \param Pkg we want the candidate version from this package */ - static pkgCache::VerIterator getCandidateVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper); - - /** \brief returns the installed version of the package - - \param Cache to be used to query for information - \param Pkg we want the installed version from this package */ - static pkgCache::VerIterator getInstalledVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper); - /*}}}*/ -}; /*}}}*/ -} -#endif diff --git a/cmdline/makefile b/cmdline/makefile index 4ffe49ee0..917ccc96a 100644 --- a/cmdline/makefile +++ b/cmdline/makefile @@ -9,14 +9,14 @@ include ../buildlib/defaults.mak PROGRAM=apt-cache SLIBS = -lapt-pkg $(INTLLIBS) LIB_MAKES = apt-pkg/makefile -SOURCE = apt-cache.cc cacheset.cc +SOURCE = apt-cache.cc include $(PROGRAM_H) # The apt-get program PROGRAM=apt-get SLIBS = -lapt-pkg -lutil $(INTLLIBS) LIB_MAKES = apt-pkg/makefile -SOURCE = apt-get.cc acqprogress.cc cacheset.cc +SOURCE = apt-get.cc acqprogress.cc include $(PROGRAM_H) # The apt-config program diff --git a/debian/changelog b/debian/changelog index 128309b51..04829715c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,10 @@ apt (0.7.26~exp11) experimental; urgency=low - handle "circular" conflicts for "all" packages correctly * cmdline/apt-cache.cc: - be able to omit dependency types in (r)depends (Closes: #319006) + * apt-pkg/cacheset.cc: + - move them back to the library as they look stable now - -- David Kalnischkies Wed, 14 Jul 2010 22:58:08 +0200 + -- David Kalnischkies Sat, 17 Jul 2010 19:56:47 +0200 apt (0.7.26~exp10) experimental; urgency=low -- cgit v1.2.3 From 621e918e5e57675580ee5cb9bb4775d106814be4 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Wed, 21 Jul 2010 17:14:53 +0200 Subject: * apt-pkg/deb/dpkgpm.cc: - Write architecture information to history file. --- apt-pkg/deb/dpkgpm.cc | 10 +++++----- debian/changelog | 7 +++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 67291063c..2945e9750 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -675,17 +675,17 @@ bool pkgDPkgPM::OpenLog() for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) { if (Cache[I].NewInstall()) - install += I.Name() + string(" (") + Cache[I].CandVersion + string("), "); + install += I.FullName(false) + string(" (") + Cache[I].CandVersion + string("), "); else if (Cache[I].Upgrade()) - upgrade += I.Name() + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string("), "); + upgrade += I.FullName(false) + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string("), "); else if (Cache[I].Downgrade()) - downgrade += I.Name() + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string("), "); + downgrade += I.FullName(false) + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string("), "); else if (Cache[I].Delete()) { if ((Cache[I].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge) - purge += I.Name() + string(" (") + Cache[I].CurVersion + string("), "); + purge += I.FullName(false) + string(" (") + Cache[I].CurVersion + string("), "); else - remove += I.Name() + string(" (") + Cache[I].CurVersion + string("), "); + remove += I.FullName(false) + string(" (") + Cache[I].CurVersion + string("), "); } } if (_config->Exists("Commandline::AsString") == true) diff --git a/debian/changelog b/debian/changelog index 0f87ce60f..efd98de73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.26~exp11) experimental; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - Write architecture information to history file. + + -- Julian Andres Klode Wed, 21 Jul 2010 17:09:11 +0200 + apt (0.7.26~exp10) experimental; urgency=low [ David Kalnischkies ] -- cgit v1.2.3 From 6bf8f0d198f00dcbb46dba97840681fa2227177a Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Wed, 21 Jul 2010 17:19:16 +0200 Subject: Add to history whether a change was automatic or not. --- apt-pkg/deb/dpkgpm.cc | 7 ++++++- debian/changelog | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 2945e9750..aa0b04bd5 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -675,7 +675,12 @@ bool pkgDPkgPM::OpenLog() for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) { if (Cache[I].NewInstall()) - install += I.FullName(false) + string(" (") + Cache[I].CandVersion + string("), "); + { + install += I.FullName(false) + string(" (") + Cache[I].CandVersion; + if (Cache[I].Flags & pkgCache::Flag::Auto) + install+= ", automatic"; + install += string("), "); + } else if (Cache[I].Upgrade()) upgrade += I.FullName(false) + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string("), "); else if (Cache[I].Downgrade()) diff --git a/debian/changelog b/debian/changelog index efd98de73..311833192 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ apt (0.7.26~exp11) experimental; urgency=low * apt-pkg/deb/dpkgpm.cc: - Write architecture information to history file. + - Add to history whether a change was automatic or not. -- Julian Andres Klode Wed, 21 Jul 2010 17:09:11 +0200 -- cgit v1.2.3 From 144c096976b2ce05fe64e5761c0df5854f6c0c09 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Fri, 23 Jul 2010 16:13:15 +0200 Subject: * apt-pkg/contrib/fileutl.cc: - Add FileFd::OpenDescriptor() (needed for python-apt's #383617). --- apt-pkg/contrib/fileutl.cc | 18 ++++++++++++++++++ apt-pkg/contrib/fileutl.h | 4 ++++ debian/changelog | 2 ++ 3 files changed, 24 insertions(+) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 49b2f3828..2a3b8a87d 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -700,6 +700,24 @@ bool FileFd::Open(string FileName,OpenMode Mode, unsigned long Perms) SetCloseExec(iFd,true); return true; } + +bool FileFd::OpenDescriptor(int Fd, OpenMode Mode, bool AutoClose) +{ + Close(); + Flags = (AutoClose) ? FileFd::AutoClose : 0; + iFd = Fd; + if (Mode == ReadOnlyGzip) { + gz = gzdopen (iFd, "r"); + if (gz == NULL) { + if (AutoClose) + close (iFd); + return _error->Errno("gzdopen",_("Could not open file descriptor %d"), + Fd); + } + } + this->FileName = ""; + return true; +} /*}}}*/ // FileFd::~File - Closes the file /*{{{*/ // --------------------------------------------------------------------- diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 0f70ab722..62705478d 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -28,6 +28,9 @@ #include +/* Define this for python-apt */ +#define APT_HAS_GZIP 1 + using std::string; class FileFd @@ -60,6 +63,7 @@ class FileFd unsigned long Tell(); unsigned long Size(); bool Open(string FileName,OpenMode Mode,unsigned long Perms = 0666); + bool OpenDescriptor(int Fd, OpenMode Mode, bool AutoClose=false); bool Close(); bool Sync(); diff --git a/debian/changelog b/debian/changelog index 311833192..06454cd5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ apt (0.7.26~exp11) experimental; urgency=low * apt-pkg/deb/dpkgpm.cc: - Write architecture information to history file. - Add to history whether a change was automatic or not. + * apt-pkg/contrib/fileutl.cc: + - Add FileFd::OpenDescriptor() (needed for python-apt's #383617). -- Julian Andres Klode Wed, 21 Jul 2010 17:09:11 +0200 -- cgit v1.2.3 From 3db58cf41785f1e0b7046bbe7f3ef5e545c9a658 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 25 Jul 2010 08:24:03 +0200 Subject: * apt-pkg/pkgcache.cc: - prefer non-virtual packages in FindPreferredPkg --- apt-pkg/cacheiterators.h | 7 +++++-- apt-pkg/pkgcache.cc | 8 +++++--- debian/changelog | 4 +++- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 1dcc34532..0be9368bd 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -115,8 +115,11 @@ class pkgCache::GrpIterator: public Iterator { /** \brief find the package with the "best" architecture The best architecture is either the "native" or the first - in the list of Architectures which is not an end-Pointer */ - PkgIterator FindPreferredPkg() const; + in the list of Architectures which is not an end-Pointer + + \param PreferNonVirtual tries to respond with a non-virtual package + and only if this fails returns the best virtual package */ + PkgIterator FindPreferredPkg(bool const &PreferNonVirtual = true) const; PkgIterator NextPkg(PkgIterator const &Pkg) const; // Constructors diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 8af8ef7de..9e1f8b633 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -349,19 +349,21 @@ pkgCache::PkgIterator pkgCache::GrpIterator::FindPkg(string Arch) const { // GrpIterator::FindPreferredPkg - Locate the "best" package /*{{{*/ // --------------------------------------------------------------------- /* Returns an End-Pointer on error, pointer to the package otherwise */ -pkgCache::PkgIterator pkgCache::GrpIterator::FindPreferredPkg() const { +pkgCache::PkgIterator pkgCache::GrpIterator::FindPreferredPkg(bool const &PreferNonVirtual) const { pkgCache::PkgIterator Pkg = FindPkg("native"); - if (Pkg.end() == false) + if (Pkg.end() == false && (PreferNonVirtual == false || Pkg->VersionList != 0)) return Pkg; std::vector const archs = APT::Configuration::getArchitectures(); for (std::vector::const_iterator a = archs.begin(); a != archs.end(); ++a) { Pkg = FindPkg(*a); - if (Pkg.end() == false) + if (Pkg.end() == false && (PreferNonVirtual == false || Pkg->VersionList != 0)) return Pkg; } + if (PreferNonVirtual == true) + return FindPreferredPkg(false); return PkgIterator(*Owner, 0); } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 04829715c..aff194e1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,10 @@ apt (0.7.26~exp11) experimental; urgency=low - be able to omit dependency types in (r)depends (Closes: #319006) * apt-pkg/cacheset.cc: - move them back to the library as they look stable now + * apt-pkg/pkgcache.cc: + - prefer non-virtual packages in FindPreferredPkg - -- David Kalnischkies Sat, 17 Jul 2010 19:56:47 +0200 + -- David Kalnischkies Sun, 25 Jul 2010 08:20:41 +0200 apt (0.7.26~exp10) experimental; urgency=low -- cgit v1.2.3 From 8d87641558a7e0ee53b03e325614532aa686e01b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 25 Jul 2010 19:51:53 +0200 Subject: - prefer non-virtual packages in FindPreferredPkg (Closes: #590041) * test/integration/*: - add with bug#590041 testcase a small test "framework" --- debian/changelog | 6 +- test/integration/framework | 170 +++++++++++++++++++++ test/integration/run-tests | 8 + .../test-bug-590041-prefer-non-virtual-packages | 51 +++++++ 4 files changed, 233 insertions(+), 2 deletions(-) create mode 100644 test/integration/framework create mode 100755 test/integration/run-tests create mode 100755 test/integration/test-bug-590041-prefer-non-virtual-packages diff --git a/debian/changelog b/debian/changelog index aff194e1c..1aa05adcb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,9 +8,11 @@ apt (0.7.26~exp11) experimental; urgency=low * apt-pkg/cacheset.cc: - move them back to the library as they look stable now * apt-pkg/pkgcache.cc: - - prefer non-virtual packages in FindPreferredPkg + - prefer non-virtual packages in FindPreferredPkg (Closes: #590041) + * test/integration/*: + - add with bug#590041 testcase a small test "framework" - -- David Kalnischkies Sun, 25 Jul 2010 08:20:41 +0200 + -- David Kalnischkies Sun, 25 Jul 2010 19:37:45 +0200 apt (0.7.26~exp10) experimental; urgency=low diff --git a/test/integration/framework b/test/integration/framework new file mode 100644 index 000000000..97dce1e19 --- /dev/null +++ b/test/integration/framework @@ -0,0 +1,170 @@ +#!/bin/sh -- # no runable script, just for vi + +# we all like colorful messages +CERROR="" # red +CWARNING="" # yellow +CMSG="" # green +CINFO="" # light blue +CDEBUG="" # blue +CNORMAL="" # default system console color +CDONE="" # green +CPASS="" # green +CFAIL="" # red +CCMD="" # pink + +msgdie() { echo "${CERROR}E: $1${CNORMAL}" >&2; exit 1; } +msgwarn() { echo "${CWARNING}W: $1${CNORMAL}" >&2; } +msgmsg() { echo "${CMSG}$1${CNORMAL}" >&2; } +msginfo() { echo "${CINFO}I: $1${CNORMAL}" >&2; } +msgdebug() { echo "${CDEBUG}D: $1${CNORMAL}" >&2; } +msgdone() { echo "${CDONE}DONE${CNORMAL}" >&2; } +msgnwarn() { echo -n "${CWARNING}W: $1${CNORMAL}" >&2; } +msgnmsg() { echo -n "${CMSG}$1${CNORMAL}" >&2; } +msgninfo() { echo -n "${CINFO}I: $1${CNORMAL}" >&2; } +msgndebug() { echo -n "${CDEBUG}D: $1${CNORMAL}" >&2; } +msgtest() { echo -n "${CINFO}$1 ${CCMD}$(echo "$2" | sed -e 's/^aptc/apt-c/' -e 's/^aptg/apt-g/' -e 's/^aptf/apt-f/')${CINFO} …${CNORMAL} " >&2; } +msgpass() { echo "${CPASS}PASS${CNORMAL}" >&2; } +msgskip() { echo "${CWARNING}SKIP${CNORMAL}" >&2; } +msgfail() { echo "${CFAIL}FAIL${CNORMAL}" >&2; } + +# enable / disable Debugging +msginfo() { true; } +msgdebug() { true; } +msgninfo() { true; } +msgndebug() { true; } +msgdone() { if [ "$1" = "debug" -o "$1" = "info" ]; then true; else echo "${CDONE}DONE${CNORMAL}" >&2; fi } + +runapt() { + msgdebug "Executing: ${CCMD}$*${CDEBUG} " + APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$* +} +aptconfig() { runapt apt-config $*; } +aptcache() { runapt apt-cache $*; } +aptget() { runapt apt-get $*; } +aptftparchive() { runapt apt-ftparchive $*; } + +setupenvironment() { + local TMPWORKINGDIRECTORY=$(mktemp -d) + msgninfo "Preparing environment for ${CCMD}$0${CINFO} in ${TMPWORKINGDIRECTORY}… " + BUILDDIRECTORY=$(readlink -f $(dirname $0)/../../build/bin) + test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first" + local OLDWORKINGDIRECTORY=$(pwd) + trap "cd /; rm -rf $TMPWORKINGDIRECTORY; cd $OLDWORKINGDIRECTORY" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM + cd $TMPWORKINGDIRECTORY + mkdir rootdir aptarchive + cd rootdir + mkdir -p etc/apt/apt.conf.d etc/apt/sources.list.d etc/apt/trusted.gpg.d etc/apt/preferences.d var/cache var/lib/dpkg + mkdir -p var/cache/apt/archives/partial var/lib/apt/lists/partial + touch var/lib/dpkg/status + mkdir -p usr/lib/apt + ln -s ${BUILDDIRECTORY}/methods usr/lib/apt/methods + cd .. + echo "RootDir \"${TMPWORKINGDIRECTORY}/rootdir\";" > aptconfig.conf + echo "Debug::NoLocking \"true\";" >> aptconfig.conf + echo "APT::Get::Show-User-Simulation-Note \"false\";" >> aptconfig.conf + export LC_ALL=C + msgdone "info" +} + +configarchitecture() { + local CONFFILE=rootdir/etc/apt/apt.conf.d/01multiarch.conf + echo "APT::Architecture \"$1\";" > $CONFFILE + shift + while [ -n "$1" ]; do + echo "APT::Architectures:: \"$1\";" >> $CONFFILE + shift + done +} + +buildflataptarchive() { + msginfo "Build APT archive for ${CCMD}$0${CINFO}…" + cd aptarchive + APTARCHIVE=$(readlink -f .) + if [ -f Packages ]; then + msgninfo "\tPackages file… " + cat Packages | gzip > Packages.gz + cat Packages | bzip2 > Packages.bz2 + cat Packages | lzma > Packages.lzma + msgdone "info" + fi + if [ -f Sources ]; then + msgninfo "\tSources file… " + cat Sources | gzip > Sources.gz + cat Sources | bzip2 > Sources.bz2 + cat Sources | lzma > Sources.lzma + msgdone "info" + fi + cd .. + aptftparchive release . > Release +} + +setupflataptarchive() { + buildflataptarchive + APTARCHIVE=$(readlink -f ./aptarchive) + if [ -f ${APTARCHIVE}/Packages ]; then + msgninfo "\tadd deb sources.list line… " + echo "deb file://$APTARCHIVE /" > rootdir/etc/apt/sources.list.d/apt-test-archive-deb.list + msgdone "info" + else + rm -f rootdir/etc/apt/sources.list.d/apt-test-archive-deb.list + fi + if [ -f ${APTARCHIVE}/Sources ]; then + msgninfo "\tadd deb-src sources.list line… " + echo "deb-src file://$APTARCHIVE /" > rootdir/etc/apt/sources.list.d/apt-test-archive-deb-src.list + msgdone "info" + else + rm -f rootdir/etc/apt/sources.list.d/apt-test-archive-deb-src.list + fi + aptget update -qq +} + +diff() { + local DIFFTEXT="$($(which diff) -u $* | sed -e '/^---/ d' -e '/^+++/ d' -e '/^@@/ d')" + if [ -n "$DIFFTEXT" ]; then + echo + echo "$DIFFTEXT" + return 1 + else + return 0 + fi +} + +testequal() { + local COMPAREFILE=$(mktemp) + echo "$1" > $COMPAREFILE + shift + msgtest "Test for equality of" "$*" + $* 2>&1 | diff $COMPAREFILE - && msgpass || msgfail +} + +testshowvirtual() { + local VIRTUAL="E: Can't select versions from package '$1' as it purely virtual" + local PACKAGE="$1" + shift + while [ -n "$1" ]; do + VIRTUAL="${VIRTUAL} +E: Can't select versions from package '$1' as it purely virtual" + PACKAGE="${PACKAGE} $1" + shift + done + msgtest "Test for virtual packages" "apt-cache show $PACKAGE" + VIRTUAL="${VIRTUAL} +E: No packages found" + local COMPAREFILE=$(mktemp) + local ARCH=$(dpkg-architecture -qDEB_HOST_ARCH_CPU) + eval `apt-config shell ARCH APT::Architecture` + echo "$VIRTUAL" | sed -e "s/:$ARCH//" -e 's/:all//' > $COMPAREFILE + aptcache show $PACKAGE 2>&1 | diff $COMPAREFILE - && msgpass || msgfail +} + +testnopackage() { + msgtest "Test for non-existent packages" "apt-cache show $*" + local SHOWPKG="$(aptcache show $* 2>&1 | grep '^Package: ')" + if [ -n "$SHOWPKG" ]; then + echo + echo "$SHOWPKG" + msgfail + return 1 + fi + msgpass +} diff --git a/test/integration/run-tests b/test/integration/run-tests new file mode 100755 index 000000000..cb74f21e7 --- /dev/null +++ b/test/integration/run-tests @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +local DIR=$(readlink -f $(dirname $0)) +for testcase in $(run-parts --list $DIR | grep '/test-'); do + echo "\033[1;32mRun Testcase \033[1;35m$(basename ${testcase})\033[0m" + ${testcase} +done diff --git a/test/integration/test-bug-590041-prefer-non-virtual-packages b/test/integration/test-bug-590041-prefer-non-virtual-packages new file mode 100755 index 000000000..aa9e487e1 --- /dev/null +++ b/test/integration/test-bug-590041-prefer-non-virtual-packages @@ -0,0 +1,51 @@ +#!/bin/sh +set -e + +. $(readlink -f $(dirname $0))/framework +setupenvironment +configarchitecture "i386" "armel" + +pkglibc6="Package: libc6 +Architecture: armel +Version: 2.11.2-2~0.3 +Description: Embedded GNU C Library: Shared libraries +Filename: pool/main/e/eglibc/libc6_2.11.2-2_armel.deb +Installed-Size: 9740 +MD5sum: f5b878ce5fb8aa01a7927fa1460df537 +Maintainer: GNU Libc Maintainers +Priority: required +SHA1: 0464d597dfbf949e8c17a42325b1f93fb4914afd +SHA256: faca4a3d9ccff57568abf41f6cb81ddd835be7b5d8b0161e2d5f9a7f26aae3c0 +Section: libs +Size: 4178958 +" + +pkglibdb1="Package: libdb1 +Architecture: i386 +Version: 2.1.3-13~0.3 +Replaces: libc6 (<< 2.2.5-13~0.3) +Description: The Berkeley database routines [glibc 2.0/2.1 compatibility] +Filename: pool/main/d/db1-compat/libdb1-compat_2.1.3-13_armel.deb +Installed-Size: 136 +MD5sum: 4043f176ab2b40b0c01bc1211b8c103c +Maintainer: Colin Watson +Priority: extra +SHA1: b9396fdd2e3e8d1d4ba9e74e7346075852d85666 +SHA256: f17decaa28d1db3eeb9eb17bebe50d437d293a509bcdd7cdfd3ebb56f5de3cea +Section: oldlibs +Size: 44168 +" + +cat <<-EOF >aptarchive/Packages +$pkglibc6 +$pkglibdb1 +EOF + +setupflataptarchive + +testshowvirtual libc6:i386 +testequal "$pkglibc6" aptcache show libc6:armel +testequal "$pkglibc6" aptcache show libc6 +testequal "$pkglibdb1" aptcache show libdb1:i386 +testnopackage libdb1:armel +testequal "$pkglibdb1" aptcache show libdb1 -- cgit v1.2.3 From f6bfb482a32543deed925b127c972a7c258df4a1 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 25 Jul 2010 20:04:16 +0200 Subject: Strip the .sh extension from the libapt testrunner and make it a bit more robust against calling from outside --- test/libapt/run-tests | 61 ++++++++++++++++++++++++++++++++++++++++++++++++ test/libapt/run-tests.sh | 60 ----------------------------------------------- 2 files changed, 61 insertions(+), 60 deletions(-) create mode 100755 test/libapt/run-tests delete mode 100755 test/libapt/run-tests.sh diff --git a/test/libapt/run-tests b/test/libapt/run-tests new file mode 100755 index 000000000..0f55f7386 --- /dev/null +++ b/test/libapt/run-tests @@ -0,0 +1,61 @@ +#!/bin/sh +set -e + +local DIR=$(readlink -f $(dirname $0)) +echo "Compiling the tests …" +test -d "$DIR/../../build/obj/test/libapt/" || mkdir -p "$DIR/../../build/obj/test/libapt/" +$(cd $DIR && make) +echo "Running all testcases …" +LDPATH="$DIR/../../build/bin" +EXT="_libapt_test" +for testapp in $(ls ${LDPATH}/*$EXT) +do + name=$(basename ${testapp}) + tmppath="" + + if [ $name = "GetListOfFilesInDir${EXT}" ]; then + # TODO: very-low: move env creation to the actual test-app + echo "Prepare Testarea for \033[1;35m$name\033[0m ..." + tmppath=$(mktemp -d) + touch "${tmppath}/anormalfile" \ + "${tmppath}/01yet-anothernormalfile" \ + "${tmppath}/anormalapt.conf" \ + "${tmppath}/01yet-anotherapt.conf" \ + "${tmppath}/anormalapt.list" \ + "${tmppath}/01yet-anotherapt.list" \ + "${tmppath}/wrongextension.wron" \ + "${tmppath}/wrong-extension.wron" \ + "${tmppath}/strangefile." \ + "${tmppath}/s.t.r.a.n.g.e.f.i.l.e" \ + "${tmppath}/.hiddenfile" \ + "${tmppath}/.hiddenfile.conf" \ + "${tmppath}/.hiddenfile.list" \ + "${tmppath}/multi..dot" \ + "${tmppath}/multi.dot.conf" \ + "${tmppath}/multi.dot.list" \ + "${tmppath}/disabledfile.disabled" \ + "${tmppath}/disabledfile.conf.disabled" \ + "${tmppath}/disabledfile.list.disabled" \ + "${tmppath}/invälid.conf" \ + "${tmppath}/invalíd" \ + "${tmppath}/01invalíd" + ln -s "${tmppath}/anormalfile" "${tmppath}/linkedfile.list" + ln -s "${tmppath}/non-existing-file" "${tmppath}/brokenlink.list" + elif [ $name = "getLanguages${EXT}" ]; then + echo "Prepare Testarea for \033[1;35m$name\033[0m ..." + tmppath=$(mktemp -d) + touch "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-tr" \ + "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-pt" \ + "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-se~" \ + "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-st.bak" + fi + + echo -n "Testing with \033[1;35m${name}\033[0m ... " + LD_LIBRARY_PATH=${LDPATH} ${testapp} ${tmppath} && echo "\033[1;32mOKAY\033[0m" || echo "\033[1;31mFAILED\033[0m" + + if [ -n "$tmppath" -a -d "$tmppath" ]; then + echo "Cleanup Testarea after \033[1;35m$name\033[0m ..." + rm -rf "$tmppath" + fi + +done diff --git a/test/libapt/run-tests.sh b/test/libapt/run-tests.sh deleted file mode 100755 index cb7769e4a..000000000 --- a/test/libapt/run-tests.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -set -e - -echo "Compiling the tests ..." -test -d '../../build/obj/test/libapt/' || mkdir -p '../../build/obj/test/libapt/' -make -echo "Running all testcases ..." -LDPATH=$(pwd)/../../build/bin -EXT="_libapt_test" -for testapp in $(ls ${LDPATH}/*$EXT) -do - name=$(basename ${testapp}) - tmppath="" - - if [ $name = "GetListOfFilesInDir${EXT}" ]; then - # TODO: very-low: move env creation to the actual test-app - echo "Prepare Testarea for \033[1;35m$name\033[0m ..." - tmppath=$(mktemp -d) - touch "${tmppath}/anormalfile" \ - "${tmppath}/01yet-anothernormalfile" \ - "${tmppath}/anormalapt.conf" \ - "${tmppath}/01yet-anotherapt.conf" \ - "${tmppath}/anormalapt.list" \ - "${tmppath}/01yet-anotherapt.list" \ - "${tmppath}/wrongextension.wron" \ - "${tmppath}/wrong-extension.wron" \ - "${tmppath}/strangefile." \ - "${tmppath}/s.t.r.a.n.g.e.f.i.l.e" \ - "${tmppath}/.hiddenfile" \ - "${tmppath}/.hiddenfile.conf" \ - "${tmppath}/.hiddenfile.list" \ - "${tmppath}/multi..dot" \ - "${tmppath}/multi.dot.conf" \ - "${tmppath}/multi.dot.list" \ - "${tmppath}/disabledfile.disabled" \ - "${tmppath}/disabledfile.conf.disabled" \ - "${tmppath}/disabledfile.list.disabled" \ - "${tmppath}/invälid.conf" \ - "${tmppath}/invalíd" \ - "${tmppath}/01invalíd" - ln -s "${tmppath}/anormalfile" "${tmppath}/linkedfile.list" - ln -s "${tmppath}/non-existing-file" "${tmppath}/brokenlink.list" - elif [ $name = "getLanguages${EXT}" ]; then - echo "Prepare Testarea for \033[1;35m$name\033[0m ..." - tmppath=$(mktemp -d) - touch "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-tr" \ - "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-pt" \ - "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-se~" \ - "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-st.bak" - fi - - echo -n "Testing with \033[1;35m${name}\033[0m ... " - LD_LIBRARY_PATH=${LDPATH} ${testapp} ${tmppath} && echo "\033[1;32mOKAY\033[0m" || echo "\033[1;31mFAILED\033[0m" - - if [ -n "$tmppath" -a -d "$tmppath" ]; then - echo "Cleanup Testarea after \033[1;35m$name\033[0m ..." - rm -rf "$tmppath" - fi - -done -- cgit v1.2.3 From a5032f842366f482371173d030e505d79366fd19 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 26 Jul 2010 09:22:53 +0200 Subject: add APT::Cache::ShowOnlyFirstOr option to print only the first alternative in the apt-cache (r)depends commands --- cmdline/apt-cache.cc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 1a1ddcb8c..88bf3a049 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -580,6 +580,7 @@ bool Depends(CommandLine &CmdL) bool const ShowConflicts = _config->FindB("APT::Cache::ShowConflicts", Important == false); bool const ShowBreaks = _config->FindB("APT::Cache::ShowBreaks", Important == false); bool const ShowEnhances = _config->FindB("APT::Cache::ShowEnhances", Important == false); + bool const ShowOnlyFirstOr = _config->FindB("APT::Cache::ShowOnlyFirstOr", false); bool DidSomething; do { @@ -618,7 +619,7 @@ bool Depends(CommandLine &CmdL) if((Installed && Trg->CurrentVer != 0) || !Installed) { - if ((D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or) + if ((D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or && ShowOnlyFirstOr == false) cout << " |"; else cout << " "; @@ -650,6 +651,9 @@ bool Depends(CommandLine &CmdL) if (Recurse == true) Colours[D.ParentPkg()->ID]++; } + + if (ShowOnlyFirstOr == true) + while ((D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or) ++D; } } } @@ -687,6 +691,7 @@ bool RDepends(CommandLine &CmdL) bool const ShowConflicts = _config->FindB("APT::Cache::ShowConflicts", Important == false); bool const ShowBreaks = _config->FindB("APT::Cache::ShowBreaks", Important == false); bool const ShowEnhances = _config->FindB("APT::Cache::ShowEnhances", Important == false); + bool const ShowOnlyFirstOr = _config->FindB("APT::Cache::ShowOnlyFirstOr", false); bool DidSomething; do { @@ -727,7 +732,7 @@ bool RDepends(CommandLine &CmdL) if((Installed && Trg->CurrentVer != 0) || !Installed) { - if ((D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or) + if ((D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or && ShowOnlyFirstOr == false) cout << " |"; else cout << " "; @@ -758,6 +763,9 @@ bool RDepends(CommandLine &CmdL) if (Recurse == true) Colours[D.ParentPkg()->ID]++; } + + if (ShowOnlyFirstOr == true) + while ((D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or) ++D; } } } -- cgit v1.2.3 From f1a58ff8b6cb4086ae59a2c6b02a29baf97ac116 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 26 Jul 2010 10:53:32 +0200 Subject: - add a 'newest' pseudo target release as in pkg/newest * --- apt-pkg/cacheset.cc | 7 ++++++- debian/changelog | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index df7e99fd0..f17a9e0d5 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -323,7 +323,12 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, V = getInstalledVer(Cache, P, helper); else if (ver == "candidate") V = getCandidateVer(Cache, P, helper); - else { + else if (ver == "newest") { + if (P->VersionList != 0) + V = P.VersionList(); + else + V = helper.canNotFindNewestVer(Cache, P); + } else { pkgVersionMatch Match(ver, (verIsRel == true ? pkgVersionMatch::Release : pkgVersionMatch::Version)); V = Match.Find(P); diff --git a/debian/changelog b/debian/changelog index 1aa05adcb..a381034c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,12 +7,14 @@ apt (0.7.26~exp11) experimental; urgency=low - be able to omit dependency types in (r)depends (Closes: #319006) * apt-pkg/cacheset.cc: - move them back to the library as they look stable now + - add a 'newest' pseudo target release as in pkg/newest * apt-pkg/pkgcache.cc: - prefer non-virtual packages in FindPreferredPkg (Closes: #590041) * test/integration/*: - add with bug#590041 testcase a small test "framework" + * - -- David Kalnischkies Sun, 25 Jul 2010 19:37:45 +0200 + -- David Kalnischkies Mon, 26 Jul 2010 10:52:14 +0200 apt (0.7.26~exp10) experimental; urgency=low -- cgit v1.2.3 From 3de4647b39216259678f40f4bf6e8122acd923b5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 26 Jul 2010 12:43:25 +0200 Subject: - show in (r)depends the canidate per default instead of newest - share the (r)depends code instead of codecopy --- cmdline/apt-cache.cc | 210 ++++++++++++++++----------------------------------- debian/changelog | 5 +- 2 files changed, 67 insertions(+), 148 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 88bf3a049..70732e4d0 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -551,27 +551,40 @@ bool DumpAvail(CommandLine &Cmd) return !_error->PendingError(); } /*}}}*/ -// Depends - Print out a dependency tree /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool Depends(CommandLine &CmdL) +// ShowDepends - Helper for printing out a dependency tree /*{{{*/ +class CacheSetHelperDepends: public APT::CacheSetHelper { +public: + APT::PackageSet virtualPkgs; + + virtual pkgCache::VerIterator canNotFindCandidateVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { + virtualPkgs.insert(Pkg); + return pkgCache::VerIterator(Cache, 0); + } + + virtual pkgCache::VerIterator canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { + virtualPkgs.insert(Pkg); + return pkgCache::VerIterator(Cache, 0); + } + + CacheSetHelperDepends() : CacheSetHelper(false) {} +}; +bool ShowDepends(CommandLine &CmdL, bool const RevDepends) { pkgCacheFile CacheFile; pkgCache *Cache = CacheFile.GetPkgCache(); if (unlikely(Cache == NULL)) return false; - SPtrArray Colours = new unsigned[Cache->Head().PackageCount]; - memset(Colours,0,sizeof(*Colours)*Cache->Head().PackageCount); - - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1); - for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) - Colours[Pkg->ID] = 1; + CacheSetHelperDepends helper; + APT::VersionSet verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1, APT::VersionSet::CANDIDATE, helper); + if (verset.empty() == true && helper.virtualPkgs.empty() == true) + return false; + std::vector Shown(Cache->Head().PackageCount); bool const Recurse = _config->FindB("APT::Cache::RecurseDepends", false); bool const Installed = _config->FindB("APT::Cache::Installed", false); bool const Important = _config->FindB("APT::Cache::Important", false); - bool const ShowDepType = _config->FindB("APT::Cache::ShowDependencyType",true); + bool const ShowDepType = _config->FindB("APT::Cache::ShowDependencyType", RevDepends == false); bool const ShowPreDepends = _config->FindB("APT::Cache::ShowPre-Depends", true); bool const ShowDepends = _config->FindB("APT::Cache::ShowDepends", true); bool const ShowRecommends = _config->FindB("APT::Cache::ShowRecommends", Important == false); @@ -581,27 +594,20 @@ bool Depends(CommandLine &CmdL) bool const ShowBreaks = _config->FindB("APT::Cache::ShowBreaks", Important == false); bool const ShowEnhances = _config->FindB("APT::Cache::ShowEnhances", Important == false); bool const ShowOnlyFirstOr = _config->FindB("APT::Cache::ShowOnlyFirstOr", false); - bool DidSomething; - do + + while (verset.empty() != true) { - DidSomething = false; - for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) - { - if (Colours[Pkg->ID] != 1) - continue; - Colours[Pkg->ID] = 2; - DidSomething = true; - - pkgCache::VerIterator Ver = Pkg.VersionList(); - if (Ver.end() == true) - { - cout << '<' << Pkg.FullName(true) << '>' << endl; - continue; - } - + pkgCache::VerIterator Ver = *verset.begin(); + verset.erase(verset.begin()); + pkgCache::PkgIterator Pkg = Ver.ParentPkg(); + Shown[Pkg->ID] = true; + cout << Pkg.FullName(true) << endl; - - for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++) + + if (RevDepends == true) + cout << "Reverse Depends:" << endl; + for (pkgCache::DepIterator D = RevDepends ? Pkg.RevDependsList() : Ver.DependsList(); + D.end() == false; D++) { switch (D->Type) { case pkgCache::Dep::PreDepends: if (!ShowPreDepends) continue; break; @@ -614,7 +620,7 @@ bool Depends(CommandLine &CmdL) case pkgCache::Dep::Enhances: if (!ShowEnhances) continue; break; } - pkgCache::PkgIterator Trg = D.TargetPkg(); + pkgCache::PkgIterator Trg = RevDepends ? D.ParentPkg() : D.TargetPkg(); if((Installed && Trg->CurrentVer != 0) || !Installed) { @@ -632,8 +638,11 @@ bool Depends(CommandLine &CmdL) else cout << Trg.FullName(true) << endl; - if (Recurse == true) - Colours[D.TargetPkg()->ID]++; + if (Recurse == true && Shown[Trg->ID] == false) + { + Shown[Trg->ID] = true; + verset.insert(APT::VersionSet::FromPackage(CacheFile, Trg, APT::VersionSet::CANDIDATE, helper)); + } } @@ -647,131 +656,40 @@ bool Depends(CommandLine &CmdL) V->ParentPkg == D->Package) continue; cout << " " << V.ParentPkg().FullName(true) << endl; - - if (Recurse == true) - Colours[D.ParentPkg()->ID]++; + + if (Recurse == true && Shown[V.ParentPkg()->ID] == false) + { + Shown[V.ParentPkg()->ID] = true; + verset.insert(APT::VersionSet::FromPackage(CacheFile, V.ParentPkg(), APT::VersionSet::CANDIDATE, helper)); + } } if (ShowOnlyFirstOr == true) while ((D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or) ++D; } - } - } - while (DidSomething == true); - + } + + for (APT::PackageSet::const_iterator Pkg = helper.virtualPkgs.begin(); + Pkg != helper.virtualPkgs.end(); ++Pkg) + cout << '<' << Pkg.FullName(true) << '>' << endl; + return true; } /*}}}*/ -// RDepends - Print out a reverse dependency tree - mbc /*{{{*/ +// Depends - Print out a dependency tree /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool Depends(CommandLine &CmdL) +{ + return ShowDepends(CmdL, false); +} + /*}}}*/ +// RDepends - Print out a reverse dependency tree /*{{{*/ // --------------------------------------------------------------------- /* */ bool RDepends(CommandLine &CmdL) { - pkgCacheFile CacheFile; - pkgCache *Cache = CacheFile.GetPkgCache(); - if (unlikely(Cache == NULL)) - return false; - - SPtrArray Colours = new unsigned[Cache->Head().PackageCount]; - memset(Colours,0,sizeof(*Colours)*Cache->Head().PackageCount); - - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1); - for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) - Colours[Pkg->ID] = 1; - - bool const Recurse = _config->FindB("APT::Cache::RecurseDepends",false); - bool const Installed = _config->FindB("APT::Cache::Installed",false); - bool const Important = _config->FindB("APT::Cache::Important", false); - bool const ShowDepType = _config->FindB("APT::Cache::ShowDependencyType",false); - bool const ShowPreDepends = _config->FindB("APT::Cache::ShowPre-Depends", true); - bool const ShowDepends = _config->FindB("APT::Cache::ShowDepends", true); - bool const ShowRecommends = _config->FindB("APT::Cache::ShowRecommends", Important == false); - bool const ShowSuggests = _config->FindB("APT::Cache::ShowSuggests", Important == false); - bool const ShowReplaces = _config->FindB("APT::Cache::ShowReplaces", Important == false); - bool const ShowConflicts = _config->FindB("APT::Cache::ShowConflicts", Important == false); - bool const ShowBreaks = _config->FindB("APT::Cache::ShowBreaks", Important == false); - bool const ShowEnhances = _config->FindB("APT::Cache::ShowEnhances", Important == false); - bool const ShowOnlyFirstOr = _config->FindB("APT::Cache::ShowOnlyFirstOr", false); - bool DidSomething; - do - { - DidSomething = false; - for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) - { - if (Colours[Pkg->ID] != 1) - continue; - Colours[Pkg->ID] = 2; - DidSomething = true; - - pkgCache::VerIterator Ver = Pkg.VersionList(); - if (Ver.end() == true) - { - cout << '<' << Pkg.FullName(true) << '>' << endl; - continue; - } - - cout << Pkg.FullName(true) << endl; - - cout << "Reverse Depends:" << endl; - for (pkgCache::DepIterator D = Pkg.RevDependsList(); D.end() == false; D++) - { - switch (D->Type) { - case pkgCache::Dep::PreDepends: if (!ShowPreDepends) continue; break; - case pkgCache::Dep::Depends: if (!ShowDepends) continue; break; - case pkgCache::Dep::Recommends: if (!ShowRecommends) continue; break; - case pkgCache::Dep::Suggests: if (!ShowSuggests) continue; break; - case pkgCache::Dep::Replaces: if (!ShowReplaces) continue; break; - case pkgCache::Dep::Conflicts: if (!ShowConflicts) continue; break; - case pkgCache::Dep::DpkgBreaks: if (!ShowBreaks) continue; break; - case pkgCache::Dep::Enhances: if (!ShowEnhances) continue; break; - } - - // Show the package - pkgCache::PkgIterator Trg = D.ParentPkg(); - - if((Installed && Trg->CurrentVer != 0) || !Installed) - { - - if ((D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or && ShowOnlyFirstOr == false) - cout << " |"; - else - cout << " "; - - if (ShowDepType == true) - cout << D.DepType() << ": "; - if (Trg->VersionList == 0) - cout << "<" << Trg.FullName(true) << ">" << endl; - else - cout << Trg.FullName(true) << endl; - - if (Recurse == true) - Colours[D.ParentPkg()->ID]++; - - } - - // Display all solutions - SPtrArray List = D.AllTargets(); - pkgPrioSortList(*Cache,List); - for (pkgCache::Version **I = List; *I != 0; I++) - { - pkgCache::VerIterator V(*Cache,*I); - if (V != Cache->VerP + V.ParentPkg()->VersionList || - V->ParentPkg == D->Package) - continue; - cout << " " << V.ParentPkg().FullName(true) << endl; - - if (Recurse == true) - Colours[D.ParentPkg()->ID]++; - } - - if (ShowOnlyFirstOr == true) - while ((D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or) ++D; - } - } - } - while (DidSomething == true); - - return true; + return ShowDepends(CmdL, true); } /*}}}*/ // xvcg - Generate a graph for xvcg /*{{{*/ diff --git a/debian/changelog b/debian/changelog index a381034c1..345a46579 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ apt (0.7.26~exp11) experimental; urgency=low - handle "circular" conflicts for "all" packages correctly * cmdline/apt-cache.cc: - be able to omit dependency types in (r)depends (Closes: #319006) + - show in (r)depends the canidate per default instead of newest + - share the (r)depends code instead of codecopy * apt-pkg/cacheset.cc: - move them back to the library as they look stable now - add a 'newest' pseudo target release as in pkg/newest @@ -12,9 +14,8 @@ apt (0.7.26~exp11) experimental; urgency=low - prefer non-virtual packages in FindPreferredPkg (Closes: #590041) * test/integration/*: - add with bug#590041 testcase a small test "framework" - * - -- David Kalnischkies Mon, 26 Jul 2010 10:52:14 +0200 + -- David Kalnischkies Mon, 26 Jul 2010 12:40:44 +0200 apt (0.7.26~exp10) experimental; urgency=low -- cgit v1.2.3 From 4b12ea903c5166e6215764e6507f6271782df6ff Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 27 Jul 2010 13:27:26 +0200 Subject: * cmdline/apt-get.cc: - Support large filesystems by using statvfs64() instead of statvfs() and statfs64() instead of statfs() (Closes: #590513). --- cmdline/apt-get.cc | 6 ++++++ debian/changelog | 3 +++ 2 files changed, 9 insertions(+) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 7cf760c27..a6dfd82ed 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -25,6 +25,9 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ +#define _LARGEFILE_SOURCE +#define _LARGEFILE64_SOURCE + #include #include #include @@ -63,6 +66,9 @@ #include #include #include + +#define statfs statfs64 +#define statvfs statvfs64 /*}}}*/ #define RAMFS_MAGIC 0x858458f6 diff --git a/debian/changelog b/debian/changelog index 06454cd5a..95f2338c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ apt (0.7.26~exp11) experimental; urgency=low - Add to history whether a change was automatic or not. * apt-pkg/contrib/fileutl.cc: - Add FileFd::OpenDescriptor() (needed for python-apt's #383617). + * cmdline/apt-get.cc: + - Support large filesystems by using statvfs64() instead of statvfs() + and statfs64() instead of statfs() (Closes: #590513). -- Julian Andres Klode Wed, 21 Jul 2010 17:09:11 +0200 -- cgit v1.2.3 From 15032eec2d508df3c63b532be22f488d240159a2 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 27 Jul 2010 13:57:42 +0200 Subject: * apt-pkg/cdrom.cc: - Use link() instead of rename() for creating the CD database backup; otherwise there would be a short time without any database. --- apt-pkg/cdrom.cc | 2 +- debian/changelog | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 93deb49c4..e3e0027fc 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -383,7 +383,7 @@ bool pkgCdrom::WriteDatabase(Configuration &Cnf) Out.close(); - rename(DFile.c_str(),string(DFile + '~').c_str()); + link(DFile.c_str(),string(DFile + '~').c_str()); if (rename(NewFile.c_str(),DFile.c_str()) != 0) return _error->Errno("rename","Failed to rename %s.new to %s", DFile.c_str(),DFile.c_str()); diff --git a/debian/changelog b/debian/changelog index 95f2338c0..ee48ec1d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ apt (0.7.26~exp11) experimental; urgency=low * cmdline/apt-get.cc: - Support large filesystems by using statvfs64() instead of statvfs() and statfs64() instead of statfs() (Closes: #590513). + * apt-pkg/cdrom.cc: + - Use link() instead of rename() for creating the CD database backup; + otherwise there would be a short time without any database. -- Julian Andres Klode Wed, 21 Jul 2010 17:09:11 +0200 -- cgit v1.2.3 From 8f8169ac464249c8a2b35b13f9c5278d4c9e5a46 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 28 Jul 2010 21:47:42 +0200 Subject: auto-install Packages and status file of the testcase --- test/integration/framework | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/test/integration/framework b/test/integration/framework index 97dce1e19..7e0d4b902 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -45,8 +45,9 @@ aptftparchive() { runapt apt-ftparchive $*; } setupenvironment() { local TMPWORKINGDIRECTORY=$(mktemp -d) + local TESTDIR=$(readlink -f $(dirname $0)) msgninfo "Preparing environment for ${CCMD}$0${CINFO} in ${TMPWORKINGDIRECTORY}… " - BUILDDIRECTORY=$(readlink -f $(dirname $0)/../../build/bin) + BUILDDIRECTORY="${TESTDIR}/../../build/bin" test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first" local OLDWORKINGDIRECTORY=$(pwd) trap "cd /; rm -rf $TMPWORKINGDIRECTORY; cd $OLDWORKINGDIRECTORY" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM @@ -55,10 +56,21 @@ setupenvironment() { cd rootdir mkdir -p etc/apt/apt.conf.d etc/apt/sources.list.d etc/apt/trusted.gpg.d etc/apt/preferences.d var/cache var/lib/dpkg mkdir -p var/cache/apt/archives/partial var/lib/apt/lists/partial - touch var/lib/dpkg/status + local STATUSFILE=$(echo "$(basename $0)" | sed 's/^test-/status-/') + if [ -f "${TESTDIR}/${STATUSFILE}" ]; then + cp "${TESTDIR}/${STATUSFILE}" var/lib/dpkg/status + else + touch var/lib/dpkg/status + fi mkdir -p usr/lib/apt ln -s ${BUILDDIRECTORY}/methods usr/lib/apt/methods cd .. + local PACKAGESFILE=$(echo "$(basename $0)" | sed 's/^test-/Packages-/') + if [ -f "${TESTDIR}/${PACKAGESFILE}" ]; then + cp "${TESTDIR}/${PACKAGESFILE}" aptarchive/Packages + else + touch var/lib/dpkg/status + fi echo "RootDir \"${TMPWORKINGDIRECTORY}/rootdir\";" > aptconfig.conf echo "Debug::NoLocking \"true\";" >> aptconfig.conf echo "APT::Get::Show-User-Simulation-Note \"false\";" >> aptconfig.conf -- cgit v1.2.3 From 966640d8fd2feac29909a22415955b3ce5779dcd Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 28 Jul 2010 21:53:17 +0200 Subject: * apt-pkg/orderlist.cc: - try to install another or-group member in DepRemove before breaking the or group (Closes: #590438) --- apt-pkg/orderlist.cc | 77 ++++++++++++++++- debian/changelog | 5 +- ...g-590438-broken-provides-thanks-to-remove-order | 35 ++++++++ ...g-590438-broken-provides-thanks-to-remove-order | 97 ++++++++++++++++++++++ ...g-590438-broken-provides-thanks-to-remove-order | 59 +++++++++++++ 5 files changed, 271 insertions(+), 2 deletions(-) create mode 100644 test/integration/Packages-bug-590438-broken-provides-thanks-to-remove-order create mode 100644 test/integration/status-bug-590438-broken-provides-thanks-to-remove-order create mode 100755 test/integration/test-bug-590438-broken-provides-thanks-to-remove-order diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index 55f9cb9cc..cb55147c3 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -886,13 +886,16 @@ bool pkgOrderList::DepRemove(DepIterator D) continue; /* We wish to see if the dep on the parent package is okay - in the removed (install) state of the target pkg. */ + in the removed (install) state of the target pkg. */ + bool tryFixDeps = false; if (CheckDep(D) == true) { // We want to catch loops with the code below. if (IsFlag(D.ParentPkg(),AddPending) == false) continue; } + else + tryFixDeps = true; // This is the loop detection if (IsFlag(D.ParentPkg(),Added) == true || @@ -903,6 +906,78 @@ bool pkgOrderList::DepRemove(DepIterator D) continue; } + if (tryFixDeps == true) + { + for (pkgCache::DepIterator F = D.ParentPkg().CurrentVer().DependsList(); + F.end() == false; ++F) + { + if (F->Type != pkgCache::Dep::Depends && F->Type != pkgCache::Dep::PreDepends) + continue; + // Check the Providers + if (F.TargetPkg()->ProvidesList != 0) + { + pkgCache::PrvIterator Prov = F.TargetPkg().ProvidesList(); + for (; Prov.end() == false; ++Prov) + { + pkgCache::PkgIterator const P = Prov.OwnerPkg(); + if (IsFlag(P, InList) == true && + IsFlag(P, AddPending) == true && + IsFlag(P, Added) == false && + Cache[P].InstallVer == 0) + break; + } + if (Prov.end() == false) + for (pkgCache::PrvIterator Prv = F.TargetPkg().ProvidesList(); + Prv.end() == false; ++Prv) + { + pkgCache::PkgIterator const P = Prv.OwnerPkg(); + if (IsFlag(P, InList) == true && + IsFlag(P, AddPending) == false && + Cache[P].InstallVer != 0 && + VisitNode(P) == true) + { + tryFixDeps = false; + break; + } + } + if (tryFixDeps == false) + break; + } + + // Check for Or groups + if ((F->CompareOp & pkgCache::Dep::Or) != pkgCache::Dep::Or) + continue; + // Lets see if the package is part of the Or group + pkgCache::DepIterator S = F; + for (; S.end() == false; ++S) + { + if (S.TargetPkg() == D.TargetPkg()) + break; + if ((S->CompareOp & pkgCache::Dep::Or) != pkgCache::Dep::Or || + CheckDep(S)) // Or group is satisfied by another package + for (;S.end() == false; ++S); + } + if (S.end() == true) + continue; + // skip to the end of the or group + for (;S.end() == false && (S->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or; ++S); + ++S; + // The soon to be removed is part of the Or group + // start again in the or group and find something which will serve as replacement + for (; F.end() == false && F != S; ++F) + { + if (F.TargetPkg() == D.TargetPkg() || + IsFlag(F.TargetPkg(), InList) == false || + VisitNode(F.TargetPkg()) == false) + continue; + tryFixDeps = false; + break; + } + if (tryFixDeps == false) + break; + } + } + // Skip over missing files if (IsMissing(D.ParentPkg()) == true) continue; diff --git a/debian/changelog b/debian/changelog index 345a46579..86b154dab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,8 +14,11 @@ apt (0.7.26~exp11) experimental; urgency=low - prefer non-virtual packages in FindPreferredPkg (Closes: #590041) * test/integration/*: - add with bug#590041 testcase a small test "framework" + * apt-pkg/orderlist.cc: + - try to install another or-group member in DepRemove before + breaking the or group (Closes: #590438) - -- David Kalnischkies Mon, 26 Jul 2010 12:40:44 +0200 + -- David Kalnischkies Wed, 28 Jul 2010 21:41:35 +0200 apt (0.7.26~exp10) experimental; urgency=low diff --git a/test/integration/Packages-bug-590438-broken-provides-thanks-to-remove-order b/test/integration/Packages-bug-590438-broken-provides-thanks-to-remove-order new file mode 100644 index 000000000..16bf008f6 --- /dev/null +++ b/test/integration/Packages-bug-590438-broken-provides-thanks-to-remove-order @@ -0,0 +1,35 @@ +Package: gawk +Priority: optional +Section: interpreters +Installed-Size: 2084 +Maintainer: Arthur Loiret +Architecture: i386 +Version: 1:3.1.7.dfsg-5 +Provides: awk +Pre-Depends: libc6 (>= 2.3) +Filename: pool/main/g/gawk/gawk_3.1.7.dfsg-5_i386.deb +Size: 766008 +MD5sum: 6459a02cfc1b9eafb3c0415e4ff4e252 +SHA1: ac033488dae4b7e8167d610e490319c047edf7e4 +SHA256: a2337dfe1cc82aeae46f2c722e5cc7be9ecefdea4aaf13f540cfe70bd8b1d627 +Description-de: GNU awk, eine Mustererkennungs- und Verarbeitungssprache +Homepage: http://www.gnu.org/software/gawk/ +Tag: devel::interpreter, implemented-in::c, interface::commandline, role::program, scope::utility, suite::gnu, use::filtering, use::scanning, works-with::text + +Package: aawk +Priority: optional +Section: interpreters +Installed-Size: 2084 +Maintainer: Arthur Loiret +Architecture: i386 +Version: 1:3.1.7.dfsg-5 +Provides: awk +Pre-Depends: libc6 (>= 2.3) +Filename: pool/main/a/aawk/aawk_3.1.7.dfsg-5_i386.deb +Size: 766008 +MD5sum: 6459a02cfc1b9eafb3c0415e4ff4e252 +SHA1: ac033488dae4b7e8167d610e490319c047edf7e4 +SHA256: a2337dfe1cc82aeae46f2c722e5cc7be9ecefdea4aaf13f540cfe70bd8b1d627 +Description-de: GNU awk, eine Mustererkennungs- und Verarbeitungssprache +Homepage: http://www.gnu.org/software/gawk/ +Tag: devel::interpreter, implemented-in::c, interface::commandline, role::program, scope::utility, suite::gnu, use::filtering, use::scanning, works-with::text diff --git a/test/integration/status-bug-590438-broken-provides-thanks-to-remove-order b/test/integration/status-bug-590438-broken-provides-thanks-to-remove-order new file mode 100644 index 000000000..c2c03c0e4 --- /dev/null +++ b/test/integration/status-bug-590438-broken-provides-thanks-to-remove-order @@ -0,0 +1,97 @@ +Package: libc-bin +Status: install ok installed +Priority: required +Section: libs +Installed-Size: 1516 +Maintainer: GNU Libc Maintainers +Architecture: i386 +Source: eglibc +Version: 2.11.2-2 +Replaces: libc0.1, libc0.3, libc6, libc6.1 +Breaks: libc0.1 (<< 2.10), libc0.3 (<< 2.10), libc6 (<< 2.10), libc6.1 (<< 2.10) +Filename: pool/main/e/eglibc/libc-bin_2.11.2-2_i386.deb +Size: 703542 +MD5sum: f554ec34c092bb8e52e3d917bec7b46c +SHA1: 4d5ba53b50937b1d50e3234e45335de5ea97b84b +SHA256: 4f1e6430a730321209bb6b9cf89ba8a72c95f5c93f3e263a982251b3cc8beb14 +Description-de: Die »Embedded GNU C Library«: Binärdateien +Homepage: http://www.eglibc.org +Tag: devel::lang:c, devel::packaging, implemented-in::c, interface::commandline, role::program, scope::utility, special::auto-inst-parts, suite::gnu, works-with::text, works-with::unicode + +Package: libc6 +Status: install ok installed +Priority: required +Section: libs +Installed-Size: 9340 +Maintainer: GNU Libc Maintainers +Architecture: i386 +Source: eglibc +Version: 2.11.2-2 +Provides: glibc-2.11-1 +Depends: libc-bin (= 2.11.2-2), libgcc1 +Recommends: libc6-i686 +Suggests: glibc-doc, debconf | debconf-2.0, locales +Conflicts: tzdata (<< 2007k-1), tzdata-etch +Breaks: locales (<< 2.11), locales-all (<< 2.11), nscd (<< 2.11) +Filename: pool/main/e/eglibc/libc6_2.11.2-2_i386.deb +Size: 3877166 +MD5sum: 3d8fe972a359ad362ac1957c2687e5c2 +SHA1: cd901f3265254e40ad198b935877f546eeaa8403 +SHA256: e1bc3da1e11f9b742d05f927362e2079482db4186ff45af9f937d284e112e7e5 +Description-de: Die »Embedded GNU C Library«: Laufzeitbibliotheken +Homepage: http://www.eglibc.org +Tag: devel::lang:c, devel::library, implemented-in::c, protocol::ipv6, role::shared-lib, suite::gnu + +Package: mawk +Status: install ok installed +Priority: required +Section: utils +Installed-Size: 228 +Maintainer: Steve Langasek +Architecture: i386 +Version: 1.3.3-15 +Provides: awk +Pre-Depends: libc6 (>= 2.1) +Filename: pool/main/m/mawk/mawk_1.3.3-15_i386.deb +Size: 81430 +MD5sum: e0f9e9903a862a52b5f107d560c4d8e0 +SHA1: cca3b3ea3a57b9c3c136fb538a4fb06a99d1a33e +SHA256: 7449b10ffb6a8636a249ad6866188cad0040a6a446fb4a3a71d81fd136297ee6 +Description-de: Eine Muster- und Textverarbeitungssprache +Tag: devel::interpreter, implemented-in::c, interface::commandline, role::program, scope::utility, use::filtering, use::scanning, works-with::text + +Package: gcc-4.5-base +Status: install ok installed +Priority: required +Section: libs +Installed-Size: 172 +Maintainer: Debian GCC Maintainers +Architecture: i386 +Source: gcc-4.5 +Version: 4.5.0-8 +Filename: pool/main/g/gcc-4.5/gcc-4.5-base_4.5.0-8_i386.deb +Size: 117894 +MD5sum: f5850c42681fcfee3429a1b43da68433 +SHA1: 0548343feba69c4c01d5dbf147393d8dc27605ac +SHA256: 04b60f5fe24b7397e3be233051615ff9addb66d4581578f67fde76f5d7f69f7a +Description: The GNU Compiler Collection (base package) +Homepage: http://gcc.gnu.org/ + +Package: libgcc1 +Status: install ok installed +Priority: required +Section: libs +Installed-Size: 148 +Maintainer: Debian GCC Maintainers +Architecture: i386 +Source: gcc-4.5 (4.5.0-8) +Version: 1:4.5.0-8 +Depends: gcc-4.5-base (= 4.5.0-8), libc6 (>= 2.2.4) +Filename: pool/main/g/gcc-4.5/libgcc1_4.5.0-8_i386.deb +Size: 52190 +MD5sum: beda956a1dcdeffed11072c2d0f3eb83 +SHA1: 7117ec43eec7982a030fcc9a12d4772de3fcdba0 +SHA256: 1d10bd532adce8683b475fcc60c22300f717ef19bf84dc5bf43b07e504f85dcb +Description: GCC support library +Homepage: http://gcc.gnu.org/ + diff --git a/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order b/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order new file mode 100755 index 000000000..bb10c4f73 --- /dev/null +++ b/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order @@ -0,0 +1,59 @@ +#!/bin/sh +set -e + +local TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture "i386" +setupflataptarchive + +pkgbasefile="Package: base-files +Status: install ok installed +Essential: yes +Priority: required +Section: admin +Installed-Size: 472 +Maintainer: Santiago Vila +Architecture: i386 +Version: 5.8 +Replaces: base, dpkg (<= 1.15.0), miscutils +Provides: base +Filename: pool/main/b/base-files/base-files_5.8_i386.deb +Size: 73986 +MD5sum: 8489687ce10e656babd467c9ee389349 +Description-de: Verschiedene Dateien für das Basis-System von Debian" + +predependstest() { +# rm rootdir/var/cache/apt/*.bin + cp $TESTDIR/$(echo "$(basename $0)" | sed 's/test-/status-/') rootdir/var/lib/dpkg/status + echo "$pkgbasefile +Pre-Depends: $1 +" >> rootdir/var/lib/dpkg/status + testequal "Inst gawk (1:3.1.7.dfsg-5 localhost [i386]) +Conf gawk (1:3.1.7.dfsg-5 localhost [i386]) +Remv mawk [1.3.3-15]" aptget install gawk mawk- -sqq -o PreDepends=$(echo "$1" | sed 's/ //g') +} + +predependstest "gawk | mawk" +predependstest "mawk | gawk" + +predependstest "aawk | mawk | gawk" +predependstest "aawk | gawk | mawk" + +predependstest "gawk | awk" +predependstest "aawk | gawk | awk" + +predependstest "mawk | awk" + +predependstest "awk | gawk" +predependstest "awk | gawk | aawk" + +predependstest "awk | mawk" + +predependstest "aawk | awk" +predependstest "awk | aawk" + +predependstest "awk" + +# aptget install gawk mawk- -sqq -o Debug::pkgOrderList=1 #-o Debug::pkgPackageManager=1 -- cgit v1.2.3 From 685625bd308f62a382aaf61f1621a18b9441edfd Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 29 Jul 2010 12:26:26 +0200 Subject: configure also the replacement before remove by adding Immediate flag --- apt-pkg/orderlist.cc | 2 + debian/changelog | 3 +- ...g-590438-broken-provides-thanks-to-remove-order | 32 ++++++++++ test/integration/framework | 16 +++++ ...g-590438-broken-provides-thanks-to-remove-order | 69 +++++++++++++++++----- 5 files changed, 106 insertions(+), 16 deletions(-) diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index cb55147c3..602b63d3b 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -936,6 +936,7 @@ bool pkgOrderList::DepRemove(DepIterator D) Cache[P].InstallVer != 0 && VisitNode(P) == true) { + Flag(P, Immediate); tryFixDeps = false; break; } @@ -970,6 +971,7 @@ bool pkgOrderList::DepRemove(DepIterator D) IsFlag(F.TargetPkg(), InList) == false || VisitNode(F.TargetPkg()) == false) continue; + Flag(F.TargetPkg(), Immediate); tryFixDeps = false; break; } diff --git a/debian/changelog b/debian/changelog index 86b154dab..b836aaab8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,8 +17,9 @@ apt (0.7.26~exp11) experimental; urgency=low * apt-pkg/orderlist.cc: - try to install another or-group member in DepRemove before breaking the or group (Closes: #590438) + - configure also the replacement before remove by adding Immediate flag - -- David Kalnischkies Wed, 28 Jul 2010 21:41:35 +0200 + -- David Kalnischkies Thu, 29 Jul 2010 12:24:49 +0200 apt (0.7.26~exp10) experimental; urgency=low diff --git a/test/integration/Packages-bug-590438-broken-provides-thanks-to-remove-order b/test/integration/Packages-bug-590438-broken-provides-thanks-to-remove-order index 16bf008f6..75a769e1a 100644 --- a/test/integration/Packages-bug-590438-broken-provides-thanks-to-remove-order +++ b/test/integration/Packages-bug-590438-broken-provides-thanks-to-remove-order @@ -33,3 +33,35 @@ SHA256: a2337dfe1cc82aeae46f2c722e5cc7be9ecefdea4aaf13f540cfe70bd8b1d627 Description-de: GNU awk, eine Mustererkennungs- und Verarbeitungssprache Homepage: http://www.gnu.org/software/gawk/ Tag: devel::interpreter, implemented-in::c, interface::commandline, role::program, scope::utility, suite::gnu, use::filtering, use::scanning, works-with::text + +Package: gawk2 +Priority: optional +Section: interpreters +Installed-Size: 2084 +Maintainer: Arthur Loiret +Architecture: i386 +Version: 1:3.1.7.dfsg-5 +Provides: awk +Pre-Depends: libc6 (>= 2.3) +Depends: coolstuff +Filename: pool/main/g/gawk/gawk_3.1.7.dfsg-5_i386.deb +Size: 766008 +MD5sum: 6459a02cfc1b9eafb3c0415e4ff4e252 +SHA1: ac033488dae4b7e8167d610e490319c047edf7e4 +SHA256: a2337dfe1cc82aeae46f2c722e5cc7be9ecefdea4aaf13f540cfe70bd8b1d627 +Description-de: GNU awk, eine Mustererkennungs- und Verarbeitungssprache +Homepage: http://www.gnu.org/software/gawk/ +Tag: devel::interpreter, implemented-in::c, interface::commandline, role::program, scope::utility, suite::gnu, use::filtering, use::scanning, works-with::text + +Package: coolstuff +Priority: optional +Section: cool +Installed-Size: 10 +Maintainer: David Kalnischkies +Architecture: all +Version: 1-1 +Filename: pool/main/c/coolstuff/coolstuff_1-1_all.deb +Size: 7608 +MD5sum: 6459aa2efc139eafb323ac3f4f5aeb22 +Description: We all need cool stuff + diff --git a/test/integration/framework b/test/integration/framework index 7e0d4b902..7b323fdb5 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -149,6 +149,22 @@ testequal() { $* 2>&1 | diff $COMPAREFILE - && msgpass || msgfail } +testequalor2() { + local COMPAREFILE1=$(mktemp) + local COMPAREFILE2=$(mktemp) + local COMPAREAGAINST=$(mktemp) + echo "$1" > $COMPAREFILE1 + echo "$2" > $COMPAREFILE2 + shift 2 + msgtest "Test for equality OR of" "$*" + $* 2>&1 1> $COMPAREAGAINST + (diff $COMPAREFILE1 $COMPAREAGAINST 1> /dev/null || + diff $COMPAREFILE2 $COMPAREAGAINST 1> /dev/null) && msgpass || + ( echo "\n${CINFO}Diff against OR 1${CNORMAL}" "$(diff $COMPAREFILE1 $COMPAREAGAINST)" \ + "\n${CINFO}Diff against OR 2${CNORMAL}" "$(diff $COMPAREFILE2 $COMPAREAGAINST)" && + msgfail ) +} + testshowvirtual() { local VIRTUAL="E: Can't select versions from package '$1' as it purely virtual" local PACKAGE="$1" diff --git a/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order b/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order index bb10c4f73..17ce50295 100755 --- a/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order +++ b/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order @@ -24,7 +24,7 @@ Size: 73986 MD5sum: 8489687ce10e656babd467c9ee389349 Description-de: Verschiedene Dateien für das Basis-System von Debian" -predependstest() { +predependsgawk() { # rm rootdir/var/cache/apt/*.bin cp $TESTDIR/$(echo "$(basename $0)" | sed 's/test-/status-/') rootdir/var/lib/dpkg/status echo "$pkgbasefile @@ -35,25 +35,64 @@ Conf gawk (1:3.1.7.dfsg-5 localhost [i386]) Remv mawk [1.3.3-15]" aptget install gawk mawk- -sqq -o PreDepends=$(echo "$1" | sed 's/ //g') } -predependstest "gawk | mawk" -predependstest "mawk | gawk" +predependsgawk "gawk | mawk" +predependsgawk "mawk | gawk" -predependstest "aawk | mawk | gawk" -predependstest "aawk | gawk | mawk" +predependsgawk "aawk | mawk | gawk" +predependsgawk "aawk | gawk | mawk" -predependstest "gawk | awk" -predependstest "aawk | gawk | awk" +predependsgawk "gawk | awk" +predependsgawk "aawk | gawk | awk" -predependstest "mawk | awk" +predependsgawk "mawk | awk" -predependstest "awk | gawk" -predependstest "awk | gawk | aawk" +predependsgawk "awk | gawk" +predependsgawk "awk | gawk | aawk" -predependstest "awk | mawk" +predependsgawk "awk | mawk" -predependstest "aawk | awk" -predependstest "awk | aawk" +predependsgawk "aawk | awk" +predependsgawk "awk | aawk" -predependstest "awk" +predependsgawk "awk" -# aptget install gawk mawk- -sqq -o Debug::pkgOrderList=1 #-o Debug::pkgPackageManager=1 +predependsgawk2() { +# rm rootdir/var/cache/apt/*.bin + cp $TESTDIR/$(echo "$(basename $0)" | sed 's/test-/status-/') rootdir/var/lib/dpkg/status + echo "$pkgbasefile +Pre-Depends: $1 +" >> rootdir/var/lib/dpkg/status + testequalor2 "Inst coolstuff (1-1 localhost [all]) +Conf coolstuff (1-1 localhost [all]) +Inst gawk2 (1:3.1.7.dfsg-5 localhost [i386]) +Conf gawk2 (1:3.1.7.dfsg-5 localhost [i386]) +Remv mawk [1.3.3-15]" "Inst coolstuff (1-1 localhost [all]) +Inst gawk2 (1:3.1.7.dfsg-5 localhost [i386]) +Conf coolstuff (1-1 localhost [all]) +Conf gawk2 (1:3.1.7.dfsg-5 localhost [i386]) +Remv mawk [1.3.3-15]" aptget install gawk2 mawk- -sqq -o PreDepends=$(echo "$1" | sed 's/ //g') +} + +predependsgawk2 "gawk2 | mawk" +predependsgawk2 "mawk | gawk2" + +predependsgawk2 "aawk | mawk | gawk2" +predependsgawk2 "aawk | gawk2 | mawk" + +predependsgawk2 "gawk2 | awk" +predependsgawk2 "aawk | gawk2 | awk" + +predependsgawk2 "mawk | awk" + +predependsgawk2 "awk | gawk2" +predependsgawk2 "awk | gawk2 | aawk" + +predependsgawk2 "awk | mawk" + +predependsgawk2 "aawk | awk" +predependsgawk2 "awk | aawk" + +predependsgawk2 "awk" + + +# aptget install gawk2 mawk- -s #-o Debug::pkgOrderList=1 #-o Debug::pkgPackageManager=1 -- cgit v1.2.3 From 12be8a62d1abb9253a4695badbf70e7210f9b0d2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 29 Jul 2010 14:37:36 +0200 Subject: * apt-pkg/contrib/error.{cc,h} - docstring cleanup --- apt-pkg/contrib/error.cc | 4 ++-- apt-pkg/contrib/error.h | 11 ++++++----- debian/changelog | 4 ++++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc index fbb6e4636..d63b06d13 100644 --- a/apt-pkg/contrib/error.cc +++ b/apt-pkg/contrib/error.cc @@ -180,7 +180,7 @@ bool GlobalError::PopMessage(std::string &Text) { } /*}}}*/ // GlobalError::DumpErrors - Dump all of the errors/warns to cerr /*{{{*/ -void GlobalError::DumpErrors(std::ostream &out, MsgType const &trashhold, +void GlobalError::DumpErrors(std::ostream &out, MsgType const &threshold, bool const &mergeStack) { if (mergeStack == true) for (std::list::const_reverse_iterator s = Stacks.rbegin(); @@ -189,7 +189,7 @@ void GlobalError::DumpErrors(std::ostream &out, MsgType const &trashhold, for (std::list::const_iterator m = Messages.begin(); m != Messages.end(); m++) - if (m->Type >= trashhold) + if (m->Type >= threshold) out << (*m) << std::endl; Discard(); } diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index e5517c2da..d39500427 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -204,9 +204,10 @@ public: /*{{{*/ * displayed or not. * * \param[out] out output stream to write the messages in - * \param WithoutNotice output notices or not + * \param threshold minimim level considered + * \param mergeStack */ - void DumpErrors(std::ostream &out, MsgType const &trashhold = WARNING, + void DumpErrors(std::ostream &out, MsgType const &threshold = WARNING, bool const &mergeStack = true); /** \brief dumps the list of messages to std::cerr @@ -214,10 +215,10 @@ public: /*{{{*/ * Note that all messages are discarded, also the notices * displayed or not. * - * \param WithoutNotice print notices or not + * \param threshold minimum level printed */ - void inline DumpErrors(MsgType const &trashhold = WARNING) { - DumpErrors(std::cerr, trashhold); + void inline DumpErrors(MsgType const &threshold = WARNING) { + DumpErrors(std::cerr, threshold); } /** \brief put the current Messages into the stack diff --git a/debian/changelog b/debian/changelog index 49f8bce46..545703603 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,10 @@ apt (0.7.26~exp11) experimental; urgency=low - try to install another or-group member in DepRemove before breaking the or group (Closes: #590438) - configure also the replacement before remove by adding Immediate flag + + [ Michael Vogt ] + * apt-pkg/contrib/error.{cc,h} + - docstring cleanup -- David Kalnischkies Mon, 26 Jul 2010 12:40:44 +0200 -- cgit v1.2.3 From ca0d389c8969ddb679358ca16e4bcddfcdaf9b03 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 29 Jul 2010 14:51:05 +0200 Subject: add inline DumpError() to avoid subtle API break --- apt-pkg/contrib/error.h | 14 +++++++++++++- debian/changelog | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index d39500427..4af0302c0 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -217,10 +217,22 @@ public: /*{{{*/ * * \param threshold minimum level printed */ - void inline DumpErrors(MsgType const &threshold = WARNING) { + void inline DumpErrors(MsgType const &threshold) { DumpErrors(std::cerr, threshold); } + // mvo: we do this instead of using a default parameter in the + // previous declaration to avoid a (subtle) API break for + // e.g. sigc++ and mem_fun0 + /** \brief dumps the messages of type WARNING or higher to std::cerr + * + * Note that all messages are discarded, displayed or not. + * + */ + void inline DumpErrors() { + DumpErrors(WARNING); + } + /** \brief put the current Messages into the stack * * All "old" messages will be pushed into a stack to diff --git a/debian/changelog b/debian/changelog index 545703603..c526df66c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,7 @@ apt (0.7.26~exp11) experimental; urgency=low [ Michael Vogt ] * apt-pkg/contrib/error.{cc,h} - docstring cleanup + - add inline DumpError() to avoid subtle API break -- David Kalnischkies Mon, 26 Jul 2010 12:40:44 +0200 -- cgit v1.2.3 From 8e86786b2f0002a7512f97d0f9b5ef3e4794e26e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 29 Jul 2010 15:09:18 +0200 Subject: remove the temporary compare files we create --- test/integration/framework | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/integration/framework b/test/integration/framework index 7b323fdb5..b4e9302e8 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -147,6 +147,7 @@ testequal() { shift msgtest "Test for equality of" "$*" $* 2>&1 | diff $COMPAREFILE - && msgpass || msgfail + rm $COMPAREFILE } testequalor2() { @@ -163,6 +164,7 @@ testequalor2() { ( echo "\n${CINFO}Diff against OR 1${CNORMAL}" "$(diff $COMPAREFILE1 $COMPAREAGAINST)" \ "\n${CINFO}Diff against OR 2${CNORMAL}" "$(diff $COMPAREFILE2 $COMPAREAGAINST)" && msgfail ) + rm $COMPAREFILE1 $COMPAREFILE2 $COMPAREAGAINST } testshowvirtual() { @@ -183,6 +185,7 @@ E: No packages found" eval `apt-config shell ARCH APT::Architecture` echo "$VIRTUAL" | sed -e "s/:$ARCH//" -e 's/:all//' > $COMPAREFILE aptcache show $PACKAGE 2>&1 | diff $COMPAREFILE - && msgpass || msgfail + rm $COMPAREFILE } testnopackage() { -- cgit v1.2.3 From bd3e16fa135fc1ce417bacc70e88418015305e98 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 29 Jul 2010 16:28:33 +0200 Subject: apt-pkg/init.h: update MAPT_PKG_MINOR because 9 was used in experimental for some time and there was quite a bit of churn --- apt-pkg/init.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/init.h b/apt-pkg/init.h index b3e4b147f..6e7340dfe 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -22,7 +22,7 @@ // Non-ABI-Breaks should only increase RELEASE number. // See also buildlib/libversion.mak #define APT_PKG_MAJOR 4 -#define APT_PKG_MINOR 9 +#define APT_PKG_MINOR 10 #define APT_PKG_RELEASE 0 extern const char *pkgVersion; -- cgit v1.2.3 From 5c9829b60e41c6ef86867fd0759b63a2894e1346 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 29 Jul 2010 17:02:30 +0200 Subject: releasing version 0.7.26~exp11 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c526df66c..77bbde51d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,7 +37,7 @@ apt (0.7.26~exp11) experimental; urgency=low - docstring cleanup - add inline DumpError() to avoid subtle API break - -- David Kalnischkies Mon, 26 Jul 2010 12:40:44 +0200 + -- Michael Vogt Thu, 29 Jul 2010 16:40:58 +0200 apt (0.7.26~exp10) experimental; urgency=low -- cgit v1.2.3 From 5691425945330b650129c97f1460953609a0b2d7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 29 Jul 2010 17:02:52 +0200 Subject: changelog update --- debian/changelog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 79f493cee..ed7d579f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ apt (0.7.26~exp11ubuntu1) maverick; urgency=low + * ABI break upload * merged from debian/experimental, remaining changes: - use ubuntu keyring and ubuntu archive keyring in apt-key - run update-apt-xapian-index in apt.cron + - support apt-key net-update and verify keys against master-keyring + - run apt-key net-update in cron.daily + - different example sources.list * debian/apt.postinst - drop set_apt_proxy_from_gconf(), no longer needed in maverick -- cgit v1.2.3 From cd02388d4877038e13326d84c5745c44acb0ce61 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 29 Jul 2010 20:16:00 +0200 Subject: remove debian-archive-keyring dependency and readd recommends to the ubuntu-keyring --- debian/changelog | 7 +++++++ debian/control | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d94bff7d4..1829e067c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.26~exp11ubuntu2) maverick; urgency=low + + * remove debian-archive-keyring dependency and readd + recommends to the ubuntu-keyring + + -- Michael Vogt Thu, 29 Jul 2010 20:02:39 +0200 + apt (0.7.26~exp11ubuntu1) maverick; urgency=low * ABI break upload diff --git a/debian/control b/debian/control index 535a436ee..5d709ab8e 100644 --- a/debian/control +++ b/debian/control @@ -13,9 +13,10 @@ Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Package: apt Architecture: any -Depends: ${shlibs:Depends}, debian-archive-keyring, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: manpages-pl (<< 20060617-3~) Provides: ${libapt-pkg:provides} +Recommends: ubuntu-keyring Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt Description: Advanced front-end for dpkg -- cgit v1.2.3 From 7fd6d117eeecdb91e62e48d3af06dee73e4930e8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 30 Jul 2010 00:15:12 +0200 Subject: * debian/control: - add dependency on zlib-dev for libapt-pkg-dev --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 77bbde51d..01dcfeef8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.26~exp12) UNRELEASEDexperimental; urgency=low + + * debian/control: + - add dependency on zlib-dev for libapt-pkg-dev + + -- Michael Vogt Thu, 29 Jul 2010 23:45:42 +0200 + apt (0.7.26~exp11) experimental; urgency=low [ Julian Andres Klode ] diff --git a/debian/control b/debian/control index 757b761e5..345b72f55 100644 --- a/debian/control +++ b/debian/control @@ -37,7 +37,7 @@ Description: Documentation for APT Package: libapt-pkg-dev Architecture: any Priority: optional -Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides}, ${misc:Depends} +Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides}, ${misc:Depends}, zlib1g-dev | zlib-dev Section: libdevel Description: Development files for APT's libapt-pkg and libapt-inst This package contains the header files and libraries for -- cgit v1.2.3 From 4ed3806e625a4b5c148e27dba5384f133dd77c1a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 30 Jul 2010 00:17:16 +0200 Subject: * apt-pkg/cacheset.cc: - make CacheSetHelper::canNotFindAllVer display a notice only (for compat reasons). Otherwise tools like sbuild blow up --- apt-pkg/cacheset.cc | 2 +- debian/changelog | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index f17a9e0d5..84021a2b7 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -464,7 +464,7 @@ PackageSet CacheSetHelper::canNotFindPackage(pkgCacheFile &Cache, std::string co VersionSet CacheSetHelper::canNotFindAllVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { if (ShowError == true) - _error->Error(_("Can't select versions from package '%s' as it purely virtual"), Pkg.FullName(true).c_str()); + _error->Notice(_("Can't select versions from package '%s' as it purely virtual"), Pkg.FullName(true).c_str()); return VersionSet(); } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 01dcfeef8..d6bfa76ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ apt (0.7.26~exp12) UNRELEASEDexperimental; urgency=low * debian/control: - add dependency on zlib-dev for libapt-pkg-dev + * apt-pkg/cacheset.cc: + - make CacheSetHelper::canNotFindAllVer display a notice + only (for compat reasons). Otherwise tools like sbuild + blow up -- Michael Vogt Thu, 29 Jul 2010 23:45:42 +0200 -- cgit v1.2.3 From cd7bbc479f8e2f277092a9557bb486ab664deba6 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 30 Jul 2010 09:51:42 +0200 Subject: - [ABI BREAK] add an ErrorType option to CacheSetHelper * cmdline/apt-cache.cc: - use Notice instead of Error in the CacheSetHelper messages for compat reasons. Otherwise tools like sbuild blow up --- apt-pkg/cacheset.cc | 18 +++++++++--------- apt-pkg/cacheset.h | 16 +++++++++++++++- apt-pkg/contrib/error.cc | 16 ++++++++++++++++ apt-pkg/contrib/error.h | 16 ++++++++++++++++ cmdline/apt-cache.cc | 24 ++++++++++++++++-------- debian/changelog | 14 +++++++++----- 6 files changed, 81 insertions(+), 23 deletions(-) diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index 84021a2b7..bbfdfd4f2 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -437,21 +437,21 @@ pkgCache::VerIterator VersionSet::getInstalledVer(pkgCacheFile &Cache, pkgCache::PkgIterator CacheSetHelper::canNotFindPkgName(pkgCacheFile &Cache, std::string const &str) { if (ShowError == true) - _error->Error(_("Unable to locate package %s"), str.c_str()); + _error->Insert(ErrorType, _("Unable to locate package %s"), str.c_str()); return pkgCache::PkgIterator(Cache, 0); } /*}}}*/ // canNotFindTask - handle the case no package is found for a task /*{{{*/ PackageSet CacheSetHelper::canNotFindTask(pkgCacheFile &Cache, std::string pattern) { if (ShowError == true) - _error->Error(_("Couldn't find task '%s'"), pattern.c_str()); + _error->Insert(ErrorType, _("Couldn't find task '%s'"), pattern.c_str()); return PackageSet(); } /*}}}*/ // canNotFindRegEx - handle the case no package is found by a regex /*{{{*/ PackageSet CacheSetHelper::canNotFindRegEx(pkgCacheFile &Cache, std::string pattern) { if (ShowError == true) - _error->Error(_("Couldn't find any package by regex '%s'"), pattern.c_str()); + _error->Insert(ErrorType, _("Couldn't find any package by regex '%s'"), pattern.c_str()); return PackageSet(); } /*}}}*/ @@ -464,7 +464,7 @@ PackageSet CacheSetHelper::canNotFindPackage(pkgCacheFile &Cache, std::string co VersionSet CacheSetHelper::canNotFindAllVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { if (ShowError == true) - _error->Notice(_("Can't select versions from package '%s' as it purely virtual"), Pkg.FullName(true).c_str()); + _error->Insert(ErrorType, _("Can't select versions from package '%s' as it purely virtual"), Pkg.FullName(true).c_str()); return VersionSet(); } /*}}}*/ @@ -472,7 +472,7 @@ VersionSet CacheSetHelper::canNotFindAllVer(pkgCacheFile &Cache, VersionSet CacheSetHelper::canNotFindInstCandVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { if (ShowError == true) - _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str()); + _error->Insert(ErrorType, _("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str()); return VersionSet(); } /*}}}*/ @@ -480,7 +480,7 @@ VersionSet CacheSetHelper::canNotFindInstCandVer(pkgCacheFile &Cache, VersionSet CacheSetHelper::canNotFindCandInstVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { if (ShowError == true) - _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str()); + _error->Insert(ErrorType, _("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str()); return VersionSet(); } /*}}}*/ @@ -488,7 +488,7 @@ VersionSet CacheSetHelper::canNotFindCandInstVer(pkgCacheFile &Cache, pkgCache::VerIterator CacheSetHelper::canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { if (ShowError == true) - _error->Error(_("Can't select newest version from package '%s' as it is purely virtual"), Pkg.FullName(true).c_str()); + _error->Insert(ErrorType, _("Can't select newest version from package '%s' as it is purely virtual"), Pkg.FullName(true).c_str()); return pkgCache::VerIterator(Cache, 0); } /*}}}*/ @@ -496,7 +496,7 @@ pkgCache::VerIterator CacheSetHelper::canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::VerIterator CacheSetHelper::canNotFindCandidateVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { if (ShowError == true) - _error->Error(_("Can't select candidate version from package %s as it has no candidate"), Pkg.FullName(true).c_str()); + _error->Insert(ErrorType, _("Can't select candidate version from package %s as it has no candidate"), Pkg.FullName(true).c_str()); return pkgCache::VerIterator(Cache, 0); } /*}}}*/ @@ -504,7 +504,7 @@ pkgCache::VerIterator CacheSetHelper::canNotFindCandidateVer(pkgCacheFile &Cache pkgCache::VerIterator CacheSetHelper::canNotFindInstalledVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { if (ShowError == true) - _error->Error(_("Can't select installed version from package %s as it is not installed"), Pkg.FullName(true).c_str()); + _error->Insert(ErrorType, _("Can't select installed version from package %s as it is not installed"), Pkg.FullName(true).c_str()); return pkgCache::VerIterator(Cache, 0); } /*}}}*/ diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index c8c3dd096..3f4f0066b 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -32,7 +32,9 @@ class CacheSetHelper { /*{{{*/ printed out. */ public: /*{{{*/ - CacheSetHelper(bool const &ShowError = true) : ShowError(ShowError) {}; + CacheSetHelper(bool const &ShowError = true, + GlobalError::MsgType ErrorType = GlobalError::ERROR) : + ShowError(ShowError), ErrorType(ErrorType) {}; virtual ~CacheSetHelper() {}; virtual void showTaskSelection(PackageSet const &pkgset, string const &pattern) {}; @@ -58,9 +60,21 @@ public: /*{{{*/ bool showErrors() const { return ShowError; }; bool showErrors(bool const &newValue) { if (ShowError == newValue) return ShowError; else return ((ShowError = newValue) == false); }; + GlobalError::MsgType errorType() const { return ErrorType; }; + GlobalError::MsgType errorType(GlobalError::MsgType const &newValue) + { + if (ErrorType == newValue) return ErrorType; + else { + GlobalError::MsgType const &oldValue = ErrorType; + ErrorType = newValue; + return oldValue; + } + }; + /*}}}*/ protected: bool ShowError; + GlobalError::MsgType ErrorType; }; /*}}}*/ class PackageSet : public std::set { /*{{{*/ /** \class APT::PackageSet diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc index d63b06d13..e2e8d6e57 100644 --- a/apt-pkg/contrib/error.cc +++ b/apt-pkg/contrib/error.cc @@ -92,6 +92,14 @@ bool GlobalError::DebugE(const char *Function,const char *Description,...) { return InsertErrno(DEBUG, Function, Description, args); } /*}}}*/ +// GlobalError::InsertErrno - Get part of the errortype string from errno/*{{{*/ +bool GlobalError::InsertErrno(MsgType const &type, const char *Function, + const char *Description,...) { + va_list args; + va_start(args,Description); + return InsertErrno(type, Function, Description, args); +} + /*}}}*/ // GlobalError::InsertErrno - formats an error message with the errno /*{{{*/ bool GlobalError::InsertErrno(MsgType type, const char* Function, const char* Description, va_list &args) { @@ -138,6 +146,14 @@ bool GlobalError::Debug(const char *Description,...) return Insert(DEBUG, Description, args); } /*}}}*/ +// GlobalError::Insert - Add a errotype message to the list /*{{{*/ +bool GlobalError::Insert(MsgType const &type, const char *Description,...) +{ + va_list args; + va_start(args,Description); + return Insert(type, Description, args); +} + /*}}}*/ // GlobalError::Insert - Insert a new item at the end /*{{{*/ bool GlobalError::Insert(MsgType type, const char* Description, va_list &args) { diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index 4af0302c0..ae756dbc4 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -114,6 +114,15 @@ public: /*{{{*/ */ bool DebugE(const char *Function,const char *Description,...) __like_printf(3) __cold; + /** \brief adds an errno message with the given type + * + * \param type of the error message + * \param Function which failed + * \param Description of the error + */ + bool InsertErrno(MsgType const &type, const char* Function, + const char* Description,...) __like_printf(4) __cold; + /** \brief add an fatal error message to the list * * Most of the stuff we consider as "error" is also "fatal" for @@ -169,6 +178,13 @@ public: /*{{{*/ */ bool Debug(const char *Description,...) __like_printf(2) __cold; + /** \brief adds an error message with the given type + * + * \param type of the error message + * \param Description of the error + */ + bool Insert(MsgType const &type, const char* Description,...) __like_printf(3) __cold; + /** \brief is an error in the list? * * \return \b true if an error is included in the list, \b false otherwise diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 70732e4d0..2a4e200a7 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -173,7 +173,9 @@ bool UnMet(CommandLine &CmdL) } else { - APT::VersionSet verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1); + APT::CacheSetHelper helper(true, GlobalError::NOTICE); + APT::VersionSet verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1, + APT::VersionSet::CANDIDATE, helper); for (APT::VersionSet::iterator V = verset.begin(); V != verset.end(); ++V) if (ShowUnMet(V, Important) == false) return false; @@ -187,7 +189,8 @@ bool UnMet(CommandLine &CmdL) bool DumpPackage(CommandLine &CmdL) { pkgCacheFile CacheFile; - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1); + APT::CacheSetHelper helper(true, GlobalError::NOTICE); + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1, helper); for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { @@ -566,7 +569,7 @@ public: return pkgCache::VerIterator(Cache, 0); } - CacheSetHelperDepends() : CacheSetHelper(false) {} + CacheSetHelperDepends() : CacheSetHelper(false, GlobalError::NOTICE) {} }; bool ShowDepends(CommandLine &CmdL, bool const RevDepends) { @@ -754,11 +757,12 @@ bool XVcg(CommandLine &CmdL) } // Load the list of packages from the command line into the show list + APT::CacheSetHelper helper(true, GlobalError::NOTICE); std::list mods; mods.push_back(APT::PackageSet::Modifier(0, ",", APT::PackageSet::Modifier::POSTFIX)); mods.push_back(APT::PackageSet::Modifier(1, "^", APT::PackageSet::Modifier::POSTFIX)); std::map pkgsets = - APT::PackageSet::GroupedFromCommandLine(CacheFile, CmdL.FileList + 1, mods, 0); + APT::PackageSet::GroupedFromCommandLine(CacheFile, CmdL.FileList + 1, mods, 0, helper); for (APT::PackageSet::const_iterator Pkg = pkgsets[0].begin(); Pkg != pkgsets[0].end(); ++Pkg) @@ -968,11 +972,12 @@ bool Dotty(CommandLine &CmdL) } // Load the list of packages from the command line into the show list + APT::CacheSetHelper helper(true, GlobalError::NOTICE); std::list mods; mods.push_back(APT::PackageSet::Modifier(0, ",", APT::PackageSet::Modifier::POSTFIX)); mods.push_back(APT::PackageSet::Modifier(1, "^", APT::PackageSet::Modifier::POSTFIX)); std::map pkgsets = - APT::PackageSet::GroupedFromCommandLine(CacheFile, CmdL.FileList + 1, mods, 0); + APT::PackageSet::GroupedFromCommandLine(CacheFile, CmdL.FileList + 1, mods, 0, helper); for (APT::PackageSet::const_iterator Pkg = pkgsets[0].begin(); Pkg != pkgsets[0].end(); ++Pkg) @@ -1403,9 +1408,10 @@ bool ShowAuto(CommandLine &CmdL) bool ShowPackage(CommandLine &CmdL) { pkgCacheFile CacheFile; + APT::CacheSetHelper helper(true, GlobalError::NOTICE); APT::VersionSet::Version const select = _config->FindB("APT::Cache::AllVersions", true) ? APT::VersionSet::ALL : APT::VersionSet::CANDIDATE; - APT::VersionSet const verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1, select); + APT::VersionSet const verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1, select, helper); for (APT::VersionSet::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver) if (DisplayRecord(CacheFile, Ver) == false) return false; @@ -1564,7 +1570,8 @@ bool Policy(CommandLine &CmdL) (InstalledLessCandidate > 0 ? (InstalledLessCandidate) : 0) - 1; // Print out detailed information for each package - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1); + APT::CacheSetHelper helper(true, GlobalError::NOTICE); + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1, helper); for (APT::PackageSet::const_iterator I = pkgset.begin(); I != pkgset.end(); ++I) { pkgCache::PkgIterator Pkg = I.Group().FindPkg("any"); @@ -1644,7 +1651,8 @@ bool Madison(CommandLine &CmdL) if (_error->PendingError() == true) _error->Discard(); - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1); + APT::CacheSetHelper helper(true, GlobalError::NOTICE); + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1, helper); for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { if (Pkg.end() == false) diff --git a/debian/changelog b/debian/changelog index d6bfa76ee..bd3400d2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,17 @@ apt (0.7.26~exp12) UNRELEASEDexperimental; urgency=low + [ Michael Vogt ] * debian/control: - add dependency on zlib-dev for libapt-pkg-dev - * apt-pkg/cacheset.cc: - - make CacheSetHelper::canNotFindAllVer display a notice - only (for compat reasons). Otherwise tools like sbuild - blow up - -- Michael Vogt Thu, 29 Jul 2010 23:45:42 +0200 + [ David Kalnischkies ] + * apt-pkg/cacheset.cc: + - [ABI BREAK] add an ErrorType option to CacheSetHelper + * cmdline/apt-cache.cc: + - use Notice instead of Error in the CacheSetHelper messages + for compat reasons. Otherwise tools like sbuild blow up + + -- David Kalnischkies Fri, 30 Jul 2010 09:48:04 +0200 apt (0.7.26~exp11) experimental; urgency=low -- cgit v1.2.3 From 5c6a9439ea115ab7b5adb934f4955be893961830 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 30 Jul 2010 10:09:57 +0200 Subject: * debian/control: - remove libcurl3-gnutls-dev alternative as the package is gone - increase needed version of libcurl4-gnutls-dev to >= 7.19.0 as we use CURLOPT_{ISSUERCERT,CRLFILE} (Closes: #589642) --- debian/changelog | 6 +++++- debian/control | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bd3400d2b..14cc1c352 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,8 +10,12 @@ apt (0.7.26~exp12) UNRELEASEDexperimental; urgency=low * cmdline/apt-cache.cc: - use Notice instead of Error in the CacheSetHelper messages for compat reasons. Otherwise tools like sbuild blow up + * debian/control: + - remove libcurl3-gnutls-dev alternative as the package is gone + - increase needed version of libcurl4-gnutls-dev to >= 7.19.0 + as we use CURLOPT_{ISSUERCERT,CRLFILE} (Closes: #589642) - -- David Kalnischkies Fri, 30 Jul 2010 09:48:04 +0200 + -- David Kalnischkies Fri, 30 Jul 2010 10:08:42 +0200 apt (0.7.26~exp11) experimental; urgency=low diff --git a/debian/control b/debian/control index 345b72f55..dba0933b1 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Luca Bruno , Julian Andres Klode Standards-Version: 3.9.0 -Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen +Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen Build-Conflicts: autoconf2.13, automake1.4 Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ -- cgit v1.2.3 From 65f810811a5f66a934f933900c185bfd012a6b3e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 30 Jul 2010 11:02:24 +0200 Subject: - return success in show if a virtual package was given * --- cmdline/apt-cache.cc | 64 +++++++++++++++++++++++++++++++--------------------- debian/changelog | 4 +++- 2 files changed, 41 insertions(+), 27 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 2a4e200a7..6813d2978 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -46,6 +46,29 @@ using namespace std; +// CacheSetHelper saving virtual packages /*{{{*/ +class CacheSetHelperVirtuals: public APT::CacheSetHelper { +public: + APT::PackageSet virtualPkgs; + + virtual pkgCache::VerIterator canNotFindCandidateVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { + virtualPkgs.insert(Pkg); + return CacheSetHelper::canNotFindCandidateVer(Cache, Pkg); + } + + virtual pkgCache::VerIterator canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { + virtualPkgs.insert(Pkg); + return CacheSetHelper::canNotFindNewestVer(Cache, Pkg); + } + + virtual APT::VersionSet canNotFindAllVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { + virtualPkgs.insert(Pkg); + return CacheSetHelper::canNotFindAllVer(Cache, Pkg); + } + + CacheSetHelperVirtuals(bool const &ShowErrors = true, GlobalError::MsgType const &ErrorType = GlobalError::NOTICE) : CacheSetHelper(ShowErrors, ErrorType) {} +}; + /*}}}*/ // LocalitySort - Sort a version list by package file locality /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -173,7 +196,7 @@ bool UnMet(CommandLine &CmdL) } else { - APT::CacheSetHelper helper(true, GlobalError::NOTICE); + CacheSetHelperVirtuals helper(true, GlobalError::NOTICE); APT::VersionSet verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1, APT::VersionSet::CANDIDATE, helper); for (APT::VersionSet::iterator V = verset.begin(); V != verset.end(); ++V) @@ -555,22 +578,6 @@ bool DumpAvail(CommandLine &Cmd) } /*}}}*/ // ShowDepends - Helper for printing out a dependency tree /*{{{*/ -class CacheSetHelperDepends: public APT::CacheSetHelper { -public: - APT::PackageSet virtualPkgs; - - virtual pkgCache::VerIterator canNotFindCandidateVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { - virtualPkgs.insert(Pkg); - return pkgCache::VerIterator(Cache, 0); - } - - virtual pkgCache::VerIterator canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { - virtualPkgs.insert(Pkg); - return pkgCache::VerIterator(Cache, 0); - } - - CacheSetHelperDepends() : CacheSetHelper(false, GlobalError::NOTICE) {} -}; bool ShowDepends(CommandLine &CmdL, bool const RevDepends) { pkgCacheFile CacheFile; @@ -578,7 +585,7 @@ bool ShowDepends(CommandLine &CmdL, bool const RevDepends) if (unlikely(Cache == NULL)) return false; - CacheSetHelperDepends helper; + CacheSetHelperVirtuals helper(false); APT::VersionSet verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1, APT::VersionSet::CANDIDATE, helper); if (verset.empty() == true && helper.virtualPkgs.empty() == true) return false; @@ -1408,7 +1415,7 @@ bool ShowAuto(CommandLine &CmdL) bool ShowPackage(CommandLine &CmdL) { pkgCacheFile CacheFile; - APT::CacheSetHelper helper(true, GlobalError::NOTICE); + CacheSetHelperVirtuals helper(true, GlobalError::NOTICE); APT::VersionSet::Version const select = _config->FindB("APT::Cache::AllVersions", true) ? APT::VersionSet::ALL : APT::VersionSet::CANDIDATE; APT::VersionSet const verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1, select, helper); @@ -1416,9 +1423,14 @@ bool ShowPackage(CommandLine &CmdL) if (DisplayRecord(CacheFile, Ver) == false) return false; - if (verset.empty() == false) - return true; - return _error->Error(_("No packages found")); + if (verset.empty() == true) + { + if (helper.virtualPkgs.empty() == true) + return _error->Error(_("No packages found")); + else + _error->Notice(_("No packages found")); + } + return true; } /*}}}*/ // ShowPkgNames - Show package names /*{{{*/ @@ -1491,10 +1503,10 @@ bool ShowSrcPackage(CommandLine &CmdL) _error->Warning(_("Unable to locate package %s"),*I); continue; } - } - if (found > 0) - return true; - return _error->Error(_("No packages found")); + } + if (found == 0) + _error->Notice(_("No packages found")); + return true; } /*}}}*/ // Policy - Show the results of the preferences file /*{{{*/ diff --git a/debian/changelog b/debian/changelog index 14cc1c352..12c70884b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,12 +10,14 @@ apt (0.7.26~exp12) UNRELEASEDexperimental; urgency=low * cmdline/apt-cache.cc: - use Notice instead of Error in the CacheSetHelper messages for compat reasons. Otherwise tools like sbuild blow up + - return success in show if a virtual package was given * debian/control: - remove libcurl3-gnutls-dev alternative as the package is gone - increase needed version of libcurl4-gnutls-dev to >= 7.19.0 as we use CURLOPT_{ISSUERCERT,CRLFILE} (Closes: #589642) + * - -- David Kalnischkies Fri, 30 Jul 2010 10:08:42 +0200 + -- David Kalnischkies Fri, 30 Jul 2010 11:01:18 +0200 apt (0.7.26~exp11) experimental; urgency=low -- cgit v1.2.3 From e3326595301fc7bd1ee025a9dbb09ca51a08f5fa Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 30 Jul 2010 12:40:54 +0200 Subject: releasing version 0.7.26~exp12 --- debian/changelog | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 12c70884b..33bd66b1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.26~exp12) UNRELEASEDexperimental; urgency=low +apt (0.7.26~exp12) experimental; urgency=low [ Michael Vogt ] * debian/control: @@ -15,9 +15,8 @@ apt (0.7.26~exp12) UNRELEASEDexperimental; urgency=low - remove libcurl3-gnutls-dev alternative as the package is gone - increase needed version of libcurl4-gnutls-dev to >= 7.19.0 as we use CURLOPT_{ISSUERCERT,CRLFILE} (Closes: #589642) - * - -- David Kalnischkies Fri, 30 Jul 2010 11:01:18 +0200 + -- Michael Vogt Fri, 30 Jul 2010 11:55:48 +0200 apt (0.7.26~exp11) experimental; urgency=low -- cgit v1.2.3