From 455c71b15d7f41aecbef51d7f11dcc92338e8481 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Dunand?= <aurelien.dunand@smartjog.com>
Date: Fri, 29 Jul 2011 10:52:10 +0200
Subject: [PATCH] Reorder subparsers as the same order of their function
---
bin/is | 52 ++++++++++++++++++++++++++--------------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/bin/is b/bin/is
index 311c496..c9082b4 100755
--- a/bin/is
+++ b/bin/is
@@ -149,7 +149,7 @@ def c_list(parser, args):
# list direct image or reposity content
elif len(args.list_args) == 1:
# list image file content
- if (istools.pathtype(args.list_args[0]) == 'file' and
+ if (istools.pathtype(args.list_args[0]) == "file" and
os.path.isfile(args.list_args[0])):
pkg = PackageImage(args.list_args[0])
arrow("Image %s v%s" % (pkg.name, pkg.version))
@@ -255,9 +255,9 @@ p_main.add_argument("-V", "--version", action="version",
help="show installsystems version")
# exclusive group on debug/quiet
ex_group = p_main.add_mutually_exclusive_group()
-ex_group.add_argument('-d', "--debug", action="store_true",
+ex_group.add_argument("-d", "--debug", action="store_true",
help="active debug mode")
-ex_group.add_argument('-q', "--quiet", action="store_true",
+ex_group.add_argument("-q", "--quiet", action="store_true",
help="active quiet mode")
# common options
p_main.add_argument("-c", "--config", default="installsystems",
@@ -285,9 +285,9 @@ p_new.set_defaults(func=c_new)
# build command parser
p_build = subparsers.add_parser("build", help=c_build.__doc__.lower())
-p_build.add_argument('-f', "--force", action="store_true", default=False,
+p_build.add_argument("-f", "--force", action="store_true", default=False,
help="overwrite existing image")
-p_build.add_argument('-c', "--no-check", action="store_true", default=False,
+p_build.add_argument("-c", "--no-check", action="store_true", default=False,
help="do not check compilation before adding scripts")
p_build.add_argument("path", nargs="?", default=".")
p_build.set_defaults(func=c_build)
@@ -300,7 +300,7 @@ p_init.set_defaults(func=c_init)
# add command parser
p_add = subparsers.add_parser("add", help=c_add.__doc__.lower())
-p_add.add_argument('-p', "--preserve", action="store_true", default=False,
+p_add.add_argument("-p", "--preserve", action="store_true", default=False,
help="don't remove image after adding to database")
p_add.add_argument("path", nargs="+")
p_add.set_defaults(func=c_add)
@@ -314,47 +314,47 @@ p_del.set_defaults(func=c_del)
# install command parser
p_install = subparsers.add_parser("install", add_help=False,
help=c_install.__doc__.lower())
-p_install.add_argument('-f', "--force", action="store_true", default=False,
+p_install.add_argument("-f", "--force", action="store_true", default=False,
help="overwrite existing image")
p_install.add_argument("-v", "--image-version", type=int, default=None,
help="image version")
p_install.add_argument("image", help="image to install (path or name)")
p_install.set_defaults(func=c_install, subparser=p_install)
+# list command parser
+p_list = subparsers.add_parser("list", help=c_list.__doc__.lower())
+p_list.add_argument("-l", action="store_true", dest="detail",
+ default=False, help="detailled list output")
+p_list.add_argument("list_args", nargs="*", help="list content of image or repositories")
+p_list.set_defaults(func=c_list, subparser=p_list)
+
# update command parser
p_update = subparsers.add_parser("update", help=c_update.__doc__.lower())
-p_update.add_argument('-f', "--force", action="store_true", default=False,
- help="overwrite existing image")
-p_update.add_argument('-c', "--no-check", action="store_true", default=False,
- help="do not check compilation before adding scripts")
-p_update.add_argument('-p', "--preserve", action="store_true", default=False,
- help="don't remove image after adding to database")
+p_update.add_argument("-f", "--force", action="store_true", default=False,
+ help="overwrite existing image")
+p_update.add_argument("-c", "--no-check", action="store_true", default=False,
+ help="do not check compilation before adding scripts")
+p_update.add_argument("-p", "--preserve", action="store_true", default=False,
+ help="don't remove image after adding to database")
p_update.add_argument("path", nargs="?", default=".")
p_update.set_defaults(func=c_update)
# cat command parser
p_cat = subparsers.add_parser("cat", help=c_cat.__doc__.lower())
p_cat.add_argument("-v", "--image-version", type=int, default=None,
- help="image version")
+ help="image version")
p_cat.add_argument("image", help="image (path or name)")
-p_cat.add_argument("files", nargs='+', help="files to cat")
+p_cat.add_argument("files", nargs="+", help="files to cat")
p_cat.set_defaults(func=c_cat)
-# get command parser
-p_get = subparsers.add_parser("get", help=c_get.__doc__.lower())
-p_get.set_defaults(func=c_get)
-
-# list command parser
-p_list = subparsers.add_parser("list", help=c_list.__doc__.lower())
-p_list.add_argument("-l", action="store_true", dest='detail',
- default=False, help='detailled list output')
-p_list.add_argument("list_args", nargs="*", help="list content of image or repositories")
-p_list.set_defaults(func=c_list, subparser=p_list)
-
# search command parser
p_search = subparsers.add_parser("search", help=c_search.__doc__.lower())
p_search.set_defaults(func=c_search)
+# get command parser
+p_get = subparsers.add_parser("get", help=c_get.__doc__.lower())
+p_get.set_defaults(func=c_get)
+
# clean command parser
p_clean = subparsers.add_parser("clean", help=c_clean.__doc__.lower())
p_clean.set_defaults(func=c_clean)
--
GitLab