Author: jsmeix Date: Wed Mar 19 17:24:28 2008 New Revision: 45625 URL: http://svn.opensuse.org/viewcvs/yast?rev=45625&view=rev Log: - V 2.16.1 - Added hint how to set up HP all-in-one network scanners to the help text (see Novell/Suse Bugzilla bnc#310476). - Replaced the "scanimage -d ... -T" test by "scanimage -d ... -v >/dev/null" (see Novell/Suse Bugzilla bnc#344534). Modified: trunk/scanner/VERSION trunk/scanner/package/yast2-scanner.changes trunk/scanner/src/Scanner.ycp trunk/scanner/src/helps.ycp trunk/scanner/tools/test_scanner_backend Modified: trunk/scanner/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/VERSION?rev=45625&r1=45624&r2=45625&view=diff ============================================================================== --- trunk/scanner/VERSION (original) +++ trunk/scanner/VERSION Wed Mar 19 17:24:28 2008 @@ -1 +1 @@ -2.16.0 +2.16.1 Modified: trunk/scanner/package/yast2-scanner.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/package/yast2-scanner.changes?rev=45625&r1=45624&r2=45625&view=diff ============================================================================== --- trunk/scanner/package/yast2-scanner.changes (original) +++ trunk/scanner/package/yast2-scanner.changes Wed Mar 19 17:24:28 2008 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Wed Mar 19 16:45:38 CET 2008 - jsmeix@suse.de + +- V 2.16.1 +- Added hint how to set up HP all-in-one network scanners + to the help text (see Novell/Suse Bugzilla bnc#310476). +- Replaced the "scanimage -d ... -T" test + by "scanimage -d ... -v >/dev/null" + (see Novell/Suse Bugzilla bnc#344534). + +------------------------------------------------------------------- Tue Mar 18 12:48:38 CET 2008 - jsmeix@suse.de - V 2.16.0 Modified: trunk/scanner/src/Scanner.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/Scanner.ycp?rev=45625&r1=45624&r2=45625&view=diff ============================================================================== --- trunk/scanner/src/Scanner.ycp (original) +++ trunk/scanner/src/Scanner.ycp Wed Mar 19 17:24:28 2008 @@ -2061,8 +2061,8 @@ Popup::ShowFeedback( sformat( // Header of a Popup::ShowFeedback where %1 will be replaced by the driver name: _("Testing %1"), backend_name ), // Body of a Popup::ShowFeedback where %1 will be replaced by the SANE device identifier. - // Do not change or translate "scanimage -d %1 -T", it is a fixed command. - sformat( _("Testing with 'scanimage -d %1 -T'..."), + // Do not change or translate "scanimage -d %1 -v", it is a fixed command. + sformat( _("Testing with 'scanimage -d %1 -v'..."), sane_device ) ); @@ -2072,8 +2072,8 @@ // %1 will be replaced by the SANE device identifier // %2 will be replaced by the actual test results // which are usually only available in English. - // Do not change or translate "scanimage -d %1 -T", it is a fixed command. - _("Test with 'scanimage -d %1 -T' failed.\nThe results are:\n\n%2"), + // Do not change or translate "scanimage -d %1 -v", it is a fixed command. + _("Test with 'scanimage -d %1 -v' failed.\nThe results are:\n\n%2"), sane_device, // Fallback message if the real results are missing: result["stderr"]:_("(no results available)") @@ -2096,8 +2096,8 @@ // %1 will be replaced by the SANE device identifier // %2 will be replaced by the actual test results // which are usually only available in English. - // Do not change or translate "scanimage -d %1 -T", it is a fixed command. - _("Test with 'scanimage -d %1 -T' succeeded.\nThe results are:\n\n%2"), + // Do not change or translate "scanimage -d %1 -v", it is a fixed command. + _("Test with 'scanimage -d %1 -v' succeeded.\nThe results are:\n\n%2"), sane_device, // Fallback message if the real results are missing: result["stderr"]:_("(no results available)") Modified: trunk/scanner/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/helps.ycp?rev=45625&r1=45624&r2=45625&view=diff ============================================================================== --- trunk/scanner/src/helps.ycp (original) +++ trunk/scanner/src/helps.ycp Wed Mar 19 17:24:28 2008 @@ -47,7 +47,7 @@ // Do not change or translate "HP", it is a manufacturer name. // Do not change or translate "OfficeJet", it is a model name. // Do not change or translate "PSC", it is a model (Printer Scanner Copier) name. -// Do not change or translate "/usr/sbin/lsusb", it is a command name. +// Do not change or translate "lsusb", it is a command name. _("<p> A normal USB scanner should be detected automatically. It might happen that particular USB devices which are no scanners are shown too @@ -58,7 +58,7 @@ In particular, HP all-in-one devices, such as OfficeJets and PSCs, are not detected, but can be configured this way. If you have difficulties configuring your scanner here, -check whether it appears in the output of <tt>/usr/sbin/lsusb</tt>. +check whether it appears in the output of <tt>lsusb</tt>. If it is not listed there, the USB system cannot communicate with the scanner. </p>") + // Overview dialog help 4/8: @@ -81,13 +81,19 @@ // or with a "remote scanner" (i.e. a scanner which is connected to another host in the network). // Do not confuse "scanning via network" (i.e. use a remote scanner via another host in the network) // with "scanning the network" (i.e. scan the network for other hosts or services). +// Do not change or translate "hp-setup", it is a command name. _("<p> -Network scanners cannot be configured with this tool. -These devices must be configured manually. +Network scanners cannot be configured with this tool +except for HP all-in-one devices. +Network scanners must be configured manually. A network scanner is a scanner that has a network interface so it is directly accessible in the network. In contrast, scanning via network means accessing a remote scanner connected to another host in the network. +To set up the scanner unit in a HP all-in-one device +which is connected via a built-in network interface, +first run <tt>hp-setup</tt> as root, then you can configure +the scanner unit with this tool using <b>Add</b>. </p>") + // Overview dialog help 7/8: // Do not confuse "scanning via network" (i.e. use a remote scanner via another host in the network) Modified: trunk/scanner/tools/test_scanner_backend URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/tools/test_scanner_backend?rev=45625&r1=45624&r2=45625&view=diff ============================================================================== --- trunk/scanner/tools/test_scanner_backend (original) +++ trunk/scanner/tools/test_scanner_backend Wed Mar 19 17:24:28 2008 @@ -10,22 +10,30 @@ umask 022 MY_NAME=${0##*/} -BACKEND="$1" -[ -z "$BACKEND" ] && { echo -en "\nUsage:\n$MY_NAME backend\n" 1>&2 ; exit 1 ; } +SANE_DEVICE="$1" +[ -z "$SANE_DEVICE" ] && { echo -en "\nUsage:\n$MY_NAME SANE_device\n" 1>&2 ; exit 1 ; } -MAXIMUM_WAIT="120" -# The exit code of "scanimage -d $BACKEND -T" is needed as exit code of this script. +# The test via "scanimage -d $SANE_DEVICE -T" does not work for any backend +# because it tries using a variety of buffer sizes during the data transfer, +# followed by a cancel instead of completing the scan. +# This might put some scanners/backends into an inconsistent state, +# when they do not properly implement the cancel, see the Novell/Suse Bugzilla bug +# https://bugzilla.novell.com/show_bug.cgi?id=344534 +# Therefore the test is done via "scanimage -d $SANE_DEVICE -v >/dev/null" +# which does a complete scan and "-v" provides some basic info what it does. +# The exit code of "scanimage" is needed as exit code of this script. # Therefore this command must run in the foreground. # Therefore a simple time bomb background process is started before it. -# This time bomb background process process is normally killed at the end. +# This time bomb background process is normally killed at the end. # As a signal is processed not until a "sleep" has finished, # it is crucial not to do simply "sleep $MAXIMUM_WAIT" # but to do "for i in $( seq $MAXIMUM_WAIT ) ; do sleep 1 ; done" # otherwise it would wait in any case until "sleep $MAXIMUM_WAIT" has finished. +MAXIMUM_WAIT="120" if [ -x /usr/bin/scanimage ] then ( for i in $( seq $MAXIMUM_WAIT ) ; do sleep 1 ; done ; killall -9 scanimage &>/dev/null ) & timebombPID=$! - scanimage -d $BACKEND -T + scanimage -d $SANE_DEVICE -v >/dev/null scanimageEXIT=$? # If the timebomb is still running, scanimage has finished # and killing the timebomb will be successful. -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org