diff options
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 85 | ||||
| -rw-r--r-- | apt-pkg/deb/dpkgpm.h | 4 | ||||
| -rw-r--r-- | apt-pkg/init.cc | 2 | ||||
| -rw-r--r-- | cmdline/apt-get.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | po/ChangeLog | 8 | ||||
| -rw-r--r-- | po/gl.po | 26 | ||||
| -rw-r--r-- | po/sv.po | 61 |
8 files changed, 120 insertions, 78 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 3235b0b06..706abcb92 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -495,6 +495,46 @@ void pkgDPkgPM::DoDpkgStatusFd(int statusfd, int OutStatusFd) } /*}}}*/ +bool pkgDPkgPM::OpenLog() +{ + string logdir = _config->FindDir("Dir::Log"); + if(not FileExists(logdir)) + return _error->Error(_("Directory '%s' missing"), logdir.c_str()); + string logfile_name = flCombine(logdir, + _config->Find("Dir::Log::Terminal")); + if (!logfile_name.empty()) + { + term_out = fopen(logfile_name.c_str(),"a"); + 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, outstr); + fprintf(term_out, "\n"); + } + return true; +} + +bool pkgDPkgPM::CloseLog() +{ + if(term_out) + { + char outstr[200]; + time_t t = time(NULL); + struct tm *tmp = localtime(&t); + strftime(outstr, sizeof(outstr), "%F %T", tmp); + fprintf(term_out, "Log ended: "); + fprintf(term_out, outstr); + fprintf(term_out, "\n"); + fclose(term_out); + } + term_out = NULL; + return true; +} + // DPkgPM::Go - Run the sequence /*{{{*/ // --------------------------------------------------------------------- @@ -571,24 +611,7 @@ bool pkgDPkgPM::Go(int OutStatusFd) } // create log - string logdir = _config->FindDir("Dir::Log"); - if(not FileExists(logdir)) - return _error->Error(_("Directory '%s' missing"), logdir.c_str()); - string logfile_name = flCombine(logdir, - _config->Find("Dir::Log::Terminal")); - if (!logfile_name.empty()) - { - term_out = fopen(logfile_name.c_str(),"a"); - 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, outstr); - fprintf(term_out, "\n"); - } + OpenLog(); // this loop is runs once per operation for (vector<Item>::iterator I = List.begin(); I != List.end();) @@ -818,16 +841,16 @@ bool pkgDPkgPM::Go(int OutStatusFd) tv.tv_sec = 1; tv.tv_usec = 0; select_ret = select(max(master, _dpkgin)+1, &rfds, NULL, NULL, &tv); - if (select_ret == 0) - continue; - else if (select_ret < 0 && errno == EINTR) - continue; - else if (select_ret < 0) - { - perror("select() returned error"); - continue; - } - + if (select_ret == 0) + continue; + else if (select_ret < 0 && errno == EINTR) + continue; + else if (select_ret < 0) + { + perror("select() returned error"); + continue; + } + if(master >= 0 && FD_ISSET(master, &rfds)) DoTerminalPty(master); if(master >= 0 && FD_ISSET(0, &rfds)) @@ -867,14 +890,12 @@ bool pkgDPkgPM::Go(int OutStatusFd) if(stopOnError) { - if(term_out) - fclose(term_out); + CloseLog(); return false; } } } - if(term_out) - fclose(term_out); + CloseLog(); if (RunScripts("DPkg::Post-Invoke") == false) return false; diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index 448091626..b7f45b978 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -66,6 +66,10 @@ class pkgDPkgPM : public pkgPackageManager bool RunScriptsWithPkgs(const char *Cnf); bool SendV2Pkgs(FILE *F); + // dpkg log + bool OpenLog(); + bool CloseLog(); + // input processing void DoStdin(int master); void DoTerminalPty(int master); diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 676b66d38..2b412e16b 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -35,7 +35,7 @@ bool pkgInitConfig(Configuration &Cnf) // General APT things Cnf.Set("APT::Architecture", COMMON_ARCH); Cnf.Set("APT::Build-Essential::", "build-essential"); - Cnf.Set("APT::Install-Recommends", false); + Cnf.Set("APT::Install-Recommends", true); Cnf.Set("APT::Install-Suggests", false); Cnf.Set("Dir","/"); diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index e214691f8..efb618cb0 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2644,6 +2644,7 @@ bool ShowHelp(CommandLine &CmdL) " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" + " autoremove - Remove all automatic unused packages\n" " purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" @@ -2754,6 +2755,7 @@ int main(int argc,const char *argv[]) {"upgrade",&DoUpgrade}, {"install",&DoInstall}, {"remove",&DoInstall}, + {"purge",&DoInstall}, {"autoremove",&DoInstall}, {"purge",&DoInstall}, {"dist-upgrade",&DoDistUpgrade}, diff --git a/debian/changelog b/debian/changelog index e1f037350..22e966f0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,8 @@ apt (0.7.7) UNRELEASED; urgency=low * cmdline/apt-mark: - Fix chmoding after have renamed the extended-states file (LP: #140019) (thanks to Laurent Bigonville) + * apt-pkg/depcache.cc: + - set "APT::Install-Recommends" to true by default (OMG!) * debian/apt.cron.daily: - only run the cron job if apt-get check succeeds (LP: #131719) @@ -51,6 +53,8 @@ apt (0.7.7) UNRELEASED; urgency=low - Vietnamese updated. Closes: #440611 - Danish updated. Closes: #441102 - Thai added. Closes: #442833 + - Swedish updated. + - Galician updated. Closes: #446626 [ Otavio Salvador ] * Add hash support to copy method. Thanks Anders Kaseorg by the patch @@ -71,6 +75,10 @@ apt (0.7.7) UNRELEASED; urgency=low - cmdline/apt-extracttemplates.cc: likewise; - apt-pkg/deb/debmetaindex.cc: comparison with string literal results in unspecified behaviour; + * cmdline/apt-get.cc: adds 'autoremove' as a valid comment to usage + statement of apt-get (closes: #445468). + * cmdline/apt-get.cc: really applies Julien Danjou <acid@debian.org> + patch to add 'purge' command line argument (closes: #133421). [ Ian Jackson ] * dpkg-triggers: Deal properly with new package states. @@ -79,7 +87,7 @@ apt (0.7.7) UNRELEASED; urgency=low * apt-pkg/contrib/mmap.cc: - don't fail if msync() returns > 0 - -- Otavio Salvador <otavio@debian.org> Mon, 06 Aug 2007 10:44:53 -0300 + -- Otavio Salvador <otavio@debian.org> Sat, 06 Oct 2007 18:23:42 -0300 apt (0.7.6) unstable; urgency=low diff --git a/po/ChangeLog b/po/ChangeLog index 54fd2e055..fb1d9fe17 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,11 @@ +2007-10-14 Jacobo Tarrio <jtarrio@trasno.net> + + * gl.po: updated to 535t. Closes: #446626 + +2007-10-12 Peter Karlsson <peterk@debian.org> + + * sv.po: updated to 535t. + 2007-09-17 Theppitak Karoonboonyanan <thep@linux.thai.net> * th.po: added with 535t. Closes: #442833 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-08-04 09:09+0200\n" -"PO-Revision-Date: 2007-06-18 15:26+0200\n" +"PO-Revision-Date: 2007-10-14 14:35+0100\n" "Last-Translator: Jacobo TarrÃo <jtarrio@debian.org>\n" "Language-Team: Galician <proxecto@trasno.net>\n" "MIME-Version: 1.0\n" @@ -158,9 +158,9 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 #: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144 -#, fuzzy, c-format +#, c-format msgid "%s %s for %s compiled on %s %s\n" -msgstr "%s %s para %s %s compilado en %s %s\n" +msgstr "%s %s para %s compilado en %s %s\n" #: cmdline/apt-cache.cc:1721 msgid "" @@ -1688,9 +1688,10 @@ msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Este non é un arquivo DEB válido, falla o membro \"%s\"" #: apt-inst/deb/debfile.cc:50 -#, fuzzy, c-format +#, c-format msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" -msgstr "Este non é un arquivo DEB válido, non ten un membro \"%s\" ou \"%s\"" +msgstr "" +"Este non é un arquivo DEB válido, non ten un membro \"%s\", \"%s\" ou \"%s\"" #: apt-inst/deb/debfile.cc:110 #, c-format @@ -2110,9 +2111,9 @@ msgid "Opening configuration file %s" msgstr "A abrir o ficheiro de configuración %s" #: apt-pkg/contrib/configuration.cc:510 -#, fuzzy, c-format +#, c-format msgid "Line %d too long (max %u)" -msgstr "Liña %d longa de máis (máximo %lu)" +msgstr "Liña %d longa de máis (máximo %u)" #: apt-pkg/contrib/configuration.cc:606 #, c-format @@ -2669,9 +2670,8 @@ msgid "MD5Sum mismatch" msgstr "Os MD5Sum non coinciden" #: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405 -#, fuzzy msgid "Hash Sum mismatch" -msgstr "Os MD5Sum non coinciden" +msgstr "Os \"hashes\" non coinciden" #: apt-pkg/acquire-item.cc:1097 msgid "There is no public key available for the following key IDs:\n" @@ -2869,14 +2869,14 @@ msgid "Completely removed %s" msgstr "Eliminouse %s completamente" #: apt-pkg/deb/dpkgpm.cc:566 -#, fuzzy, c-format +#, c-format msgid "Directory '%s' missing" -msgstr "O directorio de listas %spartial falla." +msgstr "O directorio \"%s\" falla" #: apt-pkg/deb/dpkgpm.cc:709 -#, fuzzy, c-format +#, c-format msgid "openpty failed\n" -msgstr "Fallou a chamada a select" +msgstr "Fallou a chamada a openpty\n" #: methods/rred.cc:219 msgid "Could not patch file" @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-08-04 09:09+0200\n" -"PO-Revision-Date: 2007-07-14 18:39+0100\n" +"PO-Revision-Date: 2007-10-09 13:26+0100\n" "Last-Translator: Peter Karlsson <peterk@debian.org>\n" "Language-Team: Swedish <debian-l10n-swedish@debian.org>\n" "MIME-Version: 1.0\n" @@ -26,7 +26,7 @@ msgstr "" #: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" -msgstr "Kunde inte hitta paket %s" +msgstr "Kunde inte hitta paketet %s" #: cmdline/apt-cache.cc:247 msgid "Total package names : " @@ -159,9 +159,9 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 #: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144 -#, fuzzy, c-format +#, c-format msgid "%s %s for %s compiled on %s %s\n" -msgstr "%s %s för %s %s kompilerad den %s %s\n" +msgstr "%s %s för %s kompilerad den %s %s\n" #: cmdline/apt-cache.cc:1721 msgid "" @@ -234,7 +234,7 @@ msgstr "" " -q Inaktivera förloppsindikatorn.\n" " -i Visa endast viktiga beroenden för \"unmet\"-kommandot.\n" " -c=? Läs denna konfigurationsfil.\n" -" -o=? Ställ in en godtycklig konfigurationsflagga. T.ex -o dir::cache=/tmp\n" +" -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" "Se manualsidorna för apt-cache(8) och apt.conf(5) för mer information.\n" #: cmdline/apt-cdrom.cc:78 @@ -243,15 +243,15 @@ msgstr "Ange ett namn för denna skiva, exempelvis \"Debian 2.1r1 Disk 1\"" #: cmdline/apt-cdrom.cc:93 msgid "Please insert a Disc in the drive and press enter" -msgstr "Mata in skivan i enheten och tryck på Enter" +msgstr "Mata in en skiva i enheten och tryck på Enter" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." -msgstr "Repetera denna process för resten av cd-skivorna i din uppsättning." +msgstr "Upprepa proceduren för resten av cd-skivorna i din uppsättning." #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" -msgstr "Argumentetn gavs inte parvis" +msgstr "Argumenten gavs inte parvis" #: cmdline/apt-config.cc:76 msgid "" @@ -274,12 +274,12 @@ msgstr "" "\n" "Kommandon:\n" " shell - Skalläge.\n" -" dump - Visa konfiguraitonen.\n" +" dump - Visa konfigurationen.\n" "\n" "Flaggor:\n" " -h Denna hjälptext.\n" " -c=? Läs denna konfigurationsfil.\n" -" -o=? Ställ in en godtycklig konfigurationsflagga. T.ex -o dir::cache=/tmp\n" +" -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" #: cmdline/apt-extracttemplates.cc:98 #, c-format @@ -308,7 +308,7 @@ msgstr "" " -h Denna hjälptext.\n" " -t Ställ in temporärkatalogen.\n" " -c=? Läs denna konfigurationsfil.\n" -" -o=? Ställ in en godtycklig konfigurationsflagga. T.ex -o dir::cache=/tmp\n" +" -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format @@ -530,7 +530,7 @@ msgstr "*** Misslyckades med att länka %s till %s" #: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" -msgstr " Avlänkningsgränsen på %sB nådd.\n" +msgstr " Avlänkningsgränsen på %sB nåddes.\n" # Fält vid namn "Package" #: ftparchive/writer.cc:386 @@ -732,7 +732,7 @@ msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"VARNING: Följande systemkritiska paket kommer att tas bort\n" +"VARNING: Följande systemkritiska paket kommer att tas bort.\n" "Detta bör INTE genomföras såvida du inte vet exakt vad du gör!" #: cmdline/apt-get.cc:578 @@ -1204,12 +1204,12 @@ msgstr "Barnprocessen misslyckades" #: cmdline/apt-get.cc:2328 msgid "Must specify at least one package to check builddeps for" -msgstr "Du måste ange minst ett paket att inhämta byggberoenden för" +msgstr "Du måste ange minst ett paket att kontrollera byggberoenden för" #: cmdline/apt-get.cc:2356 #, c-format msgid "Unable to get build-dependency information for %s" -msgstr "Kunde inte hämta information on byggberoenden för %s" +msgstr "Kunde inte hämta information om byggberoenden för %s" #: cmdline/apt-get.cc:2376 #, c-format @@ -1335,7 +1335,7 @@ msgstr "" " -b Bygg källkodspaketet när det hämtats.\n" " -V Visa pratsamma versionsnummer.\n" " -c=? Läs denna konfigurationsfil.\n" -" -o=? Ställ in en godtycklig konfigurationsflagga. T.ex -o dir::cache=/tmp\n" +" -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" "Se manualsidorna för apt-get(8), sources.list(5) och apt.conf(5)\n" "för mer information och flaggor.\n" " Denna APT har Speciella Ko-Krafter.\n" @@ -1408,7 +1408,7 @@ msgstr "" " -h Denna hjälptext.\n" " -s Använd källkodsfilssortering.\n" " -c=? Läs denna konfigurationsfil.\n" -" -o=? Ställ in en godtycklig konfigurationsflagga. T.ex -o dir::cache=/tmp\n" +" -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" #: dselect/install:32 msgid "Bad default setting!" @@ -1490,7 +1490,7 @@ msgstr "DropNode anropat på fortfarande länkad nod" #: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" -msgstr "Misslyckades med att hitta hash-elementett!" +msgstr "Misslyckades med att hitta hash-elementet!" #: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" @@ -1688,9 +1688,9 @@ msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Detta är inte ett giltigt DEB-arkiv, delen \"%s\" saknas" #: apt-inst/deb/debfile.cc:50 -#, fuzzy, c-format +#, c-format msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" -msgstr "Detta är inte ett giltigt DEB-arkiv, både \"%s\" och \"%s\" saknas" +msgstr "Detta är inte ett giltigt DEB-arkiv, \"%s\", \"%s\" och \"%s\" saknas" # chdir #: apt-inst/deb/debfile.cc:110 @@ -2078,7 +2078,7 @@ msgstr "Fel vid läsning från server" #: methods/http.cc:1104 msgid "Bad header data" -msgstr "Felaktig data i huvud" +msgstr "Felaktiga data i huvud" #: methods/http.cc:1121 methods/http.cc:1176 msgid "Connection failed" @@ -2113,9 +2113,9 @@ msgid "Opening configuration file %s" msgstr "Öppnar konfigurationsfilen %s" #: apt-pkg/contrib/configuration.cc:510 -#, fuzzy, c-format +#, c-format msgid "Line %d too long (max %u)" -msgstr "Rad %d är för lång (max %lu)" +msgstr "Rad %d är för lång (max %u)" #: apt-pkg/contrib/configuration.cc:606 #, c-format @@ -2192,7 +2192,7 @@ msgstr "Flaggan %s kräver ett argument." #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "" -"Flagga %s: Den angivna konfigurationsposten måste innehålla ett =<värde>." +"Flaggan %s: Den angivna konfigurationsposten måste innehålla ett =<värde>." #: apt-pkg/contrib/cmndline.cc:234 #, c-format @@ -2540,7 +2540,7 @@ msgstr "Paketsystemet \"%s\" stöds inte" # #: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" -msgstr "Kunde inte fastställa en lämpligt paketsystemstyp" +msgstr "Kunde inte fastställa en lämplig paketsystemstyp" #: apt-pkg/clean.cc:57 #, c-format @@ -2679,9 +2679,8 @@ msgid "MD5Sum mismatch" msgstr "MD5-kontrollsumman stämmer inte" #: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405 -#, fuzzy msgid "Hash Sum mismatch" -msgstr "MD5-kontrollsumman stämmer inte" +msgstr "Hash-kontrollsumman stämmer inte" #: apt-pkg/acquire-item.cc:1097 msgid "There is no public key available for the following key IDs:\n" @@ -2874,14 +2873,14 @@ msgid "Completely removed %s" msgstr "Tog bort hela %s" #: apt-pkg/deb/dpkgpm.cc:566 -#, fuzzy, c-format +#, c-format msgid "Directory '%s' missing" -msgstr "Listkatalogen %spartial saknas." +msgstr "Katalogen \"%s\" saknas" #: apt-pkg/deb/dpkgpm.cc:709 -#, fuzzy, c-format +#, c-format msgid "openpty failed\n" -msgstr "\"Select\" misslyckades" +msgstr "\"openpty\" misslyckades\n" #: methods/rred.cc:219 msgid "Could not patch file" |