Author: jsrain Date: Tue Apr 22 15:17:49 2008 New Revision: 46955 URL: http://svn.opensuse.org/viewcvs/yast?rev=46955&view=rev Log: rename MODLIST variable to YAST_MODLIST to prevent conflicts with zypper (#382097) Modified: trunk/yast2/package/yast2.changes trunk/yast2/scripts/yast2-completion.sh Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=46955&r1=46954&r2=46955&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue Apr 22 15:17:49 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 22 15:15:59 CEST 2008 - jsrain@suse.cz + +- rename MODLIST variable to YAST_MODLIST to prevent conflicts + with zypper (#382097) + +------------------------------------------------------------------- Mon Apr 21 12:20:01 CEST 2008 - jsrain@suse.cz - fixed CWM testsuite Modified: trunk/yast2/scripts/yast2-completion.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2-completion.sh?rev=46955&r1=46954&r2=46955&view=diff ============================================================================== --- trunk/yast2/scripts/yast2-completion.sh (original) +++ trunk/yast2/scripts/yast2-completion.sh Tue Apr 22 15:17:49 2008 @@ -2,15 +2,15 @@ # A Christmas gift from Carsten Hoeger YAST=/sbin/yast -MODLIST=() +YAST_MODLIST=() _yast2 () { local cur prevprev prev len idx mod MODOPTS line opt rest MODOPTS=() - if test ${#MODLIST[*]} = 0; then + if test ${#YAST_MODLIST[*]} = 0; then # build a list of know yast modules - MODLIST=($(LC_ALL=C $YAST -l| grep '^[a-z]' | grep -v "Available")) + YAST_MODLIST=($(LC_ALL=C $YAST -l| grep '^[a-z]' | grep -v "Available")) fi if [[ ${#COMP_WORDS[@]} -gt 4 ]]; then @@ -36,7 +36,7 @@ fi # iterate through all yast modules - for mod in ${MODLIST[@]}; do + for mod in ${YAST_MODLIST[@]}; do # if argument before last argument is a yast module, # check it's available options if [[ -n $prevprev && $prevprev == $mod ]]; then @@ -102,7 +102,7 @@ len=${#cur} idx=0 - for pval in ${MODLIST[@]}; do + for pval in ${YAST_MODLIST[@]}; do if [[ "$cur" == "${pval:0:$len}" ]]; then COMPREPLY[$idx]=$pval idx=$[$idx+1] -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org