# process the options and command arguments for x in cmdline: if not x: continue if len(x)>=2 and x[0:2]=="--": if x in options: myopts.append(x) elif x[2:] in actions: if x[2:]=="rsync" or x=="rsync": # "emerge --rsync" print print red("*** '--rsync' has been deprecated.") print red("*** Please use '--sync' instead.") print the x=="rsync" above is not needed, since x=="rsync" is not possible when x[2:]=="--". It can be dropped. x=="rsync" is handled later in the code and performs correctly. Reproducible: Always Steps to Reproduce: 1. 2. 3. skyfw@spider bin $ diff -C 4 emerge.new emerge *** emerge.new Tue Dec 28 23:15:02 2004 --- emerge Tue Dec 14 07:56:29 2004 *************** *** 225,233 **** if len(x)>=2 and x[0:2]=="--": if x in options: myopts.append(x) elif x[2:] in actions: ! if x[2:]=="rsync": # "emerge --rsync" print print red("*** '--rsync' has been deprecated.") print red("*** Please use '--sync' instead.") --- 225,233 ---- if len(x)>=2 and x[0:2]=="--": if x in options: myopts.append(x) elif x[2:] in actions: ! if x[2:]=="rsync" or x=="rsync": # "emerge --rsync" print print red("*** '--rsync' has been deprecated.") print red("*** Please use '--sync' instead.") The case of "rsync" is handled below. elif (not myaction) and (x in actions): if x not in ["system", "world"]: #print red("*** Deprecated use of action '"+x+"'") if x=="rsync": # "emerge rsync" print print red("*** 'rsync' will now install the package rsync.") print red("*** To sync the tree, please use '--sync' instead.") print myfiles.append(x) continue
Created attachment 47085 [details, diff] Small fix
Please use context diffs, they are easier to follow. diff -u
Very minor importance, no updated diff.
