Hello community,
here is the log from the commit of package yast2-printer for openSUSE:Factory
checked in at Fri May 7 15:58:52 CEST 2010.
--------
--- yast2-printer/yast2-printer.changes 2010-04-29 15:52:21.000000000 +0200
+++ yast2-printer/yast2-printer.changes 2010-05-06 16:13:57.000000000 +0200
@@ -1,0 +2,10 @@
+Thu May 6 15:49:01 CEST 2010 - jsmeix@suse.de
+
+- yast2-printer can launch hp-setup to set up HP devices.
+ When hp-setup has finished, it is likely that a new print queue
+ was created by it and therefore basicadd.ycp should call
+ Printerlib::WaitForUpdatedConfigFiles after hp-setup finished
+ (see Novell/Suse Bugzilla bnc#603247).
+- 2.19.10
+
+-------------------------------------------------------------------
@@ -7 +17 @@
- implicitely without a button click.
+ indirectly without a button click.
calling whatdependson for head-i586
Old:
----
yast2-printer-2.19.9.tar.bz2
New:
----
yast2-printer-2.19.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-printer.spec ++++++
--- /var/tmp/diff_new_pack.w6LZYo/_old 2010-05-07 15:58:16.000000000 +0200
+++ /var/tmp/diff_new_pack.w6LZYo/_new 2010-05-07 15:58:16.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-printer (Version 2.19.9)
+# spec file for package yast2-printer (Version 2.19.10)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-printer
-Version: 2.19.9
+Version: 2.19.10
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-printer-2.19.9.tar.bz2
+Source0: yast2-printer-2.19.10.tar.bz2
Prefix: /usr
@@ -54,7 +54,7 @@
Developer documentation for yast2-printer.
%prep
-%setup -n yast2-printer-2.19.9
+%setup -n yast2-printer-2.19.10
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-printer-2.19.9.tar.bz2 -> yast2-printer-2.19.10.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.9/VERSION new/yast2-printer-2.19.10/VERSION
--- old/yast2-printer-2.19.9/VERSION 2010-04-23 16:34:39.000000000 +0200
+++ new/yast2-printer-2.19.10/VERSION 2010-05-06 13:44:46.000000000 +0200
@@ -1 +1 @@
-2.19.9
+2.19.10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.9/configure new/yast2-printer-2.19.10/configure
--- old/yast2-printer-2.19.9/configure 2010-04-29 15:47:55.000000000 +0200
+++ new/yast2-printer-2.19.10/configure 2010-05-06 15:52:10.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.9.
+# Generated by GNU Autoconf 2.63 for yast2-printer 2.19.10.
#
# 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.9'
-PACKAGE_STRING='yast2-printer 2.19.9'
+PACKAGE_VERSION='2.19.10'
+PACKAGE_STRING='yast2-printer 2.19.10'
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.9 to adapt to many kinds of systems.
+\`configure' configures yast2-printer 2.19.10 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.9:";;
+ short | recursive ) echo "Configuration of yast2-printer 2.19.10:";;
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.9
+yast2-printer configure 2.19.10
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.9, which was
+It was created by yast2-printer $as_me 2.19.10, 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.9'
+ VERSION='2.19.10'
cat >>confdefs.h <<_ACEOF
@@ -2587,7 +2587,7 @@
-VERSION="2.19.9"
+VERSION="2.19.10"
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.9, which was
+This file was extended by yast2-printer $as_me 2.19.10, 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.9
+yast2-printer config.status 2.19.10
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.9/configure.in new/yast2-printer-2.19.10/configure.in
--- old/yast2-printer-2.19.9/configure.in 2010-04-29 15:47:49.000000000 +0200
+++ new/yast2-printer-2.19.10/configure.in 2010-05-06 15:52:05.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.9, http://bugs.opensuse.org/, yast2-printer)
+AC_INIT(yast2-printer, 2.19.10, 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.9"
+VERSION="2.19.10"
RPMNAME="yast2-printer"
MAINTAINER="Michal Zugec "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-printer-2.19.9/src/Printer.ycp new/yast2-printer-2.19.10/src/Printer.ycp
--- old/yast2-printer-2.19.9/src/Printer.ycp 2010-04-23 16:34:29.000000000 +0200
+++ new/yast2-printer-2.19.10/src/Printer.ycp 2010-04-30 10:19:06.000000000 +0200
@@ -2268,7 +2268,7 @@
if( ! Printerlib::ExecuteBashCommand( "type -P netcat" ) )
{ // netcat is required for a meaningful test
// but in most cases TestClientOnlyServer is called
- // implicitely without a button click by the user
+ // indirectly 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 )
@@ -2288,7 +2288,7 @@
// but some output is needed for the Popup::ErrorDetails below:
if( Printerlib::ExecuteBashCommand( "netcat -v -w 1 -z " + server_name + " 631" ) )
{ // 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.
+ // because in most cases TestClientOnlyServer is called indirectly without a button click.
return true;
}
// The netcat-test failed:
@@ -2340,7 +2340,7 @@
}
// netcat was not executable but at least the ping-test was successful.
// 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.
+ // because in most cases TestClientOnlyServer is called indirectly without a button click.
return true;
}
// The ping-test failed:
@@ -2393,7 +2393,7 @@
}
// ping was not executable but at least the host-test was successful.
// 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.
+ // because in most cases TestClientOnlyServer is called indirectly without a button click.
return true;
}
// The host-test failed:
@@ -2421,7 +2421,7 @@
}
// Neither netcat nor ping nor host were executable.
// 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
+ // because in most cases TestClientOnlyServer is called indirectly 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.9/src/basicadd.ycp new/yast2-printer-2.19.10/src/basicadd.ycp
--- old/yast2-printer-2.19.9/src/basicadd.ycp 2010-04-14 16:45:33.000000000 +0200
+++ new/yast2-printer-2.19.10/src/basicadd.ycp 2010-05-06 13:38:21.000000000 +0200
@@ -697,6 +697,8 @@
// (always zero even in case of error).
// The hp-setup exit code does not matter because the printer autodetection in the Overview dialog
// will show an appropriate result (e.g. no new print queue if hp-setup failed):
+ Wizard::DisableBackButton();
+ Wizard::DisableNextButton();
if( ! Printer::RunHpsetup() )
{ Popup::Error( // Message of a Popup::Error.
// Only a simple message because before the RunHpsetup function was called
@@ -704,10 +706,29 @@
// Do not change or translate "hp-setup", it is a program name:
_("Failed to run hp-setup.")
);
+ Wizard::EnableBackButton();
+ Wizard::EnableNextButton();
continue;
}
- // Exit this dialog and run go back to the Overview dialog via the sequencer in wizards.ycp
+ // When hp-setup has finished, it is likely that a new print queue was created by it.
+ // After a local queue was added, enforce to show also local queues
+ // in particular when no local queues were shown before:
+ Printer::queue_filter_show_local = true;
+ // Since CUPS 1.4 the new DirtyCleanInterval directive controls the delay when cupsd updates config files:
+ if( ! Printerlib::WaitForUpdatedConfigFiles( _("Creating New Printer Setup") ) )
+ { // It returns false if the user had interrupted the waiting for updated config files:
+ Popup::ErrorDetails( // Message of a Popup::ErrorDetails:
+ _("New Printer Configuration not yet Stored in the System"),
+ // Explanation details of a Popup::ErrorDetails.
+ // The 'next dialog' is the overview dialog where the printer configurations are shown
+ // which has a 'Refresh List' button to update the shown printer configurations:
+ _("If the next dialog does not show the new printer configuration as expected, wait some time and use the 'Refresh List' button.")
+ );
+ }
+ // Exit this dialog and go back to the Overview dialog via the sequencer in wizards.ycp
// to show the new printer autodetection results:
+ Wizard::EnableBackButton();
+ Wizard::EnableNextButton();
break;
}
y2milestone( "Ignoring unexpected returncode in BasicAddDialog: %1", user_input );
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org