Author: jsmeix Date: Wed May 7 15:51:34 2008 New Revision: 47355 URL: http://svn.opensuse.org/viewcvs/yast?rev=47355&view=rev Log: - V 2.16.9 - Added an explanatory error message to determine_active_scanners if there is no response from the 'scanimage' command. Because of the YaST 'text freeze' this error message cannot be translated for openSUSE 11.0 so that currently it is only a simple stderr message, (see Novell/Suse Bugzilla bnc#387555). Modified: trunk/scanner/VERSION trunk/scanner/package/yast2-scanner.changes trunk/scanner/src/Scanner.ycp trunk/scanner/tools/determine_active_scanners Modified: trunk/scanner/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/VERSION?rev=47355&r1=47354&r2=47355&view=diff ============================================================================== --- trunk/scanner/VERSION (original) +++ trunk/scanner/VERSION Wed May 7 15:51:34 2008 @@ -1 +1 @@ -2.16.8 +2.16.9 Modified: trunk/scanner/package/yast2-scanner.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/package/yast2-scanner.changes?rev=47355&r1=47354&r2=47355&view=diff ============================================================================== --- trunk/scanner/package/yast2-scanner.changes (original) +++ trunk/scanner/package/yast2-scanner.changes Wed May 7 15:51:34 2008 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Wed May 7 15:40:27 CEST 2008 - jsmeix@suse.de + +- V 2.16.9 +- Added an explanatory error message to determine_active_scanners + if there is no response from the 'scanimage' command. + Because of the YaST 'text freeze' this error message cannot be + translated for openSUSE 11.0 so that currently it is only a + simple stderr message, (see Novell/Suse Bugzilla bnc#387555). + +------------------------------------------------------------------- Tue Apr 29 11:52:18 CEST 2008 - jsmeix@suse.de - V 2.16.8 Modified: trunk/scanner/src/Scanner.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/Scanner.ycp?rev=47355&r1=47354&r2=47355&view=diff ============================================================================== --- trunk/scanner/src/Scanner.ycp (original) +++ trunk/scanner/src/Scanner.ycp Wed May 7 15:51:34 2008 @@ -493,6 +493,8 @@ // Do not confuse this error with the case when no active scanner was determined. // The latter results no error. _("Failed to determine the active scanners.") + + "\n" + + OnlyMeaningfulErrorMessage( result["stderr"]:"" ) ); return false; } Modified: trunk/scanner/tools/determine_active_scanners URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/tools/determine_active_scanners?rev=47355&r1=47354&r2=47355&view=diff ============================================================================== --- trunk/scanner/tools/determine_active_scanners (original) +++ trunk/scanner/tools/determine_active_scanners Wed May 7 15:51:34 2008 @@ -30,7 +30,27 @@ sleep 1 done if ps $scanimagePID &>/dev/null - then kill -9 $scanimagePID &>/dev/null + then [ "$OUTPUT_FORMAT" = "YCP" ] && echo "[]" + # I do not know how to suppress the "...Killed..." notification on stderr + # which disturbs my error message. + # Therefore the error message is output before the kill command is executed. + # This has also the advantage that usually the "...Killed..." notification + # happens after the "exit" so that it is nicely lost in the middle of nowhere: + echo "There is no response from the 'scanimage -L' command." 1>&2 + echo "Therefore it was aborted after $MAXIMUM_WAIT seconds timeout." 1>&2 + if grep -q '^net$' /etc/sane.d/dll.conf + then echo "" 1>&2 + echo "When the 'net' metadriver is activated and something is wrong" 1>&2 + echo "in the network, it can happen that there is no response from" 1>&2 + echo "the 'scanimage -L' command. For example when the communication" 1>&2 + echo "with a server which should be used by the 'net' metadriver" 1>&2 + echo "gets distorted because a firewall drops some network traffic." 1>&2 + echo "In this case it should help to disable the 'net' metadriver" 1>&2 + echo "as a workaround until the issue in the network is fixed." 1>&2 + fi + echo "" 1>&2 + kill -9 $scanimagePID &>/dev/null + exit 10 fi else echo "Cannot execute /usr/bin/scanimage" 1>&2 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org