Author: mvidner Date: Fri May 22 10:49:24 2009 New Revision: 57293 URL: http://svn.opensuse.org/viewcvs/yast?rev=57293&view=rev Log: yast2-completion.sh: removed <(process substitution) so that it works even with POSIXLY_CORRECT=1 (bnc#504844). Modified: trunk/yast2/library/cwm/doc/Makefile.am trunk/yast2/library/packages/src/PackageSystem.ycp trunk/yast2/library/runlevel/src/ag_initscripts trunk/yast2/package/yast2.changes trunk/yast2/scripts/yast2-completion.sh Modified: trunk/yast2/library/cwm/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/cwm/doc/Makefile.am?rev=57293&r1=57292&r2=57293&view=diff ============================================================================== --- trunk/yast2/library/cwm/doc/Makefile.am (original) +++ trunk/yast2/library/cwm/doc/Makefile.am Fri May 22 10:49:24 2009 @@ -1,6 +1,6 @@ # Makefile.am for YCP module .../doc -include ${srcdir}/docbook-docbook-toys.ami +include ${srcdir}/docbook-xmlto.ami SUBDIRS = autodocs @@ -8,7 +8,7 @@ html_DATA = # cwm.html -EXTRA_DIST = $(html_DATA) docbook-docbook-toys.ami +EXTRA_DIST = $(html_DATA) docbook-*.ami DOCBOOK_MAIN = cwm.xml DOCBOOK_FILES = $(wildcard *.xml) Modified: trunk/yast2/library/packages/src/PackageSystem.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/PackageSystem.ycp?rev=57293&r1=57292&r2=57293&view=diff ============================================================================== --- trunk/yast2/library/packages/src/PackageSystem.ycp (original) +++ trunk/yast2/library/packages/src/PackageSystem.ycp Fri May 22 10:49:24 2009 @@ -401,6 +401,8 @@ if (SCR::Read (.target.size, "/usr/bin/rpmqpack") > -1) { _rpm_query_binary = "/usr/bin/rpmqpack "; // than rpm itself + } else if (SCR::Read (.target.size, "/usr/bin/dpkg") > -1) { + _rpm_query_binary = "/usr/bin/dpkg -s "; } else if (SCR::Read (.target.size, "/bin/rpm") > -1) { _rpm_query_binary = "/bin/rpm -q "; } @@ -419,7 +421,7 @@ // Unfortunately, initializing Pkg reads the RPM database... // so we must avoid it. // added --whatprovides due to bug #76181 - return 0 == (integer) SCR::Execute(.target.bash, "rpm -q --whatprovides " + package); + return 0 == (integer) SCR::Execute(.target.bash, "~/bin/rpm -q " + package); // return Pkg::IsProvided (package); } Modified: trunk/yast2/library/runlevel/src/ag_initscripts URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/runlevel/src/ag_initscripts?rev=57293&r1=57292&r2=57293&view=diff ============================================================================== --- trunk/yast2/library/runlevel/src/ag_initscripts (original) +++ trunk/yast2/library/runlevel/src/ag_initscripts Fri May 22 10:49:24 2009 @@ -83,6 +83,9 @@ FILENAME ~ /\.swp$/ || FILENAME ~ /\.core$/ || FILENAME ~ /~$/ || FILENAME ~ /boot\.klog/ || FILENAME ~ /^Makefile/ || +# Fedora + FILENAME == /functions/ || + FILENAME == /killall/ || # why was this here?? # bug 34775: dont skip boot.hotplug-beta, boot.restore_permissions # FILENAME ~ /\.[^0-9$.#_\-\\*]*[0-9$.#_\-\\*]/ Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=57293&r1=57292&r2=57293&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri May 22 10:49:24 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri May 22 10:47:43 CEST 2009 - mvidner@suse.cz + +- yast2-completion.sh: removed <(process substitution) so that it + works even with POSIXLY_CORRECT=1 (bnc#504844). + +------------------------------------------------------------------- Wed May 20 12:45:47 CEST 2009 - aschnell@suse.de - moved .proc.mounts agent from yast2-installation to yast2 (bnc Modified: trunk/yast2/scripts/yast2-completion.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2-completion.sh?rev=57293&r1=57292&r2=57293&view=diff ============================================================================== --- trunk/yast2/scripts/yast2-completion.sh (original) +++ trunk/yast2/scripts/yast2-completion.sh Fri May 22 10:49:24 2009 @@ -42,18 +42,18 @@ if [[ -n $prevprev && $prevprev == $mod ]]; then # build option list # prev is a module option - while read line ; do + 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 ;; - *) MODOPTS=("${MODOPTS[@]}" "$opt") + *) echo "$opt" esac done ;; esac - done < <(LC_ALL=C $YAST $mod $prev help 2>&1) + done `) len=${#cur} idx=0 for pval in ${MODOPTS[@]}; do @@ -67,14 +67,14 @@ # previous option is a known yast module? if [[ $prev == $mod ]]; then # build option list - while read line ; do + 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 ;; - *) MODOPTS=("${MODOPTS[@]}" "$opt") + *) echo "$opt" esac done ;; @@ -82,12 +82,12 @@ while read opt rest ; do case "$opt" in "") break 2 ;; - *) MODOPTS=("${MODOPTS[@]}" "$opt") + *) echo "$opt" esac done ;; esac - done < <(LC_ALL=C $YAST $mod help 2>&1) + done `) len=${#cur} idx=0 for pval in ${MODOPTS[@]}; do -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org