Attachment 293595 Details for Bug 430704 – Fix usage in all command-line programs

[patch] Fix usage in all command-line programs

freeipa-621-usage.patch (text/plain), 7.83 KB, created by Rob Crittenden on 2008-01-31 15:54:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Crittenden

Created: 2008-01-31 15:54:39 UTC

Size: 7.83 KB

patch

obsolete

># HG changeset patch
># User Rob Crittenden <rcritten@redhat.com>
># Date 1201794725 18000
># Node ID fc901c4cde816e8104ee66ed0cc7eddd285b7fb9
># Parent  42b61b49f827728eb2b06c83a0de4cfaa5033a47
>Handle the --usage option by actually displaying the usage
>Fix some missing options in --usage
>Remove a few debugging statements
>Resolves 430704
>
>diff -r 42b61b49f827 -r fc901c4cde81 ipa-admintools/ipa-adddelegation
>--- a/ipa-admintools/ipa-adddelegation	Wed Jan 30 15:16:43 2008 -0500
>+++ b/ipa-admintools/ipa-adddelegation	Thu Jan 31 10:52:05 2008 -0500
>@@ -34,7 +34,7 @@ import errno
> import errno
> 
> def usage():
>-    print "ipa-adddelgation [-a|--attributes attr1,attr2,..,attrn] [-s|--source STRING] [-t|--target STRING] name"
>+    print "ipa-adddelgation [-a|--attributes attr1,attr2,..,attrn] [-l|--list] [-s|--source STRING] [-t|--target STRING] name"
>     sys.exit(1)
> 
> def parse_options():
>@@ -58,6 +58,9 @@ def main():
> def main():
> 
>     options, args = parse_options()
>+
>+    if options.usage:
>+        usage()
> 
>     if options.list:
>         client = ipaclient.IPAClient()
>diff -r 42b61b49f827 -r fc901c4cde81 ipa-admintools/ipa-addgroup
>--- a/ipa-admintools/ipa-addgroup	Wed Jan 30 15:16:43 2008 -0500
>+++ b/ipa-admintools/ipa-addgroup	Thu Jan 31 10:52:05 2008 -0500
>@@ -33,7 +33,7 @@ import errno
> import errno
> 
> def usage():
>-    print "ipa-addgroup [-d|--description STRING] group"
>+    print "ipa-addgroup [-d|--description STRING] [-g|--gid GID] group"
>     sys.exit(1)
> 
> def parse_options():
>@@ -56,6 +56,9 @@ def main():
> 
>     group=ipa.group.Group()
>     options, args = parse_options()
>+
>+    if options.usage:
>+        usage()
> 
>     cont = False
> 
>diff -r 42b61b49f827 -r fc901c4cde81 ipa-admintools/ipa-adduser
>--- a/ipa-admintools/ipa-adduser	Wed Jan 30 15:16:43 2008 -0500
>+++ b/ipa-admintools/ipa-adduser	Thu Jan 31 10:52:05 2008 -0500
>@@ -34,7 +34,7 @@ import errno
> import errno
> 
> def usage():
>-    print "ipa-adduser [-c|--gecos STRING] [-d|--directory STRING] [-f|--firstname STRING] [-l|--lastname STRING] user"
>+    print "ipa-adduser [-c|--gecos STRING] [-d|--directory STRING] [-f|--firstname STRING] [-l|--lastname STRING] [-s|--shell] [-g|--groups] [-k|krb-principal [-M|mailAddress] user"
>     sys.exit(1)
> 
> def parse_options():
>@@ -86,6 +86,9 @@ def main():
>     user=ipa.user.User()
>     options, args = parse_options()
> 
>+    if options.usage:
>+        usage()
>+
>     if len(args) != 2:
>         all_interactive = True
> 
>diff -r 42b61b49f827 -r fc901c4cde81 ipa-admintools/ipa-deldelegation
>--- a/ipa-admintools/ipa-deldelegation	Wed Jan 30 15:16:43 2008 -0500
>+++ b/ipa-admintools/ipa-deldelegation	Thu Jan 31 10:52:05 2008 -0500
>@@ -51,8 +51,7 @@ def main():
> 
>     options, args = parse_options()
> 
>-    if len(args) != 2:
>-        print "args is %s" % len(args)
>+    if options.usage or len(args) != 2:
>         usage()
> 
>     client = ipaclient.IPAClient()
>diff -r 42b61b49f827 -r fc901c4cde81 ipa-admintools/ipa-delgroup
>--- a/ipa-admintools/ipa-delgroup	Wed Jan 30 15:16:43 2008 -0500
>+++ b/ipa-admintools/ipa-delgroup	Thu Jan 31 10:52:05 2008 -0500
>@@ -45,7 +45,7 @@ def main():
> def main():
>     options, args = parse_options()
> 
>-    if len(args) != 2:
>+    if options.usage or len(args) != 2:
>         usage()
> 
>     try:
>diff -r 42b61b49f827 -r fc901c4cde81 ipa-admintools/ipa-deluser
>--- a/ipa-admintools/ipa-deluser	Wed Jan 30 15:16:43 2008 -0500
>+++ b/ipa-admintools/ipa-deluser	Thu Jan 31 10:52:05 2008 -0500
>@@ -45,7 +45,7 @@ def main():
> def main():
>     options, args = parse_options()
> 
>-    if len(args) != 2:
>+    if options.usage or len(args) != 2:
>         usage()
> 
>     try:
>diff -r 42b61b49f827 -r fc901c4cde81 ipa-admintools/ipa-findgroup
>--- a/ipa-admintools/ipa-findgroup	Wed Jan 30 15:16:43 2008 -0500
>+++ b/ipa-admintools/ipa-findgroup	Thu Jan 31 10:52:05 2008 -0500
>@@ -30,7 +30,7 @@ import kerberos
> import kerberos
> 
> def usage():
>-    print "ipa-findgroup <group_name>"
>+    print "ipa-findgroup [-a|--all] [-n|--notranslate] group"
>     sys.exit()
> 
> def parse_options():
>@@ -51,7 +51,7 @@ def main():
>     group={}
>     options, args = parse_options()
> 
>-    if len(args) != 2:
>+    if options.usage or len(args) != 2:
>         usage()
> 
>     try:
>diff -r 42b61b49f827 -r fc901c4cde81 ipa-admintools/ipa-findservice
>--- a/ipa-admintools/ipa-findservice	Wed Jan 30 15:16:43 2008 -0500
>+++ b/ipa-admintools/ipa-findservice	Thu Jan 31 10:52:05 2008 -0500
>@@ -50,7 +50,7 @@ def main():
>     user={}
>     options, args = parse_options()
> 
>-    if len(args) != 2:
>+    if options.usage or len(args) != 2:
>         usage()
> 
>     try:
>diff -r 42b61b49f827 -r fc901c4cde81 ipa-admintools/ipa-finduser
>--- a/ipa-admintools/ipa-finduser	Wed Jan 30 15:16:43 2008 -0500
>+++ b/ipa-admintools/ipa-finduser	Thu Jan 31 10:52:05 2008 -0500
>@@ -32,7 +32,7 @@ import kerberos
> import kerberos
> 
> def usage():
>-    print "ipa-finduser user"
>+    print "ipa-finduser [-a|--all] [-n|--notranslate] user"
>     sys.exit()
> 
> def parse_options():
>@@ -76,7 +76,7 @@ def main():
>     user={}
>     options, args = parse_options()
> 
>-    if len(args) != 2:
>+    if options.usage or len(args) != 2:
>         usage()
> 
>     try:
>diff -r 42b61b49f827 -r fc901c4cde81 ipa-admintools/ipa-listdelegation
>--- a/ipa-admintools/ipa-listdelegation	Wed Jan 30 15:16:43 2008 -0500
>+++ b/ipa-admintools/ipa-listdelegation	Thu Jan 31 10:52:05 2008 -0500
>@@ -50,6 +50,9 @@ def main():
> 
>     options, args = parse_options()
> 
>+    if options.usage:
>+        usage()
>+
>     client = ipaclient.IPAClient()
>     try:
>         aci_entry = client.get_aci_entry(aci_fields)
>diff -r 42b61b49f827 -r fc901c4cde81 ipa-admintools/ipa-lockuser
>--- a/ipa-admintools/ipa-lockuser	Wed Jan 30 15:16:43 2008 -0500
>+++ b/ipa-admintools/ipa-lockuser	Thu Jan 31 10:52:05 2008 -0500
>@@ -29,7 +29,7 @@ import kerberos
> import kerberos
> 
> def usage():
>-    print "ipa-lockuser user"
>+    print "ipa-lockuser [-u|--unlock] user"
>     sys.exit(1)
> 
> def parse_options():
>@@ -47,7 +47,7 @@ def main():
> def main():
>     options, args = parse_options()
> 
>-    if len(args) != 2:
>+    if options.usage or len(args) != 2:
>         usage()
> 
>     msg = "inactivated"
>diff -r 42b61b49f827 -r fc901c4cde81 ipa-admintools/ipa-moddelegation
>--- a/ipa-admintools/ipa-moddelegation	Wed Jan 30 15:16:43 2008 -0500
>+++ b/ipa-admintools/ipa-moddelegation	Thu Jan 31 10:52:05 2008 -0500
>@@ -60,8 +60,7 @@ def main():
> 
>     options, args = parse_options()
> 
>-    if len(args) != 2:
>-        print "args is %s" % len(args)
>+    if options.usage or len(args) != 2:
>         usage()
> 
>     if not options.attributes and not options.source and not options.target:
>diff -r 42b61b49f827 -r fc901c4cde81 ipa-admintools/ipa-modgroup
>--- a/ipa-admintools/ipa-modgroup	Wed Jan 30 15:16:43 2008 -0500
>+++ b/ipa-admintools/ipa-modgroup	Thu Jan 31 10:52:05 2008 -0500
>@@ -89,6 +89,8 @@ def main():
>     group=ipa.group.Group()
>     options, args = parse_options()
> 
>+    if options.usage:
>+        usage()
>     if (options.add or options.remove) and (len(args) != 3):
>         usage()
>     elif ((options.desc or options.addattr or options.delattr or options.setattr) and (len(args) != 2)):
>diff -r 42b61b49f827 -r fc901c4cde81 ipa-admintools/ipa-moduser
>--- a/ipa-admintools/ipa-moduser	Wed Jan 30 15:16:43 2008 -0500
>+++ b/ipa-admintools/ipa-moduser	Thu Jan 31 10:52:05 2008 -0500
>@@ -86,7 +86,7 @@ def main():
> 
>     options, args = parse_options()
> 
>-    if len(args) != 2:
>+    if options.usage or len(args) != 2:
>         usage()
> 
>     username = args[1]
>diff -r 42b61b49f827 -r fc901c4cde81 ipa-admintools/ipa-passwd
>--- a/ipa-admintools/ipa-passwd	Wed Jan 30 15:16:43 2008 -0500
>+++ b/ipa-admintools/ipa-passwd	Thu Jan 31 10:52:05 2008 -0500
>@@ -61,8 +61,12 @@ def main():
>     username = None
>     principal = None
> 
>+    options, args = parse_options()
>+
>+    if options.usage:
>+        usage()
>+
>     krbctx = krbV.default_context()
>-    options, args = parse_options()
> 
>     if len(args) == 2:
>         username = args[1]

Actions: View | Diff

Attachments on bug 430704: 293595