Author: jsrain Date: Thu Jan 7 14:27:42 2010 New Revision: 60263 URL: http://svn.opensuse.org/viewcvs/yast?rev=60263&view=rev Log: updated start-up script to behave correctly if QT CC is to be used without QT back-end (bnc#545331) Modified: trunk/yast2/package/yast2.changes trunk/yast2/scripts/yast2 Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=60263&r1=60262&r2=60263&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Thu Jan 7 14:27:42 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 7 14:26:21 CET 2010 - jsrain@suse.cz + +- updated start-up script to behave correctly if QT CC is to be + used without QT back-end (bnc#545331) + +------------------------------------------------------------------- Tue Jan 5 15:07:54 UTC 2010 - lslezak@suse.cz - added missing UI::SetProductName() call - display the proper Modified: trunk/yast2/scripts/yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2?rev=60263&r1=60262&r2=60263&view=diff ============================================================================== --- trunk/yast2/scripts/yast2 (original) +++ trunk/yast2/scripts/yast2 Thu Jan 7 14:27:42 2010 @@ -183,16 +183,25 @@ if check_gtk; then SELECTED_GUI=gtk else - echo >&2 "GTK GUI wanted but not found, falling back to Qt." - WANTED_GUI=qt + if check_qt; then + SELECTED_GUI=qt + WANTED_GUI=qt + echo >&2 "GTK GUI wanted but not found, falling back to Qt." + else + echo >&2 "GTK GUI wanted but not found, falling back to ncurses." + fi fi - fi - - if [ "$WANTED_GUI" = "qt" ]; then + elif [ "$WANTED_GUI" = "qt" ]; then if check_qt; then SELECTED_GUI=qt else - echo >&2 "Qt GUI wanted but not found, falling back to ncurses." + if check_gtk; then + SELECTED_GUI=gtk + WANTED_GUI=gtk + echo >&2 "Qt GUI wanted but not found, falling back to GTK." + else + echo >&2 "Qt GUI wanted but not found, falling back to ncurses." + fi fi elif [ "$SELECTED_GUI" != "gtk" -a "$WANTED_GUI" != "ncurses" ]; then echo >&2 "Unknown GUI '$WANTED_GUI', falling back to ncurses." -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org