Hello community,
here is the log from the commit of package yast2-scanner
checked in at Tue Nov 4 18:01:52 CET 2008.
--------
--- yast2-scanner/yast2-scanner.changes 2008-09-10 16:38:34.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-scanner/yast2-scanner.changes 2008-11-04 12:43:21.575697000 +0100
@@ -1,0 +2,12 @@
+Tue Nov 4 09:17:52 CET 2008 - jsmeix@suse.de
+
+- V 2.17.2
+- Removed the "Back" button from the Overview dialog
+ and renamed other buttons according to new style guide
+ by manually overwriting the Wizard module defaults
+ (see Novell/Suse Bugzilla bnc#440560 comment #5).
+- Replaced Report with Popup and used Popup::ErrorDetails
+ to show stderr when commands failed (without any change
+ for translated texts).
+
+-------------------------------------------------------------------
@@ -15 +27 @@
-- Added an translateble error message to DetermineActiveScanners
+- Added an translatable error message to DetermineActiveScanners
@@ -18 +30 @@
-- Added an translateble message to SetScannerAccessPermissions
+- Added an translatable message to SetScannerAccessPermissions
calling whatdependson for head-i586
Old:
----
yast2-scanner-2.17.1.tar.bz2
New:
----
yast2-scanner-2.17.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-scanner.spec ++++++
--- /var/tmp/diff_new_pack.j31171/_old 2008-11-04 18:01:31.000000000 +0100
+++ /var/tmp/diff_new_pack.j31171/_new 2008-11-04 18:01:31.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-scanner (Version 2.17.1)
+# spec file for package yast2-scanner (Version 2.17.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,12 +20,12 @@
Url: http://en.opensuse.org/YaST
Name: yast2-scanner
-Version: 2.17.1
+Version: 2.17.2
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-scanner-2.17.1.tar.bz2
+Source0: yast2-scanner-2.17.2.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files xorg-x11-libX11-devel yast2 yast2-devtools yast2-testsuite
Requires: yast2
@@ -53,7 +53,7 @@
Johannes Meixner
%prep
-%setup -n yast2-scanner-2.17.1
+%setup -n yast2-scanner-2.17.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -93,8 +93,16 @@
%{prefix}/lib/YaST2/bin/*scanner*
%{prefix}/lib/YaST2/bin/displaytest
%doc %{prefix}/share/doc/packages/yast2-scanner
-
%changelog
+* Tue Nov 04 2008 jsmeix@suse.de
+- V 2.17.2
+- Removed the "Back" button from the Overview dialog
+ and renamed other buttons according to new style guide
+ by manually overwriting the Wizard module defaults
+ (see Novell/Suse Bugzilla bnc#440560 comment #5).
+- Replaced Report with Popup and used Popup::ErrorDetails
+ to show stderr when commands failed (without any change
+ for translated texts).
* Wed Sep 10 2008 jsmeix@suse.de
- V 2.17.1
Run test_and_set_scanner_access_permissions also
@@ -104,10 +112,10 @@
- V 2.17.0
- Applied proofread texts.
- Enforce a safe environment for ExecuteBashCommand.
-- Added an translateble error message to DetermineActiveScanners
+- Added an translatable error message to DetermineActiveScanners
if there is no response from the 'scanimage' command
(see V 2.16.9 and Novell/Suse Bugzilla bnc#387555).
-- Added an translateble message to SetScannerAccessPermissions
+- Added an translatable message to SetScannerAccessPermissions
if HAL does not know about the scanner
(see V 2.16.7 and Novell/Suse Bugzilla bnc#340173).
* Fri May 16 2008 jsrain@suse.cz
++++++ yast2-scanner-2.17.1.tar.bz2 -> yast2-scanner-2.17.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.17.1/configure new/yast2-scanner-2.17.2/configure
--- old/yast2-scanner-2.17.1/configure 2008-09-10 16:35:16.000000000 +0200
+++ new/yast2-scanner-2.17.2/configure 2008-11-04 12:24:33.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-scanner 2.17.1.
+# Generated by GNU Autoconf 2.61 for yast2-scanner 2.17.2.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-scanner'
PACKAGE_TARNAME='yast2-scanner'
-PACKAGE_VERSION='2.17.1'
-PACKAGE_STRING='yast2-scanner 2.17.1'
+PACKAGE_VERSION='2.17.2'
+PACKAGE_STRING='yast2-scanner 2.17.2'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1438,7 +1438,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-scanner 2.17.1 to adapt to many kinds of systems.
+\`configure' configures yast2-scanner 2.17.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1509,7 +1509,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-scanner 2.17.1:";;
+ short | recursive ) echo "Configuration of yast2-scanner 2.17.2:";;
esac
cat <<\_ACEOF
@@ -1615,7 +1615,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-scanner configure 2.17.1
+yast2-scanner configure 2.17.2
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1629,7 +1629,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-scanner $as_me 2.17.1, which was
+It was created by yast2-scanner $as_me 2.17.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2450,7 +2450,7 @@
# Define the identity of the package.
PACKAGE='yast2-scanner'
- VERSION='2.17.1'
+ VERSION='2.17.2'
cat >>confdefs.h <<_ACEOF
@@ -2678,7 +2678,7 @@
-VERSION="2.17.1"
+VERSION="2.17.2"
RPMNAME="yast2-scanner"
MAINTAINER="Johannes Meixner "
@@ -22553,7 +22553,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-scanner $as_me 2.17.1, which was
+This file was extended by yast2-scanner $as_me 2.17.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22606,7 +22606,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-scanner config.status 2.17.1
+yast2-scanner config.status 2.17.2
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.17.1/configure.in new/yast2-scanner-2.17.2/configure.in
--- old/yast2-scanner-2.17.1/configure.in 2008-09-10 16:35:02.000000000 +0200
+++ new/yast2-scanner-2.17.2/configure.in 2008-11-04 12:24:16.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-scanner, 2.17.1, http://bugs.opensuse.org/, yast2-scanner)
+AC_INIT(yast2-scanner, 2.17.2, http://bugs.opensuse.org/, yast2-scanner)
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.17.1"
+VERSION="2.17.2"
RPMNAME="yast2-scanner"
MAINTAINER="Johannes Meixner "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.17.1/src/dialogs.ycp new/yast2-scanner-2.17.2/src/dialogs.ycp
--- old/yast2-scanner-2.17.1/src/dialogs.ycp 2008-09-10 14:19:07.000000000 +0200
+++ new/yast2-scanner-2.17.2/src/dialogs.ycp 2008-11-04 12:42:49.000000000 +0100
@@ -4,8 +4,8 @@
* Summary: Dialogs definitions
* Authors: Johannes Meixner
*
- * $Id: dialogs.ycp 45768 2008-03-26 17:56:46Z jsmeix $
- * $Id: dialogs.ycp 45768 2008-03-26 17:56:46Z jsmeix $
+ * $Id: dialogs.ycp 52876 2008-11-04 11:42:48Z jsmeix $
+ * $Id: dialogs.ycp 52876 2008-11-04 11:42:48Z jsmeix $
*/
{
@@ -62,6 +62,14 @@
// Otherwise the user is asked for confirmation whether he want's to continue
// despite the fact that the module might not work correctly
if( ! Confirm::MustBeRoot() ) return `abort;
+ // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FEd...
+ // the "abort" button in a single configuration dialog must now be named "cancel":
+ Wizard::SetAbortButton( `abort, Label::CancelButton() );
+ // No "back" or "next" button at all makes any sense here
+ // because there is no dialog where to go "back"
+ // and the "next" dialog (i.e. the Overview dialog) is launced automatically
+ Wizard::HideBackButton();
+ Wizard::HideNextButton();
Wizard::RestoreHelp( HELPS["read"]:"" );
boolean ret = Scanner::Read();
return ret ? `next : `abort;
@@ -72,7 +80,11 @@
* @return `abort if aborted and `next otherwise
*/
symbol WriteDialog()
-{ Wizard::RestoreHelp(HELPS["write"]:"");
+{ // No "abort" or "back" or "next" button at all makes any sense here:
+ Wizard::HideAbortButton();
+ Wizard::HideBackButton();
+ Wizard::HideNextButton();
+ Wizard::RestoreHelp(HELPS["write"]:"");
boolean ret = Scanner::Write();
return ret ? `next : `abort;
}
@@ -87,7 +99,6 @@
{ // Caption of the OverviewDialog
// (the same as the caption of the matching help text)
string caption = _("Scanner Configuration");
-
WizardHW::CreateHWDialog( caption,
HELPS["overview"]:"",
[ // Header for a column of the overview table
@@ -120,11 +131,18 @@
]
]
);
-
- Wizard::SetNextButton( `next, Label::FinishButton() );
-
WizardHW::SetContents( Scanner::OverviewContents() );
-
+ // In the Overview dialog the "next" button is used to finish the whole module.
+ // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FEd...
+ // the "finish" button in an Overview dialog must now be named "OK":
+ Wizard::SetNextButton( `next, Label::OKButton() );
+ // Do not have a "Back" button in the Overview dialog
+ // because in the Overview dialog there is nothing where to go back,
+ // see http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FEd...
+ Wizard::HideBackButton();
+ // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FEd...
+ // the "abort" button in an Overview dialog must now be named "cancel":
+ Wizard::SetAbortButton( `abort, Label::CancelButton() );
any ret = nil;
while(true)
{ // UI::UserInput returns the label of the button which was cklicked:
@@ -512,6 +530,12 @@
continue;
}
y2milestone( "OverviewDialog returns: %1", ret );
+ // Re-set the default ID and label for the button with the "next" functionality for further wizard dialogs:
+ Wizard::SetNextButton( `next, Label::NextButton() );
+ // Restore the above hidden button with "back" functionality for other wizard dialogs:
+ Wizard::RestoreBackButton();
+ // Re-set the default ID and label for the button with the "abort" functionality for further wizard dialogs:
+ Wizard::SetAbortButton( `abort, Label::AbortButton() );
return ret;
}
@@ -598,15 +622,19 @@
Label::BackButton(),
Label::NextButton()
);
+ // According to http://en.opensuse.org/YaST/Style_Guide#Configuration_Wizard
+ // there is no longer a "abort" functionality which exits the whole module.
+ // Instead this button is now named "Cancel" and its functionality is
+ // to go back to the Overview dialog (i.e. what the "back" button would do)
+ // because it reads "Cancel - Closes the window and returns to the overview."
+ Wizard::SetAbortButton( `back, Label::CancelButton() );
+ // According to http://en.opensuse.org/YaST/Style_Guide#Configuration_Wizard
+ // the button with the "back" functionality must be disabled
+ // when it is the first dialog of a wizard stlye dialog sequence.
+ Wizard::DisableBackButton();
any ret = nil;
while(true)
{ ret = UI::UserInput();
- if( ret == `abort
- || ret == `cancel
- )
- { if( ! ReallyAbort() ) continue;
- break;
- }
if ( ret == `back )
{ break;
}
@@ -734,6 +762,10 @@
y2milestone( "Ignoring unexpected returncode in SelectModelDialog: %1", ret );
continue;
}
+ // Re-set the default ID and label for the button with the "abort" functionality for further wizard dialogs:
+ Wizard::SetAbortButton( `abort, Label::AbortButton() );
+ // Re-enable the above disabled button with the "back" functionality for further wizard dialogs:
+ Wizard::EnableBackButton();
return ret;
}
@@ -749,12 +781,29 @@
// The content here is only a dummy.
// The real content is what the "Progress:..." shows in ActivateBackend().
term contents = `Label( "" );
+ // According to http://en.opensuse.org/YaST/Style_Guide#Configuration_Wizard
+ // the button with the "back" functionality is unchanged
+ // when it is not the first dialog of a wizard stlye dialog sequence.
+ // According to http://en.opensuse.org/YaST/Style_Guide#Configuration_Wizard
+ // the last "next" button of a wizard-style dialog sequence must be named "finish":
Wizard::SetContentsButtons( caption,
contents,
HELPS["configure_backend"]:"",
Label::BackButton(),
- Label::NextButton()
+ Label::FinishButton()
);
+ // According to http://en.opensuse.org/YaST/Style_Guide#Configuration_Wizard
+ // there is no longer a "abort" functionality which exits the whole module
+ // for a wizard stlye dialog sequence.
+ // Instead within a wizard stlye dialog sequence the button with the
+ // "abort" functionality is now named "Cancel" and it does not abort the whole module
+ // but goes back to the Overvied dialog because it reads
+ // "Cancel - Closes the window and returns to the overview."
+ // But in this special case it does not make sense to just return to the overview
+ // because it is not clear if the right now enabled backend should be disabled
+ // (the same backend could be already used for another scanner)
+ // so that I do not show any "abort"/"cancel" button here at all:
+ Wizard::HideAbortButton();
Wizard::DisableBackButton();
Wizard::DisableAbortButton();
Wizard::DisableNextButton();
@@ -770,12 +819,6 @@
any ret = nil;
while(true)
{ ret = UI::UserInput();
- /* abort or cancel */
- if( ret == `abort
- || ret == `cancel )
- { if( ! ReallyAbort() ) continue;
- break;
- }
if( ret == `back )
{ Wizard::DisableBackButton();
Wizard::DisableAbortButton();
@@ -797,6 +840,8 @@
y2milestone( "Ignoring unexpected returncode in ConfigureBackendDialog: %1", ret );
continue;
}
+ // Restore the above hidden button with "abort" functionality for other wizard dialogs:
+ Wizard::RestoreAbortButton();
return ret;
}
@@ -979,21 +1024,25 @@
),
`VStretch()
);
+ // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FEd...
+ // there is no longer a "abort" functionality which exits the whole module.
+ // Instead this button is now named "Cancel" and its functionality is
+ // to go back to the Overview dialog (i.e. what the "back" button would do)
+ // because it reads "Cancel - Closes the window and returns to the overview."
+ // Therefore the button with the "abort" functionality is not shown at all
+ // and the button with the "back" functionality is named "Cancel".
+ // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FEd...
+ // the "finish" button in a single (step) configuration dialog must now be named "OK".
Wizard::SetContentsButtons( caption,
contents,
HELPS["configure_network_scanning"]:"",
- Label::BackButton(),
- Label::NextButton()
+ Label::CancelButton(),
+ Label::OKButton()
);
+ Wizard::HideAbortButton();
any ret = nil;
while(true)
{ ret = UI::UserInput();
- /* abort or cancel */
- if( ret == `abort
- || ret == `cancel )
- { if( ! ReallyAbort() ) continue;
- break;
- }
/* local host configuration */
if( ret == `local_host_config )
{ UI::ChangeWidget( `id(`saned_hosts_input),
@@ -1106,6 +1155,8 @@
y2milestone( "Ignoring unexpected returncode in ConfigureBackendDialog: %1", ret );
continue;
}
+ // Restore the above hidden button with "abort" functionality for other wizard dialogs:
+ Wizard::RestoreAbortButton();
return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.17.1/src/scanner.ycp new/yast2-scanner-2.17.2/src/scanner.ycp
--- old/yast2-scanner-2.17.1/src/scanner.ycp 2008-09-10 14:19:07.000000000 +0200
+++ new/yast2-scanner-2.17.2/src/scanner.ycp 2008-11-04 12:42:49.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Main file
* Authors: Johannes Meixner
*
- * $Id: scanner.ycp 23459 2005-05-18 12:36:11Z jsmeix $
+ * $Id: scanner.ycp 52876 2008-11-04 11:42:48Z jsmeix $
*
* Main file for scanner configuration. Uses all other files.
*/
@@ -21,9 +21,6 @@
y2milestone ("----------------------------------------");
y2milestone ("Scanner module started");
-import "Progress";
-import "Report";
-import "Summary";
import "CommandLine";
import "Scanner";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.17.1/src/Scanner.ycp new/yast2-scanner-2.17.2/src/Scanner.ycp
--- old/yast2-scanner-2.17.1/src/Scanner.ycp 2008-09-10 16:37:56.000000000 +0200
+++ new/yast2-scanner-2.17.2/src/Scanner.ycp 2008-11-04 12:42:49.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Scanner settings, input and output functions
* Authors: Johannes Meixner
*
- * $Id: Scanner.ycp 50970 2008-09-10 14:37:55Z jsmeix $
+ * $Id: Scanner.ycp 52876 2008-11-04 11:42:48Z jsmeix $
*
* Representation of the configuration of scanner.
* Input and output routines.
@@ -16,8 +16,6 @@
textdomain "scanner";
import "Progress";
-import "Report";
-import "Summary";
import "Popup";
import "Package";
import "Label";
@@ -366,10 +364,13 @@
{ return "not installed";
}
if( ! ExecuteBashCommand( "/bin/rpm -q " + package_name + " | /usr/bin/tr -d '\n'" ) )
- { Report::Error( sformat( // Message of a Report::Error where %1 will be replaced by the package name.
- // Only a simple message because this error does not happen on a normal system
- // (i.e. a system which is not totally broken or totally messed up).
- _("Failed to determine the version of package %1."), package_name ) );
+ { Popup::ErrorDetails( sformat( // Message of a Popup::ErrorDetails where %1 will be replaced by the package name.
+ // Only a simple message because this error does not happen on a normal system
+ // (i.e. a system which is not totally broken or totally messed up).
+ _("Failed to determine the version of package %1."), package_name
+ ),
+ result["stderr"]:""
+ );
}
return result["stdout"]:"failed to determine";
}
@@ -389,7 +390,7 @@
boolean TestAndInstallPackage( string package_name )
{ // First of all the multi-line string because such strings cannot be indented:
string iscan_message =
- // Message of a Report::Error
+ // Message of a Popup::Error
// Do not change or translate "iscan", it is a package name.
// Do not change or translate "i386", it is an architecture name.
_("The package iscan should be installed
@@ -439,7 +440,7 @@
if( Arch::x86_64() )
{ iscan_message = iscan_message + "\n" + iscan_64bit_message;
}
- Report::Error( iscan_message );
+ Popup::Error( iscan_message );
return false;
}
// Is the package available to be installed?
@@ -447,33 +448,33 @@
boolean package_available = Package::Available( package_name );
if( nil == package_available )
{ y2milestone( "Required package %1 is not installed and there is no package repository available.", package_name );
- Report::Error( sformat( // Message of a Report::Error where %1 will be replaced by the package name:
- _("Required package %1 is not installed and there is no package repository available."),
- package_name
- )
+ Popup::Error( sformat( // Message of a Popup::Error where %1 will be replaced by the package name:
+ _("Required package %1 is not installed and there is no package repository available."),
+ package_name
+ )
);
return false;
}
if( ! package_available )
{ y2milestone( "Required package %1 is not installed and not available in the repository.", package_name );
- Report::Error( sformat( // Message of a Report::Error where %1 will be replaced by the package name:
- _("Required package %1 is not installed and not available in the repository."),
- package_name
- )
+ Popup::Error( sformat( // Message of a Popup::Error where %1 will be replaced by the package name:
+ _("Required package %1 is not installed and not available in the repository."),
+ package_name
+ )
);
return false;
}
if( ! Package::Install( package_name ) )
{ y2milestone( "Failed to install required package %1.", package_name );
- Report::Error( // Message of a Report::Error where %1 will be replaced by the package name.
- // Only a simple message because:
- // Either the user has explicitely rejected to install the package,
- // or this error does not happen on a normal system
- // (i.e. a system which is not totally broken or totally messed up).
- sformat( _("Failed to install required package %1."),
- package_name
- )
- );
+ Popup::Error( // Message of a Popup::Error where %1 will be replaced by the package name.
+ // Only a simple message because:
+ // Either the user has explicitely rejected to install the package,
+ // or this error does not happen on a normal system
+ // (i.e. a system which is not totally broken or totally messed up).
+ sformat( _("Failed to install required package %1."),
+ package_name
+ )
+ );
return false;
}
return true;
@@ -490,7 +491,7 @@
boolean DetermineActiveScanners()
{ // First of all the multi-line strings because such strings cannot be indented:
string no_response_from_scanimage_message =
- // Message of a Report::Error when there is no response from the 'scanimage' command.
+ // Message of a Popup::Error when there is no response from the 'scanimage' command.
// Do not change or translate "net", it is a metadriver name.
// Do not simply use "driver" because net is no normal driver but a metadriver.
// Do not change or translate "scanimage -L", it is a fixed command.
@@ -510,40 +511,39 @@
// so that it was killed after a timeout (usually 60 seconds).
// Do not show result["stderr"] which is the same as
// the no_response_from_scanimage_message but untranslated:
- Report::Error( no_response_from_scanimage_message );
+ Popup::Error( no_response_from_scanimage_message );
return false;
}
- Report::Error( // Message of a Report::Error.
- // Only a simple message because this error does not happen on a normal system
- // (i.e. a system which is not totally broken or totally messed up).
- // Do not confuse this error with the case when no active scanner was determined.
- // The latter results no error.
- _("Failed to determine the active scanners.")
- + "\n"
- + OnlyMeaningfulErrorMessage( result["stderr"]:"" )
- );
+ Popup::ErrorDetails( // Message of a Popup::ErrorDetails.
+ // Only a simple message because this error does not happen on a normal system
+ // (i.e. a system which is not totally broken or totally messed up).
+ // Do not confuse this error with the case when no active scanner was determined.
+ // The latter results no error.
+ _("Failed to determine the active scanners."),
+ result["stderr"]:""
+ );
return false;
}
if( -1 == SCR::Read( .target.size, active_scanners_filename ) )
{ y2milestone( "Error: %1: file does not exist.", active_scanners_filename );
- Report::Error( sformat( // Message of a Report::Error where %1 will be replaced by the file name.
- // Only a simple message because this error does not happen on a normal system
- // (i.e. a system which is not totally broken or totally messed up).
- _("File %1 does not exist."),
- active_scanners_filename
- )
+ Popup::Error( sformat( // Message of a Popup::Error where %1 will be replaced by the file name.
+ // Only a simple message because this error does not happen on a normal system
+ // (i.e. a system which is not totally broken or totally messed up).
+ _("File %1 does not exist."),
+ active_scanners_filename
+ )
);
return false;
}
active_scanners = (list< map< string, string > >)SCR::Read( .target.ycp, active_scanners_filename );
if( nil == active_scanners )
{ y2milestone( "Error: Failed to read %1", active_scanners_filename );
- Report::Error( sformat( // Message of a Report::Error where %1 will be replaced by the file name.
- // Only a simple message because this error does not happen on a normal system
- // (i.e. a system which is not totally broken or totally messed up).
- _("Failed to read %1."),
- active_scanners_filename
- )
+ Popup::Error( sformat( // Message of a Popup::Error where %1 will be replaced by the file name.
+ // Only a simple message because this error does not happen on a normal system
+ // (i.e. a system which is not totally broken or totally messed up).
+ _("Failed to read %1."),
+ active_scanners_filename
+ )
);
active_scanners = [];
return false;
@@ -562,35 +562,36 @@
*/
boolean DetermineActiveBackends()
{ if( ! ExecuteBashCommand( determine_active_scanner_backends_commandline ) )
- { Report::Error( // Message of a Report::Error.
- // Only a simple message because this error does not happen on a normal system
- // (i.e. a system which is not totally broken or totally messed up).
- // Do not confuse this error with the case when no active driver was determined.
- // The latter results no error.
- _("Failed to determine the active drivers.")
- );
+ { Popup::ErrorDetails( // Message of a Popup::ErrorDetails.
+ // Only a simple message because this error does not happen on a normal system
+ // (i.e. a system which is not totally broken or totally messed up).
+ // Do not confuse this error with the case when no active driver was determined.
+ // The latter results no error.
+ _("Failed to determine the active drivers."),
+ result["stderr"]:""
+ );
return false;
}
if( -1 == SCR::Read( .target.size, active_backends_filename ) )
{ y2milestone( "Error: %1: file does not exist.", active_backends_filename );
- Report::Error( sformat( // Message of a Report::Error where %1 will be replaced by the file name.
- // Only a simple message because this error does not happen on a normal system
- // (i.e. a system which is not totally broken or totally messed up).
- _("File %1 does not exist."),
- active_backends_filename
- )
+ Popup::Error( sformat( // Message of a Popup::Error where %1 will be replaced by the file name.
+ // Only a simple message because this error does not happen on a normal system
+ // (i.e. a system which is not totally broken or totally messed up).
+ _("File %1 does not exist."),
+ active_backends_filename
+ )
);
return false;
}
active_backends = (list< string >)SCR::Read( .target.ycp, active_backends_filename );
if( nil == active_backends )
{ y2milestone( "Error: Failed to read %1", active_backends_filename );
- Report::Error( sformat( // Message of a Report::Error where %1 will be replaced by the file name.
- // Only a simple message because this error does not happen on a normal system
- // (i.e. a system which is not totally broken or totally messed up).
- _("Failed to read %1."),
- active_backends_filename
- )
+ Popup::Error( sformat( // Message of a Popup::Error where %1 will be replaced by the file name.
+ // Only a simple message because this error does not happen on a normal system
+ // (i.e. a system which is not totally broken or totally messed up).
+ _("Failed to read %1."),
+ active_backends_filename
+ )
);
active_backends = [];
return false;
@@ -610,35 +611,36 @@
*/
boolean AutodetectScanners()
{ if( ! ExecuteBashCommand( autodetect_scanners_commandline ) )
- { Report::Error( // Message of a Report::Error.
- // Only a simple message because this error does not happen on a normal system
- // (i.e. a system which is not totally broken or totally messed up).
- // Do not confuse this error with the case when no scanner was autodetected.
- // The latter results no error.
- _("Failed to detect scanners automatically.")
- );
+ { Popup::ErrorDetails( // Message of a Popup::ErrorDetails.
+ // Only a simple message because this error does not happen on a normal system
+ // (i.e. a system which is not totally broken or totally messed up).
+ // Do not confuse this error with the case when no scanner was autodetected.
+ // The latter results no error.
+ _("Failed to detect scanners automatically."),
+ result["stderr"]:""
+ );
return false;
}
if( -1 == SCR::Read( .target.size, autodetected_scanners_filename ) )
{ y2milestone( "Error: %1: file does not exist.", autodetected_scanners_filename );
- Report::Error( sformat( // Message of a Report::Error where %1 will be replaced by the file name.
- // Only a simple message because this error does not happen on a normal system
- // (i.e. a system which is not totally broken or totally messed up).
- _("File %1 does not exist."),
- autodetected_scanners_filename
- )
+ Popup::Error( sformat( // Message of a Popup::Error where %1 will be replaced by the file name.
+ // Only a simple message because this error does not happen on a normal system
+ // (i.e. a system which is not totally broken or totally messed up).
+ _("File %1 does not exist."),
+ autodetected_scanners_filename
+ )
);
return false;
}
autodetected_scanners = (list< map< string, string > >)SCR::Read( .target.ycp, autodetected_scanners_filename );
if( nil == autodetected_scanners )
{ y2milestone( "Error: Failed to read %1", autodetected_scanners_filename );
- Report::Error( sformat( // Message of a Report::Error where %1 will be replaced by the file name.
- // Only a simple message because this error does not happen on a normal system
- // (i.e. a system which is not totally broken or totally messed up).
- _("Failed to read %1."),
- autodetected_scanners_filename
- )
+ Popup::Error( sformat( // Message of a Popup::Error where %1 will be replaced by the file name.
+ // Only a simple message because this error does not happen on a normal system
+ // (i.e. a system which is not totally broken or totally messed up).
+ _("Failed to read %1."),
+ autodetected_scanners_filename
+ )
);
autodetected_scanners = [];
return false;
@@ -855,11 +857,12 @@
else
{ Popup::ClearFeedback();
}
- Report::Error( // Message of a Report::Error.
- // Only a simple message because this error does not happen on a normal system
- // (i.e. a system which is not totally broken or totally messed up).
- _("Aborting: Failed to create the scanner database.")
- );
+ Popup::ErrorDetails( // Message of a Popup::ErrorDetails.
+ // Only a simple message because this error does not happen on a normal system
+ // (i.e. a system which is not totally broken or totally messed up).
+ _("Aborting: Failed to create the scanner database."),
+ result["stderr"]:""
+ );
return false;
}
if( progress_feedback )
@@ -893,12 +896,12 @@
database = (list< map< string, string > >)SCR::Read( .target.ycp, database_filename );
if( database == nil )
{ y2milestone( "Aborting: Failed to read %1", database_filename );
- Report::Error( sformat( // Message of a Report::Error where %1 will be replaced by the file name.
- // Only a simple message because this error does not happen on a normal system
- // (i.e. a system which is not totally broken or totally messed up).
- _("Aborting: Failed to read %1."),
- database_filename
- )
+ Popup::Error( sformat( // Message of a Popup::Error where %1 will be replaced by the file name.
+ // Only a simple message because this error does not happen on a normal system
+ // (i.e. a system which is not totally broken or totally messed up).
+ _("Aborting: Failed to read %1."),
+ database_filename
+ )
);
return false;
}
@@ -1052,7 +1055,7 @@
global boolean RunHpsetup()
{ // First of all the multi-line strings because such strings cannot be indented:
string ptal_in_use_conflict_message =
- // Message of a Report::Error when hp-setup should be run.
+ // Message of a Popup::Error when hp-setup should be run.
// Do not change or translate "ptal", it is a service name.
// Do not change or translate "hp-setup", it is a program name.
// Do not change or translate "HPLIP", it is a subsystem name.
@@ -1064,7 +1067,7 @@
and start the scanner configuration again afterwards.
");
string displaytest_failed_message =
- // Message of a Report::Error when hp-setup should be run.
+ // Message of a Popup::Error when hp-setup should be run.
// Do not change or translate "hp-setup", it is a program name:
_("Cannot run hp-setup because no graphical display can be opened.
This happens in particular when YaST runs in text-only mode,
@@ -1081,7 +1084,7 @@
Should the hplip package be installed?
");
string hpsetup_not_executable_message =
- // Message of a Report::Error when hp-setup should be run.
+ // Message of a Popup::Error when hp-setup should be run.
// Do not change or translate "hp-setup", it is a program name:
_("Cannot run hp-setup because
/usr/bin/hp-setup is not executable
@@ -1095,7 +1098,7 @@
");
if( DependantPrintQueueExists( "hpoj" ) )
{ y2milestone( "Error: hp-setup is not launched because of conflict: PTAL is in use by a CUPS queue." );
- Report::Error( ptal_in_use_conflict_message );
+ Popup::Error( ptal_in_use_conflict_message );
return false;
}
if( ! ExecuteBashCommand( "/usr/lib/YaST2/bin/displaytest" ) )
@@ -1113,7 +1116,7 @@
// so that a few xorg-x11-lib* packages (xorg-x11-libX11, xorg-x11-libxcb, xorg-x11-libXau)
// are enforced by RPM to be installed.
y2milestone( "Error: hp-setup is not launched because /usr/lib/YaST2/bin/displaytest failed." );
- Report::Error( displaytest_failed_message );
+ Popup::Error( displaytest_failed_message );
return false;
}
if( "not installed" == actual_environment["hplip_version"]:"not installed"
@@ -1131,7 +1134,7 @@
}
if( ! ExecuteBashCommand( "test -x /usr/bin/hp-setup" ) )
{ y2milestone( "Error: /usr/bin/hp-setup not executable or does not exist." );
- Report::Error( hpsetup_not_executable_message );
+ Popup::Error( hpsetup_not_executable_message );
return false;
}
Popup::ShowFeedback( // No title for a simple busy message:
@@ -1999,14 +2002,14 @@
// when the user has decided not to initialize/activate/start the PTAL system
// because it may be already up and running or the user may want to set it up manually.
// Regardless of the state of the PTAL system the backend can be activated in /etc/sane.d/dll.conf
- Report::Warning(
- // Message of a Report::Warning for scanners which should be set up with the hpoj backend.
- // Only a simple message because before there was a Popup::YesNo
- // which asked the user whether he wants to let YaST activate the ptal service
- // so that this message is shown if the user has explicitely rejected to do it.
- // Do not change or translate "ptal", it is a service name.
- _("If the ptal service is not running, the scanner cannot work.")
- );
+ Popup::Warning(
+ // Message of a Popup::Warning for scanners which should be set up with the hpoj backend.
+ // Only a simple message because before there was a Popup::YesNo
+ // which asked the user whether he wants to let YaST activate the ptal service
+ // so that this message is shown if the user has explicitely rejected to do it.
+ // Do not change or translate "ptal", it is a service name.
+ _("If the ptal service is not running, the scanner cannot work.")
+ );
}
else
{ // The user has decided to initialize/activate/start the PTAL system:
@@ -2026,15 +2029,13 @@
// No conflicting print queue was found or
// a conflicting print queue was found but the user forced to proceed:
if( ! ExecuteBashCommand( setup_ptal_scanner_service_commandline ) )
- { Report::Error( sformat( // Message of a Report::Error where %1 can be replaced by an error message
- // if such an error message exists.
- // Only a simple message because this error does not happen on a normal system
- // (i.e. a system which is not totally broken or totally messed up).
- // Do not change or translate "PTAL", it is a subsystem name.
- _("Failed to set up the PTAL system.\n%1"),
- OnlyMeaningfulErrorMessage( result["stderr"]:"" )
- )
- );
+ { Popup::ErrorDetails( // Message of a Popup::ErrorDetails.
+ // Only a simple message because this error does not happen on a normal system
+ // (i.e. a system which is not totally broken or totally messed up).
+ // Do not change or translate "PTAL", it is a subsystem name.
+ _("Failed to set up the PTAL system."),
+ result["stderr"]:""
+ );
Progress::Title( // Last progress step progress bar title when the Progress was aborted:
_("Aborted")
);
@@ -2080,14 +2081,12 @@
}
else
{ // Whatever other error:
- Report::Warning( sformat( // Message of a Report::Warning when setting scanner access permissions failed
- // where %1 can be replaced by an error message if such an error message exists.
- // Only a simple message because this error does not happen on a normal system
- // (i.e. a system which is not totally broken or totally messed up).
- _("Failed to set scanner access permissions.\n%1"),
- OnlyMeaningfulErrorMessage( result["stderr"]:"" )
- )
- );
+ Popup::WarningDetails( // Message of a Popup::WarningDetails when setting scanner access permissions failed.
+ // Only a simple message because this error does not happen on a normal system
+ // (i.e. a system which is not totally broken or totally messed up).
+ _("Failed to set scanner access permissions.\n%1"),
+ result["stderr"]:""
+ );
}
}
}
@@ -2175,10 +2174,13 @@
}
// Deactivate the backend via bash script:
if( ! ExecuteBashCommand( deactivate_backend_commandline + " " + backend_name ) )
- { Report::Error( sformat( // Message of a Report::Error where %1 will be replaced by the driver name.
- // Only a simple message because this error does not happen on a normal system
- // (i.e. a system which is not totally broken or totally messed up).
- _("Failed to deactivate %1."), backend_name ) );
+ { Popup::ErrorDetails( sformat( // Message of a Popup::ErrorDetails where %1 will be replaced by the driver name.
+ // Only a simple message because this error does not happen on a normal system
+ // (i.e. a system which is not totally broken or totally messed up).
+ _("Failed to deactivate %1."), backend_name
+ ),
+ result["stderr"]:""
+ );
return false;
}
// Unset the special requirements for particular backends (e.g. "hpaio", "hpoj")
@@ -2213,21 +2215,23 @@
if( ! Service::Stop( "ptal" ) )
{ y2milestone( "Service::Stop('ptal') failed." );
if( user_confirmation )
- { Report::Error( // Only a simple message because this error does not happen on a normal system
- // (i.e. a system which is not totally broken or totally messed up).
- // Do not change or translate "ptal", it is a service name.
- _("Failed to stop the ptal service.")
- );
+ { Popup::ErrorDetails( // Only a simple message because this error does not happen on a normal system
+ // (i.e. a system which is not totally broken or totally messed up).
+ // Do not change or translate "ptal", it is a service name.
+ _("Failed to stop the ptal service."),
+ Service::Error()
+ );
}
}
if( ! Service::Disable( "ptal" ) )
{ y2milestone( "Service::Disable('ptal') failed." );
if( user_confirmation )
- { Report::Error( // Only a simple message because this error does not happen on a normal system
- // (i.e. a system which is not totally broken or totally messed up).
- // Do not change or translate "ptal", it is a service name.
- _("Failed to disable the ptal service.")
- );
+ { Popup::ErrorDetails( // Only a simple message because this error does not happen on a normal system
+ // (i.e. a system which is not totally broken or totally messed up).
+ // Do not change or translate "ptal", it is a service name.
+ _("Failed to disable the ptal service."),
+ Service::Error()
+ );
}
}
}
@@ -2315,9 +2319,9 @@
// then show a message but exit successfully because
// it is no error when there is no active scanner for the backend:
if( size( scanners_to_be_tested ) < 1 )
- { Report::ShowText( sformat( // Header of a Report::ShowText where %1 will be replaced by the driver name:
+ { Popup::AnyMessage( sformat( // Header of a Popup::AnyMessage where %1 will be replaced by the driver name:
_("No Scanner for %1"), backend_name ),
- // Body of a Report::ShowText:
+ // Body of a Popup::AnyMessage:
_("It is not possible to test without a matching active scanner.") );
return true;
}
@@ -2358,16 +2362,16 @@
);
if( ! ExecuteBashCommand( test_backend_commandline + " " + sane_device ) )
{ Popup::ClearFeedback();
- Report::Error( sformat( // Message of a Report::Error where
- // %1 will be replaced by the SANE device identifier
- // %2 will be replaced by the actual test results
- // which are usually only available in English.
- // Do not change or translate "scanimage -d %1 -v", it is a fixed command.
- _("Test with 'scanimage -d %1 -v' failed.\nThe results are:\n\n%2"),
- sane_device,
- // Fallback message if the real results are missing:
- result["stderr"]:_("(no results available)")
- )
+ Popup::Error( sformat( // Message of a Popup::Error where
+ // %1 will be replaced by the SANE device identifier
+ // %2 will be replaced by the actual test results
+ // which are usually only available in English.
+ // Do not change or translate "scanimage -d %1 -v", it is a fixed command.
+ _("Test with 'scanimage -d %1 -v' failed.\nThe results are:\n\n%2"),
+ sane_device,
+ // Fallback message if the real results are missing:
+ result["stderr"]:_("(no results available)")
+ )
);
// If the test failed, do the whole autodetection anew.
// Even if normally nothing should have changed because of a failed test,
@@ -2379,20 +2383,20 @@
return false;
}
Popup::ClearFeedback();
- Report::ShowText( sformat( // Header of a Report::ShowText where %1 will be replaced by the driver name:
- _("Successfully Tested %1"), backend_name
- ),
- sformat( // Body of a Report::ShowText where
- // %1 will be replaced by the SANE device identifier
- // %2 will be replaced by the actual test results
- // which are usually only available in English.
- // Do not change or translate "scanimage -d %1 -v", it is a fixed command.
- _("Test with 'scanimage -d %1 -v' succeeded.\nThe results are:\n\n%2"),
- sane_device,
- // Fallback message if the real results are missing:
- result["stderr"]:_("(no results available)")
- )
- );
+ Popup::AnyMessage( sformat( // Header of a Popup::AnyMessage where %1 will be replaced by the driver name:
+ _("Successfully Tested %1"), backend_name
+ ),
+ sformat( // Body of a Popup::AnyMessage where
+ // %1 will be replaced by the SANE device identifier
+ // %2 will be replaced by the actual test results
+ // which are usually only available in English.
+ // Do not change or translate "scanimage -d %1 -v", it is a fixed command.
+ _("Test with 'scanimage -d %1 -v' succeeded.\nThe results are:\n\n%2"),
+ sane_device,
+ // Fallback message if the real results are missing:
+ result["stderr"]:_("(no results available)")
+ )
+ );
// Test if HAL knows the particular SANE device.
// This writes also /etc/hal/fdi/policy/10osvendor/80-scanner.fdi
// if the scanner is not listed in /etc/hal/fdi/policy/10osvendor/70-scanner.fdi
@@ -2429,36 +2433,37 @@
*/
global boolean DetermineNetworkScanningConfig()
{ if( ! ExecuteBashCommand( determine_network_scanning_config_commandline ) )
- { Report::Error( // Message of a Report::Error.
- // Only a simple message because this error does not happen on a normal system
- // (i.e. a system which is not totally broken or totally messed up).
- // Do not confuse this error with the case when no scanning via network was configured.
- // The latter results no error.
- _("Failed to determine the configuration for scanning via network.")
- );
+ { Popup::ErrorDetails( // Message of a Popup::ErrorDetails.
+ // Only a simple message because this error does not happen on a normal system
+ // (i.e. a system which is not totally broken or totally messed up).
+ // Do not confuse this error with the case when no scanning via network was configured.
+ // The latter results no error.
+ _("Failed to determine the configuration for scanning via network."),
+ result["stderr"]:""
+ );
return false;
}
if( -1 == SCR::Read( .target.size, network_scanning_config_filename ) )
{ y2milestone( "Error: %1: file does not exist.", network_scanning_config_filename );
- Report::Error( sformat( // Message of a Report::Error where %1 will be replaced by the file name.
- // Only a simple message because this error does not happen on a normal system
- // (i.e. a system which is not totally broken or totally messed up).
- _("File %1 does not exist."),
- network_scanning_config_filename
- )
- );
+ Popup::Error( sformat( // Message of a Popup::Error where %1 will be replaced by the file name.
+ // Only a simple message because this error does not happen on a normal system
+ // (i.e. a system which is not totally broken or totally messed up).
+ _("File %1 does not exist."),
+ network_scanning_config_filename
+ )
+ );
return false;
}
network_scanning_config = (map< string, string >)SCR::Read( .target.ycp, network_scanning_config_filename );
if( nil == network_scanning_config )
{ y2milestone( "Error: Failed to read %1", network_scanning_config_filename );
- Report::Error( sformat( // Message of a Report::Error where %1 will be replaced by the file name.
- // Only a simple message because this error does not happen on a normal system
- // (i.e. a system which is not totally broken or totally messed up).
- _("Failed to read %1."),
- network_scanning_config_filename
- )
- );
+ Popup::Error( sformat( // Message of a Popup::Error where %1 will be replaced by the file name.
+ // Only a simple message because this error does not happen on a normal system
+ // (i.e. a system which is not totally broken or totally messed up).
+ _("Failed to read %1."),
+ network_scanning_config_filename
+ )
+ );
network_scanning_config = $[];
return false;
}
@@ -2558,13 +2563,14 @@
+ network_scanning_config["saned_hosts"]:""
+ "'";
if( ! ExecuteBashCommand( commandline ) )
- { Report::Error( // Message of a Report::Error.
- // Only a simple message because this error does not happen on a normal system
- // (i.e. a system which is not totally broken or totally messed up).
- // Do not confuse this error with the case when no scanning via network is to be set up.
- // The latter results no error.
- _("Failed to set up scanning via network.")
- );
+ { Popup::ErrorDetails( // Message of a Popup::ErrorDetails.
+ // Only a simple message because this error does not happen on a normal system
+ // (i.e. a system which is not totally broken or totally messed up).
+ // Do not confuse this error with the case when no scanning via network is to be set up.
+ // The latter results no error.
+ _("Failed to set up scanning via network."),
+ result["stderr"]:""
+ );
return false;
}
// If the Suse Firewall is used and
@@ -2599,13 +2605,13 @@
|| ! SuSEFirewall::RemoveService( "sane-port", "UDP", "EXT" )
)
{ y2milestone( "Error: SuSEFirewall::AddService(sane-port,TCP+UDP,EXT) failed." );
- Report::Error( // Message of a Report::Error.
- // Only a simple message because this error does not happen on a normal system
- // (i.e. a system which is not totally broken or totally messed up).
- // Do not confuse this error with the case when no firewall stuff is to be set up.
- // The latter results no error.
- _("Failed to deny saned access from external zone in firewall.")
- );
+ Popup::Error( // Message of a Popup::Error.
+ // Only a simple message because this error does not happen on a normal system
+ // (i.e. a system which is not totally broken or totally messed up).
+ // Do not confuse this error with the case when no firewall stuff is to be set up.
+ // The latter results no error.
+ _("Failed to deny saned access from external zone in firewall.")
+ );
return false;
}
y2milestone( "Success: SuSEFirewall::RemoveService(sane-port,TCP+UDP,EXT)" );
@@ -2616,13 +2622,13 @@
boolean progress_previous_state = Progress::set( false );
if( ! SuSEFirewall::Write() )
{ y2milestone( "Error: SuSEFirewall::Write failed to commit firewall settings regarding scanning via network." );
- Report::Error( // Message of a Report::Error.
- // Only a simple message because this error does not happen on a normal system
- // (i.e. a system which is not totally broken or totally messed up).
- // Do not confuse this error with the case when no firewall stuff is to be set up.
- // The latter results no error.
- _("Failed to write firewall settings regarding scanning via network.")
- );
+ Popup::Error( // Message of a Popup::Error.
+ // Only a simple message because this error does not happen on a normal system
+ // (i.e. a system which is not totally broken or totally messed up).
+ // Do not confuse this error with the case when no firewall stuff is to be set up.
+ // The latter results no error.
+ _("Failed to write firewall settings regarding scanning via network.")
+ );
// Restore previous Progress state:
Progress::set( progress_previous_state );
return false;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.17.1/VERSION new/yast2-scanner-2.17.2/VERSION
--- old/yast2-scanner-2.17.1/VERSION 2008-09-10 16:19:56.000000000 +0200
+++ new/yast2-scanner-2.17.2/VERSION 2008-11-04 09:17:48.000000000 +0100
@@ -1 +1 @@
-2.17.1
+2.17.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org