Author: jsmeix Date: Tue Jun 2 16:50:31 2009 New Revision: 57397 URL: http://svn.opensuse.org/viewcvs/yast?rev=57397&view=rev Log: - Adapted the Connection Wizard and its help text regarding beh for the new foomatic-filters 4.0.1 which now contains beh so that cups-backends is no longer required to set up beh (see Novell/Suse Bugzilla bnc#502656 comment #15). - Fixed the determine_printer_driver_options tool which failed to set PPD options with special characters in keywords (see Novell/Suse Bugzilla bnc#503774). - Let the autodetect_print_queues tool ignore "root"-instances (see Novell/Suse Bugzilla bnc#503065). - 2.18.17 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/connectionwizard.ycp trunk/printer/src/helps.ycp trunk/printer/tools/autodetect_print_queues trunk/printer/tools/determine_printer_driver_options Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=57397&r1=57396&r2=57397&view=diff ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Tue Jun 2 16:50:31 2009 @@ -1 +1 @@ -2.18.16 +2.18.17 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.changes?rev=57397&r1=57396&r2=57397&view=diff ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Tue Jun 2 16:50:31 2009 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Tue Jun 2 16:35:57 CEST 2009 - jsmeix@suse.de + +- Adapted the Connection Wizard and its help text regarding beh + for the new foomatic-filters 4.0.1 which now contains beh + so that cups-backends is no longer required to set up beh + (see Novell/Suse Bugzilla bnc#502656 comment #15). +- Fixed the determine_printer_driver_options tool which + failed to set PPD options with special characters in keywords + (see Novell/Suse Bugzilla bnc#503774). +- Let the autodetect_print_queues tool ignore "root"-instances + (see Novell/Suse Bugzilla bnc#503065). +- 2.18.17 + +------------------------------------------------------------------- Tue May 19 15:39:34 CEST 2009 - mzugec@suse.cz - fixed: creating AY profile (bnc#504762) Modified: trunk/printer/src/connectionwizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/connectionwizard.ycp?rev=57397&r1=57396&r2=57397&view=diff ============================================================================== --- trunk/printer/src/connectionwizard.ycp (original) +++ trunk/printer/src/connectionwizard.ycp Tue Jun 2 16:50:31 2009 @@ -788,23 +788,6 @@ ); break; case(`beh): - if( ! Printerlib::TestAndInstallPackage( "cups-backends", "installed" ) ) - { if( Popup::ContinueCancel( _("To use 'beh', the RPM package cups-backends must be installed.") ) ) - { Printerlib::TestAndInstallPackage( "cups-backends", "install" ); - } - // The user can also decide during the actual installation not to install it - // or the installation may have failed for whatever reason - // so that we test again whether or not it is now actually installed: - if( ! Printerlib::TestAndInstallPackage( "cups-backends", "installed" ) ) - { content = `VBox - ( `Left - ( `Label - ( _("The RPM package cups-backends is not installed.") ) - ) - ); - break; - } - } model_content = getContentFromCurrentModel(); content = `VBox ( `Left Modified: trunk/printer/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/helps.ycp?rev=57397&r1=57396&r2=57397&view=diff ============================================================================== --- trunk/printer/src/helps.ycp (original) +++ trunk/printer/src/helps.ycp Tue Jun 2 16:50:31 2009 @@ -527,7 +527,7 @@ The matching device URI is:<br> pipe:/path/to/targetcommand<br> <b>Daisy-chain Backend Error Handler (beh)</b><br> -To do this, the RPM package cups-backends must be installed. +To do this, the RPM package foomatic-filters must be installed. The package provides the CUPS backend 'beh'.<br> The backend 'beh' is a wrapper for the usual backend, which is then called by beh. Modified: trunk/printer/tools/autodetect_print_queues URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/autodetect_print_queues?rev=57397&r1=57396&r2=57397&view=diff ============================================================================== --- trunk/printer/tools/autodetect_print_queues (original) +++ trunk/printer/tools/autodetect_print_queues Tue Jun 2 16:50:31 2009 @@ -81,14 +81,24 @@ # Process the data: -# Extract what is needed, quotation marks " are replaced by ' : -tr '"' "'" <$TMP_DATA_RAW_V >$TMP_DATA +# Extract only real queues (i.e. suppress instances of the form queue_name/instance) +# and replace quotation marks " by ' because " is needed as YCP string delimiter: +grep -v '^device for [^:]*/[^:]*:' $TMP_DATA_RAW_V | tr '"' "'" >$TMP_DATA # Change "^device for" to "queue" -# and convert only the first colon after the queue name to "\nuri" -# so that the DeviceURI is on a seperated line: +# and convert only the first colon (i.e. the colon after the queue name) to "\nuri" +# to get the DeviceURI is on a separated line so that the content has the form +# queue first_queue +# uri backend1:/this +# queue second_queue +# uri backend2:/that +# To be on the safe side match to ': ' so that a colon inside a queue name does not match +# because a space character is not allowed inside a queue name, +# see http://www.cups.org/documentation.php/doc-1.1/sam.html which reads +# "... the printer name must start with any printable character except " ", "/", and "@". +# It can contain up to 127 letters, numbers, and the underscore (_). Case is not significant ..." sed -i -e 's/^device for/queue/' \ - -e 's/:/\nuri/' $TMP_DATA + -e 's/: /\nuri /' $TMP_DATA # Condense multiple spaces, convert tabs to blanks, and remove leading and trailing spaces: sed -i -e 's/[[:space:]][[:space:]]*/ /g' \ Modified: trunk/printer/tools/determine_printer_driver_options URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/determine_printer_driver_options?rev=57397&r1=57396&r2=57397&view=diff ============================================================================== --- trunk/printer/tools/determine_printer_driver_options (original) +++ trunk/printer/tools/determine_printer_driver_options Tue Jun 2 16:50:31 2009 @@ -50,10 +50,13 @@ # Get the raw data: # Continue even after timeout because then an empty YCP map is output # which indicates that there are no driver options. -# Simply delete unusual (in particular all non-ASCII) characters -# but keep the delimiters / * and newline: MAXIMUM_WAIT="10" -$LPOPTIONS -h localhost -p $QUEUE -l | tr -c -d '[:alnum:] <>/:\*\n' >$TMP_DATA & +# The Adobe PPD specification reads that main keywords can contain +# any printable ASCII character within the range of +# decimal 33 (\041) to decimal 126 (\176) inclusive. +# Also keep newline and space but exclude " (\042) which +# is needed as YCP string delimiter: +$LPOPTIONS -h localhost -p $QUEUE -l | tr -c -d '\n \041\043-\176' >$TMP_DATA & lpoptionsPID=$! # Timeout stuff: for i in $( seq $MAXIMUM_WAIT ) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org