Author: jsmeix Date: Thu Apr 8 15:15:11 2010 New Revision: 61614 URL: http://svn.opensuse.org/viewcvs/yast?rev=61614&view=rev Log: In overview.ycp show a generic text when the user selected that testpage printing had failed for a local queue but there are no messages in /var/log/cups/error_log regarding the testpage print job. Modified: trunk/printer/VERSION trunk/printer/src/overview.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=61614&r1=61613&r2=61614&view=diff ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Thu Apr 8 15:15:11 2010 @@ -1 +1 @@ -2.19.7 +2.19.8 Modified: trunk/printer/src/overview.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/overview.ycp?rev=61614&r1=61613&r2=61614&view=diff ============================================================================== --- trunk/printer/src/overview.ycp (original) +++ trunk/printer/src/overview.ycp Thu Apr 8 15:15:11 2010 @@ -487,10 +487,7 @@ // Body of a Popup::AnyMessage when no queue was selected from the list: _("Select an entry.") ); - // When testpage printing failed there might be whatever reason - // so that a refresh of the overview content is needed to be on the safe side. - // Re-run the OverviewDialog (with re-created queue status) via the sequencer: - return `refresh; + return nil; } if( "yes" == Printer::queues[selected_queue_index,"rejecting"]:"no" ) { Popup::AnyMessage( // Header of a Popup::AnyMessage when the queue rejects print jobs: @@ -498,8 +495,8 @@ // Body of a Popup::AnyMessage when the queue rejects print jobs: _("The testpage cannot be printed because print jobs are rejected.") ); - // When testpage printing failed there might be whatever reason - // so that a refresh of the overview content is needed to be on the safe side. + // Do a refresh of the overview content to be on the safe side. + // Perhaps the actual current queue state is no longer "rejecting". // Re-run the OverviewDialog (with re-created queue status) via the sequencer: return `refresh; } @@ -509,8 +506,8 @@ // Body of a Popup::AnyMessage when printing is disabled for the queue: _("The testpage cannot be printed because printout is disabled.") ); - // When testpage printing failed there might be whatever reason - // so that a refresh of the overview content is needed to be on the safe side. + // Do that a refresh of the overview content to be on the safe side. + // Perhaps the actual current queue state is no longer "disabled". // Re-run the OverviewDialog (with re-created queue status) via the sequencer: return `refresh; } @@ -726,7 +723,6 @@ { // When the user had selected in the Popup::AnyQuestion that "Testpage printing failed" // and when it is a local queue, extract logging information about the test print job // from /var/log/cups/error_log and show them to the user: - string test_print_cups_error_log = ""; test_print_command_stdout = deletechars( test_print_command_stdout, "'" ); Printerlib::ExecuteBashCommand( // sed is greedy and cuts all up to the last '-' for example // echo ' funprinter-1000-123 ' | sed -e 's/.*-//' @@ -741,6 +737,7 @@ + "-[0-9]* ' | sed -e 's/.*-//' | tr -d -c '[:digit:]'" ); string test_print_job_number = Printerlib::result["stdout"]:""; + string test_print_cups_error_log = ""; if( "" != test_print_job_number ) { // Note the YCP quoting: \\ becomes \ in the commandline: Printerlib::ExecuteBashCommand( "grep '\\[Job " @@ -762,6 +759,13 @@ + where_full_log ); } + else + { Popup::Notify( // When the user had selected that "Testpage printing failed" for a local queue + // but the test_print_cups_error_log was effectively empty, + // show a very generic info to the user to show at least something: + _( "For CUPS log information, see the /var/log/cups/error_log file." ) + ); + } } } else -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org