From: Michael Vogt <mvo@debian.org>
Date: Tue, 8 Oct 2013 17:57:42 +0000 (+0200)
Subject: Merge remote-tracking branch 'mvo/feature/dpkg-progress-docs' into debian/sid
X-Git-Tag: 0.9.12~12
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/15847d263c371cadcb8664021b8eb2444dd70998?hp=-c

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

15847d263c371cadcb8664021b8eb2444dd70998
diff --combined apt-private/private-cmndline.cc
index e8a21cb0c,eedabe20c..5124ac157
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@@ -62,12 -62,8 +62,12 @@@ bool addArgumentsAPTCache(std::vector<C
     {
        addArg(0, "all-names", "APT::Cache::AllNames", 0);
     }
 +   else if (CmdMatches("unmet"))
 +   {
 +      addArg('i', "important", "APT::Cache::Important", 0);
 +   }
     else if (CmdMatches("gencaches", "showsrc", "showpkg", "stats", "dump",
 -	    "dumpavail", "unmet", "showauto", "policy", "madison"))
 +	    "dumpavail", "showauto", "policy", "madison"))
        ;
     else
        return false;
@@@ -120,7 -116,7 +120,7 @@@ bool addArgumentsAPTGet(std::vector<Com
     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);