[gentoo-commits] proj/mirrorselect:master commit in: mirrorselect/

[Brian Dolbec]

commit:     9f6c6d2fd749df7528fcb2b7a85790362fb4d232
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon May  5 02:00:35 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon May  5 02:00:35 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mirrorselect.git;a=commit;h=9f6c6d2f

main.py: Sort the cli options

---
 mirrorselect/main.py | 60 ++++++++++++++++++++++++++--------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/mirrorselect/main.py b/mirrorselect/main.py
index 3014c3f..d17a4f1 100755
--- a/mirrorselect/main.py
+++ b/mirrorselect/main.py
@@ -162,19 +162,24 @@ class MirrorSelect(object):
 			" For the -r, --rsync option, it will select the rotation server "
 			"only. As multiple rsync URL's are not supported.")
 		group.add_option(
-			"-i", "--interactive", action="store_true", default=False,
-			help="Interactive Mode, this will present a list "
-			"to make it possible to select mirrors you wish to use.")
-		group.add_option(
 			"-D", "--deep", action="store_true", default=False,
 			help="Deep mode. This is used to give a more accurate "
 			"speed test. It will download a 100k file from "
 			"each server. Because of this you should only use "
 			"this option if you have a good connection.")
+		group.add_option(
+			"-i", "--interactive", action="store_true", default=False,
+			help="Interactive Mode, this will present a list "
+			"to make it possible to select mirrors you wish to use.")
 
 		group = parser.add_option_group(
 			"Server type selection (choose at most one)")
 		group.add_option(
+			"-c", "--country", action="store", default=None,
+			help="only use mirrors from the specified country "
+			"NOTE: Names with a space must be quoted "
+			"eg.:  -c 'South Korea'")
+		group.add_option(
 			"-F", "--ftp", action="store_true", default=False,
 			help="ftp only mode. Will not consider hosts of other "
 			"types.")
@@ -186,29 +191,19 @@ class MirrorSelect(object):
 			help="rsync mode. Allows you to interactively select your"
 			" rsync mirror. Requires -i or -a to be used.")
 		group.add_option(
+			"-R", "--region", action="store", default=None,
+			help="only use mirrors from the specified region "
+			"NOTE: Names with a space must be quoted "
+			"eg.:  -R 'North America'")
+		group.add_option(
 			"-4", "--ipv4", action="store_true", default=False,
 			help="only use IPv4")
 		group.add_option(
 			"-6", "--ipv6", action="store_true", default=False,
 			help="only use IPv6")
-		group.add_option(
-			"-c", "--country", action="store", default=None,
-			help="only use mirrors from the specified country "
-			"NOTE: Names with a space must be quoted "
-			"eg.:  -c 'South Korea'")
-		group.add_option(
-			"-R", "--region", action="store", default=None,
-			help="only use mirrors from the specified region "
-			"NOTE: Names with a space must be quoted "
-			"eg.:  -R 'North America'")
 
 		group = parser.add_option_group("Other options")
 		group.add_option(
-			"-o", "--output", action="store_true", default=False,
-			help="Output Only Mode, this is especially useful "
-			"when being used during installation, to redirect "
-			"output to a file other than %s" % config_path)
-		group.add_option(
 			"-b", "--blocksize", action="store", type="int",
 			help="This is to be used in automatic mode "
 			"and will split the hosts into blocks of BLOCKSIZE for "
@@ -216,20 +211,9 @@ class MirrorSelect(object):
 			"routers which block 40+ requests at any given time. "
 			"Recommended parameters to pass are: -s3 -b10")
 		group.add_option(
-			"-t", "--timeout", action="store", type="int",
-			default="10", help="Timeout for deep mode. Defaults to 10 seconds.")
-		group.add_option(
-			"-s", "--servers", action="store", type="int", default=1,
-			help="Specify Number of servers for Automatic Mode "
-			"to select. this is only valid for download mirrors. "
-			"If this is not specified, a default of 1 is used.")
-		group.add_option(
 			"-d", "--debug", action="store", type="int", dest="verbosity",
 			default=1, help="debug mode, pass in the debug level [1-9]")
 		group.add_option(
-			"-q", "--quiet", action="store_const", const=0, dest="verbosity",
-			help="Quiet mode")
-		group.add_option(
 			"-f", "--file", action="store", default='mirrorselect-test',
 			help="An alternate file to download for deep testing. "
 				"Please choose the file carefully as to not abuse the system "
@@ -241,10 +225,26 @@ class MirrorSelect(object):
 			help="An alternate file md5sum value used to compare the downloaded "
 				"file against for deep testing.")
 		group.add_option(
+			"-o", "--output", action="store_true", default=False,
+			help="Output Only Mode, this is especially useful "
+			"when being used during installation, to redirect "
+			"output to a file other than %s" % config_path)
+		group.add_option(
 			"-P", "--proxy", action="store",
 			default=None,
 			help="Proxy server to use if not the default proxy "
 				"in the environment")
+		group.add_option(
+			"-q", "--quiet", action="store_const", const=0, dest="verbosity",
+			help="Quiet mode")
+		group.add_option(
+			"-s", "--servers", action="store", type="int", default=1,
+			help="Specify Number of servers for Automatic Mode "
+			"to select. this is only valid for download mirrors. "
+			"If this is not specified, a default of 1 is used.")
+		group.add_option(
+			"-t", "--timeout", action="store", type="int",
+			default="10", help="Timeout for deep mode. Defaults to 10 seconds.")