Merge remote-tracking branch 'mvo/feature/dpkg-progress-docs' into debian/sid
authorMichael Vogt <mvo@debian.org>
Tue, 8 Oct 2013 17:57:42 +0000 (19:57 +0200)
committerMichael Vogt <mvo@debian.org>
Tue, 8 Oct 2013 17:57:42 +0000 (19:57 +0200)
1  2 
apt-private/private-cmndline.cc

index e8a21cb0cc07a0654f681d23d34bd70f43b83bcb,eedabe20c190a0d25debb29a9ce3581a8b49306e..5124ac157358e5864e2dcc884b16ecd9c6e6a72c
@@@ -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);