diff options
| -rw-r--r-- | apt-pkg/init.cc | 2 | ||||
| -rw-r--r-- | apt-private/private-cmndline.cc | 4 | ||||
| -rw-r--r-- | apt-private/private-install.cc | 6 | ||||
| -rw-r--r-- | cmdline/apt-get.cc | 1 | ||||
| -rw-r--r-- | cmdline/apt.cc | 1 | ||||
| -rwxr-xr-x | debian/apt.systemd.daily | 2 | ||||
| -rw-r--r-- | po/it.po | 69 | ||||
| -rwxr-xr-x | test/integration/test-apt-get-autoremove | 15 | ||||
| -rwxr-xr-x | test/integration/test-pdiff-usage | 8 | ||||
| -rw-r--r-- | vendor/tanglu/apt-vendor.ent | 14 | ||||
| -rw-r--r-- | vendor/tanglu/sources.list.in | 7 |
11 files changed, 51 insertions, 78 deletions
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 9a51e31e7..3502e7ddc 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -205,9 +205,7 @@ bool pkgInitConfig(Configuration &Cnf) Cnf.CndSet("Acquire::IndexTargets::deb-src::Sources::Optional", false); Cnf.CndSet("Acquire::Changelogs::URI::Origin::Debian", "https://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog"); - Cnf.CndSet("Acquire::Changelogs::URI::Origin::Tanglu", "http://metadata.tanglu.org/changelogs/@CHANGEPATH@_changelog"); Cnf.CndSet("Acquire::Changelogs::URI::Origin::Ubuntu", "https://changelogs.ubuntu.com/changelogs/pool/@CHANGEPATH@/changelog"); - Cnf.CndSet("Acquire::Changelogs::URI::Origin::Ultimedia", "http://packages.ultimediaos.com/changelogs/pool/@CHANGEPATH@/changelog.txt"); Cnf.CndSet("Acquire::Changelogs::AlwaysOnline::Origin::Ubuntu", true); // Read an alternate config file diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index 5ad3b65d3..101e0ae40 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -176,7 +176,7 @@ static bool addArgumentsAPTHelper(std::vector<CommandLine::Args> &Args, char con static bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const * const Cmd)/*{{{*/ { if (CmdMatches("install", "remove", "purge", "upgrade", "dist-upgrade", - "dselect-upgrade", "autoremove", "full-upgrade")) + "dselect-upgrade", "autoremove", "autopurge", "full-upgrade")) { addArg(0, "show-progress", "DpkgPM::Progress", 0); addArg('f', "fix-broken", "APT::Get::Fix-Broken", 0); @@ -240,7 +240,7 @@ static bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const addArg(0, "color", "APT::Moo::Color", 0); if (CmdMatches("install", "remove", "purge", "upgrade", "dist-upgrade", - "dselect-upgrade", "autoremove", "auto-remove", "clean", "autoclean", "auto-clean", "check", + "dselect-upgrade", "autoremove", "auto-remove", "autopurge", "clean", "autoclean", "auto-clean", "check", "build-dep", "full-upgrade", "source")) { addArg('s', "simulate", "APT::Get::Simulate", 0); diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc index 4e888a9bd..1713ff308 100644 --- a/apt-private/private-install.cc +++ b/apt-private/private-install.cc @@ -599,6 +599,12 @@ bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, std::vector<PseudoPkg _config->Set("APT::Get::AutomaticRemove", "true"); fallback = MOD_REMOVE; } + else if (strcasecmp(CmdL.FileList[0], "autopurge") == 0) + { + _config->Set("APT::Get::AutomaticRemove", "true"); + _config->Set("APT::Get::Purge", true); + fallback = MOD_REMOVE; + } std::list<APT::VersionSet::Modifier> mods; mods.push_back(APT::VersionSet::Modifier(MOD_INSTALL, "+", diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 39855e05a..6d25ed509 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -409,6 +409,7 @@ static std::vector<aptDispatchWithHelp> GetCommands() /*{{{*/ {"purge", &DoInstall, _("Remove packages and config files")}, {"autoremove", &DoInstall, _("Remove automatically all unused packages")}, {"auto-remove", &DoInstall, nullptr}, + {"autopurge",&DoInstall, nullptr}, {"markauto", &DoMarkAuto, nullptr}, {"unmarkauto", &DoMarkAuto, nullptr}, {"dist-upgrade", &DoDistUpgrade, _("Distribution upgrade, see apt-get(8)")}, diff --git a/cmdline/apt.cc b/cmdline/apt.cc index 6bf85467e..776b100bf 100644 --- a/cmdline/apt.cc +++ b/cmdline/apt.cc @@ -66,6 +66,7 @@ static std::vector<aptDispatchWithHelp> GetCommands() /*{{{*/ {"remove", &DoInstall, _("remove packages")}, {"autoremove", &DoInstall, _("Remove automatically all unused packages")}, {"auto-remove", &DoInstall, nullptr}, + {"autopurge",&DoInstall, nullptr}, {"purge", &DoInstall, nullptr}, // system wide stuff diff --git a/debian/apt.systemd.daily b/debian/apt.systemd.daily index b532bd151..c6fbca03f 100755 --- a/debian/apt.systemd.daily +++ b/debian/apt.systemd.daily @@ -470,7 +470,7 @@ if [ "$1" = "update" ] || [ -z "$1" ] ; then debug_echo "download upgradable (not run)" fi - if which unattended-upgrade >/dev/null 2>&1 && unattended-upgrade --help | grep -q download-only && check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $UnattendedUpgradeInterval; then + if which unattended-upgrade >/dev/null 2>&1 && env LC_ALL=C.UTF-8 unattended-upgrade --help | grep -q download-only && check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $UnattendedUpgradeInterval; then if unattended-upgrade --download-only $XUUPOPT; then update_stamp $DOWNLOAD_UPGRADEABLE_STAMP debug_echo "unattended-upgrade -d (success)" @@ -1,15 +1,15 @@ # Italian translation of apt -# Copyright (C) 2002-2010, 2011, 2012, 2013, 2014, 2015, 2017 The Free Software Foundation, Inc. +# Copyright (C) 2002-2010, 2011, 2012, 2013, 2014, 2015, 2017, 2018 The Free Software Foundation, Inc. # This file is distributed under the same license as the apt package. # Samuele Giovanni Tonon <samu@debian.org>, 2002. -# Milo Casagrande <milo@milo.name>, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2017. +# Milo Casagrande <milo@milo.name>, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2017, 2018. # msgid "" msgstr "" -"Project-Id-Version: apt 1.6~alpha5\n" +"Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2018-09-18 16:15+0200\n" -"PO-Revision-Date: 2017-11-27 13:57+0100\n" +"POT-Creation-Date: 2018-11-13 10:31+0100\n" +"PO-Revision-Date: 2018-12-04 09:33+0100\n" "Last-Translator: Milo Casagrande <milo@milo.name>\n" "Language-Team: Italian <tp@lists.linux.it>\n" "Language: it\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -"X-Generator: Poedit 2.0.4\n" +"X-Generator: Poedit 2.1.1\n" #: apt-inst/contrib/arfile.cc msgid "Invalid archive signature" @@ -357,16 +357,13 @@ msgstr "" #. the time until the file will be valid - formatted in the same way as in #. the download progress display (e.g. 7d 3h 42min 1s) #: apt-pkg/acquire-item.cc -#, fuzzy, c-format -#| msgid "" -#| "Release file for %s is expired (invalid since %s). Updates for this " -#| "repository will not be applied." +#, c-format msgid "" "Release file for %s is not valid yet (invalid for another %s). Updates for " "this repository will not be applied." msgstr "" -"Il file Release per %s è scaduto (non valido dal %s). Gli aggiornamenti per " -"questo repository non verranno applicati." +"Il file Release per %s non è ancora valido (non valido per %s). Gli " +"aggiornamenti per questo repository non verranno applicati." #: apt-pkg/acquire-item.cc #, c-format @@ -1154,23 +1151,19 @@ msgid "Unable to parse package file %s (%d)" msgstr "Impossibile analizzare il file di pacchetto %s (%d)" #: apt-pkg/deb/debsystem.cc -#, fuzzy, c-format -#| msgid "" -#| "Unable to lock the administration directory (%s), is another process " -#| "using it?" +#, c-format msgid "" "Unable to acquire the dpkg frontend lock (%s), is another process using it?" msgstr "" -"Impossibile acquisire il blocco sulla directory di amministrazione (%s). Un " -"altro processo potrebbe tenerla occupata." +"Impossibile acquisire il blocco sul frontend dpkg (%s). Un altro processo " +"potrebbe tenerlo occupato." #: apt-pkg/deb/debsystem.cc -#, fuzzy, c-format -#| msgid "Unable to lock the administration directory (%s), are you root?" +#, c-format msgid "Unable to acquire the dpkg frontend lock (%s), are you root?" msgstr "" -"Impossibile acquisire il blocco sulla directory di amministrazione (%s). È " -"necessario essere root." +"Impossibile acquisire il blocco sul frontend dpkg (%s). È necessario essere " +"root." #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a @@ -3041,7 +3034,7 @@ msgstr "Attende che il sistema sia online" #: cmdline/apt-helper.cc msgid "drop privileges before running given command" -msgstr "" +msgstr "Rilascia i privilegi prima di eseguire il comando fornito" #: cmdline/apt-internal-planner.cc msgid "" @@ -3691,10 +3684,9 @@ msgid "[IP: %s %s]" msgstr "[IP: %s %s]" #: methods/connect.cc -#, fuzzy, c-format -#| msgid "Connecting to %s (%s)" +#, c-format msgid "Connected to %s (%s)" -msgstr "Connessione a %s (%s)" +msgstr "Connessi a %s (%s)" #: methods/connect.cc methods/http.cc #, c-format @@ -3995,28 +3987,3 @@ msgstr "Connessione chiusa prematuramente" #: methods/store.cc msgid "Empty files can't be valid archives" msgstr "File vuoti non possono essere archivi validi" - -#~ msgid "Removed %s" -#~ msgstr "Pacchetto %s rimosso" - -#~ msgid "Package file %s is out of sync." -#~ msgstr "Il file dei pacchetti %s non è sincronizzato." - -#~ msgid "No mirror file '%s' found " -#~ msgstr "Nessun file mirror \"%s\" trovato " - -#~ msgid "Can not read mirror file '%s'" -#~ msgstr "Impossibile leggere il file mirror \"%s\"" - -#~ msgid "No entry found in mirror file '%s'" -#~ msgstr "Nessuna voce trovata nel file mirror \"%s\"" - -#~ msgid "[Mirror: %s]" -#~ msgstr "[Mirror: %s]" - -# (ndt) sarebbe da controllare se veramente possono esistere più file indice -#~ msgid "" -#~ "The package index files are corrupted. No Filename: field for package %s." -#~ msgstr "" -#~ "I file indice del pacchetto sono danneggiati. Manca il campo \"Filename:" -#~ "\" per il pacchetto %s." diff --git a/test/integration/test-apt-get-autoremove b/test/integration/test-apt-get-autoremove index 4dba4f164..5546958a0 100755 --- a/test/integration/test-apt-get-autoremove +++ b/test/integration/test-apt-get-autoremove @@ -219,5 +219,20 @@ Remv foo-multi2-2 [1] Remv foo-plus-1 [1] Remv foo-plus-2 [1]' apt autoremove -s + +testsuccessequal 'Reading package lists... +Building dependency tree... +Reading state information... +The following packages will be REMOVED: + foo-multi1-1* foo-multi1-2* foo-multi2-1* foo-multi2-2* foo-plus-1* + foo-plus-2* +0 upgraded, 0 newly installed, 6 to remove and 0 not upgraded. +Purg foo-multi1-1 [1] +Purg foo-multi1-2 [1] +Purg foo-multi2-1 [1] +Purg foo-multi2-2 [1] +Purg foo-plus-1 [1] +Purg foo-plus-2 [1]' apt autopurge -s + testdpkgstatus 'pi' '1' 'unrelated' testsuccess apt purge unrelated -y diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage index 7cda2ee45..c5726dd08 100755 --- a/test/integration/test-pdiff-usage +++ b/test/integration/test-pdiff-usage @@ -251,7 +251,13 @@ SHA256-Download: cp Packages-future aptarchive/Packages rm -f rootdir/var/lib/apt/lists/*_Contents-* webserverconfig 'aptwebserver::overwrite::.*Contents-.*::filename' '/hacked-i386.gz' - testfailure apt update "$@" + # This should work in at least 4% of the cases... + for i in $(seq 25); do + testfailure apt update "$@" + if ! grep 'rred:600' rootdir/tmp/testfailure.output; then + break + fi + done webserverconfig 'aptwebserver::overwrite::.*Contents-.*::filename' '/Contents-i386.gz' cp rootdir/tmp/testfailure.output patchdownload.output testfailure grep 'rred:600' patchdownload.output diff --git a/vendor/tanglu/apt-vendor.ent b/vendor/tanglu/apt-vendor.ent deleted file mode 100644 index f5cd813bf..000000000 --- a/vendor/tanglu/apt-vendor.ent +++ /dev/null @@ -1,14 +0,0 @@ -<!-- details about the keys used by the distribution --> -<!ENTITY keyring-distro "Tanglu"> -<!ENTITY keyring-package "<package>tanglu-archive-keyring</package>"> -<!ENTITY keyring-filename "<filename>/usr/share/keyrings/tanglu-archive-keyring.gpg</filename>"> -<!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/tanglu-archive-removed-keys.gpg</filename>"> -<!ENTITY keyring-master-filename ""> -<!ENTITY keyring-uri ""> -<!ENTITY current-codename "bartholomea"> - -<!ENTITY sourceslist-list-format "deb http://archive.tanglu.org/tanglu ¤t-codename; main contrib non-free"> -<!ENTITY sourceslist-sources-format "Types: deb -URIs: http://archive.tanglu.org/tanglu -Suites: ¤t-codename; -Components: main contrib non-free"> diff --git a/vendor/tanglu/sources.list.in b/vendor/tanglu/sources.list.in deleted file mode 100644 index ce95e70c2..000000000 --- a/vendor/tanglu/sources.list.in +++ /dev/null @@ -1,7 +0,0 @@ -# See sources.list(5) manpage for more information - -deb http://archive.tanglu.org/tanglu ¤t-codename; main contrib non-free -#deb-src http://archive.tanglu.org/tanglu ¤t-codename; main contrib non-free - -#deb http://archive.tanglu.org/tanglu ¤t-codename;-updates main contrib non-free -#deb-src http://archive.tanglu.org/tanglu ¤t-codename;-updates main contrib non-free |