* Apply --important option to apt-cache depends (LP: #16947)

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index d73111b6a505b89f16ad41b2ca143e57ffe20b05..a73e35a53e78b66546a5deed987c83eace94752e 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -555,6 +555,7 @@ bool Depends(CommandLine &CmdL)
    
    bool Recurse = _config->FindB("APT::Cache::RecurseDepends",false);
    bool Installed = _config->FindB("APT::Cache::Installed",false);
    
    bool Recurse = _config->FindB("APT::Cache::RecurseDepends",false);
    bool Installed = _config->FindB("APT::Cache::Installed",false);

+   bool Important = _config->FindB("APT::Cache::Important",false);

    bool DidSomething;
    do
    {
    bool DidSomething;
    do
    {


@@ -577,7 +578,12 @@ bool Depends(CommandLine &CmdL)
         
         for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++)
         {
         
         for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++)
         {

-
+           // Important deps only
+           if (Important == true)
+              if (D->Type != pkgCache::Dep::PreDepends &&
+                  D->Type != pkgCache::Dep::Depends)
+                 continue;
+                 

            pkgCache::PkgIterator Trg = D.TargetPkg();
 
            if((Installed && Trg->CurrentVer != 0) || !Installed)
            pkgCache::PkgIterator Trg = D.TargetPkg();
 
            if((Installed && Trg->CurrentVer != 0) || !Installed)

diff --git a/debian/changelog b/debian/changelog
index c788c1d7d036db24d9762d38c601bf61a94f1c96..24f876e447bea67445e90118871b58410260f7fa 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,7 +29,7 @@ apt (0.7.15) UNRELEASED; urgency=low
 
   [ Dereck Wonnacott ]
   * apt-ftparchive might write corrupt Release files (LP: #46439)
 
   [ Dereck Wonnacott ]
   * apt-ftparchive might write corrupt Release files (LP: #46439)

-
+  * Apply --important option to apt-cache depends (LP: #16947) 

 
  --
 
 
  --
 

diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index c1e65332d48aa8d5582dd918781c72e1a4bea6a3..c359ac3d8dc67f34c22de5a4e45d70f4c3c52d53 100644 (file)
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -289,7 +289,7 @@ Reverse Provides:
      </varlistentry>
 
      <varlistentry><term><option>-i</option></term><term><option>--important</option></term>
      </varlistentry>
 
      <varlistentry><term><option>-i</option></term><term><option>--important</option></term>

-     <listitem><para>Print only important dependencies; for use with unmet. Causes only Depends and 
+     <listitem><para>Print only important dependencies; for use with unmet and depends. Causes only Depends and 

      Pre-Depends relations to be printed.
      Configuration Item: <literal>APT::Cache::Important</literal>.</para></listitem>
      </varlistentry>
      Pre-Depends relations to be printed.
      Configuration Item: <literal>APT::Cache::Important</literal>.</para></listitem>
      </varlistentry>