Attachment #647860 for bug #730994

View | Details | Raw Unified | Return to bug 730994
Collapse All | Expand All

Lines 44-49 ftp only mode. Will not consider hosts of other types. Link Here

(-)a/mirrorselect.8 (+3 lines)
44	.B \-H, \-\-http	44	.B \-H, \-\-http
45	http only mode. Will not consider hosts of other types.	45	http only mode. Will not consider hosts of other types.
46	.TP	46	.TP
		47	.B \-S, \-\-https
		48	https only mode. Will not consider hosts of other types.
		49	.TP
47	.B \-r, \-\-rsync	50	.B \-r, \-\-rsync
48	rsync mode. Allows you to interactively select your rsync mirror.	51	rsync mode. Allows you to interactively select your rsync mirror.
49	Requires -i to be used.	52	Requires -i to be used.

Lines 50-56 class Extractor(object): Link Here

(-)a/mirrorselect/extractor.py (-1 / +1 lines)
50	filters[opt] = value	50	filters[opt] = value
51	self.output.print_info('Limiting test to "%s=%s" hosts. \n'	51	self.output.print_info('Limiting test to "%s=%s" hosts. \n'
52	%(opt, value))	52	%(opt, value))
53	for opt in ["ftp", "http"]:	53	for opt in ["ftp", "http", "https"]:
54	if getattr(options, opt):	54	if getattr(options, opt):
55	filters["proto"] = opt	55	filters["proto"] = opt
56	self.output.print_info('Limiting test to %s hosts. \n' % opt )	56	self.output.print_info('Limiting test to %s hosts. \n' % opt )

Lines 184-189 class MirrorSelect(object): Link Here

(-)a/mirrorselect/main.py (-2 / +5 lines)
184	group.add_option(	184	group.add_option(
185	"-H", "--http", action="store_true", default=False,	185	"-H", "--http", action="store_true", default=False,
186	help="http only mode. Will not consider hosts of other types")	186	help="http only mode. Will not consider hosts of other types")
		187	group.add_option(
		188	"-S", "--https", action="store_true", default=False,
		189	help="https only mode. Will not consider hosts of other types")
187	group.add_option(	190	group.add_option(
188	"-r", "--rsync", action="store_true", default=False,	191	"-r", "--rsync", action="store_true", default=False,
189	help="rsync mode. Allows you to interactively select your"	192	help="rsync mode. Allows you to interactively select your"
Lines 258-265 class MirrorSelect(object): Link Here
258	# sanity checks	261	# sanity checks
259		262
260	# hack: check if more than one of these is set	263	# hack: check if more than one of these is set
261	if options.http + options.ftp + options.rsync > 1:	264	if options.http + options.https + options.ftp + options.rsync > 1:
262	self.output.print_err('Choose at most one of -H, -f and -r')	265	self.output.print_err('Choose at most one of -H, -S, -f and -r')
263		266
264	if options.ipv4 and options.ipv6:	267	if options.ipv4 and options.ipv6:
265	self.output.print_err('Choose at most one of --ipv4 and --ipv6')	268	self.output.print_err('Choose at most one of --ipv4 and --ipv6')

Return to bug 730994