Просмотр исходного кода

Merge remote-tracking branch 'mvo/feature/dpkg-progress-docs' into debian/sid

Michael Vogt лет назад: 12
Родитель
Сommit
15847d263c
2 измененных файлов с 10 добавлено и 2 удалено
  1. 1 1
      apt-private/private-cmndline.cc
  2. 9 1
      doc/apt-get.8.xml

+ 1 - 1
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);

+ 9 - 1
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;