summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-10-08 19:57:42 +0200
committerMichael Vogt <mvo@debian.org>2013-10-08 19:57:42 +0200
commit15847d263c371cadcb8664021b8eb2444dd70998 (patch)
tree98d61389e9b23c11c0d034fd3fe950a6653ed90a
parent5361a6180571f5921b6c006129b5f0c274b6154b (diff)
parent4fb66d8731045e6ad90ef70dff45bd28815714fc (diff)
Merge remote-tracking branch 'mvo/feature/dpkg-progress-docs' into debian/sid
-rw-r--r--apt-private/private-cmndline.cc2
-rw-r--r--doc/apt-get.8.xml10
2 files changed, 10 insertions, 2 deletions
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index e8a21cb0c..5124ac157 100644
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -120,7 +120,7 @@ bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const * const
if (CmdMatches("install", "remove", "purge", "upgrade", "dist-upgrade",
"dselect-upgrade", "autoremove"))
{
- addArg(0, "dpkg-progress", "DpkgPM::Progress", 0);
+ addArg(0, "show-progress", "DpkgPM::Progress", 0);
addArg('f', "fix-broken", "APT::Get::Fix-Broken", 0);
addArg(0, "purge", "APT::Get::Purge", 0);
addArg('V',"verbose-versions","APT::Get::Show-Versions",0);
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index cc4e82255..18a559c0b 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -508,7 +508,15 @@
This is useful for tools like pbuilder.
Configuration Item: <literal>APT::Get::AllowUnauthenticated</literal>.</para></listitem>
</varlistentry>
-
+
+ <varlistentry><term><option>--show-progress</option></term>
+ <listitem><para>Show user friendly progress information in the
+ terminal window when packages are installed, upgraded or
+ removed. For a machine parsable version of this data see
+ README.progress-reporting in the apt doc directory.
+ <literal>DpkgPM::Progress</literal>.</para></listitem>
+ </varlistentry>
+
&apt-commonoptions;