[yum-commits] 2 commits - docs/repoquery.1 repoquery.py yum-utils.bash

[Ville Skyttä]

 docs/repoquery.1 |   10 +++++++---
 repoquery.py     |    6 ++++--
 yum-utils.bash   |    2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit 14915d6ce7ce06837f9ccaacb875234ece9c8ce4
Merge: bc3d026... d2ed953...
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Wed Feb 10 22:59:30 2010 +0200

    Merge branch 'master' of ssh://yum.baseurl.org/srv/projects/yum/git/yum-utils

commit bc3d026acd1c8f332d024bf9a9918da6451c8c07
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Tue Feb 9 21:35:15 2010 +0200

    Make --alldeps the default in repoquery.
    
    --alldeps is what people really almost always want, but fail to
    specify for some reason.  --exactdeps can be used to get the previous
    default of exact matching.

diff --git a/docs/repoquery.1 b/docs/repoquery.1
index 1056c80..e5ed8b7 100644
--- a/docs/repoquery.1
+++ b/docs/repoquery.1
@@ -107,8 +107,12 @@ Query all packages that provide CAPABILITY.
 .IP "\fB\-\-whatrequires CAPABILITY\fP"
 Query all packages that require CAPABILITY.
 .IP "\fB\-\-alldeps\fP"
-When used with --whatrequires, use both automatic and manual dependencies
-for the query.
+When used with --whatrequires, look for non-explicit dependencies in
+addition to explicit ones (e.g. files and Provides in addition to
+package names).  This is the default.
+.IP "\fB\-\-exactdeps\fP"
+When used with --whatrequires, search for dependencies only exactly as given.
+This is effectively the opposite of --alldeps.
 .IP "\fB\-\-recursive\fP"
 When used with --whatrequires, query packages recursively.
 .IP "\fB\-\-archlist=ARCH1[,ARCH2...]\fP"
@@ -147,7 +151,7 @@ Query groups instead of packages.
 .IP "List all packages whose name contains 'perl':"
 \fBrepoquery '*perl*'\fP
 .IP "List all packages depending on openssl:"
-\fBrepoquery --whatrequires --alldeps openssl\fP 
+\fBrepoquery --whatrequires openssl\fP 
 .IP "List all package names and the repository they come from, nicely formatted:"
 \fBrepoquery -a --qf "%-20{repoid} %{name}"\fP
 .IP "List name and summary of all available updates (if any), nicely formatted:"
diff --git a/repoquery.py b/repoquery.py
index 2e3004b..3e2c18a 100755
--- a/repoquery.py
+++ b/repoquery.py
@@ -647,8 +647,10 @@ def main(args):
                       help="operate on corresponding source RPM")
     parser.add_option("--resolve", action="store_true",
                       help="resolve capabilities to originating package(s)")
-    parser.add_option("--alldeps", action="store_true",
-                      help="check non-explicit dependencies (files and Provides:) as well")
+    parser.add_option("--alldeps", action="store_true", default=True,
+                      help="check non-explicit dependencies (files and Provides:) as well, defaults to on")
+    parser.add_option("--exactdeps", dest="alldeps", action="store_false",
+                      help="check dependencies exactly as given, opposite of --alldeps")
     parser.add_option("--recursive", action="store_true",
                       help="recursively query for packages (for whatrequires)")
     parser.add_option("--whatprovides", action="store_true",
diff --git a/yum-utils.bash b/yum-utils.bash
index d8ca1dd..7df1b49 100644
--- a/yum-utils.bash
+++ b/yum-utils.bash
@@ -210,7 +210,7 @@ _yu_repoquery()
     COMPREPLY=( $( compgen -W '--version --help --list --info --file
         --queryformat --groupmember --all --requires --provides --obsoletes
         --conflicts --changelog --location --nevra --envra --nvr --source
-        --srpm --resolve --alldeps --recursive --whatprovides --whatrequires
+        --srpm --resolve --exactdeps --recursive --whatprovides --whatrequires
         --whatobsoletes --whatconflicts --group --grouppkgs --archlist
         --pkgnarrow --show-duplicates --repoid --enablerepo --disablerepo
         --repofrompath --plugins --quiet --verbose --cache --tempcache