Hello community,
here is the log from the commit of package yast2-printer for openSUSE:Factory
checked in at Fri Apr 30 01:34:48 CEST 2010.
--------
--- yast2-printer/yast2-printer.changes 2010-04-23 12:42:16.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-printer/yast2-printer.changes 2010-04-29 15:52:21.000000000 +0200
@@ -1,0 +2,12 @@
+Thu Apr 29 15:48:27 CEST 2010 - jsmeix@suse.de
+
+- Do no longer show positive feedback in TestClientOnlyServer
+ because this would cause annoying popups for the user
+ because in most cases TestClientOnlyServer is called
+ implicitely without a button click.
+ Only show positive feedback in printingvianetwork.ycp
+ when TestClientOnlyServer is called by the user when
+ clicking the [Test Server] button.
+- 2.19.9
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-printer-2.19.8.tar.bz2
New:
----
yast2-printer-2.19.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-printer.spec ++++++
--- /var/tmp/diff_new_pack.Rcep7k/_old 2010-04-30 01:34:40.000000000 +0200
+++ /var/tmp/diff_new_pack.Rcep7k/_new 2010-04-30 01:34:40.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-printer (Version 2.19.8)
+# spec file for package yast2-printer (Version 2.19.9)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-printer
-Version: 2.19.8
+Version: 2.19.9
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-printer-2.19.8.tar.bz2
+Source0: yast2-printer-2.19.9.tar.bz2
Prefix: /usr
@@ -54,7 +54,7 @@
Developer documentation for yast2-printer.
%prep
-%setup -n yast2-printer-2.19.8
+%setup -n yast2-printer-2.19.9
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-printer-2.19.8.tar.bz2 -> yast2-printer-2.19.9.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.8/VERSION new/yast2-printer-2.19.9/VERSION
--- old/yast2-printer-2.19.8/VERSION 2010-04-08 15:10:33.000000000 +0200
+++ new/yast2-printer-2.19.9/VERSION 2010-04-23 16:34:39.000000000 +0200
@@ -1 +1 @@
-2.19.8
+2.19.9
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.8/configure new/yast2-printer-2.19.9/configure
--- old/yast2-printer-2.19.8/configure 2010-04-23 11:47:43.000000000 +0200
+++ new/yast2-printer-2.19.9/configure 2010-04-29 15:47:55.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-printer 2.19.8.
+# Generated by GNU Autoconf 2.63 for yast2-printer 2.19.9.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-printer'
PACKAGE_TARNAME='yast2-printer'
-PACKAGE_VERSION='2.19.8'
-PACKAGE_STRING='yast2-printer 2.19.8'
+PACKAGE_VERSION='2.19.9'
+PACKAGE_STRING='yast2-printer 2.19.9'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1336,7 +1336,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-printer 2.19.8 to adapt to many kinds of systems.
+\`configure' configures yast2-printer 2.19.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1407,7 +1407,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-printer 2.19.8:";;
+ short | recursive ) echo "Configuration of yast2-printer 2.19.9:";;
esac
cat <<\_ACEOF
@@ -1502,7 +1502,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-printer configure 2.19.8
+yast2-printer configure 2.19.9
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1516,7 +1516,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-printer $as_me 2.19.8, which was
+It was created by yast2-printer $as_me 2.19.9, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2363,7 +2363,7 @@
# Define the identity of the package.
PACKAGE='yast2-printer'
- VERSION='2.19.8'
+ VERSION='2.19.9'
cat >>confdefs.h <<_ACEOF
@@ -2587,7 +2587,7 @@
-VERSION="2.19.8"
+VERSION="2.19.9"
RPMNAME="yast2-printer"
MAINTAINER="Michal Zugec "
@@ -5413,7 +5413,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-printer $as_me 2.19.8, which was
+This file was extended by yast2-printer $as_me 2.19.9, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5467,7 +5467,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-printer config.status 2.19.8
+yast2-printer config.status 2.19.9
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.8/configure.in new/yast2-printer-2.19.9/configure.in
--- old/yast2-printer-2.19.8/configure.in 2010-04-23 11:47:38.000000000 +0200
+++ new/yast2-printer-2.19.9/configure.in 2010-04-29 15:47:49.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-printer, 2.19.8, http://bugs.opensuse.org/, yast2-printer)
+AC_INIT(yast2-printer, 2.19.9, http://bugs.opensuse.org/, yast2-printer)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.19.8"
+VERSION="2.19.9"
RPMNAME="yast2-printer"
MAINTAINER="Michal Zugec "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.8/src/Printer.ycp new/yast2-printer-2.19.9/src/Printer.ycp
--- old/yast2-printer-2.19.8/src/Printer.ycp 2010-04-22 10:56:39.000000000 +0200
+++ new/yast2-printer-2.19.9/src/Printer.ycp 2010-04-23 16:34:29.000000000 +0200
@@ -2232,11 +2232,6 @@
// First do the most meaningful test and only if this works return true.
// The subsequent tests are only there to provide more info for the user
// what might be the reason why the server is not accessible via port 631.
- string netcat_test_good_message = sformat( // Popup message
- // where %1 will be replaced by the server name.
- _("The server '%1' is accessible via port 631 (IPP/CUPS)."),
- server_name
- );
string netcat_test_fail_message = sformat( // Popup message
// where %1 will be replaced by the server name.
_("The server '%1' is not accessible via port 631 (IPP/CUPS)."),
@@ -2271,16 +2266,20 @@
// Only the netcat test provides a really meaningful result
// so that only this test returns immediately true if it was successful.
if( ! Printerlib::ExecuteBashCommand( "type -P netcat" ) )
- { // netcat is required for a meaningful test.
- // Show negative feedback:
- Popup::ErrorDetails( // Popup::ErrorDetails message:
- _("Cannot execute the program 'netcat'"),
- // Popup::ErrorDetails details:
- _("The RPM package 'netcat' is required for a meaningful test.") + "\n"
- + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:""
- );
+ { // netcat is required for a meaningful test
+ // but in most cases TestClientOnlyServer is called
+ // implicitely without a button click by the user
+ // so that even the netcat test is silently skipped
+ // and no negative feedback is shown when netcat is not executable:
if( fail_if_executable_is_missing )
- { return false;
+ { // Show negative feedback:
+ Popup::ErrorDetails( // Popup::ErrorDetails message:
+ _("Cannot execute the program 'netcat'"),
+ // Popup::ErrorDetails details:
+ _("The RPM package 'netcat' is required for a meaningful test.") + "\n"
+ + Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:""
+ );
+ return false;
}
}
else
@@ -2288,10 +2287,8 @@
// Make netcat verbose, otherwise there would be no output at all
// but some output is needed for the Popup::ErrorDetails below:
if( Printerlib::ExecuteBashCommand( "netcat -v -w 1 -z " + server_name + " 631" ) )
- { // Show positive feedback.
- // Show it as TimedMessage so that is disappears automatically
- // when TestClientOnlyServer() is called from ApplyNetworkPrintingSettings():
- Popup::TimedMessage( netcat_test_good_message, 3 );
+ { // Don't show positive feedback because this would be annoying popups for the user
+ // because in most cases TestClientOnlyServer is called implicitely without a button click.
return true;
}
// The netcat-test failed:
@@ -2342,8 +2339,8 @@
return false;
}
// netcat was not executable but at least the ping-test was successful.
- // There was already a Popup::ErrorDetails that netcat is required for a meaningful test
- // so that the less meaningful ping-test is all what could be done in this case.
+ // Don't show positive feedback because this would be annoying popups for the user
+ // because in most cases TestClientOnlyServer is called implicitely without a button click.
return true;
}
// The ping-test failed:
@@ -2395,8 +2392,8 @@
return false;
}
// ping was not executable but at least the host-test was successful.
- // There was already a Popup::ErrorDetails that netcat is required for a meaningful test
- // so that the last host-test is all what could be done in this case.
+ // Don't show positive feedback because this would be annoying popups for the user
+ // because in most cases TestClientOnlyServer is called implicitely without a button click.
return true;
}
// The host-test failed:
@@ -2423,7 +2420,8 @@
return false;
}
// Neither netcat nor ping nor host were executable.
- // There was already a Popup::ErrorDetails that netcat is required for a meaningful test
+ // Don't show any kind of feedback because this would be annoying popups for the user
+ // because in most cases TestClientOnlyServer is called implicitely without a button click
// so that nothing else could be done in this case except a "hope-for-the-best" successful return:
return true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.8/src/printingvianetwork.ycp new/yast2-printer-2.19.9/src/printingvianetwork.ycp
--- old/yast2-printer-2.19.8/src/printingvianetwork.ycp 2010-04-22 11:15:12.000000000 +0200
+++ new/yast2-printer-2.19.9/src/printingvianetwork.ycp 2010-04-23 16:34:26.000000000 +0200
@@ -924,8 +924,17 @@
}
if( `test_client_conf_server == event["ID"]:nil )
{ string current_client_conf_input_value = (string)UI::QueryWidget( `id(`client_conf_input), `Value );
- // Ignore what TestClientOnlyServer() returns, it shows sufficient popups to the user:
- Printer::TestClientOnlyServer( deletechars( tolower( current_client_conf_input_value ), " " ), true );
+ string server_name = deletechars( tolower( current_client_conf_input_value ), " " );
+ // No need for error popups because TestClientOnlyServer shows sufficient error popups:
+ if( Printer::TestClientOnlyServer( server_name, true ) )
+ { // Show positive feedback because TestClientOnlyServer doesn't do it:
+ Popup::Message( sformat( // Popup message
+ // where %1 will be replaced by the server name.
+ _("The server '%1' is accessible via port 631 (IPP/CUPS)."),
+ server_name
+ )
+ );
+ }
}
}
return nil;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org