Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2019-09-04 08:58:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2" Wed Sep 4 08:58:39 2019 rev:459 rq:727190 version:4.2.19 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2019-08-15 15:42:15.955211185 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new.7948/yast2.changes 2019-09-04 08:58:40.659072095 +0200 @@ -1,0 +2,7 @@ +Fri Aug 30 09:30:26 UTC 2019 - Steffen Winterfeldt <[email protected]> + +- yast completions have to be named after their respective command + name (bsc#1122259) +- 4.2.19 + +------------------------------------------------------------------- Old: ---- yast2-4.2.18.tar.bz2 New: ---- yast2-4.2.19.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.BVTMaJ/_old 2019-09-04 08:58:41.271072025 +0200 +++ /var/tmp/diff_new_pack.BVTMaJ/_new 2019-09-04 08:58:41.271072025 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 4.2.18 +Version: 4.2.19 Release: 0 Summary: YaST2 Main Package License: GPL-2.0-only @@ -206,7 +206,7 @@ %{yast_agentdir}/ag_* %{_fillupdir}/sysconfig.yast2 -%{_datadir}/bash-completion/completions/yast2*.sh +%{_datadir}/bash-completion/completions # documentation (not included in devel subpackage) %doc %dir %{yast_docdir} ++++++ yast2-4.2.18.tar.bz2 -> yast2-4.2.19.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.2.18/Rakefile new/yast2-4.2.19/Rakefile --- old/yast2-4.2.18/Rakefile 2019-08-08 15:52:51.000000000 +0200 +++ new/yast2-4.2.19/Rakefile 2019-08-30 11:55:44.000000000 +0200 @@ -3,7 +3,7 @@ Yast::Tasks.configuration do |conf| # lets ignore license check for now conf.skip_license_check << /.*/ - conf.install_locations["scripts/yast2-completion.sh"] = File.join(Packaging::Configuration::DESTDIR, "/usr/share/bash-completion/completions") + conf.install_locations["scripts/completions"] = File.join(Packaging::Configuration::DESTDIR, "/usr/share/bash-completion/") conf.install_locations["scripts/yast2-funcs"] = File.join(Packaging::Configuration::YAST_LIB_DIR, "/bin/") conf.install_locations["scripts/yast2"] = File.join(Packaging::Configuration::DESTDIR, "/usr/sbin/") conf.install_locations["scripts/yast"] = File.join(Packaging::Configuration::DESTDIR, "/usr/sbin/") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.2.18/package/yast2.changes new/yast2-4.2.19/package/yast2.changes --- old/yast2-4.2.18/package/yast2.changes 2019-08-08 15:52:51.000000000 +0200 +++ new/yast2-4.2.19/package/yast2.changes 2019-08-30 11:55:44.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Aug 30 09:30:26 UTC 2019 - Steffen Winterfeldt <[email protected]> + +- yast completions have to be named after their respective command + name (bsc#1122259) +- 4.2.19 + +------------------------------------------------------------------- Thu Aug 8 09:28:03 UTC 2019 - Martin Vidner <[email protected]> - Remove the obsolete XVersion API (bsc#1144627). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.2.18/package/yast2.spec new/yast2-4.2.19/package/yast2.spec --- old/yast2-4.2.18/package/yast2.spec 2019-08-08 15:52:51.000000000 +0200 +++ new/yast2-4.2.19/package/yast2.spec 2019-08-30 11:55:44.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 4.2.18 +Version: 4.2.19 Release: 0 Summary: YaST2 Main Package License: GPL-2.0-only @@ -206,7 +206,7 @@ %{yast_agentdir}/ag_* %{_fillupdir}/sysconfig.yast2 -%{_datadir}/bash-completion/completions/yast2*.sh +%{_datadir}/bash-completion/completions # documentation (not included in devel subpackage) %doc %dir %{yast_docdir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.2.18/scripts/completions/yast new/yast2-4.2.19/scripts/completions/yast --- old/yast2-4.2.18/scripts/completions/yast 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-4.2.19/scripts/completions/yast 2019-09-04 08:58:41.887071955 +0200 @@ -0,0 +1 @@ +symbolic link to yast2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.2.18/scripts/completions/yast2 new/yast2-4.2.19/scripts/completions/yast2 --- old/yast2-4.2.18/scripts/completions/yast2 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-4.2.19/scripts/completions/yast2 2019-08-30 11:55:44.000000000 +0200 @@ -0,0 +1,114 @@ +# yast2 completion +# A Christmas gift from Carsten Hoeger + +YAST=/sbin/yast +YAST_MODLIST=() + +_yast2 () +{ + local cur prevprev prev len idx mod MODOPTS line opt rest + MODOPTS=() + if test ${#YAST_MODLIST[*]} = 0; then + # build a list of know yast modules + YAST_MODLIST=($(LC_ALL=C $YAST -l| grep '^[a-z]' | grep -v "Available")) + fi + + if [[ ${#COMP_WORDS[@]} -gt 4 ]]; then + return 0 + fi + cur=${COMP_WORDS[COMP_CWORD]} + prev=${COMP_WORDS[COMP_CWORD-1]} + if [[ ${#COMP_WORDS[@]} -ge 3 && $COMP_CWORD -ge 2 ]]; then + prevprev=${COMP_WORDS[COMP_CWORD-2]} + fi + if [[ $cur == '-' ]]; then + COMPREPLY=(-h -l -g -s) + return 0 + fi + + # do not use module names to complete when enetering a package name + # zypper should handle package completion + # see bug #341706 + if [ "$prev" = "-i" -o "$prevprev" = "-i" -o "$prev" = "--install" -o "$prevprev" = "--install" \ + -o "$prev" = "--remove" -o "$prevprev" = "--remove" \ + -o "$prev" = "--update" -o "$prevprev" = "--update" ]; then + return 0; + fi + + # iterate through all yast modules + 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 + # build option list + # prev is a module option + MODOPTS=(`LC_ALL=C $YAST $mod $prev help 2>&1 | while read line ; do + case "$line" in + Options:*) + while read opt rest ; do + case "$opt" in + "") break 2 ;; + *) echo "$opt" + esac + done + ;; + esac + done `) + len=${#cur} + idx=0 + for pval in ${MODOPTS[@]}; do + if [[ "$cur" == "${pval:0:$len}" ]]; then + COMPREPLY[$idx]=$pval + idx=$[$idx+1] + fi + done + return 0 + fi + # previous option is a known yast module? + if [[ $prev == $mod ]]; then + # build option list + MODOPTS=(` LC_ALL=C $YAST $mod help 2>&1 | while read line ; do + case "$line" in + Basic\ Syntax:*) + while read rest rest opt rest ; do + case "$opt" in + \<*\>) ;; + "") break ;; + *) echo "$opt" + esac + done + ;; + Commands:*) + while read opt rest ; do + case "$opt" in + "") break 2 ;; + *) echo "$opt" + esac + done + ;; + esac + done `) + len=${#cur} + idx=0 + for pval in ${MODOPTS[@]}; do + if [[ "$cur" == "${pval:0:$len}" ]]; then + COMPREPLY[$idx]=$pval + idx=$[$idx+1] + fi + done + return 0 + fi + done + + len=${#cur} + idx=0 + for pval in ${YAST_MODLIST[@]}; do + if [[ "$cur" == "${pval:0:$len}" ]]; then + COMPREPLY[$idx]=$pval + idx=$[$idx+1] + fi + done + return 0 +} +complete -F _yast2 yast2 +complete -F _yast2 yast diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.2.18/scripts/yast2-completion.sh new/yast2-4.2.19/scripts/yast2-completion.sh --- old/yast2-4.2.18/scripts/yast2-completion.sh 2019-08-08 15:52:51.000000000 +0200 +++ new/yast2-4.2.19/scripts/yast2-completion.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,114 +0,0 @@ -# yast2 completion -# A Christmas gift from Carsten Hoeger - -YAST=/sbin/yast -YAST_MODLIST=() - -_yast2 () -{ - local cur prevprev prev len idx mod MODOPTS line opt rest - MODOPTS=() - if test ${#YAST_MODLIST[*]} = 0; then - # build a list of know yast modules - YAST_MODLIST=($(LC_ALL=C $YAST -l| grep '^[a-z]' | grep -v "Available")) - fi - - if [[ ${#COMP_WORDS[@]} -gt 4 ]]; then - return 0 - fi - cur=${COMP_WORDS[COMP_CWORD]} - prev=${COMP_WORDS[COMP_CWORD-1]} - if [[ ${#COMP_WORDS[@]} -ge 3 && $COMP_CWORD -ge 2 ]]; then - prevprev=${COMP_WORDS[COMP_CWORD-2]} - fi - if [[ $cur == '-' ]]; then - COMPREPLY=(-h -l -g -s) - return 0 - fi - - # do not use module names to complete when enetering a package name - # zypper should handle package completion - # see bug #341706 - if [ "$prev" = "-i" -o "$prevprev" = "-i" -o "$prev" = "--install" -o "$prevprev" = "--install" \ - -o "$prev" = "--remove" -o "$prevprev" = "--remove" \ - -o "$prev" = "--update" -o "$prevprev" = "--update" ]; then - return 0; - fi - - # iterate through all yast modules - 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 - # build option list - # prev is a module option - MODOPTS=(`LC_ALL=C $YAST $mod $prev help 2>&1 | while read line ; do - case "$line" in - Options:*) - while read opt rest ; do - case "$opt" in - "") break 2 ;; - *) echo "$opt" - esac - done - ;; - esac - done `) - len=${#cur} - idx=0 - for pval in ${MODOPTS[@]}; do - if [[ "$cur" == "${pval:0:$len}" ]]; then - COMPREPLY[$idx]=$pval - idx=$[$idx+1] - fi - done - return 0 - fi - # previous option is a known yast module? - if [[ $prev == $mod ]]; then - # build option list - MODOPTS=(` LC_ALL=C $YAST $mod help 2>&1 | while read line ; do - case "$line" in - Basic\ Syntax:*) - while read rest rest opt rest ; do - case "$opt" in - \<*\>) ;; - "") break ;; - *) echo "$opt" - esac - done - ;; - Commands:*) - while read opt rest ; do - case "$opt" in - "") break 2 ;; - *) echo "$opt" - esac - done - ;; - esac - done `) - len=${#cur} - idx=0 - for pval in ${MODOPTS[@]}; do - if [[ "$cur" == "${pval:0:$len}" ]]; then - COMPREPLY[$idx]=$pval - idx=$[$idx+1] - fi - done - return 0 - fi - done - - len=${#cur} - idx=0 - for pval in ${YAST_MODLIST[@]}; do - if [[ "$cur" == "${pval:0:$len}" ]]; then - COMPREPLY[$idx]=$pval - idx=$[$idx+1] - fi - done - return 0 -} -complete -F _yast2 yast2 -complete -F _yast2 yast
