From 2ac3eeb60e9ea171cee7a05a02424e61fe50d400 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 30 Mar 2006 10:38:14 +0200 Subject: * make the code follow the apt coding standards better * change the location to turn off pdiff (APT::PDiff=false) --- doc/examples/configure-index | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/examples/configure-index b/doc/examples/configure-index index dee0c06ff..965a09759 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -99,6 +99,8 @@ Acquire Queue-Mode "host"; // host|access Retries "0"; Source-Symlinks "true"; + + PDiffs "true"; // try to get the IndexFile diffs // HTTP method configuration http -- cgit v1.2.3-70-g09d2 From e47c7d16435822f40149cd831ff6ba0a143ded85 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 8 Jun 2007 22:21:42 +0200 Subject: * add "purge" commandline argument, closes: #133421) (thanks to Julien Danjou for the patch) --- cmdline/apt-get.cc | 7 ++++++- debian/changelog | 2 ++ doc/apt-get.8.xml | 6 ++++++ 3 files changed, 14 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 64882e3e8..c79c1559e 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1428,7 +1428,11 @@ bool DoInstall(CommandLine &CmdL) bool DefRemove = false; if (strcasecmp(CmdL.FileList[0],"remove") == 0) DefRemove = true; - + else if (strcasecmp(CmdL.FileList[0], "purge") == 0) + { + _config->Set("APT::Get::Purge", true); + DefRemove = true; + } for (const char **I = CmdL.FileList + 1; *I != 0; I++) { // Duplicate the string @@ -2443,6 +2447,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" + " purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" diff --git a/debian/changelog b/debian/changelog index a4757dad6..2dc11190d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -52,6 +52,8 @@ apt (0.6.47) UNRELEASED; urgency=low - check systemtable for architecture mapping too * fix error in AutocleanInterval, closes: #319339 (thanks to Israel G. Lugo for the patch) + * add "purge" commandline argument, closes: #133421) + (thanks to Julien Danjou for the patch) -- Michael Vogt Mon, 18 Dec 2006 19:39:05 +0100 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 17f663a35..0d080b885 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -42,6 +42,7 @@ dselect-upgrade install pkg remove pkg + purge pkg source pkg build-dep pkg check @@ -151,6 +152,11 @@ installed instead of removed. + purge + purge is identical to remove except that packages are + removed and purged. + + source source causes apt-get to fetch source packages. APT will examine the available packages to decide which source package to -- cgit v1.2.3-70-g09d2 From 1979e742ad5e2a0b6e547fbe3f4c4066b5a9bd2e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 8 Jun 2007 23:06:54 +0200 Subject: * add --dsc-only option, thanks to K. Richard Pixley --- cmdline/apt-get.cc | 8 +++++++- debian/changelog | 1 + doc/apt-get.8.xml | 6 +++--- po/apt-all.pot | 58 +++++++++++++++++++++++++++--------------------------- 4 files changed, 40 insertions(+), 33 deletions(-) (limited to 'doc') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index c79c1559e..6bbc40242 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1954,6 +1954,11 @@ bool DoSource(CommandLine &CmdL) I->Type != "tar") continue; + // Dsc only mode only fetches .dsc files + if (_config->FindB("APT::Get::Dsc-Only",false) == true && + I->Type != "dsc") + continue; + // don't download the same uri twice (should this be moved to // the fetcher interface itself?) if(queued.find(Last->Index().ArchiveURI(I->Path)) != queued.end()) @@ -2536,7 +2541,8 @@ 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,"tar-only","APT::Get::tar-Only",0}, + {0,"tar-only","APT::Get::Tar-Only",0}, + {0,"dsc-only","APT::Get::Dsc-Only",0}, {0,"purge","APT::Get::Purge",0}, {0,"list-cleanup","APT::Get::List-Cleanup",0}, {0,"reinstall","APT::Get::ReInstall",0}, diff --git a/debian/changelog b/debian/changelog index 7d06d98c6..dfdf0a401 100644 --- a/debian/changelog +++ b/debian/changelog @@ -56,6 +56,7 @@ apt (0.6.47) UNRELEASED; urgency=low (thanks to Julien Danjou for the patch) * fix FTBFS with gcc 4.3, closes: #417090 (thanks to Martin Michlmayr for the patch) + * add --dsc-only option, thanks to K. Richard Pixley -- Michael Vogt Mon, 18 Dec 2006 19:39:05 +0100 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 0d080b885..a6bb98ad0 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -399,9 +399,9 @@ Item: APT::Get::Only-Source. - - Download only the diff or tar file of a source archive. - Configuration Item: APT::Get::Diff-Only and + + Download only the diff, dsc, or tar file of a source archive. + Configuration Item: APT::Get::Diff-Only, APT::Get::Dsc-Only, and APT::Get::Tar-Only. diff --git a/po/apt-all.pot b/po/apt-all.pot index bfcd78c99..ad05fbdc8 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: 2007-06-08 22:53+0200\n" +"POT-Creation-Date: 2007-06-08 23:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -148,7 +148,7 @@ msgstr "" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:551 -#: cmdline/apt-get.cc:2391 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2396 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@ -709,7 +709,7 @@ msgstr "" msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1903 cmdline/apt-get.cc:2139 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1903 cmdline/apt-get.cc:2144 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" @@ -738,7 +738,7 @@ msgstr "" msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1998 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -772,7 +772,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2036 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2041 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -781,7 +781,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2045 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2050 msgid "Download complete and in download only mode" msgstr "" @@ -966,116 +966,116 @@ msgstr "" msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1928 cmdline/apt-get.cc:2157 +#: cmdline/apt-get.cc:1928 cmdline/apt-get.cc:2162 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1977 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:2001 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2009 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:2015 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:2046 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2069 +#: cmdline/apt-get.cc:2074 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2081 +#: cmdline/apt-get.cc:2086 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2082 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2104 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2118 +#: cmdline/apt-get.cc:2123 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2134 +#: cmdline/apt-get.cc:2139 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2162 +#: cmdline/apt-get.cc:2167 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2182 +#: cmdline/apt-get.cc:2187 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2234 +#: cmdline/apt-get.cc:2239 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2291 #, 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:2321 +#: cmdline/apt-get.cc:2326 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2346 +#: cmdline/apt-get.cc:2351 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2365 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2364 +#: cmdline/apt-get.cc:2369 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2396 +#: cmdline/apt-get.cc:2401 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2437 +#: cmdline/apt-get.cc:2442 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" -- cgit v1.2.3-70-g09d2