Author: mzugec Date: Tue Oct 30 15:56:08 2007 New Revision: 41644 URL: http://svn.opensuse.org/viewcvs/yast?rev=41644&view=rev Log: let the user accept even non-compliant PPDs - (#310177) Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/modules/Printerdb.ycp trunk/printer/tools/process_ppd_files Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=41644&r1=41643&r2=41644&view=diff ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Tue Oct 30 15:56:08 2007 @@ -1 +1 @@ -2.16.1 +2.16.2 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.changes?rev=41644&r1=41643&r2=41644&view=diff ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Tue Oct 30 15:56:08 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Oct 30 15:55:17 CET 2007 - mzugec@suse.cz + +- let the user accept even non-compliant PPDs - (#310177) +- 2.16.2 + +------------------------------------------------------------------- Mon Oct 29 12:35:30 CET 2007 - mzugec@suse.cz - "unknown" queue appears in the installation - (#308107) Modified: trunk/printer/src/modules/Printerdb.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/modules/Printerdb.ycp?rev=41644&r1=41643&r2=41644&view=diff ============================================================================== --- trunk/printer/src/modules/Printerdb.ycp (original) +++ trunk/printer/src/modules/Printerdb.ycp Tue Oct 30 15:56:08 2007 @@ -764,20 +764,24 @@ term text = `VBox (); if (log_text != "" && log_text != nil) text = `RichText (`opt (`plainText), log_text); - UI::OpenDialog(`opt ( `decorated ), - `VBox (`HSpacing(75), - // heading - `Heading(_("Error: No Suitable PPD File Downloaded")), - text, - `PushButton( `id(`ok), `opt(`default), - Label::OKButton ()) - ) - ); - - UI::SetFocus(`id(`ok) ); - any r = UI::UserInput(); - UI::CloseDialog(); - return false; + + UI::OpenDialog(`opt ( `decorated ), + `VBox (`HSpacing(75), + // heading + `Heading(_("Error: Detected Error in PPD File")), + text, + `HBox ( + `PushButton( `id(`continue), + Label::ContinueButton ()), + `PushButton( `id(`cancel), `opt(`default), + Label::CancelButton ()) + ) + ) + ); + UI::SetFocus( `id(`cancel) ); + any r = UI::UserInput(); + UI::CloseDialog(); + if (`cancel == r) return false; } integer count = tointeger (SCR::Read (.target.string, dir + "/count")); if (count != nil) Modified: trunk/printer/tools/process_ppd_files URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/process_ppd_files?rev=41644&r1=41643&r2=41644&view=diff ============================================================================== --- trunk/printer/tools/process_ppd_files (original) +++ trunk/printer/tools/process_ppd_files Tue Oct 30 15:56:08 2007 @@ -13,7 +13,8 @@ #set -x COPIED=0; -EXIT=1; +PASSED=0; +EXIT=0; LOG_OUT=$3; @@ -65,14 +66,12 @@ #check files and copy them to the appropriate location for I in `find -iname '*.ppd'` ; do - echo "Checking file \"$I\"" >>$LOG_OUT; \ - /usr/bin/cupstestppd "$I" >>$LOG_OUT \ - && echo "file $I is ok" >>$LOG_OUT \ - && cp "$I" $TARGET_DIR \ - && COPIED=$(($COPIED+1)) \ - && EXIT=0 ; + echo "Checking file \"$I\"" >>$LOG_OUT + /usr/bin/cupstestppd "$I" >>$LOG_OUT && { echo "file $I is ok" >>$LOG_OUT ; PASSED=$(($PASSED+1)) ; } || EXIT=1 + cp "$I" $TARGET_DIR && COPIED=$(($COPIED+1)) || EXIT=1 done -echo "$COPIED files passed" >>$LOG_OUT; +echo "$PASSED files passed" >>$LOG_OUT; echo "$COPIED" >./count; exit $EXIT; + -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org