[yum-git] debuginfo-install.py repoclosure.py repodiff.py repomanage.py repotrack.py yum-complete-transaction.py

Seth Vidal skvidal at linux.duke.edu
Wed Jan 23 05:49:00 UTC 2008


 debuginfo-install.py        |    5 ++++-
 repoclosure.py              |    8 +++++++-
 repodiff.py                 |   14 ++++++++++----
 repomanage.py               |    7 ++++++-
 repotrack.py                |    7 ++++++-
 yum-complete-transaction.py |    7 ++++++-
 6 files changed, 39 insertions(+), 9 deletions(-)

New commits:
commit 4ff7ea06adaf28e86ae8f01b519fdd60b12a734b
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Jan 23 00:48:46 2008 -0500

    add better usage explanations to a lot of yum-utils. helps to give people an
    idea what the tool is used for.

diff --git a/debuginfo-install.py b/debuginfo-install.py
index 78c1975..bbdac35 100755
--- a/debuginfo-install.py
+++ b/debuginfo-install.py
@@ -28,7 +28,10 @@ from utils import YumUtilBase
 class DebugInfoInstall(YumUtilBase):
     NAME = 'debuginfo-install'
     VERSION = '1.0'
-    USAGE = '"usage: debuginfo-install [options] package1 [package2] [package..]'
+    USAGE = """
+    debuginfo-install: Install debuginfo packages and their dependencies based on 
+                       the name of the non-debug package
+    debuginfo-install [options] package1 [package2] [package..]"""
     
     def __init__(self):
         YumUtilBase.__init__(self,
diff --git a/repoclosure.py b/repoclosure.py
index d4cd9ef..5012ec4 100755
--- a/repoclosure.py
+++ b/repoclosure.py
@@ -33,7 +33,13 @@ from yum.constants import *
 from yum.packageSack import ListPackageSack
 
 def parseArgs():
-    usage = "usage: %s [-c <config file>] [-a <arch>] [-r <repoid>] [-r <repoid2>]" % sys.argv[0]
+    usage = """
+    Read in the metadata of a series of repositories and check all the   
+    dependencies in all packages for resolution. Print out the list of
+    packages with unresolved dependencies
+    
+    %s [-c <config file>] [-a <arch>] [-r <repoid>] [-r <repoid2>]
+    """ % sys.argv[0]
     parser = OptionParser(usage=usage)
     parser.add_option("-c", "--config", default='/etc/yum.conf',
         help='config file to use (defaults to /etc/yum.conf)')
diff --git a/repodiff.py b/repodiff.py
index af91470..d6a22d5 100755
--- a/repodiff.py
+++ b/repodiff.py
@@ -85,8 +85,13 @@ def parseArgs(args):
     """
        Parse the command line args. return a list of 'new' and 'old' repos
     """
+    usage = """
+    repodiff: take 2 or more repositories and return a list of added, removed and changed
+              packages.
+              
+    repodiff --old=old_repo_baseurl --new=new_repo_baseurl """
     
-    parser = OptionParser(version = "repodiff 0.2")
+    parser = OptionParser(version = "repodiff 0.2", usage=usage)
     # query options
     parser.add_option("-n", "--new", default=[], action="append",
                       help="new baseurl[s] for repos")
@@ -95,15 +100,16 @@ def parseArgs(args):
     parser.add_option("-q", "--quiet", default=False, action='store_true')
     
     (opts, argsleft) = parser.parse_args()
+
+    if not opts.new or not opts.old:
+        parser.print_usage()
+        sys.exit(1)
     
     return opts
 
 def main(args):
     opts = parseArgs(args)
 
-    if not opts.new or not opts.old:
-        print "\nUsage:\n     repodiff --old=old_repo_baseurl --new=new_repo_baseurl\n"
-        sys.exit(1)
             
     my = DiffYum()
     my.dy_shutdown_all_other_repos()
diff --git a/repomanage.py b/repomanage.py
index 5125241..53df548 100755
--- a/repomanage.py
+++ b/repomanage.py
@@ -136,7 +136,12 @@ def trimRpms(rpms, excludeGlobs):
 
 
 def parseargs(args):
-    usage = "repomanage [--old] [--new] path."
+    usage = """
+    repomanage: manage a directory of rpm packages. returns lists of newest 
+                or oldest packages in a directory for easy piping to xargs
+                or similar programs.
+    repomanage [--old] [--new] path.
+    """
     parser = OptionParser(usage=usage)
     
     # new is only used to make sure that the user is not trying to get both 
diff --git a/repotrack.py b/repotrack.py
index 51620ae..b89386d 100755
--- a/repotrack.py
+++ b/repotrack.py
@@ -82,7 +82,12 @@ def more_to_check(unprocessed_pkgs):
     return False
 
 def parseArgs():
-    usage = "usage: %s [options] package1 [package2] [package..]" % sys.argv[0]
+    usage = """
+    Repotrack: keep current on any given pkg and its deps. It will download the package(s) you 
+               want to track and all of their dependencies
+    
+    %s [options] package1 [package2] [package..]    """ % sys.argv[0]
+    
     parser = OptionParser(usage=usage)
     parser.add_option("-c", "--config", default='/etc/yum.conf',
         help='config file to use (defaults to /etc/yum.conf)')
diff --git a/yum-complete-transaction.py b/yum-complete-transaction.py
index f431b0c..c484769 100755
--- a/yum-complete-transaction.py
+++ b/yum-complete-transaction.py
@@ -98,7 +98,12 @@ except ImportError:
 class YumCompleteTransaction(YumUtilBase):
     NAME = 'yum-complete-transactions'
     VERSION = '1.0'
-    USAGE = '"usage: yum-complete-transaction'
+    USAGE = """
+    yum-complete-transaction: completes unfinished yum transactions which occur due to error, failure 
+                              or act of $deity
+    
+    usage: yum-complete-transaction
+    """
     
     def __init__(self):
         YumUtilBase.__init__(self,



More information about the Yum-cvs-commits mailing list